Fixed bugs with 'and' and class types

OCamlPro · Feb 4, 2013 · d7ded5d · d7ded5d
1 parent 9fbcb56
commit d7ded5d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 93 deletions.
diff --git a/src/indentBlock.ml b/src/indentBlock.ml
@@ -581,7 +581,7 @@ let rec update_path config t stream tok =
 
   | TYPE ->
       (match last_token t with
-      | Some MODULE -> t.path (* module type *)
+      | Some (MODULE | CLASS) -> t.path (* module type *)
       | Some (WITH|AND) -> append KType L t.path
       | _ -> append KType L (unwind_top t.path))
 
@@ -757,7 +757,8 @@ let rec update_path config t stream tok =
         t.path
       in
       (match path with
-      | {k=KModule|KLet|KLetIn|KExternal} :: _ ->
+      | {k = KModule|KLet|KLetIn|KExternal
+           | KAnd(KModule|KLet|KLetIn|KExternal)} :: _ ->
           append KColon L path
       | {k=KVal} as h :: p ->
           let indent = config.i_base in

diff --git a/tests/failing-output/unit-classes.ml b/tests/failing-output/unit-classes.ml
@@ -9,7 +9,7 @@ class type c =
   end
 
 class type c =
-    M.cl
+  M.cl
 
 class type c =
   ['a, 'b] M.cl
@@ -81,9 +81,9 @@ class cl =
 and
 virtual ['a, 'b]
     cl2 x y :
-    object
-      val x : bool
-    end = fun x y ->
+  object
+    val x : bool
+  end = fun x y ->
   object
     val x : bool = true
   end

diff --git a/tests/failing-output/unit-modtypes.ml b/tests/failing-output/unit-modtypes.ml
diff --git a/tests/failing/unit-classes.ml b/tests/failing/unit-classes.ml
@@ -81,9 +81,9 @@ class cl =
 and
 virtual ['a, 'b]
     cl2 x y :
-    object
-      val x : bool
-    end = fun x y ->
+  object
+    val x : bool
+  end = fun x y ->
   object
     val x : bool = true
   end

diff --git a/tests/failing/unit-modtypes.ml → tests/passing/unit-modtypes.ml b/tests/failing/unit-modtypes.ml → tests/passing/unit-modtypes.ml
@@ -54,11 +54,11 @@ sig
     end
 
   class type clt =
-  object
-  end
+    object
+    end
   and ['a] clt2 =
-  object
-  end
+    object
+    end
 
   module M :
     Sig