Commits

camlspotter committed 5059fc5 Merge

merge

Comments (0)

Files changed (8)

File contents unchanged.
Binary file modified.

boot/ocamldep

Binary file modified.

boot/ocamllex

Binary file modified.

camlp4/Camlp4/Printers/OCaml.ml

               o#var s o#module_type mt semisep
       | <:str_item< open $sl$ >> ->
             pp f "@[<2>open@ %a%(%)@]" o#ident sl semisep
+      | Ast.StOpnStar(_loc, sl) ->
+            pp f "@[<2>open*@ %a%(%)@]" o#ident sl semisep
       | <:str_item< type $t$ >> ->
             pp f "@[<hv0>@[<hv2>type %a@]%(%)@]" o#ctyp t semisep
       | <:str_item< value $rec:r$ $bi$ >> ->

camlp4/Camlp4/Struct/Camlp4Ast2OCamlAst.ml

File contents unchanged.

camlp4/Camlp4Parsers/Camlp4OCamlRevisedParser.ml

File contents unchanged.

camlp4/boot/Camlp4Ast.ml

                                  (Ast.IdUid _loc "StOpn")))
                            (meta_loc _loc x0))
                         (meta_ident _loc x1)
+                  | Ast.StOpnStar x0 x1 ->
+                      Ast.ExApp _loc
+                        (Ast.ExApp _loc
+                           (Ast.ExId _loc
+                              (Ast.IdAcc _loc (Ast.IdUid _loc "Ast")
+                                 (Ast.IdUid _loc "StOpnStar")))
+                           (meta_loc _loc x0))
+                        (meta_ident _loc x1)
                   | Ast.StMty x0 x1 x2 ->
                       Ast.ExApp _loc
                         (Ast.ExApp _loc
                                  (Ast.IdUid _loc "StOpn")))
                            (meta_loc _loc x0))
                         (meta_ident _loc x1)
+                  | Ast.StOpnStar x0 x1 ->
+                      Ast.PaApp _loc
+                        (Ast.PaApp _loc
+                           (Ast.PaId _loc
+                              (Ast.IdAcc _loc (Ast.IdUid _loc "Ast")
+                                 (Ast.IdUid _loc "StOpnStar")))
+                           (meta_loc _loc x0))
+                        (meta_ident _loc x1)
                   | Ast.StMty x0 x1 x2 ->
                       Ast.PaApp _loc
                         (Ast.PaApp _loc
           | StOpn _x _x_i1 ->
               let _x = o#loc _x in
               let _x_i1 = o#ident _x_i1 in StOpn _x _x_i1
+          | StOpnStar _x _x_i1 ->
+              let _x = o#loc _x in
+              let _x_i1 = o#ident _x_i1 in StOpnStar _x _x_i1
           | StTyp _x _x_i1 ->
               let _x = o#loc _x in let _x_i1 = o#ctyp _x_i1 in StTyp _x _x_i1
           | StVal _x _x_i1 _x_i2 ->
               let o = o#loc _x in
               let o = o#string _x_i1 in let o = o#module_type _x_i2 in o
           | StOpn _x _x_i1 -> let o = o#loc _x in let o = o#ident _x_i1 in o
+          | StOpnStar _x _x_i1 -> let o = o#loc _x in let o = o#ident _x_i1 in o
           | StTyp _x _x_i1 -> let o = o#loc _x in let o = o#ctyp _x_i1 in o
           | StVal _x _x_i1 _x_i2 ->
               let o = o#loc _x in