From 9de3f45de277d8a8f264a425d9121fe91ad80345 Mon Sep 17 00:00:00 2001
From: Alasdair Armstrong
Date: Mon, 18 Feb 2019 17:47:37 +0000
Subject: Make sure we remove bitvector patterns within guards

Fixes #34
---
 src/rewrites.ml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/rewrites.ml b/src/rewrites.ml
index e40b7387..3c000f17 100644
--- a/src/rewrites.ml
+++ b/src/rewrites.ml
@@ -1549,10 +1549,11 @@ let rewrite_exp_remove_bitvector_pat rewriters (E_aux (exp,(l,annot)) as full_ex
        | None -> Pat_aux (Pat_exp (pat', body'), annot'))
      | Pat_aux (Pat_when (pat,guard,body),annot') ->
        let (pat',(guard',decls,_)) = remove_bitvector_pat pat in
+       let guard'' = rewrite_rec guard in
        let body' = decls (rewrite_rec body) in
        (match guard' with
-       | Some guard' -> Pat_aux (Pat_when (pat', bitwise_and_exp (decls guard) guard', body'), annot')
-       | None -> Pat_aux (Pat_when (pat', (decls guard), body'), annot')) in
+       | Some guard' -> Pat_aux (Pat_when (pat', bitwise_and_exp (decls guard'') guard', body'), annot')
+       | None -> Pat_aux (Pat_when (pat', (decls guard''), body'), annot')) in
     rewrap (E_case (e, List.map rewrite_pexp ps))
   | E_let (LB_aux (LB_val (pat,v),annot'),body) ->
      let (pat,(_,decls,_)) = remove_bitvector_pat pat in
-- 
cgit v1.2.3