fix: bug with 'and'

OCamlPro · Dec 17, 2012 · 8dcf257 · 8dcf257
1 parent c557575
commit 8dcf257
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/block.ml b/src/block.ml
@@ -532,7 +532,8 @@ let rec update_path t stream tok =
 
   | AND ->
       let unwind_to = function
-        | KLet | KLetIn | KBody(KLet|KLetIn) | KType | KModule
+        | KLet | KLetIn | KBody(KLet|KLetIn|KAnd(KLet|KLetIn))
+        | KType | KModule
         | KWith(KType|KModule) | KAnd(KWith(KType|KModule)) -> true
         | _ -> false
       in let path = unwind unwind_to t.path in
@@ -664,7 +665,8 @@ let rec update_path t stream tok =
   | EQUAL ->
       let unwind_to = function
         | KParen | KBrace | KBracket | KBracketBar | KBody _
-        | KExternal | KModule | KType | KLet | KLetIn -> true
+        | KExternal | KModule | KType | KLet | KLetIn
+        | KAnd(KModule|KType|KLet|KLetIn) -> true
         | _ -> false
       in let path = unwind unwind_to t.path in
       (match path with

diff --git a/tests/core-failing.ml b/tests/core-failing.ml
@@ -18,11 +18,6 @@ include struct
 end
 
 
-let _ =
-  let f x =
-    bla
-  and g x =
-    bli
 let mem { ar; cmp } el =
   let len = Array.length ar in
   len > 0 &&

diff --git a/tests/core-passing.ml b/tests/core-passing.ml
@@ -128,4 +128,11 @@ let should_check_can_sell_and_marking regulatory_regime =
 let _ =
   invalid_arg
     (sprintf "Dequeue.%s: index %i is not in [%d, %d]"
-       fname i (front_index buf) (back_index buf))
+       fname i (front_index buf) (back_index buf))
+
+let _ =
+  let f x =
+    bla
+  and g x =
+    bli
+