Expose Parse.module_type and Parse.module_expr

ocaml · Oct 12, 2021 · 5f77554 · 5f77554
1 parent 0b3f8dd
commit 5f77554
Show file tree

Hide file tree

Showing 5 changed files with 3,593 additions and 3,487 deletions.
diff --git a/boot/menhir/parser.ml b/boot/menhir/parser.ml
diff --git a/boot/menhir/parser.mli b/boot/menhir/parser.mli
@@ -142,6 +142,10 @@ val parse_pattern: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (Parsetree.patte
 
 val parse_mty_longident: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (Longident.t)
 
+val parse_module_type: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (Parsetree.module_type)
+
+val parse_module_expr: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (Parsetree.module_expr)
+
 val parse_mod_longident: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (Longident.t)
 
 val parse_mod_ext_longident: (Lexing.lexbuf -> token) -> Lexing.lexbuf -> (Longident.t)
@@ -181,6 +185,10 @@ module Incremental : sig
 
   val parse_mty_longident: Lexing.position -> (Longident.t) MenhirInterpreter.checkpoint
 
+  val parse_module_type: Lexing.position -> (Parsetree.module_type) MenhirInterpreter.checkpoint
+
+  val parse_module_expr: Lexing.position -> (Parsetree.module_expr) MenhirInterpreter.checkpoint
+
   val parse_mod_longident: Lexing.position -> (Longident.t) MenhirInterpreter.checkpoint
 
   val parse_mod_ext_longident: Lexing.position -> (Longident.t) MenhirInterpreter.checkpoint

diff --git a/parsing/parse.ml b/parsing/parse.ml
@@ -95,6 +95,8 @@ and use_file = wrap Parser.use_file
 and core_type = wrap Parser.parse_core_type
 and expression = wrap Parser.parse_expression
 and pattern = wrap Parser.parse_pattern
+let module_type = wrap Parser.parse_module_type
+let module_expr = wrap Parser.parse_module_expr
 
 let longident = wrap Parser.parse_any_longident
 let val_ident = wrap Parser.parse_val_longident

diff --git a/parsing/parse.mli b/parsing/parse.mli
@@ -27,6 +27,8 @@ val use_file : Lexing.lexbuf -> Parsetree.toplevel_phrase list
 val core_type : Lexing.lexbuf -> Parsetree.core_type
 val expression : Lexing.lexbuf -> Parsetree.expression
 val pattern : Lexing.lexbuf -> Parsetree.pattern
+val module_type : Lexing.lexbuf -> Parsetree.module_type
+val module_expr : Lexing.lexbuf -> Parsetree.module_expr
 
 (** The functions below can be used to parse Longident safely. *)
 

diff --git a/parsing/parser.mly b/parsing/parser.mly
@@ -849,6 +849,10 @@ The precedences must be listed from low to high.
 %start use_file                         /* for the #use directive */
 %type <Parsetree.toplevel_phrase list> use_file
 /* BEGIN AVOID */
+%start parse_module_type
+%type <Parsetree.module_type> parse_module_type
+%start parse_module_expr
+%type <Parsetree.module_expr> parse_module_expr
 %start parse_core_type
 %type <Parsetree.core_type> parse_core_type
 %start parse_expression
@@ -1198,6 +1202,16 @@ use_file:
 ;
 
 /* BEGIN AVOID */
+parse_module_type:
+  module_type EOF
+    { $1 }
+;
+
+parse_module_expr:
+  module_expr EOF
+    { $1 }
+;
+
 parse_core_type:
   core_type EOF
     { $1 }