Refactoring.

camlp5 · Jul 17, 2018 · 9f3a317 · 9f3a317
1 parent da6f5ba
commit 9f3a317
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,7 @@
 Camlp5 Version 7.06:
 --------------------
 
+* [17 Jul 18] Support nonrec type declaration (Kakadu).
 * [27 Jun 18] Updated for ocaml upcomming version 4.08.0.
 * [19 Jun 18] Add support for OCaml 4.07.0
 * [19 Jun 18] Fix OPAM file [in particular avoid the filesystem deletion bug]

diff --git a/main/reloc.ml b/main/reloc.ml
@@ -547,9 +547,9 @@ and str_item floc sh =
     | StOpn loc x1 →
         let loc = floc loc in
         StOpn loc x1
-    | StTyp loc flg x1 →
+    | StTyp loc x1 x2 →
         let loc = floc loc in
-        StTyp loc flg (vala_map (List.map (type_decl floc sh)) x1)
+        StTyp loc x1 (vala_map (List.map (type_decl floc sh)) x2)
     | StUse loc x1 x2 →
         let loc = floc loc in
         StUse loc x1

diff --git a/ocaml_src/meta/q_MLast.ml b/ocaml_src/meta/q_MLast.ml
@@ -1089,7 +1089,7 @@ Grammar.safe_extend
               (let (_, c, tl, _) =
                  match ctl with
                    Qast.Tuple [xx1; xx2; xx3; xx4] -> xx1, xx2, xx3, xx4
-                 | _ -> raise (Match_failure ("q_MLast.ml", 313, 19))
+                 | _ -> raise (Match_failure ("q_MLast.ml", 313, 20))
                in
                Qast.Node ("StExc", [Qast.Loc; c; tl; b]) :
                'str_item)));
@@ -1955,7 +1955,7 @@ Grammar.safe_extend
               (let (_, c, tl, _) =
                  match ctl with
                    Qast.Tuple [xx1; xx2; xx3; xx4] -> xx1, xx2, xx3, xx4
-                 | _ -> raise (Match_failure ("q_MLast.ml", 384, 19))
+                 | _ -> raise (Match_failure ("q_MLast.ml", 384, 20))
                in
                Qast.Node ("SgExc", [Qast.Loc; c; tl]) :
                'sig_item)));