diff options
author | Tom Kelly <ctk21@cl.cam.ac.uk> | 2021-10-04 13:43:41 +0100 |
---|---|---|
committer | Tom Kelly <ctk21@cl.cam.ac.uk> | 2021-10-04 13:43:41 +0100 |
commit | cc4e5f5f2d87149e62ca33cc3c0456735e365f4f (patch) | |
tree | eb98182eb50671504bfb23efcd69e266471bb9b0 | |
parent | 219f0470fa12f2460953d2c2407f19e050d93f5a (diff) | |
parent | 80482ed60b9c3459595f3df4e124744a2eb79993 (diff) | |
download | ocaml-cc4e5f5f2d87149e62ca33cc3c0456735e365f4f.tar.gz |
Merge commit '80482ed60b9c3459595f3df4e124744a2eb79993' into 5.00
-rw-r--r-- | Changes | 12 | ||||
-rw-r--r-- | boot/menhir/parser.ml | 1930 | ||||
-rw-r--r-- | parsing/parser.mly | 38 | ||||
-rw-r--r-- | parsing/pprintast.ml | 4 | ||||
-rw-r--r-- | testsuite/tests/parsetree/locations_test.compilers.reference | 69 | ||||
-rw-r--r-- | testsuite/tests/parsetree/locations_test.ml | 4 | ||||
-rw-r--r-- | testsuite/tests/parsetree/source.ml | 2 | ||||
-rw-r--r-- | testsuite/tests/typing-objects/field_kind.ml | 73 | ||||
-rw-r--r-- | toplevel/toploop.ml | 2 | ||||
-rw-r--r-- | toplevel/toploop.mli | 1 | ||||
-rw-r--r-- | typing/btype.ml | 24 | ||||
-rw-r--r-- | typing/btype.mli | 3 | ||||
-rw-r--r-- | typing/ctype.ml | 8 |
13 files changed, 1135 insertions, 1035 deletions
@@ -86,6 +86,9 @@ Working version Types (Nicolas Chataing, review by Jacques Garrigue) +- #10555: Do not use ghost locations for type constraints + (Nicolás Ojeda Bär, report by Anton Bachin, review by Thomas Refis) + ### Build system: - #10471: Fix detection of arm32 architectures with musl in the configure @@ -104,6 +107,12 @@ Working version otherwise the derived pointer is live across a poll point. (Vincent Laviron and Xavier Leroy, review by Xavier Leroy and Sadiq Jaffer) +- #10539: Field kinds should be kept when copying types + Losing the sharing meant that one could desynchronize them between several + occurences of self, allowing a method to be both public and hidden, + which broke type soundness. + (Jacques Garrigue, review by Leo White) + - #10542: Fix detection of immediate64 types through unboxed types. (Leo White, review by Stephen Dolan and Gabriel Scherer) @@ -701,6 +710,9 @@ OCaml 4.13.0 with -dsource (Matt Else, review by Florian Angeletti) +- #10550, #10551: fix pretty-print of gadt-pattern-with-type-vars + (Chet Murthy, review by Gabriel Scherer) + OCaml 4.12, maintenance version ------------------------------- diff --git a/boot/menhir/parser.ml b/boot/menhir/parser.ml index 9870bc9d43..8a9cc0b955 100644 --- a/boot/menhir/parser.ml +++ b/boot/menhir/parser.ml @@ -415,8 +415,8 @@ let mkstrexp e attrs = let mkexp_constraint ~loc e (t1, t2) = match t1, t2 with - | Some t, None -> ghexp ~loc (Pexp_constraint(e, t)) - | _, Some t -> ghexp ~loc (Pexp_coerce(e, t1, t)) + | Some t, None -> mkexp ~loc (Pexp_constraint(e, t)) + | _, Some t -> mkexp ~loc (Pexp_coerce(e, t1, t)) | None, None -> assert false let mkexp_opt_constraint ~loc e = function @@ -425,7 +425,7 @@ let mkexp_opt_constraint ~loc e = function let mkpat_opt_constraint ~loc p = function | None -> p - | Some typ -> ghpat ~loc (Ppat_constraint(p, typ)) + | Some typ -> mkpat ~loc (Ppat_constraint(p, typ)) let syntax_error () = raise Syntaxerr.Escape_error @@ -596,12 +596,12 @@ let loc_last (id : Longident.t Location.loc) : string Location.loc = let loc_lident (id : string Location.loc) : Longident.t Location.loc = loc_map (fun x -> Lident x) id -let exp_of_longident ~loc lid = - let lid = make_ghost (loc_map (fun id -> Lident (Longident.last id)) lid) in - ghexp ~loc (Pexp_ident lid) +let exp_of_longident lid = + let lid = loc_map (fun id -> Lident (Longident.last id)) lid in + Exp.mk ~loc:lid.loc (Pexp_ident lid) -let exp_of_label ~loc lbl = - mkexp ~loc (Pexp_ident (loc_lident lbl)) +let exp_of_label lbl = + Exp.mk ~loc:lbl.loc (Pexp_ident (loc_lident lbl)) let pat_of_label lbl = Pat.mk ~loc:lbl.loc (Ppat_var (loc_last lbl)) @@ -18669,18 +18669,18 @@ module Tables = struct let _sloc = (_symbolstartpos, _endpos) in # 2846 "parsing/parser.mly" - ( let label, pat = + ( let constraint_loc, label, pat = match opat with | None -> (* No pattern; this is a pun. Desugar it. But that the pattern was there and the label reconstructed (which piece of AST is marked as ghost is important for warning emission). *) - make_ghost label, pat_of_label label + _sloc, make_ghost label, pat_of_label label | Some pat -> - label, pat + (_startpos_octy_, _endpos), label, pat in - label, mkpat_opt_constraint ~loc:_sloc pat octy + label, mkpat_opt_constraint ~loc:constraint_loc pat octy ) # 18686 "parsing/parser.ml" @@ -18753,18 +18753,18 @@ module Tables = struct let _sloc = (_symbolstartpos, _endpos) in # 2846 "parsing/parser.mly" - ( let label, pat = + ( let constraint_loc, label, pat = match opat with | None -> (* No pattern; this is a pun. Desugar it. But that the pattern was there and the label reconstructed (which piece of AST is marked as ghost is important for warning emission). *) - make_ghost label, pat_of_label label + _sloc, make_ghost label, pat_of_label label | Some pat -> - label, pat + (_startpos_octy_, _endpos), label, pat in - label, mkpat_opt_constraint ~loc:_sloc pat octy + label, mkpat_opt_constraint ~loc:constraint_loc pat octy ) # 18770 "parsing/parser.ml" @@ -18846,18 +18846,18 @@ module Tables = struct let _sloc = (_symbolstartpos, _endpos) in # 2846 "parsing/parser.mly" - ( let label, pat = + ( let constraint_loc, label, pat = match opat with | None -> (* No pattern; this is a pun. Desugar it. But that the pattern was there and the label reconstructed (which piece of AST is marked as ghost is important for warning emission). *) - make_ghost label, pat_of_label label + _sloc, make_ghost label, pat_of_label label | Some pat -> - label, pat + (_startpos_octy_, _endpos), label, pat in - label, mkpat_opt_constraint ~loc:_sloc pat octy + label, mkpat_opt_constraint ~loc:constraint_loc pat octy ) # 18863 "parsing/parser.ml" @@ -18932,18 +18932,18 @@ module Tables = struct let _sloc = (_symbolstartpos, _endpos) in # 2846 "parsing/parser.mly" - ( let label, pat = + ( let constraint_loc, label, pat = match opat with | None -> (* No pattern; this is a pun. Desugar it. But that the pattern was there and the label reconstructed (which piece of AST is marked as ghost is important for warning emission). *) - make_ghost label, pat_of_label label + _sloc, make_ghost label, pat_of_label label | Some pat -> - label, pat + (_startpos_octy_, _endpos), label, pat in - label, mkpat_opt_constraint ~loc:_sloc pat octy + label, mkpat_opt_constraint ~loc:constraint_loc pat octy ) # 18949 "parsing/parser.ml" @@ -31616,28 +31616,24 @@ module Tables = struct # 31617 "parsing/parser.ml" in - let _startpos_label_ = _startpos__1_ in - let _endpos = _endpos_oe_ in - let _symbolstartpos = _startpos_label_ in - let _sloc = (_symbolstartpos, _endpos) in # 2652 "parsing/parser.mly" - ( let e = + ( let label, e = match oe with | None -> (* No expression; this is a pun. Desugar it. *) - exp_of_label ~loc:_sloc label + make_ghost label, exp_of_label label | Some e -> - e + label, e in label, e ) -# 31635 "parsing/parser.ml" +# 31631 "parsing/parser.ml" in # 1053 "parsing/parser.mly" ( [x] ) -# 31641 "parsing/parser.ml" +# 31637 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -31672,7 +31668,7 @@ module Tables = struct let _1 : ( # 705 "parsing/parser.mly" (string) -# 31676 "parsing/parser.ml" +# 31672 "parsing/parser.ml" ) = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in let _startpos = _startpos__1_ in @@ -31680,14 +31676,14 @@ module Tables = struct let _v : ((Asttypes.label Asttypes.loc * Parsetree.expression) list) = let _2 = # 126 "<standard.mly>" ( Some x ) -# 31684 "parsing/parser.ml" +# 31680 "parsing/parser.ml" in let x = let label = let _1 = # 3498 "parsing/parser.mly" ( _1 ) -# 31691 "parsing/parser.ml" +# 31687 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -31695,31 +31691,27 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 31699 "parsing/parser.ml" +# 31695 "parsing/parser.ml" in - let _startpos_label_ = _startpos__1_ in - let _endpos = _endpos_oe_ in - let _symbolstartpos = _startpos_label_ in - let _sloc = (_symbolstartpos, _endpos) in # 2652 "parsing/parser.mly" - ( let e = + ( let label, e = match oe with | None -> (* No expression; this is a pun. Desugar it. *) - exp_of_label ~loc:_sloc label + make_ghost label, exp_of_label label | Some e -> - e + label, e in label, e ) -# 31717 "parsing/parser.ml" +# 31709 "parsing/parser.ml" in # 1053 "parsing/parser.mly" ( [x] ) -# 31723 "parsing/parser.ml" +# 31715 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -31761,7 +31753,7 @@ module Tables = struct let _1 : ( # 705 "parsing/parser.mly" (string) -# 31765 "parsing/parser.ml" +# 31757 "parsing/parser.ml" ) = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in let _startpos = _startpos__1_ in @@ -31771,7 +31763,7 @@ module Tables = struct let _1 = # 3498 "parsing/parser.mly" ( _1 ) -# 31775 "parsing/parser.ml" +# 31767 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -31779,31 +31771,27 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 31783 "parsing/parser.ml" +# 31775 "parsing/parser.ml" in - let _startpos_label_ = _startpos__1_ in - let _endpos = _endpos_oe_ in - let _symbolstartpos = _startpos_label_ in - let _sloc = (_symbolstartpos, _endpos) in # 2652 "parsing/parser.mly" - ( let e = + ( let label, e = match oe with | None -> (* No expression; this is a pun. Desugar it. *) - exp_of_label ~loc:_sloc label + make_ghost label, exp_of_label label | Some e -> - e + label, e in label, e ) -# 31801 "parsing/parser.ml" +# 31789 "parsing/parser.ml" in # 1057 "parsing/parser.mly" ( x :: xs ) -# 31807 "parsing/parser.ml" +# 31795 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -31828,12 +31816,12 @@ module Tables = struct let _v : (Parsetree.pattern list) = let _2 = # 124 "<standard.mly>" ( None ) -# 31832 "parsing/parser.ml" +# 31820 "parsing/parser.ml" in # 1053 "parsing/parser.mly" ( [x] ) -# 31837 "parsing/parser.ml" +# 31825 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -31867,13 +31855,13 @@ module Tables = struct # 126 "<standard.mly>" ( Some x ) -# 31871 "parsing/parser.ml" +# 31859 "parsing/parser.ml" in # 1053 "parsing/parser.mly" ( [x] ) -# 31877 "parsing/parser.ml" +# 31865 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -31912,7 +31900,7 @@ module Tables = struct let _v : (Parsetree.pattern list) = # 1057 "parsing/parser.mly" ( x :: xs ) -# 31916 "parsing/parser.ml" +# 31904 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -31951,7 +31939,7 @@ module Tables = struct let _v : ((Longident.t Asttypes.loc * Parsetree.expression) list) = let _2 = # 124 "<standard.mly>" ( None ) -# 31955 "parsing/parser.ml" +# 31943 "parsing/parser.ml" in let x = let label = @@ -31961,7 +31949,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 31965 "parsing/parser.ml" +# 31953 "parsing/parser.ml" in let _startpos_label_ = _startpos__1_ in @@ -31970,22 +31958,22 @@ module Tables = struct let _sloc = (_symbolstartpos, _endpos) in # 2635 "parsing/parser.mly" - ( let e = + ( let constraint_loc, label, e = match eo with | None -> (* No pattern; this is a pun. Desugar it. *) - exp_of_longident ~loc:_sloc label + _sloc, make_ghost label, exp_of_longident label | Some e -> - e + (_startpos_c_, _endpos), label, e in - label, mkexp_opt_constraint ~loc:_sloc e c ) -# 31983 "parsing/parser.ml" + label, mkexp_opt_constraint ~loc:constraint_loc e c ) +# 31971 "parsing/parser.ml" in # 1053 "parsing/parser.mly" ( [x] ) -# 31989 "parsing/parser.ml" +# 31977 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32031,7 +32019,7 @@ module Tables = struct let _v : ((Longident.t Asttypes.loc * Parsetree.expression) list) = let _2 = # 126 "<standard.mly>" ( Some x ) -# 32035 "parsing/parser.ml" +# 32023 "parsing/parser.ml" in let x = let label = @@ -32041,7 +32029,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 32045 "parsing/parser.ml" +# 32033 "parsing/parser.ml" in let _startpos_label_ = _startpos__1_ in @@ -32050,22 +32038,22 @@ module Tables = struct let _sloc = (_symbolstartpos, _endpos) in # 2635 "parsing/parser.mly" - ( let e = + ( let constraint_loc, label, e = match eo with | None -> (* No pattern; this is a pun. Desugar it. *) - exp_of_longident ~loc:_sloc label + _sloc, make_ghost label, exp_of_longident label | Some e -> - e + (_startpos_c_, _endpos), label, e in - label, mkexp_opt_constraint ~loc:_sloc e c ) -# 32063 "parsing/parser.ml" + label, mkexp_opt_constraint ~loc:constraint_loc e c ) +# 32051 "parsing/parser.ml" in # 1053 "parsing/parser.mly" ( [x] ) -# 32069 "parsing/parser.ml" +# 32057 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32123,7 +32111,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 32127 "parsing/parser.ml" +# 32115 "parsing/parser.ml" in let _startpos_label_ = _startpos__1_ in @@ -32132,22 +32120,22 @@ module Tables = struct let _sloc = (_symbolstartpos, _endpos) in # 2635 "parsing/parser.mly" - ( let e = + ( let constraint_loc, label, e = match eo with | None -> (* No pattern; this is a pun. Desugar it. *) - exp_of_longident ~loc:_sloc label + _sloc, make_ghost label, exp_of_longident label | Some e -> - e + (_startpos_c_, _endpos), label, e in - label, mkexp_opt_constraint ~loc:_sloc e c ) -# 32145 "parsing/parser.ml" + label, mkexp_opt_constraint ~loc:constraint_loc e c ) +# 32133 "parsing/parser.ml" in # 1057 "parsing/parser.mly" ( x :: xs ) -# 32151 "parsing/parser.ml" +# 32139 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32172,7 +32160,7 @@ module Tables = struct let _v : (Parsetree.expression) = # 2169 "parsing/parser.mly" ( _1 ) -# 32176 "parsing/parser.ml" +# 32164 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32204,7 +32192,7 @@ module Tables = struct let _v : (Parsetree.expression) = # 2170 "parsing/parser.mly" ( _1 ) -# 32208 "parsing/parser.ml" +# 32196 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32244,7 +32232,7 @@ module Tables = struct let _1 = # 2172 "parsing/parser.mly" ( Pexp_sequence(_1, _3) ) -# 32248 "parsing/parser.ml" +# 32236 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in let _endpos = _endpos__1_ in @@ -32253,13 +32241,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 32257 "parsing/parser.ml" +# 32245 "parsing/parser.ml" in # 2173 "parsing/parser.mly" ( _1 ) -# 32263 "parsing/parser.ml" +# 32251 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32317,7 +32305,7 @@ module Tables = struct ( let seq = mkexp ~loc:_sloc (Pexp_sequence (_1, _5)) in let payload = PStr [mkstrexp seq []] in mkexp ~loc:_sloc (Pexp_extension (_4, payload)) ) -# 32321 "parsing/parser.ml" +# 32309 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32387,7 +32375,7 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 32391 "parsing/parser.ml" +# 32379 "parsing/parser.ml" in let _endpos_attrs_ = _endpos__1_inlined4_ in @@ -32396,7 +32384,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 32400 "parsing/parser.ml" +# 32388 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined3_ in @@ -32408,7 +32396,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 32412 "parsing/parser.ml" +# 32400 "parsing/parser.ml" in let attrs1 = @@ -32416,7 +32404,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 32420 "parsing/parser.ml" +# 32408 "parsing/parser.ml" in let _endpos = _endpos_attrs_ in @@ -32431,7 +32419,7 @@ module Tables = struct Te.mk_exception ~attrs (Te.decl id ~vars ~args ?res ~attrs:(attrs1 @ attrs2) ~loc ~docs) , ext ) -# 32435 "parsing/parser.ml" +# 32423 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32457,7 +32445,7 @@ module Tables = struct let _1 = # 260 "<standard.mly>" ( List.flatten xss ) -# 32461 "parsing/parser.ml" +# 32449 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos_xss_, _startpos_xss_) in let _endpos = _endpos__1_ in @@ -32465,13 +32453,13 @@ module Tables = struct # 876 "parsing/parser.mly" ( extra_sig _startpos _endpos _1 ) -# 32469 "parsing/parser.ml" +# 32457 "parsing/parser.ml" in # 1618 "parsing/parser.mly" ( _1 ) -# 32475 "parsing/parser.ml" +# 32463 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32505,7 +32493,7 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 32509 "parsing/parser.ml" +# 32497 "parsing/parser.ml" in let _endpos__2_ = _endpos__1_inlined1_ in @@ -32516,7 +32504,7 @@ module Tables = struct # 1633 "parsing/parser.mly" ( let docs = symbol_docs _sloc in mksig ~loc:_sloc (Psig_extension (_1, (add_docs_attrs docs _2))) ) -# 32520 "parsing/parser.ml" +# 32508 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32542,7 +32530,7 @@ module Tables = struct let _1 = # 1637 "parsing/parser.mly" ( Psig_attribute _1 ) -# 32546 "parsing/parser.ml" +# 32534 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -32550,13 +32538,13 @@ module Tables = struct # 924 "parsing/parser.mly" ( mksig ~loc:_sloc _1 ) -# 32554 "parsing/parser.ml" +# 32542 "parsing/parser.ml" in # 1639 "parsing/parser.mly" ( _1 ) -# 32560 "parsing/parser.ml" +# 32548 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32582,7 +32570,7 @@ module Tables = struct let _1 = # 1642 "parsing/parser.mly" ( psig_value _1 ) -# 32586 "parsing/parser.ml" +# 32574 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -32590,13 +32578,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 32594 "parsing/parser.ml" +# 32582 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 32600 "parsing/parser.ml" +# 32588 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32622,7 +32610,7 @@ module Tables = struct let _1 = # 1644 "parsing/parser.mly" ( psig_value _1 ) -# 32626 "parsing/parser.ml" +# 32614 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -32630,13 +32618,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 32634 "parsing/parser.ml" +# 32622 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 32640 "parsing/parser.ml" +# 32628 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32673,24 +32661,24 @@ module Tables = struct let _1 = # 1114 "parsing/parser.mly" ( let (x, b) = a in x, b :: bs ) -# 32677 "parsing/parser.ml" +# 32665 "parsing/parser.ml" in # 2926 "parsing/parser.mly" ( _1 ) -# 32682 "parsing/parser.ml" +# 32670 "parsing/parser.ml" in # 2909 "parsing/parser.mly" ( _1 ) -# 32688 "parsing/parser.ml" +# 32676 "parsing/parser.ml" in # 1646 "parsing/parser.mly" ( psig_type _1 ) -# 32694 "parsing/parser.ml" +# 32682 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos_bs_, _startpos_a_) in @@ -32700,13 +32688,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 32704 "parsing/parser.ml" +# 32692 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 32710 "parsing/parser.ml" +# 32698 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32743,24 +32731,24 @@ module Tables = struct let _1 = # 1114 "parsing/parser.mly" ( let (x, b) = a in x, b :: bs ) -# 32747 "parsing/parser.ml" +# 32735 "parsing/parser.ml" in # 2926 "parsing/parser.mly" ( _1 ) -# 32752 "parsing/parser.ml" +# 32740 "parsing/parser.ml" in # 2914 "parsing/parser.mly" ( _1 ) -# 32758 "parsing/parser.ml" +# 32746 "parsing/parser.ml" in # 1648 "parsing/parser.mly" ( psig_typesubst _1 ) -# 32764 "parsing/parser.ml" +# 32752 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos_bs_, _startpos_a_) in @@ -32770,13 +32758,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 32774 "parsing/parser.ml" +# 32762 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 32780 "parsing/parser.ml" +# 32768 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -32863,14 +32851,14 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 32867 "parsing/parser.ml" +# 32855 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined3_ in let cs = # 1106 "parsing/parser.mly" ( List.rev xs ) -# 32874 "parsing/parser.ml" +# 32862 "parsing/parser.ml" in let tid = let (_endpos__1_, _startpos__1_, _1) = (_endpos__1_inlined2_, _startpos__1_inlined2_, _1_inlined2) in @@ -32880,20 +32868,20 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 32884 "parsing/parser.ml" +# 32872 "parsing/parser.ml" in let _4 = # 3681 "parsing/parser.mly" ( Recursive ) -# 32890 "parsing/parser.ml" +# 32878 "parsing/parser.ml" in let attrs1 = let _1 = _1_inlined1 in # 3840 "parsing/parser.mly" ( _1 ) -# 32897 "parsing/parser.ml" +# 32885 "parsing/parser.ml" in let _endpos = _endpos_attrs2_ in @@ -32905,19 +32893,19 @@ module Tables = struct let attrs = attrs1 @ attrs2 in Te.mk tid cs ~params ~priv ~attrs ~docs, ext ) -# 32909 "parsing/parser.ml" +# 32897 "parsing/parser.ml" in # 3167 "parsing/parser.mly" ( _1 ) -# 32915 "parsing/parser.ml" +# 32903 "parsing/parser.ml" in # 1650 "parsing/parser.mly" ( psig_typext _1 ) -# 32921 "parsing/parser.ml" +# 32909 "parsing/parser.ml" in let _endpos__1_ = _endpos__1_inlined3_ in @@ -32927,13 +32915,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 32931 "parsing/parser.ml" +# 32919 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 32937 "parsing/parser.ml" +# 32925 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -33027,14 +33015,14 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 33031 "parsing/parser.ml" +# 33019 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined4_ in let cs = # 1106 "parsing/parser.mly" ( List.rev xs ) -# 33038 "parsing/parser.ml" +# 33026 "parsing/parser.ml" in let tid = let (_endpos__1_, _startpos__1_, _1) = (_endpos__1_inlined3_, _startpos__1_inlined3_, _1_inlined3) in @@ -33044,7 +33032,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 33048 "parsing/parser.ml" +# 33036 "parsing/parser.ml" in let _4 = @@ -33055,7 +33043,7 @@ module Tables = struct # 3683 "parsing/parser.mly" ( not_expecting _loc "nonrec flag" ) -# 33059 "parsing/parser.ml" +# 33047 "parsing/parser.ml" in let attrs1 = @@ -33063,7 +33051,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 33067 "parsing/parser.ml" +# 33055 "parsing/parser.ml" in let _endpos = _endpos_attrs2_ in @@ -33075,19 +33063,19 @@ module Tables = struct let attrs = attrs1 @ attrs2 in Te.mk tid cs ~params ~priv ~attrs ~docs, ext ) -# 33079 "parsing/parser.ml" +# 33067 "parsing/parser.ml" in # 3167 "parsing/parser.mly" ( _1 ) -# 33085 "parsing/parser.ml" +# 33073 "parsing/parser.ml" in # 1650 "parsing/parser.mly" ( psig_typext _1 ) -# 33091 "parsing/parser.ml" +# 33079 "parsing/parser.ml" in let _endpos__1_ = _endpos__1_inlined4_ in @@ -33097,13 +33085,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 33101 "parsing/parser.ml" +# 33089 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 33107 "parsing/parser.ml" +# 33095 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -33129,7 +33117,7 @@ module Tables = struct let _1 = # 1652 "parsing/parser.mly" ( psig_exception _1 ) -# 33133 "parsing/parser.ml" +# 33121 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -33137,13 +33125,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 33141 "parsing/parser.ml" +# 33129 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 33147 "parsing/parser.ml" +# 33135 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -33208,7 +33196,7 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 33212 "parsing/parser.ml" +# 33200 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined3_ in @@ -33220,7 +33208,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 33224 "parsing/parser.ml" +# 33212 "parsing/parser.ml" in let attrs1 = @@ -33228,7 +33216,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 33232 "parsing/parser.ml" +# 33220 "parsing/parser.ml" in let _endpos = _endpos_attrs2_ in @@ -33242,13 +33230,13 @@ module Tables = struct let docs = symbol_docs _sloc in Md.mk name body ~attrs ~loc ~docs, ext ) -# 33246 "parsing/parser.ml" +# 33234 "parsing/parser.ml" in # 1654 "parsing/parser.mly" ( let (body, ext) = _1 in (Psig_module body, ext) ) -# 33252 "parsing/parser.ml" +# 33240 "parsing/parser.ml" in let _endpos__1_ = _endpos__1_inlined3_ in @@ -33258,13 +33246,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 33262 "parsing/parser.ml" +# 33250 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 33268 "parsing/parser.ml" +# 33256 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -33336,7 +33324,7 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 33340 "parsing/parser.ml" +# 33328 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined4_ in @@ -33349,7 +33337,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 33353 "parsing/parser.ml" +# 33341 "parsing/parser.ml" in let (_endpos_id_, _startpos_id_) = (_endpos__1_, _startpos__1_) in @@ -33359,7 +33347,7 @@ module Tables = struct # 1720 "parsing/parser.mly" ( Mty.alias ~loc:(make_loc _sloc) id ) -# 33363 "parsing/parser.ml" +# 33351 "parsing/parser.ml" in let name = @@ -33370,7 +33358,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 33374 "parsing/parser.ml" +# 33362 "parsing/parser.ml" in let attrs1 = @@ -33378,7 +33366,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 33382 "parsing/parser.ml" +# 33370 "parsing/parser.ml" in let _endpos = _endpos_attrs2_ in @@ -33392,13 +33380,13 @@ module Tables = struct let docs = symbol_docs _sloc in Md.mk name body ~attrs ~loc ~docs, ext ) -# 33396 "parsing/parser.ml" +# 33384 "parsing/parser.ml" in # 1656 "parsing/parser.mly" ( let (body, ext) = _1 in (Psig_module body, ext) ) -# 33402 "parsing/parser.ml" +# 33390 "parsing/parser.ml" in let _endpos__1_ = _endpos__1_inlined4_ in @@ -33408,13 +33396,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 33412 "parsing/parser.ml" +# 33400 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 33418 "parsing/parser.ml" +# 33406 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -33440,7 +33428,7 @@ module Tables = struct let _1 = # 1658 "parsing/parser.mly" ( let (body, ext) = _1 in (Psig_modsubst body, ext) ) -# 33444 "parsing/parser.ml" +# 33432 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -33448,13 +33436,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 33452 "parsing/parser.ml" +# 33440 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 33458 "parsing/parser.ml" +# 33446 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -33542,7 +33530,7 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 33546 "parsing/parser.ml" +# 33534 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined3_ in @@ -33554,7 +33542,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 33558 "parsing/parser.ml" +# 33546 "parsing/parser.ml" in let attrs1 = @@ -33562,7 +33550,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 33566 "parsing/parser.ml" +# 33554 "parsing/parser.ml" in let _endpos = _endpos_attrs2_ in @@ -33576,25 +33564,25 @@ module Tables = struct let docs = symbol_docs _sloc in ext, Md.mk name mty ~attrs ~loc ~docs ) -# 33580 "parsing/parser.ml" +# 33568 "parsing/parser.ml" in # 1114 "parsing/parser.mly" ( let (x, b) = a in x, b :: bs ) -# 33586 "parsing/parser.ml" +# 33574 "parsing/parser.ml" in # 1743 "parsing/parser.mly" ( _1 ) -# 33592 "parsing/parser.ml" +# 33580 "parsing/parser.ml" in # 1660 "parsing/parser.mly" ( let (ext, l) = _1 in (Psig_recmodule l, ext) ) -# 33598 "parsing/parser.ml" +# 33586 "parsing/parser.ml" in let _endpos__1_ = _endpos_bs_ in @@ -33604,13 +33592,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 33608 "parsing/parser.ml" +# 33596 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 33614 "parsing/parser.ml" +# 33602 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -33636,7 +33624,7 @@ module Tables = struct let _1 = # 1662 "parsing/parser.mly" ( let (body, ext) = _1 in (Psig_modtype body, ext) ) -# 33640 "parsing/parser.ml" +# 33628 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -33644,13 +33632,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 33648 "parsing/parser.ml" +# 33636 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 33654 "parsing/parser.ml" +# 33642 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -33676,7 +33664,7 @@ module Tables = struct let _1 = # 1664 "parsing/parser.mly" ( let (body, ext) = _1 in (Psig_modtypesubst body, ext) ) -# 33680 "parsing/parser.ml" +# 33668 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -33684,13 +33672,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 33688 "parsing/parser.ml" +# 33676 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 33694 "parsing/parser.ml" +# 33682 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -33716,7 +33704,7 @@ module Tables = struct let _1 = # 1666 "parsing/parser.mly" ( let (body, ext) = _1 in (Psig_open body, ext) ) -# 33720 "parsing/parser.ml" +# 33708 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -33724,13 +33712,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 33728 "parsing/parser.ml" +# 33716 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 33734 "parsing/parser.ml" +# 33722 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -33788,7 +33776,7 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 33792 "parsing/parser.ml" +# 33780 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined2_ in @@ -33797,7 +33785,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 33801 "parsing/parser.ml" +# 33789 "parsing/parser.ml" in let _endpos = _endpos_attrs2_ in @@ -33811,13 +33799,13 @@ module Tables = struct let docs = symbol_docs _sloc in Incl.mk thing ~attrs ~loc ~docs, ext ) -# 33815 "parsing/parser.ml" +# 33803 "parsing/parser.ml" in # 1668 "parsing/parser.mly" ( psig_include _1 ) -# 33821 "parsing/parser.ml" +# 33809 "parsing/parser.ml" in let _endpos__1_ = _endpos__1_inlined2_ in @@ -33827,13 +33815,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 33831 "parsing/parser.ml" +# 33819 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 33837 "parsing/parser.ml" +# 33825 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -33912,7 +33900,7 @@ module Tables = struct let _1_inlined2 : ( # 705 "parsing/parser.mly" (string) -# 33916 "parsing/parser.ml" +# 33904 "parsing/parser.ml" ) = Obj.magic _1_inlined2 in let params : ((Parsetree.core_type * (Asttypes.variance * Asttypes.injectivity)) list) = Obj.magic params in let virt : (Asttypes.virtual_flag) = Obj.magic virt in @@ -33932,7 +33920,7 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 33936 "parsing/parser.ml" +# 33924 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined3_ in @@ -33944,7 +33932,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 33948 "parsing/parser.ml" +# 33936 "parsing/parser.ml" in let attrs1 = @@ -33952,7 +33940,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 33956 "parsing/parser.ml" +# 33944 "parsing/parser.ml" in let _endpos = _endpos_attrs2_ in @@ -33967,25 +33955,25 @@ module Tables = struct ext, Ci.mk id cty ~virt ~params ~attrs ~loc ~docs ) -# 33971 "parsing/parser.ml" +# 33959 "parsing/parser.ml" in # 1114 "parsing/parser.mly" ( let (x, b) = a in x, b :: bs ) -# 33977 "parsing/parser.ml" +# 33965 "parsing/parser.ml" in # 2089 "parsing/parser.mly" ( _1 ) -# 33983 "parsing/parser.ml" +# 33971 "parsing/parser.ml" in # 1670 "parsing/parser.mly" ( let (ext, l) = _1 in (Psig_class l, ext) ) -# 33989 "parsing/parser.ml" +# 33977 "parsing/parser.ml" in let _endpos__1_ = _endpos_bs_ in @@ -33995,13 +33983,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 33999 "parsing/parser.ml" +# 33987 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 34005 "parsing/parser.ml" +# 33993 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34027,7 +34015,7 @@ module Tables = struct let _1 = # 1672 "parsing/parser.mly" ( let (ext, l) = _1 in (Psig_class_type l, ext) ) -# 34031 "parsing/parser.ml" +# 34019 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -34035,13 +34023,13 @@ module Tables = struct # 941 "parsing/parser.mly" ( wrap_mksig_ext ~loc:_sloc _1 ) -# 34039 "parsing/parser.ml" +# 34027 "parsing/parser.ml" in # 1674 "parsing/parser.mly" ( _1 ) -# 34045 "parsing/parser.ml" +# 34033 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34066,7 +34054,7 @@ module Tables = struct let _v : (Parsetree.constant) = # 3510 "parsing/parser.mly" ( _1 ) -# 34070 "parsing/parser.ml" +# 34058 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34093,7 +34081,7 @@ module Tables = struct let _2 : ( # 691 "parsing/parser.mly" (string * char option) -# 34097 "parsing/parser.ml" +# 34085 "parsing/parser.ml" ) = Obj.magic _2 in let _1 : unit = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in @@ -34102,7 +34090,7 @@ module Tables = struct let _v : (Parsetree.constant) = # 3511 "parsing/parser.mly" ( let (n, m) = _2 in Pconst_integer("-" ^ n, m) ) -# 34106 "parsing/parser.ml" +# 34094 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34129,7 +34117,7 @@ module Tables = struct let _2 : ( # 670 "parsing/parser.mly" (string * char option) -# 34133 "parsing/parser.ml" +# 34121 "parsing/parser.ml" ) = Obj.magic _2 in let _1 : unit = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in @@ -34138,7 +34126,7 @@ module Tables = struct let _v : (Parsetree.constant) = # 3512 "parsing/parser.mly" ( let (f, m) = _2 in Pconst_float("-" ^ f, m) ) -# 34142 "parsing/parser.ml" +# 34130 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34165,7 +34153,7 @@ module Tables = struct let _2 : ( # 691 "parsing/parser.mly" (string * char option) -# 34169 "parsing/parser.ml" +# 34157 "parsing/parser.ml" ) = Obj.magic _2 in let _1 : unit = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in @@ -34174,7 +34162,7 @@ module Tables = struct let _v : (Parsetree.constant) = # 3513 "parsing/parser.mly" ( let (n, m) = _2 in Pconst_integer (n, m) ) -# 34178 "parsing/parser.ml" +# 34166 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34201,7 +34189,7 @@ module Tables = struct let _2 : ( # 670 "parsing/parser.mly" (string * char option) -# 34205 "parsing/parser.ml" +# 34193 "parsing/parser.ml" ) = Obj.magic _2 in let _1 : unit = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in @@ -34210,7 +34198,7 @@ module Tables = struct let _v : (Parsetree.constant) = # 3514 "parsing/parser.mly" ( let (f, m) = _2 in Pconst_float(f, m) ) -# 34214 "parsing/parser.ml" +# 34202 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34255,14 +34243,14 @@ module Tables = struct ( let fields, closed = _1 in let closed = match closed with Some () -> Open | None -> Closed in fields, closed ) -# 34259 "parsing/parser.ml" +# 34247 "parsing/parser.ml" in # 2809 "parsing/parser.mly" ( let (fields, closed) = _2 in Ppat_record(fields, closed) ) -# 34266 "parsing/parser.ml" +# 34254 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -34272,13 +34260,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 34276 "parsing/parser.ml" +# 34264 "parsing/parser.ml" in # 2823 "parsing/parser.mly" ( _1 ) -# 34282 "parsing/parser.ml" +# 34270 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34323,7 +34311,7 @@ module Tables = struct ( let fields, closed = _1 in let closed = match closed with Some () -> Open | None -> Closed in fields, closed ) -# 34327 "parsing/parser.ml" +# 34315 "parsing/parser.ml" in let _loc__3_ = (_startpos__3_, _endpos__3_) in @@ -34331,7 +34319,7 @@ module Tables = struct # 2812 "parsing/parser.mly" ( unclosed "{" _loc__1_ "}" _loc__3_ ) -# 34335 "parsing/parser.ml" +# 34323 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -34341,13 +34329,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 34345 "parsing/parser.ml" +# 34333 "parsing/parser.ml" in # 2823 "parsing/parser.mly" ( _1 ) -# 34351 "parsing/parser.ml" +# 34339 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34388,13 +34376,13 @@ module Tables = struct let _2 = # 2832 "parsing/parser.mly" ( ps ) -# 34392 "parsing/parser.ml" +# 34380 "parsing/parser.ml" in let _loc__3_ = (_startpos__3_, _endpos__3_) in # 2814 "parsing/parser.mly" ( fst (mktailpat _loc__3_ _2) ) -# 34398 "parsing/parser.ml" +# 34386 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -34404,13 +34392,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 34408 "parsing/parser.ml" +# 34396 "parsing/parser.ml" in # 2823 "parsing/parser.mly" ( _1 ) -# 34414 "parsing/parser.ml" +# 34402 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34451,14 +34439,14 @@ module Tables = struct let _2 = # 2832 "parsing/parser.mly" ( ps ) -# 34455 "parsing/parser.ml" +# 34443 "parsing/parser.ml" in let _loc__3_ = (_startpos__3_, _endpos__3_) in let _loc__1_ = (_startpos__1_, _endpos__1_) in # 2816 "parsing/parser.mly" ( unclosed "[" _loc__1_ "]" _loc__3_ ) -# 34462 "parsing/parser.ml" +# 34450 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -34468,13 +34456,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 34472 "parsing/parser.ml" +# 34460 "parsing/parser.ml" in # 2823 "parsing/parser.mly" ( _1 ) -# 34478 "parsing/parser.ml" +# 34466 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34515,12 +34503,12 @@ module Tables = struct let _2 = # 2832 "parsing/parser.mly" ( ps ) -# 34519 "parsing/parser.ml" +# 34507 "parsing/parser.ml" in # 2818 "parsing/parser.mly" ( Ppat_array _2 ) -# 34524 "parsing/parser.ml" +# 34512 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -34530,13 +34518,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 34534 "parsing/parser.ml" +# 34522 "parsing/parser.ml" in # 2823 "parsing/parser.mly" ( _1 ) -# 34540 "parsing/parser.ml" +# 34528 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34569,7 +34557,7 @@ module Tables = struct let _1 = # 2820 "parsing/parser.mly" ( Ppat_array [] ) -# 34573 "parsing/parser.ml" +# 34561 "parsing/parser.ml" in let _endpos__1_ = _endpos__2_ in let _endpos = _endpos__1_ in @@ -34578,13 +34566,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 34582 "parsing/parser.ml" +# 34570 "parsing/parser.ml" in # 2823 "parsing/parser.mly" ( _1 ) -# 34588 "parsing/parser.ml" +# 34576 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34625,14 +34613,14 @@ module Tables = struct let _2 = # 2832 "parsing/parser.mly" ( ps ) -# 34629 "parsing/parser.ml" +# 34617 "parsing/parser.ml" in let _loc__3_ = (_startpos__3_, _endpos__3_) in let _loc__1_ = (_startpos__1_, _endpos__1_) in # 2822 "parsing/parser.mly" ( unclosed "[|" _loc__1_ "|]" _loc__3_ ) -# 34636 "parsing/parser.ml" +# 34624 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -34642,13 +34630,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 34646 "parsing/parser.ml" +# 34634 "parsing/parser.ml" in # 2823 "parsing/parser.mly" ( _1 ) -# 34652 "parsing/parser.ml" +# 34640 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34690,7 +34678,7 @@ module Tables = struct # 2337 "parsing/parser.mly" ( reloc_exp ~loc:_sloc _2 ) -# 34694 "parsing/parser.ml" +# 34682 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34731,7 +34719,7 @@ module Tables = struct # 2339 "parsing/parser.mly" ( unclosed "(" _loc__1_ ")" _loc__3_ ) -# 34735 "parsing/parser.ml" +# 34723 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34780,7 +34768,7 @@ module Tables = struct # 2341 "parsing/parser.mly" ( mkexp_constraint ~loc:_sloc _2 _3 ) -# 34784 "parsing/parser.ml" +# 34772 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34834,12 +34822,12 @@ module Tables = struct let r = # 2342 "parsing/parser.mly" ( None ) -# 34838 "parsing/parser.ml" +# 34826 "parsing/parser.ml" in # 2231 "parsing/parser.mly" ( array, d, Paren, i, r ) -# 34843 "parsing/parser.ml" +# 34831 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos__5_, _startpos_array_) in @@ -34849,7 +34837,7 @@ module Tables = struct # 2343 "parsing/parser.mly" ( mk_indexop_expr builtin_indexing_operators ~loc:_sloc _1 ) -# 34853 "parsing/parser.ml" +# 34841 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34903,12 +34891,12 @@ module Tables = struct let r = # 2342 "parsing/parser.mly" ( None ) -# 34907 "parsing/parser.ml" +# 34895 "parsing/parser.ml" in # 2233 "parsing/parser.mly" ( array, d, Brace, i, r ) -# 34912 "parsing/parser.ml" +# 34900 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos__5_, _startpos_array_) in @@ -34918,7 +34906,7 @@ module Tables = struct # 2343 "parsing/parser.mly" ( mk_indexop_expr builtin_indexing_operators ~loc:_sloc _1 ) -# 34922 "parsing/parser.ml" +# 34910 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -34972,12 +34960,12 @@ module Tables = struct let r = # 2342 "parsing/parser.mly" ( None ) -# 34976 "parsing/parser.ml" +# 34964 "parsing/parser.ml" in # 2235 "parsing/parser.mly" ( array, d, Bracket, i, r ) -# 34981 "parsing/parser.ml" +# 34969 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos__5_, _startpos_array_) in @@ -34987,7 +34975,7 @@ module Tables = struct # 2343 "parsing/parser.mly" ( mk_indexop_expr builtin_indexing_operators ~loc:_sloc _1 ) -# 34991 "parsing/parser.ml" +# 34979 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -35035,7 +35023,7 @@ module Tables = struct let _2 : ( # 686 "parsing/parser.mly" (string) -# 35039 "parsing/parser.ml" +# 35027 "parsing/parser.ml" ) = Obj.magic _2 in let array : (Parsetree.expression) = Obj.magic array in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in @@ -35045,29 +35033,29 @@ module Tables = struct let r = # 2344 "parsing/parser.mly" ( None ) -# 35049 "parsing/parser.ml" +# 35037 "parsing/parser.ml" in let i = # 2664 "parsing/parser.mly" ( es ) -# 35054 "parsing/parser.ml" +# 35042 "parsing/parser.ml" in let d = let _1 = # 124 "<standard.mly>" ( None ) -# 35060 "parsing/parser.ml" +# 35048 "parsing/parser.ml" in # 2247 "parsing/parser.mly" ( _1, _2 ) -# 35065 "parsing/parser.ml" +# 35053 "parsing/parser.ml" in # 2231 "parsing/parser.mly" ( array, d, Paren, i, r ) -# 35071 "parsing/parser.ml" +# 35059 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos__5_, _startpos_array_) in @@ -35077,7 +35065,7 @@ module Tables = struct # 2345 "parsing/parser.mly" ( mk_indexop_expr user_indexing_operators ~loc:_sloc _1 ) -# 35081 "parsing/parser.ml" +# 35069 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -35137,7 +35125,7 @@ module Tables = struct let _2 : ( # 686 "parsing/parser.mly" (string) -# 35141 "parsing/parser.ml" +# 35129 "parsing/parser.ml" ) = Obj.magic _2 in let _2_inlined1 : (Longident.t) = Obj.magic _2_inlined1 in let _1 : unit = Obj.magic _1 in @@ -35149,12 +35137,12 @@ module Tables = struct let r = # 2344 "parsing/parser.mly" ( None ) -# 35153 "parsing/parser.ml" +# 35141 "parsing/parser.ml" in let i = # 2664 "parsing/parser.mly" ( es ) -# 35158 "parsing/parser.ml" +# 35146 "parsing/parser.ml" in let d = let _1 = @@ -35162,24 +35150,24 @@ module Tables = struct let x = # 2247 "parsing/parser.mly" (_2) -# 35166 "parsing/parser.ml" +# 35154 "parsing/parser.ml" in # 126 "<standard.mly>" ( Some x ) -# 35171 "parsing/parser.ml" +# 35159 "parsing/parser.ml" in # 2247 "parsing/parser.mly" ( _1, _2 ) -# 35177 "parsing/parser.ml" +# 35165 "parsing/parser.ml" in # 2231 "parsing/parser.mly" ( array, d, Paren, i, r ) -# 35183 "parsing/parser.ml" +# 35171 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos__5_, _startpos_array_) in @@ -35189,7 +35177,7 @@ module Tables = struct # 2345 "parsing/parser.mly" ( mk_indexop_expr user_indexing_operators ~loc:_sloc _1 ) -# 35193 "parsing/parser.ml" +# 35181 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -35237,7 +35225,7 @@ module Tables = struct let _2 : ( # 686 "parsing/parser.mly" (string) -# 35241 "parsing/parser.ml" +# 35229 "parsing/parser.ml" ) = Obj.magic _2 in let array : (Parsetree.expression) = Obj.magic array in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in @@ -35247,29 +35235,29 @@ module Tables = struct let r = # 2344 "parsing/parser.mly" ( None ) -# 35251 "parsing/parser.ml" +# 35239 "parsing/parser.ml" in let i = # 2664 "parsing/parser.mly" ( es ) -# 35256 "parsing/parser.ml" +# 35244 "parsing/parser.ml" in let d = let _1 = # 124 "<standard.mly>" ( None ) -# 35262 "parsing/parser.ml" +# 35250 "parsing/parser.ml" in # 2247 "parsing/parser.mly" ( _1, _2 ) -# 35267 "parsing/parser.ml" +# 35255 "parsing/parser.ml" in # 2233 "parsing/parser.mly" ( array, d, Brace, i, r ) -# 35273 "parsing/parser.ml" +# 35261 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos__5_, _startpos_array_) in @@ -35279,7 +35267,7 @@ module Tables = struct # 2345 "parsing/parser.mly" ( mk_indexop_expr user_indexing_operators ~loc:_sloc _1 ) -# 35283 "parsing/parser.ml" +# 35271 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -35339,7 +35327,7 @@ module Tables = struct let _2 : ( # 686 "parsing/parser.mly" (string) -# 35343 "parsing/parser.ml" +# 35331 "parsing/parser.ml" ) = Obj.magic _2 in let _2_inlined1 : (Longident.t) = Obj.magic _2_inlined1 in let _1 : unit = Obj.magic _1 in @@ -35351,12 +35339,12 @@ module Tables = struct let r = # 2344 "parsing/parser.mly" ( None ) -# 35355 "parsing/parser.ml" +# 35343 "parsing/parser.ml" in let i = # 2664 "parsing/parser.mly" ( es ) -# 35360 "parsing/parser.ml" +# 35348 "parsing/parser.ml" in let d = let _1 = @@ -35364,24 +35352,24 @@ module Tables = struct let x = # 2247 "parsing/parser.mly" (_2) -# 35368 "parsing/parser.ml" +# 35356 "parsing/parser.ml" in # 126 "<standard.mly>" ( Some x ) -# 35373 "parsing/parser.ml" +# 35361 "parsing/parser.ml" in # 2247 "parsing/parser.mly" ( _1, _2 ) -# 35379 "parsing/parser.ml" +# 35367 "parsing/parser.ml" in # 2233 "parsing/parser.mly" ( array, d, Brace, i, r ) -# 35385 "parsing/parser.ml" +# 35373 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos__5_, _startpos_array_) in @@ -35391,7 +35379,7 @@ module Tables = struct # 2345 "parsing/parser.mly" ( mk_indexop_expr user_indexing_operators ~loc:_sloc _1 ) -# 35395 "parsing/parser.ml" +# 35383 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -35439,7 +35427,7 @@ module Tables = struct let _2 : ( # 686 "parsing/parser.mly" (string) -# 35443 "parsing/parser.ml" +# 35431 "parsing/parser.ml" ) = Obj.magic _2 in let array : (Parsetree.expression) = Obj.magic array in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in @@ -35449,29 +35437,29 @@ module Tables = struct let r = # 2344 "parsing/parser.mly" ( None ) -# 35453 "parsing/parser.ml" +# 35441 "parsing/parser.ml" in let i = # 2664 "parsing/parser.mly" ( es ) -# 35458 "parsing/parser.ml" +# 35446 "parsing/parser.ml" in let d = let _1 = # 124 "<standard.mly>" ( None ) -# 35464 "parsing/parser.ml" +# 35452 "parsing/parser.ml" in # 2247 "parsing/parser.mly" ( _1, _2 ) -# 35469 "parsing/parser.ml" +# 35457 "parsing/parser.ml" in # 2235 "parsing/parser.mly" ( array, d, Bracket, i, r ) -# 35475 "parsing/parser.ml" +# 35463 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos__5_, _startpos_array_) in @@ -35481,7 +35469,7 @@ module Tables = struct # 2345 "parsing/parser.mly" ( mk_indexop_expr user_indexing_operators ~loc:_sloc _1 ) -# 35485 "parsing/parser.ml" +# 35473 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -35541,7 +35529,7 @@ module Tables = struct let _2 : ( # 686 "parsing/parser.mly" (string) -# 35545 "parsing/parser.ml" +# 35533 "parsing/parser.ml" ) = Obj.magic _2 in let _2_inlined1 : (Longident.t) = Obj.magic _2_inlined1 in let _1 : unit = Obj.magic _1 in @@ -35553,12 +35541,12 @@ module Tables = struct let r = # 2344 "parsing/parser.mly" ( None ) -# 35557 "parsing/parser.ml" +# 35545 "parsing/parser.ml" in let i = # 2664 "parsing/parser.mly" ( es ) -# 35562 "parsing/parser.ml" +# 35550 "parsing/parser.ml" in let d = let _1 = @@ -35566,24 +35554,24 @@ module Tables = struct let x = # 2247 "parsing/parser.mly" (_2) -# 35570 "parsing/parser.ml" +# 35558 "parsing/parser.ml" in # 126 "<standard.mly>" ( Some x ) -# 35575 "parsing/parser.ml" +# 35563 "parsing/parser.ml" in # 2247 "parsing/parser.mly" ( _1, _2 ) -# 35581 "parsing/parser.ml" +# 35569 "parsing/parser.ml" in # 2235 "parsing/parser.mly" ( array, d, Bracket, i, r ) -# 35587 "parsing/parser.ml" +# 35575 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos__5_, _startpos_array_) in @@ -35593,7 +35581,7 @@ module Tables = struct # 2345 "parsing/parser.mly" ( mk_indexop_expr user_indexing_operators ~loc:_sloc _1 ) -# 35597 "parsing/parser.ml" +# 35585 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -35649,13 +35637,13 @@ module Tables = struct # 2240 "parsing/parser.mly" ( indexop_unclosed_error _loc__p_ Paren _loc__e_ ) -# 35653 "parsing/parser.ml" +# 35641 "parsing/parser.ml" in # 2346 "parsing/parser.mly" ( _1 ) -# 35659 "parsing/parser.ml" +# 35647 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -35711,13 +35699,13 @@ module Tables = struct # 2242 "parsing/parser.mly" ( indexop_unclosed_error _loc__p_ Brace _loc__e_ ) -# 35715 "parsing/parser.ml" +# 35703 "parsing/parser.ml" in # 2346 "parsing/parser.mly" ( _1 ) -# 35721 "parsing/parser.ml" +# 35709 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -35773,13 +35761,13 @@ module Tables = struct # 2244 "parsing/parser.mly" ( indexop_unclosed_error _loc__p_ Bracket _loc__e_ ) -# 35777 "parsing/parser.ml" +# 35765 "parsing/parser.ml" in # 2346 "parsing/parser.mly" ( _1 ) -# 35783 "parsing/parser.ml" +# 35771 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -35827,7 +35815,7 @@ module Tables = struct let _2 : ( # 686 "parsing/parser.mly" (string) -# 35831 "parsing/parser.ml" +# 35819 "parsing/parser.ml" ) = Obj.magic _2 in let _1 : (Parsetree.expression) = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in @@ -35837,18 +35825,18 @@ module Tables = struct let _4 = # 2664 "parsing/parser.mly" ( es ) -# 35841 "parsing/parser.ml" +# 35829 "parsing/parser.ml" in let _2 = let _1 = # 124 "<standard.mly>" ( None ) -# 35847 "parsing/parser.ml" +# 35835 "parsing/parser.ml" in # 2247 "parsing/parser.mly" ( _1, _2 ) -# 35852 "parsing/parser.ml" +# 35840 "parsing/parser.ml" in let _loc__p_ = (_startpos__p_, _endpos__p_) in @@ -35856,13 +35844,13 @@ module Tables = struct # 2240 "parsing/parser.mly" ( indexop_unclosed_error _loc__p_ Paren _loc__e_ ) -# 35860 "parsing/parser.ml" +# 35848 "parsing/parser.ml" in # 2347 "parsing/parser.mly" ( _1 ) -# 35866 "parsing/parser.ml" +# 35854 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -35922,7 +35910,7 @@ module Tables = struct let _2 : ( # 686 "parsing/parser.mly" (string) -# 35926 "parsing/parser.ml" +# 35914 "parsing/parser.ml" ) = Obj.magic _2 in let _2_inlined1 : (Longident.t) = Obj.magic _2_inlined1 in let _1_inlined1 : unit = Obj.magic _1_inlined1 in @@ -35934,7 +35922,7 @@ module Tables = struct let _4 = # 2664 "parsing/parser.mly" ( es ) -# 35938 "parsing/parser.ml" +# 35926 "parsing/parser.ml" in let _2 = let _1 = @@ -35942,18 +35930,18 @@ module Tables = struct let x = # 2247 "parsing/parser.mly" (_2) -# 35946 "parsing/parser.ml" +# 35934 "parsing/parser.ml" in # 126 "<standard.mly>" ( Some x ) -# 35951 "parsing/parser.ml" +# 35939 "parsing/parser.ml" in # 2247 "parsing/parser.mly" ( _1, _2 ) -# 35957 "parsing/parser.ml" +# 35945 "parsing/parser.ml" in let _loc__p_ = (_startpos__p_, _endpos__p_) in @@ -35961,13 +35949,13 @@ module Tables = struct # 2240 "parsing/parser.mly" ( indexop_unclosed_error _loc__p_ Paren _loc__e_ ) -# 35965 "parsing/parser.ml" +# 35953 "parsing/parser.ml" in # 2347 "parsing/parser.mly" ( _1 ) -# 35971 "parsing/parser.ml" +# 35959 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -36015,7 +36003,7 @@ module Tables = struct let _2 : ( # 686 "parsing/parser.mly" (string) -# 36019 "parsing/parser.ml" +# 36007 "parsing/parser.ml" ) = Obj.magic _2 in let _1 : (Parsetree.expression) = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in @@ -36025,18 +36013,18 @@ module Tables = struct let _4 = # 2664 "parsing/parser.mly" ( es ) -# 36029 "parsing/parser.ml" +# 36017 "parsing/parser.ml" in let _2 = let _1 = # 124 "<standard.mly>" ( None ) -# 36035 "parsing/parser.ml" +# 36023 "parsing/parser.ml" in # 2247 "parsing/parser.mly" ( _1, _2 ) -# 36040 "parsing/parser.ml" +# 36028 "parsing/parser.ml" in let _loc__p_ = (_startpos__p_, _endpos__p_) in @@ -36044,13 +36032,13 @@ module Tables = struct # 2242 "parsing/parser.mly" ( indexop_unclosed_error _loc__p_ Brace _loc__e_ ) -# 36048 "parsing/parser.ml" +# 36036 "parsing/parser.ml" in # 2347 "parsing/parser.mly" ( _1 ) -# 36054 "parsing/parser.ml" +# 36042 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -36110,7 +36098,7 @@ module Tables = struct let _2 : ( # 686 "parsing/parser.mly" (string) -# 36114 "parsing/parser.ml" +# 36102 "parsing/parser.ml" ) = Obj.magic _2 in let _2_inlined1 : (Longident.t) = Obj.magic _2_inlined1 in let _1_inlined1 : unit = Obj.magic _1_inlined1 in @@ -36122,7 +36110,7 @@ module Tables = struct let _4 = # 2664 "parsing/parser.mly" ( es ) -# 36126 "parsing/parser.ml" +# 36114 "parsing/parser.ml" in let _2 = let _1 = @@ -36130,18 +36118,18 @@ module Tables = struct let x = # 2247 "parsing/parser.mly" (_2) -# 36134 "parsing/parser.ml" +# 36122 "parsing/parser.ml" in # 126 "<standard.mly>" ( Some x ) -# 36139 "parsing/parser.ml" +# 36127 "parsing/parser.ml" in # 2247 "parsing/parser.mly" ( _1, _2 ) -# 36145 "parsing/parser.ml" +# 36133 "parsing/parser.ml" in let _loc__p_ = (_startpos__p_, _endpos__p_) in @@ -36149,13 +36137,13 @@ module Tables = struct # 2242 "parsing/parser.mly" ( indexop_unclosed_error _loc__p_ Brace _loc__e_ ) -# 36153 "parsing/parser.ml" +# 36141 "parsing/parser.ml" in # 2347 "parsing/parser.mly" ( _1 ) -# 36159 "parsing/parser.ml" +# 36147 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -36203,7 +36191,7 @@ module Tables = struct let _2 : ( # 686 "parsing/parser.mly" (string) -# 36207 "parsing/parser.ml" +# 36195 "parsing/parser.ml" ) = Obj.magic _2 in let _1 : (Parsetree.expression) = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in @@ -36213,18 +36201,18 @@ module Tables = struct let _4 = # 2664 "parsing/parser.mly" ( es ) -# 36217 "parsing/parser.ml" +# 36205 "parsing/parser.ml" in let _2 = let _1 = # 124 "<standard.mly>" ( None ) -# 36223 "parsing/parser.ml" +# 36211 "parsing/parser.ml" in # 2247 "parsing/parser.mly" ( _1, _2 ) -# 36228 "parsing/parser.ml" +# 36216 "parsing/parser.ml" in let _loc__p_ = (_startpos__p_, _endpos__p_) in @@ -36232,13 +36220,13 @@ module Tables = struct # 2244 "parsing/parser.mly" ( indexop_unclosed_error _loc__p_ Bracket _loc__e_ ) -# 36236 "parsing/parser.ml" +# 36224 "parsing/parser.ml" in # 2347 "parsing/parser.mly" ( _1 ) -# 36242 "parsing/parser.ml" +# 36230 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -36298,7 +36286,7 @@ module Tables = struct let _2 : ( # 686 "parsing/parser.mly" (string) -# 36302 "parsing/parser.ml" +# 36290 "parsing/parser.ml" ) = Obj.magic _2 in let _2_inlined1 : (Longident.t) = Obj.magic _2_inlined1 in let _1_inlined1 : unit = Obj.magic _1_inlined1 in @@ -36310,7 +36298,7 @@ module Tables = struct let _4 = # 2664 "parsing/parser.mly" ( es ) -# 36314 "parsing/parser.ml" +# 36302 "parsing/parser.ml" in let _2 = let _1 = @@ -36318,18 +36306,18 @@ module Tables = struct let x = # 2247 "parsing/parser.mly" (_2) -# 36322 "parsing/parser.ml" +# 36310 "parsing/parser.ml" in # 126 "<standard.mly>" ( Some x ) -# 36327 "parsing/parser.ml" +# 36315 "parsing/parser.ml" in # 2247 "parsing/parser.mly" ( _1, _2 ) -# 36333 "parsing/parser.ml" +# 36321 "parsing/parser.ml" in let _loc__p_ = (_startpos__p_, _endpos__p_) in @@ -36337,13 +36325,13 @@ module Tables = struct # 2244 "parsing/parser.mly" ( indexop_unclosed_error _loc__p_ Bracket _loc__e_ ) -# 36341 "parsing/parser.ml" +# 36329 "parsing/parser.ml" in # 2347 "parsing/parser.mly" ( _1 ) -# 36347 "parsing/parser.ml" +# 36335 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -36399,13 +36387,13 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 36403 "parsing/parser.ml" +# 36391 "parsing/parser.ml" in # 2356 "parsing/parser.mly" ( e.pexp_desc, (ext, attrs @ e.pexp_attributes) ) -# 36409 "parsing/parser.ml" +# 36397 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -36416,7 +36404,7 @@ module Tables = struct # 2349 "parsing/parser.mly" ( let desc, attrs = _1 in mkexp_attrs ~loc:_sloc desc attrs ) -# 36420 "parsing/parser.ml" +# 36408 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -36467,13 +36455,13 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 36471 "parsing/parser.ml" +# 36459 "parsing/parser.ml" in # 3853 "parsing/parser.mly" ( _1, _2 ) -# 36477 "parsing/parser.ml" +# 36465 "parsing/parser.ml" in let _endpos = _endpos__3_ in @@ -36482,7 +36470,7 @@ module Tables = struct # 2358 "parsing/parser.mly" ( Pexp_construct (mkloc (Lident "()") (make_loc _sloc), None), _2 ) -# 36486 "parsing/parser.ml" +# 36474 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -36493,7 +36481,7 @@ module Tables = struct # 2349 "parsing/parser.mly" ( let desc, attrs = _1 in mkexp_attrs ~loc:_sloc desc attrs ) -# 36497 "parsing/parser.ml" +# 36485 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -36551,13 +36539,13 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 36555 "parsing/parser.ml" +# 36543 "parsing/parser.ml" in # 3853 "parsing/parser.mly" ( _1, _2 ) -# 36561 "parsing/parser.ml" +# 36549 "parsing/parser.ml" in let _loc__4_ = (_startpos__4_, _endpos__4_) in @@ -36565,7 +36553,7 @@ module Tables = struct # 2360 "parsing/parser.mly" ( unclosed "begin" _loc__1_ "end" _loc__4_ ) -# 36569 "parsing/parser.ml" +# 36557 "parsing/parser.ml" in let _endpos__1_ = _endpos__4_ in @@ -36576,7 +36564,7 @@ module Tables = struct # 2349 "parsing/parser.mly" ( let desc, attrs = _1 in mkexp_attrs ~loc:_sloc desc attrs ) -# 36580 "parsing/parser.ml" +# 36568 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -36628,7 +36616,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 36632 "parsing/parser.ml" +# 36620 "parsing/parser.ml" in let _2 = @@ -36638,19 +36626,19 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 36642 "parsing/parser.ml" +# 36630 "parsing/parser.ml" in # 3853 "parsing/parser.mly" ( _1, _2 ) -# 36648 "parsing/parser.ml" +# 36636 "parsing/parser.ml" in # 2362 "parsing/parser.mly" ( Pexp_new(_3), _2 ) -# 36654 "parsing/parser.ml" +# 36642 "parsing/parser.ml" in let _endpos__1_ = _endpos__1_inlined3_ in @@ -36661,7 +36649,7 @@ module Tables = struct # 2349 "parsing/parser.mly" ( let desc, attrs = _1 in mkexp_attrs ~loc:_sloc desc attrs ) -# 36665 "parsing/parser.ml" +# 36653 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -36726,19 +36714,19 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 36730 "parsing/parser.ml" +# 36718 "parsing/parser.ml" in # 3853 "parsing/parser.mly" ( _1, _2 ) -# 36736 "parsing/parser.ml" +# 36724 "parsing/parser.ml" in # 2364 "parsing/parser.mly" ( Pexp_pack _4, _3 ) -# 36742 "parsing/parser.ml" +# 36730 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -36749,7 +36737,7 @@ module Tables = struct # 2349 "parsing/parser.mly" ( let desc, attrs = _1 in mkexp_attrs ~loc:_sloc desc attrs ) -# 36753 "parsing/parser.ml" +# 36741 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -36831,7 +36819,7 @@ module Tables = struct ( let (lid, cstrs, attrs) = package_type_of_module_type _1 in let descr = Ptyp_package (lid, cstrs) in mktyp ~loc:_sloc ~attrs descr ) -# 36835 "parsing/parser.ml" +# 36823 "parsing/parser.ml" in let _3 = @@ -36841,13 +36829,13 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 36845 "parsing/parser.ml" +# 36833 "parsing/parser.ml" in # 3853 "parsing/parser.mly" ( _1, _2 ) -# 36851 "parsing/parser.ml" +# 36839 "parsing/parser.ml" in let _endpos = _endpos__7_ in @@ -36856,7 +36844,7 @@ module Tables = struct # 2366 "parsing/parser.mly" ( Pexp_constraint (ghexp ~loc:_sloc (Pexp_pack _4), _6), _3 ) -# 36860 "parsing/parser.ml" +# 36848 "parsing/parser.ml" in let _endpos__1_ = _endpos__7_ in @@ -36867,7 +36855,7 @@ module Tables = struct # 2349 "parsing/parser.mly" ( let desc, attrs = _1 in mkexp_attrs ~loc:_sloc desc attrs ) -# 36871 "parsing/parser.ml" +# 36859 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -36939,13 +36927,13 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 36943 "parsing/parser.ml" +# 36931 "parsing/parser.ml" in # 3853 "parsing/parser.mly" ( _1, _2 ) -# 36949 "parsing/parser.ml" +# 36937 "parsing/parser.ml" in let _loc__6_ = (_startpos__6_, _endpos__6_) in @@ -36953,7 +36941,7 @@ module Tables = struct # 2368 "parsing/parser.mly" ( unclosed "(" _loc__1_ ")" _loc__6_ ) -# 36957 "parsing/parser.ml" +# 36945 "parsing/parser.ml" in let _endpos__1_ = _endpos__6_ in @@ -36964,7 +36952,7 @@ module Tables = struct # 2349 "parsing/parser.mly" ( let desc, attrs = _1 in mkexp_attrs ~loc:_sloc desc attrs ) -# 36968 "parsing/parser.ml" +# 36956 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -37029,12 +37017,12 @@ module Tables = struct let _1 = # 260 "<standard.mly>" ( List.flatten xss ) -# 37033 "parsing/parser.ml" +# 37021 "parsing/parser.ml" in # 1917 "parsing/parser.mly" ( _1 ) -# 37038 "parsing/parser.ml" +# 37026 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos_xss_, _startpos_xss_) in @@ -37043,13 +37031,13 @@ module Tables = struct # 877 "parsing/parser.mly" ( extra_cstr _startpos _endpos _1 ) -# 37047 "parsing/parser.ml" +# 37035 "parsing/parser.ml" in # 1904 "parsing/parser.mly" ( Cstr.mk _1 _2 ) -# 37053 "parsing/parser.ml" +# 37041 "parsing/parser.ml" in let _2 = @@ -37059,19 +37047,19 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 37063 "parsing/parser.ml" +# 37051 "parsing/parser.ml" in # 3853 "parsing/parser.mly" ( _1, _2 ) -# 37069 "parsing/parser.ml" +# 37057 "parsing/parser.ml" in # 2370 "parsing/parser.mly" ( Pexp_object _3, _2 ) -# 37075 "parsing/parser.ml" +# 37063 "parsing/parser.ml" in let _endpos__1_ = _endpos__4_ in @@ -37082,7 +37070,7 @@ module Tables = struct # 2349 "parsing/parser.mly" ( let desc, attrs = _1 in mkexp_attrs ~loc:_sloc desc attrs ) -# 37086 "parsing/parser.ml" +# 37074 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -37147,12 +37135,12 @@ module Tables = struct let _1 = # 260 "<standard.mly>" ( List.flatten xss ) -# 37151 "parsing/parser.ml" +# 37139 "parsing/parser.ml" in # 1917 "parsing/parser.mly" ( _1 ) -# 37156 "parsing/parser.ml" +# 37144 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos_xss_, _startpos_xss_) in @@ -37161,13 +37149,13 @@ module Tables = struct # 877 "parsing/parser.mly" ( extra_cstr _startpos _endpos _1 ) -# 37165 "parsing/parser.ml" +# 37153 "parsing/parser.ml" in # 1904 "parsing/parser.mly" ( Cstr.mk _1 _2 ) -# 37171 "parsing/parser.ml" +# 37159 "parsing/parser.ml" in let _2 = @@ -37177,13 +37165,13 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 37181 "parsing/parser.ml" +# 37169 "parsing/parser.ml" in # 3853 "parsing/parser.mly" ( _1, _2 ) -# 37187 "parsing/parser.ml" +# 37175 "parsing/parser.ml" in let _loc__4_ = (_startpos__4_, _endpos__4_) in @@ -37191,7 +37179,7 @@ module Tables = struct # 2372 "parsing/parser.mly" ( unclosed "object" _loc__1_ "end" _loc__4_ ) -# 37195 "parsing/parser.ml" +# 37183 "parsing/parser.ml" in let _endpos__1_ = _endpos__4_ in @@ -37202,7 +37190,7 @@ module Tables = struct # 2349 "parsing/parser.mly" ( let desc, attrs = _1 in mkexp_attrs ~loc:_sloc desc attrs ) -# 37206 "parsing/parser.ml" +# 37194 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -37233,13 +37221,13 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 37237 "parsing/parser.ml" +# 37225 "parsing/parser.ml" in # 2376 "parsing/parser.mly" ( Pexp_ident (_1) ) -# 37243 "parsing/parser.ml" +# 37231 "parsing/parser.ml" in let _endpos = _endpos__1_ in @@ -37248,13 +37236,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 37252 "parsing/parser.ml" +# 37240 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 37258 "parsing/parser.ml" +# 37246 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -37280,7 +37268,7 @@ module Tables = struct let _1 = # 2378 "parsing/parser.mly" ( Pexp_constant _1 ) -# 37284 "parsing/parser.ml" +# 37272 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -37288,13 +37276,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 37292 "parsing/parser.ml" +# 37280 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 37298 "parsing/parser.ml" +# 37286 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -37325,13 +37313,13 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 37329 "parsing/parser.ml" +# 37317 "parsing/parser.ml" in # 2380 "parsing/parser.mly" ( Pexp_construct(_1, None) ) -# 37335 "parsing/parser.ml" +# 37323 "parsing/parser.ml" in let _endpos = _endpos__1_ in @@ -37340,13 +37328,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 37344 "parsing/parser.ml" +# 37332 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 37350 "parsing/parser.ml" +# 37338 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -37372,7 +37360,7 @@ module Tables = struct let _1 = # 2382 "parsing/parser.mly" ( Pexp_variant(_1, None) ) -# 37376 "parsing/parser.ml" +# 37364 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -37380,13 +37368,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 37384 "parsing/parser.ml" +# 37372 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 37390 "parsing/parser.ml" +# 37378 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -37414,7 +37402,7 @@ module Tables = struct let _1 : ( # 729 "parsing/parser.mly" (string) -# 37418 "parsing/parser.ml" +# 37406 "parsing/parser.ml" ) = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in let _startpos = _startpos__1_ in @@ -37428,13 +37416,13 @@ module Tables = struct # 910 "parsing/parser.mly" ( mkoperator ~loc:_sloc _1 ) -# 37432 "parsing/parser.ml" +# 37420 "parsing/parser.ml" in # 2384 "parsing/parser.mly" ( Pexp_apply(_1, [Nolabel,_2]) ) -# 37438 "parsing/parser.ml" +# 37426 "parsing/parser.ml" in let _endpos__1_ = _endpos__2_ in @@ -37444,13 +37432,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 37448 "parsing/parser.ml" +# 37436 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 37454 "parsing/parser.ml" +# 37442 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -37485,7 +37473,7 @@ module Tables = struct let _1 = # 2385 "parsing/parser.mly" ("!") -# 37489 "parsing/parser.ml" +# 37477 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -37493,13 +37481,13 @@ module Tables = struct # 910 "parsing/parser.mly" ( mkoperator ~loc:_sloc _1 ) -# 37497 "parsing/parser.ml" +# 37485 "parsing/parser.ml" in # 2386 "parsing/parser.mly" ( Pexp_apply(_1, [Nolabel,_2]) ) -# 37503 "parsing/parser.ml" +# 37491 "parsing/parser.ml" in let _endpos__1_ = _endpos__2_ in @@ -37509,13 +37497,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 37513 "parsing/parser.ml" +# 37501 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 37519 "parsing/parser.ml" +# 37507 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -37556,12 +37544,12 @@ module Tables = struct let _2 = # 2647 "parsing/parser.mly" ( xs ) -# 37560 "parsing/parser.ml" +# 37548 "parsing/parser.ml" in # 2388 "parsing/parser.mly" ( Pexp_override _2 ) -# 37565 "parsing/parser.ml" +# 37553 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -37571,13 +37559,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 37575 "parsing/parser.ml" +# 37563 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 37581 "parsing/parser.ml" +# 37569 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -37618,14 +37606,14 @@ module Tables = struct let _2 = # 2647 "parsing/parser.mly" ( xs ) -# 37622 "parsing/parser.ml" +# 37610 "parsing/parser.ml" in let _loc__3_ = (_startpos__3_, _endpos__3_) in let _loc__1_ = (_startpos__1_, _endpos__1_) in # 2390 "parsing/parser.mly" ( unclosed "{<" _loc__1_ ">}" _loc__3_ ) -# 37629 "parsing/parser.ml" +# 37617 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -37635,13 +37623,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 37639 "parsing/parser.ml" +# 37627 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 37645 "parsing/parser.ml" +# 37633 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -37674,7 +37662,7 @@ module Tables = struct let _1 = # 2392 "parsing/parser.mly" ( Pexp_override [] ) -# 37678 "parsing/parser.ml" +# 37666 "parsing/parser.ml" in let _endpos__1_ = _endpos__2_ in let _endpos = _endpos__1_ in @@ -37683,13 +37671,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 37687 "parsing/parser.ml" +# 37675 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 37693 "parsing/parser.ml" +# 37681 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -37735,13 +37723,13 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 37739 "parsing/parser.ml" +# 37727 "parsing/parser.ml" in # 2394 "parsing/parser.mly" ( Pexp_field(_1, _3) ) -# 37745 "parsing/parser.ml" +# 37733 "parsing/parser.ml" in let _endpos__1_ = _endpos__1_inlined1_ in @@ -37751,13 +37739,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 37755 "parsing/parser.ml" +# 37743 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 37761 "parsing/parser.ml" +# 37749 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -37817,7 +37805,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 37821 "parsing/parser.ml" +# 37809 "parsing/parser.ml" in let _loc__1_ = (_startpos__1_, _endpos__1_) in @@ -37826,13 +37814,13 @@ module Tables = struct ( let loc = make_loc _loc__1_ in let me = Mod.ident ~loc _1 in Opn.mk ~loc me ) -# 37830 "parsing/parser.ml" +# 37818 "parsing/parser.ml" in # 2396 "parsing/parser.mly" ( Pexp_open(od, _4) ) -# 37836 "parsing/parser.ml" +# 37824 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -37842,13 +37830,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 37846 "parsing/parser.ml" +# 37834 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 37852 "parsing/parser.ml" +# 37840 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -37903,7 +37891,7 @@ module Tables = struct let _4 = # 2647 "parsing/parser.mly" ( xs ) -# 37907 "parsing/parser.ml" +# 37895 "parsing/parser.ml" in let od = let _1 = @@ -37913,7 +37901,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 37917 "parsing/parser.ml" +# 37905 "parsing/parser.ml" in let _loc__1_ = (_startpos__1_, _endpos__1_) in @@ -37922,7 +37910,7 @@ module Tables = struct ( let loc = make_loc _loc__1_ in let me = Mod.ident ~loc _1 in Opn.mk ~loc me ) -# 37926 "parsing/parser.ml" +# 37914 "parsing/parser.ml" in let _startpos_od_ = _startpos__1_ in @@ -37933,7 +37921,7 @@ module Tables = struct # 2398 "parsing/parser.mly" ( (* TODO: review the location of Pexp_override *) Pexp_open(od, mkexp ~loc:_sloc (Pexp_override _4)) ) -# 37937 "parsing/parser.ml" +# 37925 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -37943,13 +37931,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 37947 "parsing/parser.ml" +# 37935 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 37953 "parsing/parser.ml" +# 37941 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -38004,14 +37992,14 @@ module Tables = struct let _4 = # 2647 "parsing/parser.mly" ( xs ) -# 38008 "parsing/parser.ml" +# 37996 "parsing/parser.ml" in let _loc__5_ = (_startpos__5_, _endpos__5_) in let _loc__3_ = (_startpos__3_, _endpos__3_) in # 2401 "parsing/parser.mly" ( unclosed "{<" _loc__3_ ">}" _loc__5_ ) -# 38015 "parsing/parser.ml" +# 38003 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -38021,13 +38009,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 38025 "parsing/parser.ml" +# 38013 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 38031 "parsing/parser.ml" +# 38019 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -38060,7 +38048,7 @@ module Tables = struct let _1_inlined1 : ( # 705 "parsing/parser.mly" (string) -# 38064 "parsing/parser.ml" +# 38052 "parsing/parser.ml" ) = Obj.magic _1_inlined1 in let _2 : unit = Obj.magic _2 in let _1 : (Parsetree.expression) = Obj.magic _1 in @@ -38074,7 +38062,7 @@ module Tables = struct let _1 = # 3498 "parsing/parser.mly" ( _1 ) -# 38078 "parsing/parser.ml" +# 38066 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -38082,13 +38070,13 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 38086 "parsing/parser.ml" +# 38074 "parsing/parser.ml" in # 2403 "parsing/parser.mly" ( Pexp_send(_1, _3) ) -# 38092 "parsing/parser.ml" +# 38080 "parsing/parser.ml" in let _endpos__1_ = _endpos__1_inlined1_ in @@ -38098,13 +38086,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 38102 "parsing/parser.ml" +# 38090 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 38108 "parsing/parser.ml" +# 38096 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -38138,7 +38126,7 @@ module Tables = struct let _1_inlined1 : ( # 740 "parsing/parser.mly" (string) -# 38142 "parsing/parser.ml" +# 38130 "parsing/parser.ml" ) = Obj.magic _1_inlined1 in let _1 : (Parsetree.expression) = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in @@ -38154,13 +38142,13 @@ module Tables = struct # 910 "parsing/parser.mly" ( mkoperator ~loc:_sloc _1 ) -# 38158 "parsing/parser.ml" +# 38146 "parsing/parser.ml" in # 2405 "parsing/parser.mly" ( mkinfix _1 _2 _3 ) -# 38164 "parsing/parser.ml" +# 38152 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -38170,13 +38158,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 38174 "parsing/parser.ml" +# 38162 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 38180 "parsing/parser.ml" +# 38168 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -38202,7 +38190,7 @@ module Tables = struct let _1 = # 2407 "parsing/parser.mly" ( Pexp_extension _1 ) -# 38206 "parsing/parser.ml" +# 38194 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -38210,13 +38198,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 38214 "parsing/parser.ml" +# 38202 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 38220 "parsing/parser.ml" +# 38208 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -38266,7 +38254,7 @@ module Tables = struct let _1 = # 2408 "parsing/parser.mly" (Lident "()") -# 38270 "parsing/parser.ml" +# 38258 "parsing/parser.ml" in let _endpos__1_ = _endpos__2_ in let _endpos = _endpos__1_ in @@ -38275,7 +38263,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 38279 "parsing/parser.ml" +# 38267 "parsing/parser.ml" in let (_endpos__3_, _startpos__3_) = (_endpos__2_inlined1_, _startpos__1_inlined1_) in @@ -38287,7 +38275,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 38291 "parsing/parser.ml" +# 38279 "parsing/parser.ml" in let _loc__1_ = (_startpos__1_, _endpos__1_) in @@ -38296,14 +38284,14 @@ module Tables = struct ( let loc = make_loc _loc__1_ in let me = Mod.ident ~loc _1 in Opn.mk ~loc me ) -# 38300 "parsing/parser.ml" +# 38288 "parsing/parser.ml" in let _loc__3_ = (_startpos__3_, _endpos__3_) in # 2409 "parsing/parser.mly" ( Pexp_open(od, mkexp ~loc:(_loc__3_) (Pexp_construct(_3, None))) ) -# 38307 "parsing/parser.ml" +# 38295 "parsing/parser.ml" in let _endpos__1_ = _endpos__2_inlined1_ in @@ -38313,13 +38301,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 38317 "parsing/parser.ml" +# 38305 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 38323 "parsing/parser.ml" +# 38311 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -38376,7 +38364,7 @@ module Tables = struct # 2411 "parsing/parser.mly" ( unclosed "(" _loc__3_ ")" _loc__5_ ) -# 38380 "parsing/parser.ml" +# 38368 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -38386,13 +38374,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 38390 "parsing/parser.ml" +# 38378 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 38396 "parsing/parser.ml" +# 38384 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -38434,7 +38422,7 @@ module Tables = struct # 2413 "parsing/parser.mly" ( let (exten, fields) = _2 in Pexp_record(fields, exten) ) -# 38438 "parsing/parser.ml" +# 38426 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in let _endpos = _endpos__1_ in @@ -38443,13 +38431,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 38447 "parsing/parser.ml" +# 38435 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 38453 "parsing/parser.ml" +# 38441 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -38493,7 +38481,7 @@ module Tables = struct # 2416 "parsing/parser.mly" ( unclosed "{" _loc__1_ "}" _loc__3_ ) -# 38497 "parsing/parser.ml" +# 38485 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -38503,13 +38491,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 38507 "parsing/parser.ml" +# 38495 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 38513 "parsing/parser.ml" +# 38501 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -38570,7 +38558,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 38574 "parsing/parser.ml" +# 38562 "parsing/parser.ml" in let _loc__1_ = (_startpos__1_, _endpos__1_) in @@ -38579,7 +38567,7 @@ module Tables = struct ( let loc = make_loc _loc__1_ in let me = Mod.ident ~loc _1 in Opn.mk ~loc me ) -# 38583 "parsing/parser.ml" +# 38571 "parsing/parser.ml" in let _endpos = _endpos__5_ in @@ -38588,7 +38576,7 @@ module Tables = struct ( let (exten, fields) = _4 in Pexp_open(od, mkexp ~loc:(_startpos__3_, _endpos) (Pexp_record(fields, exten))) ) -# 38592 "parsing/parser.ml" +# 38580 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -38598,13 +38586,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 38602 "parsing/parser.ml" +# 38590 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 38608 "parsing/parser.ml" +# 38596 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -38662,7 +38650,7 @@ module Tables = struct # 2422 "parsing/parser.mly" ( unclosed "{" _loc__3_ "}" _loc__5_ ) -# 38666 "parsing/parser.ml" +# 38654 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -38672,13 +38660,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 38676 "parsing/parser.ml" +# 38664 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 38682 "parsing/parser.ml" +# 38670 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -38719,12 +38707,12 @@ module Tables = struct let _2 = # 2664 "parsing/parser.mly" ( es ) -# 38723 "parsing/parser.ml" +# 38711 "parsing/parser.ml" in # 2424 "parsing/parser.mly" ( Pexp_array(_2) ) -# 38728 "parsing/parser.ml" +# 38716 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -38734,13 +38722,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 38738 "parsing/parser.ml" +# 38726 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 38744 "parsing/parser.ml" +# 38732 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -38781,14 +38769,14 @@ module Tables = struct let _2 = # 2664 "parsing/parser.mly" ( es ) -# 38785 "parsing/parser.ml" +# 38773 "parsing/parser.ml" in let _loc__3_ = (_startpos__3_, _endpos__3_) in let _loc__1_ = (_startpos__1_, _endpos__1_) in # 2426 "parsing/parser.mly" ( unclosed "[|" _loc__1_ "|]" _loc__3_ ) -# 38792 "parsing/parser.ml" +# 38780 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -38798,13 +38786,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 38802 "parsing/parser.ml" +# 38790 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 38808 "parsing/parser.ml" +# 38796 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -38837,7 +38825,7 @@ module Tables = struct let _1 = # 2428 "parsing/parser.mly" ( Pexp_array [] ) -# 38841 "parsing/parser.ml" +# 38829 "parsing/parser.ml" in let _endpos__1_ = _endpos__2_ in let _endpos = _endpos__1_ in @@ -38846,13 +38834,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 38850 "parsing/parser.ml" +# 38838 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 38856 "parsing/parser.ml" +# 38844 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -38907,7 +38895,7 @@ module Tables = struct let _4 = # 2664 "parsing/parser.mly" ( es ) -# 38911 "parsing/parser.ml" +# 38899 "parsing/parser.ml" in let od = let _1 = @@ -38917,7 +38905,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 38921 "parsing/parser.ml" +# 38909 "parsing/parser.ml" in let _loc__1_ = (_startpos__1_, _endpos__1_) in @@ -38926,14 +38914,14 @@ module Tables = struct ( let loc = make_loc _loc__1_ in let me = Mod.ident ~loc _1 in Opn.mk ~loc me ) -# 38930 "parsing/parser.ml" +# 38918 "parsing/parser.ml" in let _endpos = _endpos__5_ in # 2430 "parsing/parser.mly" ( Pexp_open(od, mkexp ~loc:(_startpos__3_, _endpos) (Pexp_array(_4))) ) -# 38937 "parsing/parser.ml" +# 38925 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -38943,13 +38931,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 38947 "parsing/parser.ml" +# 38935 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 38953 "parsing/parser.ml" +# 38941 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -39002,7 +38990,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 39006 "parsing/parser.ml" +# 38994 "parsing/parser.ml" in let _loc__1_ = (_startpos__1_, _endpos__1_) in @@ -39011,7 +38999,7 @@ module Tables = struct ( let loc = make_loc _loc__1_ in let me = Mod.ident ~loc _1 in Opn.mk ~loc me ) -# 39015 "parsing/parser.ml" +# 39003 "parsing/parser.ml" in let _endpos = _endpos__4_ in @@ -39019,7 +39007,7 @@ module Tables = struct # 2432 "parsing/parser.mly" ( (* TODO: review the location of Pexp_array *) Pexp_open(od, mkexp ~loc:(_startpos__3_, _endpos) (Pexp_array [])) ) -# 39023 "parsing/parser.ml" +# 39011 "parsing/parser.ml" in let _endpos__1_ = _endpos__4_ in @@ -39029,13 +39017,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 39033 "parsing/parser.ml" +# 39021 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 39039 "parsing/parser.ml" +# 39027 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -39090,14 +39078,14 @@ module Tables = struct let _4 = # 2664 "parsing/parser.mly" ( es ) -# 39094 "parsing/parser.ml" +# 39082 "parsing/parser.ml" in let _loc__5_ = (_startpos__5_, _endpos__5_) in let _loc__3_ = (_startpos__3_, _endpos__3_) in # 2436 "parsing/parser.mly" ( unclosed "[|" _loc__3_ "|]" _loc__5_ ) -# 39101 "parsing/parser.ml" +# 39089 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -39107,13 +39095,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 39111 "parsing/parser.ml" +# 39099 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 39117 "parsing/parser.ml" +# 39105 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -39154,13 +39142,13 @@ module Tables = struct let _2 = # 2664 "parsing/parser.mly" ( es ) -# 39158 "parsing/parser.ml" +# 39146 "parsing/parser.ml" in let _loc__3_ = (_startpos__3_, _endpos__3_) in # 2438 "parsing/parser.mly" ( fst (mktailexp _loc__3_ _2) ) -# 39164 "parsing/parser.ml" +# 39152 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -39170,13 +39158,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 39174 "parsing/parser.ml" +# 39162 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 39180 "parsing/parser.ml" +# 39168 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -39217,14 +39205,14 @@ module Tables = struct let _2 = # 2664 "parsing/parser.mly" ( es ) -# 39221 "parsing/parser.ml" +# 39209 "parsing/parser.ml" in let _loc__3_ = (_startpos__3_, _endpos__3_) in let _loc__1_ = (_startpos__1_, _endpos__1_) in # 2440 "parsing/parser.mly" ( unclosed "[" _loc__1_ "]" _loc__3_ ) -# 39228 "parsing/parser.ml" +# 39216 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -39234,13 +39222,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 39238 "parsing/parser.ml" +# 39226 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 39244 "parsing/parser.ml" +# 39232 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -39295,7 +39283,7 @@ module Tables = struct let _4 = # 2664 "parsing/parser.mly" ( es ) -# 39299 "parsing/parser.ml" +# 39287 "parsing/parser.ml" in let od = let _1 = @@ -39305,7 +39293,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 39309 "parsing/parser.ml" +# 39297 "parsing/parser.ml" in let _loc__1_ = (_startpos__1_, _endpos__1_) in @@ -39314,7 +39302,7 @@ module Tables = struct ( let loc = make_loc _loc__1_ in let me = Mod.ident ~loc _1 in Opn.mk ~loc me ) -# 39318 "parsing/parser.ml" +# 39306 "parsing/parser.ml" in let _endpos = _endpos__5_ in @@ -39326,7 +39314,7 @@ module Tables = struct let tail_exp, _tail_loc = mktailexp _loc__5_ _4 in mkexp ~loc:(_startpos__3_, _endpos) tail_exp in Pexp_open(od, list_exp) ) -# 39330 "parsing/parser.ml" +# 39318 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -39336,13 +39324,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 39340 "parsing/parser.ml" +# 39328 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 39346 "parsing/parser.ml" +# 39334 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -39392,7 +39380,7 @@ module Tables = struct let _1 = # 2447 "parsing/parser.mly" (Lident "[]") -# 39396 "parsing/parser.ml" +# 39384 "parsing/parser.ml" in let _endpos__1_ = _endpos__2_ in let _endpos = _endpos__1_ in @@ -39401,7 +39389,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 39405 "parsing/parser.ml" +# 39393 "parsing/parser.ml" in let (_endpos__3_, _startpos__3_) = (_endpos__2_inlined1_, _startpos__1_inlined1_) in @@ -39413,7 +39401,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 39417 "parsing/parser.ml" +# 39405 "parsing/parser.ml" in let _loc__1_ = (_startpos__1_, _endpos__1_) in @@ -39422,14 +39410,14 @@ module Tables = struct ( let loc = make_loc _loc__1_ in let me = Mod.ident ~loc _1 in Opn.mk ~loc me ) -# 39426 "parsing/parser.ml" +# 39414 "parsing/parser.ml" in let _loc__3_ = (_startpos__3_, _endpos__3_) in # 2448 "parsing/parser.mly" ( Pexp_open(od, mkexp ~loc:_loc__3_ (Pexp_construct(_3, None))) ) -# 39433 "parsing/parser.ml" +# 39421 "parsing/parser.ml" in let _endpos__1_ = _endpos__2_inlined1_ in @@ -39439,13 +39427,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 39443 "parsing/parser.ml" +# 39431 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 39449 "parsing/parser.ml" +# 39437 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -39500,14 +39488,14 @@ module Tables = struct let _4 = # 2664 "parsing/parser.mly" ( es ) -# 39504 "parsing/parser.ml" +# 39492 "parsing/parser.ml" in let _loc__5_ = (_startpos__5_, _endpos__5_) in let _loc__3_ = (_startpos__3_, _endpos__3_) in # 2451 "parsing/parser.mly" ( unclosed "[" _loc__3_ "]" _loc__5_ ) -# 39511 "parsing/parser.ml" +# 39499 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -39517,13 +39505,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 39521 "parsing/parser.ml" +# 39509 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 39527 "parsing/parser.ml" +# 39515 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -39620,7 +39608,7 @@ module Tables = struct ( let (lid, cstrs, attrs) = package_type_of_module_type _1 in let descr = Ptyp_package (lid, cstrs) in mktyp ~loc:_sloc ~attrs descr ) -# 39624 "parsing/parser.ml" +# 39612 "parsing/parser.ml" in let _5 = @@ -39630,13 +39618,13 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 39634 "parsing/parser.ml" +# 39622 "parsing/parser.ml" in # 3853 "parsing/parser.mly" ( _1, _2 ) -# 39640 "parsing/parser.ml" +# 39628 "parsing/parser.ml" in let od = @@ -39647,7 +39635,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 39651 "parsing/parser.ml" +# 39639 "parsing/parser.ml" in let _loc__1_ = (_startpos__1_, _endpos__1_) in @@ -39656,7 +39644,7 @@ module Tables = struct ( let loc = make_loc _loc__1_ in let me = Mod.ident ~loc _1 in Opn.mk ~loc me ) -# 39660 "parsing/parser.ml" +# 39648 "parsing/parser.ml" in let _startpos_od_ = _startpos__1_ in @@ -39669,7 +39657,7 @@ module Tables = struct mkexp_attrs ~loc:(_startpos__3_, _endpos) (Pexp_constraint (ghexp ~loc:_sloc (Pexp_pack _6), _8)) _5 in Pexp_open(od, modexp) ) -# 39673 "parsing/parser.ml" +# 39661 "parsing/parser.ml" in let _endpos__1_ = _endpos__9_ in @@ -39679,13 +39667,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 39683 "parsing/parser.ml" +# 39671 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 39689 "parsing/parser.ml" +# 39677 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -39772,13 +39760,13 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 39776 "parsing/parser.ml" +# 39764 "parsing/parser.ml" in # 3853 "parsing/parser.mly" ( _1, _2 ) -# 39782 "parsing/parser.ml" +# 39770 "parsing/parser.ml" in let _loc__8_ = (_startpos__8_, _endpos__8_) in @@ -39786,7 +39774,7 @@ module Tables = struct # 2460 "parsing/parser.mly" ( unclosed "(" _loc__3_ ")" _loc__8_ ) -# 39790 "parsing/parser.ml" +# 39778 "parsing/parser.ml" in let _endpos__1_ = _endpos__8_ in @@ -39796,13 +39784,13 @@ module Tables = struct # 916 "parsing/parser.mly" ( mkexp ~loc:_sloc _1 ) -# 39800 "parsing/parser.ml" +# 39788 "parsing/parser.ml" in # 2352 "parsing/parser.mly" ( _1 ) -# 39806 "parsing/parser.ml" +# 39794 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -39833,13 +39821,13 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 39837 "parsing/parser.ml" +# 39825 "parsing/parser.ml" in # 2747 "parsing/parser.mly" ( Ppat_var (_1) ) -# 39843 "parsing/parser.ml" +# 39831 "parsing/parser.ml" in let _endpos = _endpos__1_ in @@ -39848,13 +39836,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 39852 "parsing/parser.ml" +# 39840 "parsing/parser.ml" in # 2748 "parsing/parser.mly" ( _1 ) -# 39858 "parsing/parser.ml" +# 39846 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -39879,7 +39867,7 @@ module Tables = struct let _v : (Parsetree.pattern) = # 2749 "parsing/parser.mly" ( _1 ) -# 39883 "parsing/parser.ml" +# 39871 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -39921,7 +39909,7 @@ module Tables = struct # 2754 "parsing/parser.mly" ( reloc_pat ~loc:_sloc _2 ) -# 39925 "parsing/parser.ml" +# 39913 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -39946,7 +39934,7 @@ module Tables = struct let _v : (Parsetree.pattern) = # 2756 "parsing/parser.mly" ( _1 ) -# 39950 "parsing/parser.ml" +# 39938 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40011,7 +39999,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 40015 "parsing/parser.ml" +# 40003 "parsing/parser.ml" in let _3 = @@ -40021,13 +40009,13 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 40025 "parsing/parser.ml" +# 40013 "parsing/parser.ml" in # 3853 "parsing/parser.mly" ( _1, _2 ) -# 40031 "parsing/parser.ml" +# 40019 "parsing/parser.ml" in let _endpos = _endpos__5_ in @@ -40036,7 +40024,7 @@ module Tables = struct # 2758 "parsing/parser.mly" ( mkpat_attrs ~loc:_sloc (Ppat_unpack _4) _3 ) -# 40040 "parsing/parser.ml" +# 40028 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40117,7 +40105,7 @@ module Tables = struct ( let (lid, cstrs, attrs) = package_type_of_module_type _1 in let descr = Ptyp_package (lid, cstrs) in mktyp ~loc:_sloc ~attrs descr ) -# 40121 "parsing/parser.ml" +# 40109 "parsing/parser.ml" in let _4 = @@ -40128,7 +40116,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 40132 "parsing/parser.ml" +# 40120 "parsing/parser.ml" in let (_endpos__4_, _startpos__4_) = (_endpos__1_inlined3_, _startpos__1_inlined3_) in @@ -40139,13 +40127,13 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 40143 "parsing/parser.ml" +# 40131 "parsing/parser.ml" in # 3853 "parsing/parser.mly" ( _1, _2 ) -# 40149 "parsing/parser.ml" +# 40137 "parsing/parser.ml" in let _endpos = _endpos__7_ in @@ -40157,7 +40145,7 @@ module Tables = struct ( mkpat_attrs ~loc:_sloc (Ppat_constraint(mkpat ~loc:_loc__4_ (Ppat_unpack _4), _6)) _3 ) -# 40161 "parsing/parser.ml" +# 40149 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40183,7 +40171,7 @@ module Tables = struct let _1 = # 2768 "parsing/parser.mly" ( Ppat_any ) -# 40187 "parsing/parser.ml" +# 40175 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -40191,13 +40179,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 40195 "parsing/parser.ml" +# 40183 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 40201 "parsing/parser.ml" +# 40189 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40223,7 +40211,7 @@ module Tables = struct let _1 = # 2770 "parsing/parser.mly" ( Ppat_constant _1 ) -# 40227 "parsing/parser.ml" +# 40215 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -40231,13 +40219,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 40235 "parsing/parser.ml" +# 40223 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 40241 "parsing/parser.ml" +# 40229 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40277,7 +40265,7 @@ module Tables = struct let _1 = # 2772 "parsing/parser.mly" ( Ppat_interval (_1, _3) ) -# 40281 "parsing/parser.ml" +# 40269 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in let _endpos = _endpos__1_ in @@ -40286,13 +40274,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 40290 "parsing/parser.ml" +# 40278 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 40296 "parsing/parser.ml" +# 40284 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40323,13 +40311,13 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 40327 "parsing/parser.ml" +# 40315 "parsing/parser.ml" in # 2774 "parsing/parser.mly" ( Ppat_construct(_1, None) ) -# 40333 "parsing/parser.ml" +# 40321 "parsing/parser.ml" in let _endpos = _endpos__1_ in @@ -40338,13 +40326,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 40342 "parsing/parser.ml" +# 40330 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 40348 "parsing/parser.ml" +# 40336 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40370,7 +40358,7 @@ module Tables = struct let _1 = # 2776 "parsing/parser.mly" ( Ppat_variant(_1, None) ) -# 40374 "parsing/parser.ml" +# 40362 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -40378,13 +40366,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 40382 "parsing/parser.ml" +# 40370 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 40388 "parsing/parser.ml" +# 40376 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40423,13 +40411,13 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 40427 "parsing/parser.ml" +# 40415 "parsing/parser.ml" in # 2778 "parsing/parser.mly" ( Ppat_type (_2) ) -# 40433 "parsing/parser.ml" +# 40421 "parsing/parser.ml" in let _endpos__1_ = _endpos__1_inlined1_ in @@ -40439,13 +40427,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 40443 "parsing/parser.ml" +# 40431 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 40449 "parsing/parser.ml" +# 40437 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40490,13 +40478,13 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 40494 "parsing/parser.ml" +# 40482 "parsing/parser.ml" in # 2780 "parsing/parser.mly" ( Ppat_open(_1, _3) ) -# 40500 "parsing/parser.ml" +# 40488 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -40506,13 +40494,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 40510 "parsing/parser.ml" +# 40498 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 40516 "parsing/parser.ml" +# 40504 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40562,7 +40550,7 @@ module Tables = struct let _1 = # 2781 "parsing/parser.mly" (Lident "[]") -# 40566 "parsing/parser.ml" +# 40554 "parsing/parser.ml" in let _endpos__1_ = _endpos__2_ in let _endpos = _endpos__1_ in @@ -40571,7 +40559,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 40575 "parsing/parser.ml" +# 40563 "parsing/parser.ml" in let _endpos__3_ = _endpos__2_inlined1_ in @@ -40582,7 +40570,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 40586 "parsing/parser.ml" +# 40574 "parsing/parser.ml" in let _endpos = _endpos__3_ in @@ -40591,7 +40579,7 @@ module Tables = struct # 2782 "parsing/parser.mly" ( Ppat_open(_1, mkpat ~loc:_sloc (Ppat_construct(_3, None))) ) -# 40595 "parsing/parser.ml" +# 40583 "parsing/parser.ml" in let _endpos__1_ = _endpos__2_inlined1_ in @@ -40601,13 +40589,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 40605 "parsing/parser.ml" +# 40593 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 40611 "parsing/parser.ml" +# 40599 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40657,7 +40645,7 @@ module Tables = struct let _1 = # 2783 "parsing/parser.mly" (Lident "()") -# 40661 "parsing/parser.ml" +# 40649 "parsing/parser.ml" in let _endpos__1_ = _endpos__2_ in let _endpos = _endpos__1_ in @@ -40666,7 +40654,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 40670 "parsing/parser.ml" +# 40658 "parsing/parser.ml" in let _endpos__3_ = _endpos__2_inlined1_ in @@ -40677,7 +40665,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 40681 "parsing/parser.ml" +# 40669 "parsing/parser.ml" in let _endpos = _endpos__3_ in @@ -40686,7 +40674,7 @@ module Tables = struct # 2784 "parsing/parser.mly" ( Ppat_open(_1, mkpat ~loc:_sloc (Ppat_construct(_3, None))) ) -# 40690 "parsing/parser.ml" +# 40678 "parsing/parser.ml" in let _endpos__1_ = _endpos__2_inlined1_ in @@ -40696,13 +40684,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 40700 "parsing/parser.ml" +# 40688 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 40706 "parsing/parser.ml" +# 40694 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40761,13 +40749,13 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 40765 "parsing/parser.ml" +# 40753 "parsing/parser.ml" in # 2786 "parsing/parser.mly" ( Ppat_open (_1, _4) ) -# 40771 "parsing/parser.ml" +# 40759 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -40777,13 +40765,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 40781 "parsing/parser.ml" +# 40769 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 40787 "parsing/parser.ml" +# 40775 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40840,7 +40828,7 @@ module Tables = struct # 2788 "parsing/parser.mly" ( unclosed "(" _loc__3_ ")" _loc__5_ ) -# 40844 "parsing/parser.ml" +# 40832 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -40850,13 +40838,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 40854 "parsing/parser.ml" +# 40842 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 40860 "parsing/parser.ml" +# 40848 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40905,7 +40893,7 @@ module Tables = struct # 2790 "parsing/parser.mly" ( expecting _loc__4_ "pattern" ) -# 40909 "parsing/parser.ml" +# 40897 "parsing/parser.ml" in let _endpos__1_ = _endpos__4_ in @@ -40915,13 +40903,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 40919 "parsing/parser.ml" +# 40907 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 40925 "parsing/parser.ml" +# 40913 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -40964,7 +40952,7 @@ module Tables = struct # 2792 "parsing/parser.mly" ( unclosed "(" _loc__1_ ")" _loc__3_ ) -# 40968 "parsing/parser.ml" +# 40956 "parsing/parser.ml" in let _endpos__1_ = _endpos__3_ in @@ -40974,13 +40962,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 40978 "parsing/parser.ml" +# 40966 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 40984 "parsing/parser.ml" +# 40972 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41034,7 +41022,7 @@ module Tables = struct let _1 = # 2794 "parsing/parser.mly" ( Ppat_constraint(_2, _4) ) -# 41038 "parsing/parser.ml" +# 41026 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in let _endpos = _endpos__1_ in @@ -41043,13 +41031,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 41047 "parsing/parser.ml" +# 41035 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 41053 "parsing/parser.ml" +# 41041 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41106,7 +41094,7 @@ module Tables = struct # 2796 "parsing/parser.mly" ( unclosed "(" _loc__1_ ")" _loc__5_ ) -# 41110 "parsing/parser.ml" +# 41098 "parsing/parser.ml" in let _endpos__1_ = _endpos__5_ in @@ -41116,13 +41104,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 41120 "parsing/parser.ml" +# 41108 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 41126 "parsing/parser.ml" +# 41114 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41171,7 +41159,7 @@ module Tables = struct # 2798 "parsing/parser.mly" ( expecting _loc__4_ "type" ) -# 41175 "parsing/parser.ml" +# 41163 "parsing/parser.ml" in let _endpos__1_ = _endpos__4_ in @@ -41181,13 +41169,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 41185 "parsing/parser.ml" +# 41173 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 41191 "parsing/parser.ml" +# 41179 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41270,7 +41258,7 @@ module Tables = struct ( let (lid, cstrs, attrs) = package_type_of_module_type _1 in let descr = Ptyp_package (lid, cstrs) in mktyp ~loc:_sloc ~attrs descr ) -# 41274 "parsing/parser.ml" +# 41262 "parsing/parser.ml" in let _3 = @@ -41280,13 +41268,13 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 41284 "parsing/parser.ml" +# 41272 "parsing/parser.ml" in # 3853 "parsing/parser.mly" ( _1, _2 ) -# 41290 "parsing/parser.ml" +# 41278 "parsing/parser.ml" in let _loc__7_ = (_startpos__7_, _endpos__7_) in @@ -41294,7 +41282,7 @@ module Tables = struct # 2801 "parsing/parser.mly" ( unclosed "(" _loc__1_ ")" _loc__7_ ) -# 41298 "parsing/parser.ml" +# 41286 "parsing/parser.ml" in let _endpos__1_ = _endpos__7_ in @@ -41304,13 +41292,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 41308 "parsing/parser.ml" +# 41296 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 41314 "parsing/parser.ml" +# 41302 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41336,7 +41324,7 @@ module Tables = struct let _1 = # 2803 "parsing/parser.mly" ( Ppat_extension _1 ) -# 41340 "parsing/parser.ml" +# 41328 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -41344,13 +41332,13 @@ module Tables = struct # 918 "parsing/parser.mly" ( mkpat ~loc:_sloc _1 ) -# 41348 "parsing/parser.ml" +# 41336 "parsing/parser.ml" in # 2764 "parsing/parser.mly" ( _1 ) -# 41354 "parsing/parser.ml" +# 41342 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41371,7 +41359,7 @@ module Tables = struct let _1 : ( # 705 "parsing/parser.mly" (string) -# 41375 "parsing/parser.ml" +# 41363 "parsing/parser.ml" ) = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in let _startpos = _startpos__1_ in @@ -41379,7 +41367,7 @@ module Tables = struct let _v : (string) = # 3761 "parsing/parser.mly" ( _1 ) -# 41383 "parsing/parser.ml" +# 41371 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41400,7 +41388,7 @@ module Tables = struct let _1 : ( # 756 "parsing/parser.mly" (string) -# 41404 "parsing/parser.ml" +# 41392 "parsing/parser.ml" ) = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in let _startpos = _startpos__1_ in @@ -41408,7 +41396,7 @@ module Tables = struct let _v : (string) = # 3762 "parsing/parser.mly" ( _1 ) -# 41412 "parsing/parser.ml" +# 41400 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41433,7 +41421,7 @@ module Tables = struct let _v : (string) = # 3763 "parsing/parser.mly" ( "and" ) -# 41437 "parsing/parser.ml" +# 41425 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41458,7 +41446,7 @@ module Tables = struct let _v : (string) = # 3764 "parsing/parser.mly" ( "as" ) -# 41462 "parsing/parser.ml" +# 41450 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41483,7 +41471,7 @@ module Tables = struct let _v : (string) = # 3765 "parsing/parser.mly" ( "assert" ) -# 41487 "parsing/parser.ml" +# 41475 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41508,7 +41496,7 @@ module Tables = struct let _v : (string) = # 3766 "parsing/parser.mly" ( "begin" ) -# 41512 "parsing/parser.ml" +# 41500 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41533,7 +41521,7 @@ module Tables = struct let _v : (string) = # 3767 "parsing/parser.mly" ( "class" ) -# 41537 "parsing/parser.ml" +# 41525 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41558,7 +41546,7 @@ module Tables = struct let _v : (string) = # 3768 "parsing/parser.mly" ( "constraint" ) -# 41562 "parsing/parser.ml" +# 41550 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41583,7 +41571,7 @@ module Tables = struct let _v : (string) = # 3769 "parsing/parser.mly" ( "do" ) -# 41587 "parsing/parser.ml" +# 41575 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41608,7 +41596,7 @@ module Tables = struct let _v : (string) = # 3770 "parsing/parser.mly" ( "done" ) -# 41612 "parsing/parser.ml" +# 41600 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41633,7 +41621,7 @@ module Tables = struct let _v : (string) = # 3771 "parsing/parser.mly" ( "downto" ) -# 41637 "parsing/parser.ml" +# 41625 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41658,7 +41646,7 @@ module Tables = struct let _v : (string) = # 3772 "parsing/parser.mly" ( "else" ) -# 41662 "parsing/parser.ml" +# 41650 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41683,7 +41671,7 @@ module Tables = struct let _v : (string) = # 3773 "parsing/parser.mly" ( "end" ) -# 41687 "parsing/parser.ml" +# 41675 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41708,7 +41696,7 @@ module Tables = struct let _v : (string) = # 3774 "parsing/parser.mly" ( "exception" ) -# 41712 "parsing/parser.ml" +# 41700 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41733,7 +41721,7 @@ module Tables = struct let _v : (string) = # 3775 "parsing/parser.mly" ( "external" ) -# 41737 "parsing/parser.ml" +# 41725 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41758,7 +41746,7 @@ module Tables = struct let _v : (string) = # 3776 "parsing/parser.mly" ( "false" ) -# 41762 "parsing/parser.ml" +# 41750 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41783,7 +41771,7 @@ module Tables = struct let _v : (string) = # 3777 "parsing/parser.mly" ( "for" ) -# 41787 "parsing/parser.ml" +# 41775 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41808,7 +41796,7 @@ module Tables = struct let _v : (string) = # 3778 "parsing/parser.mly" ( "fun" ) -# 41812 "parsing/parser.ml" +# 41800 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41833,7 +41821,7 @@ module Tables = struct let _v : (string) = # 3779 "parsing/parser.mly" ( "function" ) -# 41837 "parsing/parser.ml" +# 41825 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41858,7 +41846,7 @@ module Tables = struct let _v : (string) = # 3780 "parsing/parser.mly" ( "functor" ) -# 41862 "parsing/parser.ml" +# 41850 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41883,7 +41871,7 @@ module Tables = struct let _v : (string) = # 3781 "parsing/parser.mly" ( "if" ) -# 41887 "parsing/parser.ml" +# 41875 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41908,7 +41896,7 @@ module Tables = struct let _v : (string) = # 3782 "parsing/parser.mly" ( "in" ) -# 41912 "parsing/parser.ml" +# 41900 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41933,7 +41921,7 @@ module Tables = struct let _v : (string) = # 3783 "parsing/parser.mly" ( "include" ) -# 41937 "parsing/parser.ml" +# 41925 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41958,7 +41946,7 @@ module Tables = struct let _v : (string) = # 3784 "parsing/parser.mly" ( "inherit" ) -# 41962 "parsing/parser.ml" +# 41950 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -41983,7 +41971,7 @@ module Tables = struct let _v : (string) = # 3785 "parsing/parser.mly" ( "initializer" ) -# 41987 "parsing/parser.ml" +# 41975 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42008,7 +41996,7 @@ module Tables = struct let _v : (string) = # 3786 "parsing/parser.mly" ( "lazy" ) -# 42012 "parsing/parser.ml" +# 42000 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42033,7 +42021,7 @@ module Tables = struct let _v : (string) = # 3787 "parsing/parser.mly" ( "let" ) -# 42037 "parsing/parser.ml" +# 42025 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42058,7 +42046,7 @@ module Tables = struct let _v : (string) = # 3788 "parsing/parser.mly" ( "match" ) -# 42062 "parsing/parser.ml" +# 42050 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42083,7 +42071,7 @@ module Tables = struct let _v : (string) = # 3789 "parsing/parser.mly" ( "method" ) -# 42087 "parsing/parser.ml" +# 42075 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42108,7 +42096,7 @@ module Tables = struct let _v : (string) = # 3790 "parsing/parser.mly" ( "module" ) -# 42112 "parsing/parser.ml" +# 42100 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42133,7 +42121,7 @@ module Tables = struct let _v : (string) = # 3791 "parsing/parser.mly" ( "mutable" ) -# 42137 "parsing/parser.ml" +# 42125 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42158,7 +42146,7 @@ module Tables = struct let _v : (string) = # 3792 "parsing/parser.mly" ( "new" ) -# 42162 "parsing/parser.ml" +# 42150 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42183,7 +42171,7 @@ module Tables = struct let _v : (string) = # 3793 "parsing/parser.mly" ( "nonrec" ) -# 42187 "parsing/parser.ml" +# 42175 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42208,7 +42196,7 @@ module Tables = struct let _v : (string) = # 3794 "parsing/parser.mly" ( "object" ) -# 42212 "parsing/parser.ml" +# 42200 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42233,7 +42221,7 @@ module Tables = struct let _v : (string) = # 3795 "parsing/parser.mly" ( "of" ) -# 42237 "parsing/parser.ml" +# 42225 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42258,7 +42246,7 @@ module Tables = struct let _v : (string) = # 3796 "parsing/parser.mly" ( "open" ) -# 42262 "parsing/parser.ml" +# 42250 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42283,7 +42271,7 @@ module Tables = struct let _v : (string) = # 3797 "parsing/parser.mly" ( "or" ) -# 42287 "parsing/parser.ml" +# 42275 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42308,7 +42296,7 @@ module Tables = struct let _v : (string) = # 3798 "parsing/parser.mly" ( "private" ) -# 42312 "parsing/parser.ml" +# 42300 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42333,7 +42321,7 @@ module Tables = struct let _v : (string) = # 3799 "parsing/parser.mly" ( "rec" ) -# 42337 "parsing/parser.ml" +# 42325 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42358,7 +42346,7 @@ module Tables = struct let _v : (string) = # 3800 "parsing/parser.mly" ( "sig" ) -# 42362 "parsing/parser.ml" +# 42350 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42383,7 +42371,7 @@ module Tables = struct let _v : (string) = # 3801 "parsing/parser.mly" ( "struct" ) -# 42387 "parsing/parser.ml" +# 42375 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42408,7 +42396,7 @@ module Tables = struct let _v : (string) = # 3802 "parsing/parser.mly" ( "then" ) -# 42412 "parsing/parser.ml" +# 42400 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42433,7 +42421,7 @@ module Tables = struct let _v : (string) = # 3803 "parsing/parser.mly" ( "to" ) -# 42437 "parsing/parser.ml" +# 42425 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42458,7 +42446,7 @@ module Tables = struct let _v : (string) = # 3804 "parsing/parser.mly" ( "true" ) -# 42462 "parsing/parser.ml" +# 42450 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42483,7 +42471,7 @@ module Tables = struct let _v : (string) = # 3805 "parsing/parser.mly" ( "try" ) -# 42487 "parsing/parser.ml" +# 42475 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42508,7 +42496,7 @@ module Tables = struct let _v : (string) = # 3806 "parsing/parser.mly" ( "type" ) -# 42512 "parsing/parser.ml" +# 42500 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42533,7 +42521,7 @@ module Tables = struct let _v : (string) = # 3807 "parsing/parser.mly" ( "val" ) -# 42537 "parsing/parser.ml" +# 42525 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42558,7 +42546,7 @@ module Tables = struct let _v : (string) = # 3808 "parsing/parser.mly" ( "virtual" ) -# 42562 "parsing/parser.ml" +# 42550 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42583,7 +42571,7 @@ module Tables = struct let _v : (string) = # 3809 "parsing/parser.mly" ( "when" ) -# 42587 "parsing/parser.ml" +# 42575 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42608,7 +42596,7 @@ module Tables = struct let _v : (string) = # 3810 "parsing/parser.mly" ( "while" ) -# 42612 "parsing/parser.ml" +# 42600 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42633,7 +42621,7 @@ module Tables = struct let _v : (string) = # 3811 "parsing/parser.mly" ( "with" ) -# 42637 "parsing/parser.ml" +# 42625 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42658,7 +42646,7 @@ module Tables = struct let _v : (Parsetree.type_exception * string Asttypes.loc option) = # 3082 "parsing/parser.mly" ( _1 ) -# 42662 "parsing/parser.ml" +# 42650 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42734,7 +42722,7 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 42738 "parsing/parser.ml" +# 42726 "parsing/parser.ml" in let _endpos_attrs_ = _endpos__1_inlined5_ in @@ -42743,7 +42731,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 42747 "parsing/parser.ml" +# 42735 "parsing/parser.ml" in let lid = @@ -42754,7 +42742,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 42758 "parsing/parser.ml" +# 42746 "parsing/parser.ml" in let id = @@ -42765,7 +42753,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 42769 "parsing/parser.ml" +# 42757 "parsing/parser.ml" in let attrs1 = @@ -42773,7 +42761,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 42777 "parsing/parser.ml" +# 42765 "parsing/parser.ml" in let _endpos = _endpos_attrs_ in @@ -42786,7 +42774,7 @@ module Tables = struct Te.mk_exception ~attrs (Te.rebind id lid ~attrs:(attrs1 @ attrs2) ~loc ~docs) , ext ) -# 42790 "parsing/parser.ml" +# 42778 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42818,7 +42806,7 @@ module Tables = struct let _v : (Parsetree.expression) = # 2589 "parsing/parser.mly" ( _2 ) -# 42822 "parsing/parser.ml" +# 42810 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42853,7 +42841,7 @@ module Tables = struct # 2591 "parsing/parser.mly" ( let (l, o, p) = _1 in ghexp ~loc:_sloc (Pexp_fun(l, o, p, _2)) ) -# 42857 "parsing/parser.ml" +# 42845 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42906,7 +42894,7 @@ module Tables = struct let _v : (Parsetree.expression) = let _3 = # 2481 "parsing/parser.mly" ( xs ) -# 42910 "parsing/parser.ml" +# 42898 "parsing/parser.ml" in let _endpos = _endpos__5_ in let _symbolstartpos = _startpos__1_ in @@ -42914,7 +42902,7 @@ module Tables = struct # 2593 "parsing/parser.mly" ( mk_newtypes ~loc:_sloc _3 _5 ) -# 42918 "parsing/parser.ml" +# 42906 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -42941,24 +42929,24 @@ module Tables = struct let ys = # 260 "<standard.mly>" ( List.flatten xss ) -# 42945 "parsing/parser.ml" +# 42933 "parsing/parser.ml" in let xs = let items = # 953 "parsing/parser.mly" ( [] ) -# 42951 "parsing/parser.ml" +# 42939 "parsing/parser.ml" in # 1372 "parsing/parser.mly" ( items ) -# 42956 "parsing/parser.ml" +# 42944 "parsing/parser.ml" in # 267 "<standard.mly>" ( xs @ ys ) -# 42962 "parsing/parser.ml" +# 42950 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos_xss_, _startpos_xss_) in @@ -42967,13 +42955,13 @@ module Tables = struct # 875 "parsing/parser.mly" ( extra_str _startpos _endpos _1 ) -# 42971 "parsing/parser.ml" +# 42959 "parsing/parser.ml" in # 1365 "parsing/parser.mly" ( _1 ) -# 42977 "parsing/parser.ml" +# 42965 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -43014,7 +43002,7 @@ module Tables = struct let ys = # 260 "<standard.mly>" ( List.flatten xss ) -# 43018 "parsing/parser.ml" +# 43006 "parsing/parser.ml" in let xs = let items = @@ -43024,12 +43012,12 @@ module Tables = struct let attrs = # 3836 "parsing/parser.mly" ( _1 ) -# 43028 "parsing/parser.ml" +# 43016 "parsing/parser.ml" in # 1379 "parsing/parser.mly" ( mkstrexp e attrs ) -# 43033 "parsing/parser.ml" +# 43021 "parsing/parser.ml" in let _startpos__1_ = _startpos_e_ in @@ -43037,7 +43025,7 @@ module Tables = struct # 887 "parsing/parser.mly" ( text_str _startpos @ [_1] ) -# 43041 "parsing/parser.ml" +# 43029 "parsing/parser.ml" in let _startpos__1_ = _startpos_e_ in @@ -43047,25 +43035,25 @@ module Tables = struct # 906 "parsing/parser.mly" ( mark_rhs_docs _startpos _endpos; _1 ) -# 43051 "parsing/parser.ml" +# 43039 "parsing/parser.ml" in # 955 "parsing/parser.mly" ( x ) -# 43057 "parsing/parser.ml" +# 43045 "parsing/parser.ml" in # 1372 "parsing/parser.mly" ( items ) -# 43063 "parsing/parser.ml" +# 43051 "parsing/parser.ml" in # 267 "<standard.mly>" ( xs @ ys ) -# 43069 "parsing/parser.ml" +# 43057 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos_xss_, _startpos_e_) in @@ -43074,13 +43062,13 @@ module Tables = struct # 875 "parsing/parser.mly" ( extra_str _startpos _endpos _1 ) -# 43078 "parsing/parser.ml" +# 43066 "parsing/parser.ml" in # 1365 "parsing/parser.mly" ( _1 ) -# 43084 "parsing/parser.ml" +# 43072 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -43108,7 +43096,7 @@ module Tables = struct # 1394 "parsing/parser.mly" ( val_of_let_bindings ~loc:_sloc _1 ) -# 43112 "parsing/parser.ml" +# 43100 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -43144,7 +43132,7 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 43148 "parsing/parser.ml" +# 43136 "parsing/parser.ml" in let _endpos__2_ = _endpos__1_inlined1_ in @@ -43155,7 +43143,7 @@ module Tables = struct # 1397 "parsing/parser.mly" ( let docs = symbol_docs _sloc in Pstr_extension (_1, add_docs_attrs docs _2) ) -# 43159 "parsing/parser.ml" +# 43147 "parsing/parser.ml" in let _endpos__1_ = _endpos__1_inlined1_ in @@ -43165,13 +43153,13 @@ module Tables = struct # 922 "parsing/parser.mly" ( mkstr ~loc:_sloc _1 ) -# 43169 "parsing/parser.ml" +# 43157 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 43175 "parsing/parser.ml" +# 43163 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -43197,7 +43185,7 @@ module Tables = struct let _1 = # 1400 "parsing/parser.mly" ( Pstr_attribute _1 ) -# 43201 "parsing/parser.ml" +# 43189 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -43205,13 +43193,13 @@ module Tables = struct # 922 "parsing/parser.mly" ( mkstr ~loc:_sloc _1 ) -# 43209 "parsing/parser.ml" +# 43197 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 43215 "parsing/parser.ml" +# 43203 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -43237,7 +43225,7 @@ module Tables = struct let _1 = # 1404 "parsing/parser.mly" ( pstr_primitive _1 ) -# 43241 "parsing/parser.ml" +# 43229 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -43245,13 +43233,13 @@ module Tables = struct # 939 "parsing/parser.mly" ( wrap_mkstr_ext ~loc:_sloc _1 ) -# 43249 "parsing/parser.ml" +# 43237 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 43255 "parsing/parser.ml" +# 43243 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -43277,7 +43265,7 @@ module Tables = struct let _1 = # 1406 "parsing/parser.mly" ( pstr_primitive _1 ) -# 43281 "parsing/parser.ml" +# 43269 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -43285,13 +43273,13 @@ module Tables = struct # 939 "parsing/parser.mly" ( wrap_mkstr_ext ~loc:_sloc _1 ) -# 43289 "parsing/parser.ml" +# 43277 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 43295 "parsing/parser.ml" +# 43283 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -43328,24 +43316,24 @@ module Tables = struct let _1 = # 1114 "parsing/parser.mly" ( let (x, b) = a in x, b :: bs ) -# 43332 "parsing/parser.ml" +# 43320 "parsing/parser.ml" in # 2926 "parsing/parser.mly" ( _1 ) -# 43337 "parsing/parser.ml" +# 43325 "parsing/parser.ml" in # 2909 "parsing/parser.mly" ( _1 ) -# 43343 "parsing/parser.ml" +# 43331 "parsing/parser.ml" in # 1408 "parsing/parser.mly" ( pstr_type _1 ) -# 43349 "parsing/parser.ml" +# 43337 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos_bs_, _startpos_a_) in @@ -43355,13 +43343,13 @@ module Tables = struct # 939 "parsing/parser.mly" ( wrap_mkstr_ext ~loc:_sloc _1 ) -# 43359 "parsing/parser.ml" +# 43347 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 43365 "parsing/parser.ml" +# 43353 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -43448,14 +43436,14 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 43452 "parsing/parser.ml" +# 43440 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined3_ in let cs = # 1106 "parsing/parser.mly" ( List.rev xs ) -# 43459 "parsing/parser.ml" +# 43447 "parsing/parser.ml" in let tid = let (_endpos__1_, _startpos__1_, _1) = (_endpos__1_inlined2_, _startpos__1_inlined2_, _1_inlined2) in @@ -43465,20 +43453,20 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 43469 "parsing/parser.ml" +# 43457 "parsing/parser.ml" in let _4 = # 3681 "parsing/parser.mly" ( Recursive ) -# 43475 "parsing/parser.ml" +# 43463 "parsing/parser.ml" in let attrs1 = let _1 = _1_inlined1 in # 3840 "parsing/parser.mly" ( _1 ) -# 43482 "parsing/parser.ml" +# 43470 "parsing/parser.ml" in let _endpos = _endpos_attrs2_ in @@ -43490,19 +43478,19 @@ module Tables = struct let attrs = attrs1 @ attrs2 in Te.mk tid cs ~params ~priv ~attrs ~docs, ext ) -# 43494 "parsing/parser.ml" +# 43482 "parsing/parser.ml" in # 3163 "parsing/parser.mly" ( _1 ) -# 43500 "parsing/parser.ml" +# 43488 "parsing/parser.ml" in # 1410 "parsing/parser.mly" ( pstr_typext _1 ) -# 43506 "parsing/parser.ml" +# 43494 "parsing/parser.ml" in let _endpos__1_ = _endpos__1_inlined3_ in @@ -43512,13 +43500,13 @@ module Tables = struct # 939 "parsing/parser.mly" ( wrap_mkstr_ext ~loc:_sloc _1 ) -# 43516 "parsing/parser.ml" +# 43504 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 43522 "parsing/parser.ml" +# 43510 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -43612,14 +43600,14 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 43616 "parsing/parser.ml" +# 43604 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined4_ in let cs = # 1106 "parsing/parser.mly" ( List.rev xs ) -# 43623 "parsing/parser.ml" +# 43611 "parsing/parser.ml" in let tid = let (_endpos__1_, _startpos__1_, _1) = (_endpos__1_inlined3_, _startpos__1_inlined3_, _1_inlined3) in @@ -43629,7 +43617,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 43633 "parsing/parser.ml" +# 43621 "parsing/parser.ml" in let _4 = @@ -43640,7 +43628,7 @@ module Tables = struct # 3683 "parsing/parser.mly" ( not_expecting _loc "nonrec flag" ) -# 43644 "parsing/parser.ml" +# 43632 "parsing/parser.ml" in let attrs1 = @@ -43648,7 +43636,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 43652 "parsing/parser.ml" +# 43640 "parsing/parser.ml" in let _endpos = _endpos_attrs2_ in @@ -43660,19 +43648,19 @@ module Tables = struct let attrs = attrs1 @ attrs2 in Te.mk tid cs ~params ~priv ~attrs ~docs, ext ) -# 43664 "parsing/parser.ml" +# 43652 "parsing/parser.ml" in # 3163 "parsing/parser.mly" ( _1 ) -# 43670 "parsing/parser.ml" +# 43658 "parsing/parser.ml" in # 1410 "parsing/parser.mly" ( pstr_typext _1 ) -# 43676 "parsing/parser.ml" +# 43664 "parsing/parser.ml" in let _endpos__1_ = _endpos__1_inlined4_ in @@ -43682,13 +43670,13 @@ module Tables = struct # 939 "parsing/parser.mly" ( wrap_mkstr_ext ~loc:_sloc _1 ) -# 43686 "parsing/parser.ml" +# 43674 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 43692 "parsing/parser.ml" +# 43680 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -43714,7 +43702,7 @@ module Tables = struct let _1 = # 1412 "parsing/parser.mly" ( pstr_exception _1 ) -# 43718 "parsing/parser.ml" +# 43706 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -43722,13 +43710,13 @@ module Tables = struct # 939 "parsing/parser.mly" ( wrap_mkstr_ext ~loc:_sloc _1 ) -# 43726 "parsing/parser.ml" +# 43714 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 43732 "parsing/parser.ml" +# 43720 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -43793,7 +43781,7 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 43797 "parsing/parser.ml" +# 43785 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined3_ in @@ -43805,7 +43793,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 43809 "parsing/parser.ml" +# 43797 "parsing/parser.ml" in let attrs1 = @@ -43813,7 +43801,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 43817 "parsing/parser.ml" +# 43805 "parsing/parser.ml" in let _endpos = _endpos_attrs2_ in @@ -43826,13 +43814,13 @@ module Tables = struct let attrs = attrs1 @ attrs2 in let body = Mb.mk name body ~attrs ~loc ~docs in Pstr_module body, ext ) -# 43830 "parsing/parser.ml" +# 43818 "parsing/parser.ml" in # 1414 "parsing/parser.mly" ( _1 ) -# 43836 "parsing/parser.ml" +# 43824 "parsing/parser.ml" in let _endpos__1_ = _endpos__1_inlined3_ in @@ -43842,13 +43830,13 @@ module Tables = struct # 939 "parsing/parser.mly" ( wrap_mkstr_ext ~loc:_sloc _1 ) -# 43846 "parsing/parser.ml" +# 43834 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 43852 "parsing/parser.ml" +# 43840 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -43929,7 +43917,7 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 43933 "parsing/parser.ml" +# 43921 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined3_ in @@ -43941,7 +43929,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 43945 "parsing/parser.ml" +# 43933 "parsing/parser.ml" in let attrs1 = @@ -43949,7 +43937,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 43953 "parsing/parser.ml" +# 43941 "parsing/parser.ml" in let _endpos = _endpos_attrs2_ in @@ -43964,25 +43952,25 @@ module Tables = struct ext, Mb.mk name body ~attrs ~loc ~docs ) -# 43968 "parsing/parser.ml" +# 43956 "parsing/parser.ml" in # 1114 "parsing/parser.mly" ( let (x, b) = a in x, b :: bs ) -# 43974 "parsing/parser.ml" +# 43962 "parsing/parser.ml" in # 1461 "parsing/parser.mly" ( _1 ) -# 43980 "parsing/parser.ml" +# 43968 "parsing/parser.ml" in # 1416 "parsing/parser.mly" ( pstr_recmodule _1 ) -# 43986 "parsing/parser.ml" +# 43974 "parsing/parser.ml" in let _endpos__1_ = _endpos_bs_ in @@ -43992,13 +43980,13 @@ module Tables = struct # 939 "parsing/parser.mly" ( wrap_mkstr_ext ~loc:_sloc _1 ) -# 43996 "parsing/parser.ml" +# 43984 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 44002 "parsing/parser.ml" +# 43990 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44024,7 +44012,7 @@ module Tables = struct let _1 = # 1418 "parsing/parser.mly" ( let (body, ext) = _1 in (Pstr_modtype body, ext) ) -# 44028 "parsing/parser.ml" +# 44016 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -44032,13 +44020,13 @@ module Tables = struct # 939 "parsing/parser.mly" ( wrap_mkstr_ext ~loc:_sloc _1 ) -# 44036 "parsing/parser.ml" +# 44024 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 44042 "parsing/parser.ml" +# 44030 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44064,7 +44052,7 @@ module Tables = struct let _1 = # 1420 "parsing/parser.mly" ( let (body, ext) = _1 in (Pstr_open body, ext) ) -# 44068 "parsing/parser.ml" +# 44056 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -44072,13 +44060,13 @@ module Tables = struct # 939 "parsing/parser.mly" ( wrap_mkstr_ext ~loc:_sloc _1 ) -# 44076 "parsing/parser.ml" +# 44064 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 44082 "parsing/parser.ml" +# 44070 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44150,7 +44138,7 @@ module Tables = struct let _1_inlined2 : ( # 705 "parsing/parser.mly" (string) -# 44154 "parsing/parser.ml" +# 44142 "parsing/parser.ml" ) = Obj.magic _1_inlined2 in let params : ((Parsetree.core_type * (Asttypes.variance * Asttypes.injectivity)) list) = Obj.magic params in let virt : (Asttypes.virtual_flag) = Obj.magic virt in @@ -44170,7 +44158,7 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 44174 "parsing/parser.ml" +# 44162 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined3_ in @@ -44182,7 +44170,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 44186 "parsing/parser.ml" +# 44174 "parsing/parser.ml" in let attrs1 = @@ -44190,7 +44178,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 44194 "parsing/parser.ml" +# 44182 "parsing/parser.ml" in let _endpos = _endpos_attrs2_ in @@ -44205,25 +44193,25 @@ module Tables = struct ext, Ci.mk id body ~virt ~params ~attrs ~loc ~docs ) -# 44209 "parsing/parser.ml" +# 44197 "parsing/parser.ml" in # 1114 "parsing/parser.mly" ( let (x, b) = a in x, b :: bs ) -# 44215 "parsing/parser.ml" +# 44203 "parsing/parser.ml" in # 1800 "parsing/parser.mly" ( _1 ) -# 44221 "parsing/parser.ml" +# 44209 "parsing/parser.ml" in # 1422 "parsing/parser.mly" ( let (ext, l) = _1 in (Pstr_class l, ext) ) -# 44227 "parsing/parser.ml" +# 44215 "parsing/parser.ml" in let _endpos__1_ = _endpos_bs_ in @@ -44233,13 +44221,13 @@ module Tables = struct # 939 "parsing/parser.mly" ( wrap_mkstr_ext ~loc:_sloc _1 ) -# 44237 "parsing/parser.ml" +# 44225 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 44243 "parsing/parser.ml" +# 44231 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44265,7 +44253,7 @@ module Tables = struct let _1 = # 1424 "parsing/parser.mly" ( let (ext, l) = _1 in (Pstr_class_type l, ext) ) -# 44269 "parsing/parser.ml" +# 44257 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -44273,13 +44261,13 @@ module Tables = struct # 939 "parsing/parser.mly" ( wrap_mkstr_ext ~loc:_sloc _1 ) -# 44277 "parsing/parser.ml" +# 44265 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 44283 "parsing/parser.ml" +# 44271 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44337,7 +44325,7 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 44341 "parsing/parser.ml" +# 44329 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined2_ in @@ -44346,7 +44334,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 44350 "parsing/parser.ml" +# 44338 "parsing/parser.ml" in let _endpos = _endpos_attrs2_ in @@ -44360,13 +44348,13 @@ module Tables = struct let docs = symbol_docs _sloc in Incl.mk thing ~attrs ~loc ~docs, ext ) -# 44364 "parsing/parser.ml" +# 44352 "parsing/parser.ml" in # 1426 "parsing/parser.mly" ( pstr_include _1 ) -# 44370 "parsing/parser.ml" +# 44358 "parsing/parser.ml" in let _endpos__1_ = _endpos__1_inlined2_ in @@ -44376,13 +44364,13 @@ module Tables = struct # 939 "parsing/parser.mly" ( wrap_mkstr_ext ~loc:_sloc _1 ) -# 44380 "parsing/parser.ml" +# 44368 "parsing/parser.ml" in # 1428 "parsing/parser.mly" ( _1 ) -# 44386 "parsing/parser.ml" +# 44374 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44407,7 +44395,7 @@ module Tables = struct let _v : (string) = # 3746 "parsing/parser.mly" ( "-" ) -# 44411 "parsing/parser.ml" +# 44399 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44432,7 +44420,7 @@ module Tables = struct let _v : (string) = # 3747 "parsing/parser.mly" ( "-." ) -# 44436 "parsing/parser.ml" +# 44424 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44487,7 +44475,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 44491 "parsing/parser.ml" +# 44479 "parsing/parser.ml" in let _endpos__5_ = _endpos__1_inlined1_ in @@ -44496,18 +44484,18 @@ module Tables = struct let xs = # 253 "<standard.mly>" ( List.rev xs ) -# 44500 "parsing/parser.ml" +# 44488 "parsing/parser.ml" in # 1017 "parsing/parser.mly" ( xs ) -# 44505 "parsing/parser.ml" +# 44493 "parsing/parser.ml" in # 3454 "parsing/parser.mly" ( _1 ) -# 44511 "parsing/parser.ml" +# 44499 "parsing/parser.ml" in let _1 = @@ -44517,7 +44505,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 44521 "parsing/parser.ml" +# 44509 "parsing/parser.ml" in let _endpos = _endpos__5_ in @@ -44528,7 +44516,7 @@ module Tables = struct ( let info = symbol_info _endpos in let attrs = add_info_attrs info _5 in Rf.tag ~loc:(make_loc _sloc) ~attrs _1 _3 _4 ) -# 44532 "parsing/parser.ml" +# 44520 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44562,7 +44550,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 44566 "parsing/parser.ml" +# 44554 "parsing/parser.ml" in let _endpos__2_ = _endpos__1_inlined1_ in @@ -44573,7 +44561,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 44577 "parsing/parser.ml" +# 44565 "parsing/parser.ml" in let _endpos = _endpos__2_ in @@ -44584,7 +44572,7 @@ module Tables = struct ( let info = symbol_info _endpos in let attrs = add_info_attrs info _2 in Rf.tag ~loc:(make_loc _sloc) ~attrs _1 true [] ) -# 44588 "parsing/parser.ml" +# 44576 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44616,7 +44604,7 @@ module Tables = struct let _v : (Parsetree.toplevel_phrase) = let arg = # 124 "<standard.mly>" ( None ) -# 44620 "parsing/parser.ml" +# 44608 "parsing/parser.ml" in let _endpos_arg_ = _endpos__1_inlined1_ in let dir = @@ -44627,7 +44615,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 44631 "parsing/parser.ml" +# 44619 "parsing/parser.ml" in let _endpos = _endpos_arg_ in @@ -44636,7 +44624,7 @@ module Tables = struct # 3644 "parsing/parser.mly" ( mk_directive ~loc:_sloc dir arg ) -# 44640 "parsing/parser.ml" +# 44628 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44669,7 +44657,7 @@ module Tables = struct let _1_inlined2 : ( # 743 "parsing/parser.mly" (string * Location.t * string option) -# 44673 "parsing/parser.ml" +# 44661 "parsing/parser.ml" ) = Obj.magic _1_inlined2 in let _1_inlined1 : (Asttypes.label) = Obj.magic _1_inlined1 in let _1 : unit = Obj.magic _1 in @@ -44682,7 +44670,7 @@ module Tables = struct let _1 = # 3648 "parsing/parser.mly" ( let (s, _, _) = _1 in Pdir_string s ) -# 44686 "parsing/parser.ml" +# 44674 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -44690,13 +44678,13 @@ module Tables = struct # 944 "parsing/parser.mly" ( mk_directive_arg ~loc:_sloc _1 ) -# 44694 "parsing/parser.ml" +# 44682 "parsing/parser.ml" in # 126 "<standard.mly>" ( Some x ) -# 44700 "parsing/parser.ml" +# 44688 "parsing/parser.ml" in let _endpos_arg_ = _endpos__1_inlined2_ in @@ -44708,7 +44696,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 44712 "parsing/parser.ml" +# 44700 "parsing/parser.ml" in let _endpos = _endpos_arg_ in @@ -44717,7 +44705,7 @@ module Tables = struct # 3644 "parsing/parser.mly" ( mk_directive ~loc:_sloc dir arg ) -# 44721 "parsing/parser.ml" +# 44709 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44750,7 +44738,7 @@ module Tables = struct let _1_inlined2 : ( # 691 "parsing/parser.mly" (string * char option) -# 44754 "parsing/parser.ml" +# 44742 "parsing/parser.ml" ) = Obj.magic _1_inlined2 in let _1_inlined1 : (Asttypes.label) = Obj.magic _1_inlined1 in let _1 : unit = Obj.magic _1 in @@ -44763,7 +44751,7 @@ module Tables = struct let _1 = # 3649 "parsing/parser.mly" ( let (n, m) = _1 in Pdir_int (n ,m) ) -# 44767 "parsing/parser.ml" +# 44755 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -44771,13 +44759,13 @@ module Tables = struct # 944 "parsing/parser.mly" ( mk_directive_arg ~loc:_sloc _1 ) -# 44775 "parsing/parser.ml" +# 44763 "parsing/parser.ml" in # 126 "<standard.mly>" ( Some x ) -# 44781 "parsing/parser.ml" +# 44769 "parsing/parser.ml" in let _endpos_arg_ = _endpos__1_inlined2_ in @@ -44789,7 +44777,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 44793 "parsing/parser.ml" +# 44781 "parsing/parser.ml" in let _endpos = _endpos_arg_ in @@ -44798,7 +44786,7 @@ module Tables = struct # 3644 "parsing/parser.mly" ( mk_directive ~loc:_sloc dir arg ) -# 44802 "parsing/parser.ml" +# 44790 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44840,7 +44828,7 @@ module Tables = struct let _1 = # 3650 "parsing/parser.mly" ( Pdir_ident _1 ) -# 44844 "parsing/parser.ml" +# 44832 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -44848,13 +44836,13 @@ module Tables = struct # 944 "parsing/parser.mly" ( mk_directive_arg ~loc:_sloc _1 ) -# 44852 "parsing/parser.ml" +# 44840 "parsing/parser.ml" in # 126 "<standard.mly>" ( Some x ) -# 44858 "parsing/parser.ml" +# 44846 "parsing/parser.ml" in let _endpos_arg_ = _endpos__1_inlined2_ in @@ -44866,7 +44854,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 44870 "parsing/parser.ml" +# 44858 "parsing/parser.ml" in let _endpos = _endpos_arg_ in @@ -44875,7 +44863,7 @@ module Tables = struct # 3644 "parsing/parser.mly" ( mk_directive ~loc:_sloc dir arg ) -# 44879 "parsing/parser.ml" +# 44867 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44917,7 +44905,7 @@ module Tables = struct let _1 = # 3651 "parsing/parser.mly" ( Pdir_ident _1 ) -# 44921 "parsing/parser.ml" +# 44909 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -44925,13 +44913,13 @@ module Tables = struct # 944 "parsing/parser.mly" ( mk_directive_arg ~loc:_sloc _1 ) -# 44929 "parsing/parser.ml" +# 44917 "parsing/parser.ml" in # 126 "<standard.mly>" ( Some x ) -# 44935 "parsing/parser.ml" +# 44923 "parsing/parser.ml" in let _endpos_arg_ = _endpos__1_inlined2_ in @@ -44943,7 +44931,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 44947 "parsing/parser.ml" +# 44935 "parsing/parser.ml" in let _endpos = _endpos_arg_ in @@ -44952,7 +44940,7 @@ module Tables = struct # 3644 "parsing/parser.mly" ( mk_directive ~loc:_sloc dir arg ) -# 44956 "parsing/parser.ml" +# 44944 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -44994,7 +44982,7 @@ module Tables = struct let _1 = # 3652 "parsing/parser.mly" ( Pdir_bool false ) -# 44998 "parsing/parser.ml" +# 44986 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -45002,13 +44990,13 @@ module Tables = struct # 944 "parsing/parser.mly" ( mk_directive_arg ~loc:_sloc _1 ) -# 45006 "parsing/parser.ml" +# 44994 "parsing/parser.ml" in # 126 "<standard.mly>" ( Some x ) -# 45012 "parsing/parser.ml" +# 45000 "parsing/parser.ml" in let _endpos_arg_ = _endpos__1_inlined2_ in @@ -45020,7 +45008,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 45024 "parsing/parser.ml" +# 45012 "parsing/parser.ml" in let _endpos = _endpos_arg_ in @@ -45029,7 +45017,7 @@ module Tables = struct # 3644 "parsing/parser.mly" ( mk_directive ~loc:_sloc dir arg ) -# 45033 "parsing/parser.ml" +# 45021 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45071,7 +45059,7 @@ module Tables = struct let _1 = # 3653 "parsing/parser.mly" ( Pdir_bool true ) -# 45075 "parsing/parser.ml" +# 45063 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -45079,13 +45067,13 @@ module Tables = struct # 944 "parsing/parser.mly" ( mk_directive_arg ~loc:_sloc _1 ) -# 45083 "parsing/parser.ml" +# 45071 "parsing/parser.ml" in # 126 "<standard.mly>" ( Some x ) -# 45089 "parsing/parser.ml" +# 45077 "parsing/parser.ml" in let _endpos_arg_ = _endpos__1_inlined2_ in @@ -45097,7 +45085,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 45101 "parsing/parser.ml" +# 45089 "parsing/parser.ml" in let _endpos = _endpos_arg_ in @@ -45106,7 +45094,7 @@ module Tables = struct # 3644 "parsing/parser.mly" ( mk_directive ~loc:_sloc dir arg ) -# 45110 "parsing/parser.ml" +# 45098 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45148,12 +45136,12 @@ module Tables = struct let attrs = # 3836 "parsing/parser.mly" ( _1 ) -# 45152 "parsing/parser.ml" +# 45140 "parsing/parser.ml" in # 1379 "parsing/parser.mly" ( mkstrexp e attrs ) -# 45157 "parsing/parser.ml" +# 45145 "parsing/parser.ml" in let _startpos__1_ = _startpos_e_ in @@ -45161,7 +45149,7 @@ module Tables = struct # 887 "parsing/parser.mly" ( text_str _startpos @ [_1] ) -# 45165 "parsing/parser.ml" +# 45153 "parsing/parser.ml" in let _startpos__1_ = _startpos_e_ in @@ -45170,13 +45158,13 @@ module Tables = struct # 875 "parsing/parser.mly" ( extra_str _startpos _endpos _1 ) -# 45174 "parsing/parser.ml" +# 45162 "parsing/parser.ml" in # 1154 "parsing/parser.mly" ( Ptop_def _1 ) -# 45180 "parsing/parser.ml" +# 45168 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45209,7 +45197,7 @@ module Tables = struct let _1 = # 260 "<standard.mly>" ( List.flatten xss ) -# 45213 "parsing/parser.ml" +# 45201 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos_xss_, _startpos_xss_) in let _endpos = _endpos__1_ in @@ -45217,13 +45205,13 @@ module Tables = struct # 875 "parsing/parser.mly" ( extra_str _startpos _endpos _1 ) -# 45221 "parsing/parser.ml" +# 45209 "parsing/parser.ml" in # 1158 "parsing/parser.mly" ( Ptop_def _1 ) -# 45227 "parsing/parser.ml" +# 45215 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45255,7 +45243,7 @@ module Tables = struct let _v : (Parsetree.toplevel_phrase) = # 1162 "parsing/parser.mly" ( _1 ) -# 45259 "parsing/parser.ml" +# 45247 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45280,7 +45268,7 @@ module Tables = struct let _v : (Parsetree.toplevel_phrase) = # 1165 "parsing/parser.mly" ( raise End_of_file ) -# 45284 "parsing/parser.ml" +# 45272 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45305,7 +45293,7 @@ module Tables = struct let _v : (Parsetree.core_type) = # 3346 "parsing/parser.mly" ( ty ) -# 45309 "parsing/parser.ml" +# 45297 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45333,18 +45321,18 @@ module Tables = struct let xs = # 253 "<standard.mly>" ( List.rev xs ) -# 45337 "parsing/parser.ml" +# 45325 "parsing/parser.ml" in # 1045 "parsing/parser.mly" ( xs ) -# 45342 "parsing/parser.ml" +# 45330 "parsing/parser.ml" in # 3349 "parsing/parser.mly" ( Ptyp_tuple tys ) -# 45348 "parsing/parser.ml" +# 45336 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos_xs_, _startpos_xs_) in @@ -45354,13 +45342,13 @@ module Tables = struct # 920 "parsing/parser.mly" ( mktyp ~loc:_sloc _1 ) -# 45358 "parsing/parser.ml" +# 45346 "parsing/parser.ml" in # 3351 "parsing/parser.mly" ( _1 ) -# 45364 "parsing/parser.ml" +# 45352 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45392,7 +45380,7 @@ module Tables = struct let _v : (Parsetree.core_type option * Parsetree.core_type option) = # 2667 "parsing/parser.mly" ( (Some _2, None) ) -# 45396 "parsing/parser.ml" +# 45384 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45438,7 +45426,7 @@ module Tables = struct let _v : (Parsetree.core_type option * Parsetree.core_type option) = # 2668 "parsing/parser.mly" ( (Some _2, Some _4) ) -# 45442 "parsing/parser.ml" +# 45430 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45470,7 +45458,7 @@ module Tables = struct let _v : (Parsetree.core_type option * Parsetree.core_type option) = # 2669 "parsing/parser.mly" ( (None, Some _2) ) -# 45474 "parsing/parser.ml" +# 45462 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45502,7 +45490,7 @@ module Tables = struct let _v : (Parsetree.core_type option * Parsetree.core_type option) = # 2670 "parsing/parser.mly" ( syntax_error() ) -# 45506 "parsing/parser.ml" +# 45494 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45534,7 +45522,7 @@ module Tables = struct let _v : (Parsetree.core_type option * Parsetree.core_type option) = # 2671 "parsing/parser.mly" ( syntax_error() ) -# 45538 "parsing/parser.ml" +# 45526 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45552,7 +45540,7 @@ module Tables = struct let _v : (Parsetree.type_kind * Asttypes.private_flag * Parsetree.core_type option) = # 3000 "parsing/parser.mly" ( (Ptype_abstract, Public, None) ) -# 45556 "parsing/parser.ml" +# 45544 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45584,7 +45572,7 @@ module Tables = struct let _v : (Parsetree.type_kind * Asttypes.private_flag * Parsetree.core_type option) = # 3002 "parsing/parser.mly" ( _2 ) -# 45588 "parsing/parser.ml" +# 45576 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45609,7 +45597,7 @@ module Tables = struct let _v : (Longident.t) = # 3605 "parsing/parser.mly" ( _1 ) -# 45613 "parsing/parser.ml" +# 45601 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45641,7 +45629,7 @@ module Tables = struct let _v : (Parsetree.core_type * (Asttypes.variance * Asttypes.injectivity)) = # 3017 "parsing/parser.mly" ( _2, _1 ) -# 45645 "parsing/parser.ml" +# 45633 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45659,7 +45647,7 @@ module Tables = struct let _v : ((Parsetree.core_type * (Asttypes.variance * Asttypes.injectivity)) list) = # 3010 "parsing/parser.mly" ( [] ) -# 45663 "parsing/parser.ml" +# 45651 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45684,7 +45672,7 @@ module Tables = struct let _v : ((Parsetree.core_type * (Asttypes.variance * Asttypes.injectivity)) list) = # 3012 "parsing/parser.mly" ( [p] ) -# 45688 "parsing/parser.ml" +# 45676 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45724,18 +45712,18 @@ module Tables = struct let xs = # 253 "<standard.mly>" ( List.rev xs ) -# 45728 "parsing/parser.ml" +# 45716 "parsing/parser.ml" in # 1017 "parsing/parser.mly" ( xs ) -# 45733 "parsing/parser.ml" +# 45721 "parsing/parser.ml" in # 3014 "parsing/parser.mly" ( ps ) -# 45739 "parsing/parser.ml" +# 45727 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45768,7 +45756,7 @@ module Tables = struct let _1 = # 3022 "parsing/parser.mly" ( Ptyp_var tyvar ) -# 45772 "parsing/parser.ml" +# 45760 "parsing/parser.ml" in let _endpos__1_ = _endpos_tyvar_ in let _endpos = _endpos__1_ in @@ -45777,13 +45765,13 @@ module Tables = struct # 920 "parsing/parser.mly" ( mktyp ~loc:_sloc _1 ) -# 45781 "parsing/parser.ml" +# 45769 "parsing/parser.ml" in # 3025 "parsing/parser.mly" ( _1 ) -# 45787 "parsing/parser.ml" +# 45775 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45809,7 +45797,7 @@ module Tables = struct let _1 = # 3024 "parsing/parser.mly" ( Ptyp_any ) -# 45813 "parsing/parser.ml" +# 45801 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -45817,13 +45805,13 @@ module Tables = struct # 920 "parsing/parser.mly" ( mktyp ~loc:_sloc _1 ) -# 45821 "parsing/parser.ml" +# 45809 "parsing/parser.ml" in # 3025 "parsing/parser.mly" ( _1 ) -# 45827 "parsing/parser.ml" +# 45815 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45841,7 +45829,7 @@ module Tables = struct let _v : (Asttypes.variance * Asttypes.injectivity) = # 3029 "parsing/parser.mly" ( NoVariance, NoInjectivity ) -# 45845 "parsing/parser.ml" +# 45833 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45866,7 +45854,7 @@ module Tables = struct let _v : (Asttypes.variance * Asttypes.injectivity) = # 3030 "parsing/parser.mly" ( Covariant, NoInjectivity ) -# 45870 "parsing/parser.ml" +# 45858 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45891,7 +45879,7 @@ module Tables = struct let _v : (Asttypes.variance * Asttypes.injectivity) = # 3031 "parsing/parser.mly" ( Contravariant, NoInjectivity ) -# 45895 "parsing/parser.ml" +# 45883 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45916,7 +45904,7 @@ module Tables = struct let _v : (Asttypes.variance * Asttypes.injectivity) = # 3032 "parsing/parser.mly" ( NoVariance, Injective ) -# 45920 "parsing/parser.ml" +# 45908 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45948,7 +45936,7 @@ module Tables = struct let _v : (Asttypes.variance * Asttypes.injectivity) = # 3033 "parsing/parser.mly" ( Covariant, Injective ) -# 45952 "parsing/parser.ml" +# 45940 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -45980,7 +45968,7 @@ module Tables = struct let _v : (Asttypes.variance * Asttypes.injectivity) = # 3033 "parsing/parser.mly" ( Covariant, Injective ) -# 45984 "parsing/parser.ml" +# 45972 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46012,7 +46000,7 @@ module Tables = struct let _v : (Asttypes.variance * Asttypes.injectivity) = # 3034 "parsing/parser.mly" ( Contravariant, Injective ) -# 46016 "parsing/parser.ml" +# 46004 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46044,7 +46032,7 @@ module Tables = struct let _v : (Asttypes.variance * Asttypes.injectivity) = # 3034 "parsing/parser.mly" ( Contravariant, Injective ) -# 46048 "parsing/parser.ml" +# 46036 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46065,7 +46053,7 @@ module Tables = struct let _1 : ( # 683 "parsing/parser.mly" (string) -# 46069 "parsing/parser.ml" +# 46057 "parsing/parser.ml" ) = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in let _startpos = _startpos__1_ in @@ -46076,7 +46064,7 @@ module Tables = struct ( if _1 = "+!" then Covariant, Injective else if _1 = "-!" then Contravariant, Injective else expecting _loc__1_ "type_variance" ) -# 46080 "parsing/parser.ml" +# 46068 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46097,7 +46085,7 @@ module Tables = struct let _1 : ( # 729 "parsing/parser.mly" (string) -# 46101 "parsing/parser.ml" +# 46089 "parsing/parser.ml" ) = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in let _startpos = _startpos__1_ in @@ -46108,7 +46096,7 @@ module Tables = struct ( if _1 = "!+" then Covariant, Injective else if _1 = "!-" then Contravariant, Injective else expecting _loc__1_ "type_variance" ) -# 46112 "parsing/parser.ml" +# 46100 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46142,24 +46130,24 @@ module Tables = struct let ys = # 260 "<standard.mly>" ( List.flatten xss ) -# 46146 "parsing/parser.ml" +# 46134 "parsing/parser.ml" in let xs = let _1 = # 953 "parsing/parser.mly" ( [] ) -# 46152 "parsing/parser.ml" +# 46140 "parsing/parser.ml" in # 1185 "parsing/parser.mly" ( _1 ) -# 46157 "parsing/parser.ml" +# 46145 "parsing/parser.ml" in # 267 "<standard.mly>" ( xs @ ys ) -# 46163 "parsing/parser.ml" +# 46151 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos_xss_, _startpos_xss_) in @@ -46168,13 +46156,13 @@ module Tables = struct # 879 "parsing/parser.mly" ( extra_def _startpos _endpos _1 ) -# 46172 "parsing/parser.ml" +# 46160 "parsing/parser.ml" in # 1178 "parsing/parser.mly" ( _1 ) -# 46178 "parsing/parser.ml" +# 46166 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46222,7 +46210,7 @@ module Tables = struct let ys = # 260 "<standard.mly>" ( List.flatten xss ) -# 46226 "parsing/parser.ml" +# 46214 "parsing/parser.ml" in let xs = let _1 = @@ -46232,18 +46220,18 @@ module Tables = struct let attrs = # 3836 "parsing/parser.mly" ( _1 ) -# 46236 "parsing/parser.ml" +# 46224 "parsing/parser.ml" in # 1379 "parsing/parser.mly" ( mkstrexp e attrs ) -# 46241 "parsing/parser.ml" +# 46229 "parsing/parser.ml" in # 897 "parsing/parser.mly" ( Ptop_def [_1] ) -# 46247 "parsing/parser.ml" +# 46235 "parsing/parser.ml" in let _startpos__1_ = _startpos_e_ in @@ -46251,25 +46239,25 @@ module Tables = struct # 895 "parsing/parser.mly" ( text_def _startpos @ [_1] ) -# 46255 "parsing/parser.ml" +# 46243 "parsing/parser.ml" in # 955 "parsing/parser.mly" ( x ) -# 46261 "parsing/parser.ml" +# 46249 "parsing/parser.ml" in # 1185 "parsing/parser.mly" ( _1 ) -# 46267 "parsing/parser.ml" +# 46255 "parsing/parser.ml" in # 267 "<standard.mly>" ( xs @ ys ) -# 46273 "parsing/parser.ml" +# 46261 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos_xss_, _startpos_e_) in @@ -46278,13 +46266,13 @@ module Tables = struct # 879 "parsing/parser.mly" ( extra_def _startpos _endpos _1 ) -# 46282 "parsing/parser.ml" +# 46270 "parsing/parser.ml" in # 1178 "parsing/parser.mly" ( _1 ) -# 46288 "parsing/parser.ml" +# 46276 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46323,7 +46311,7 @@ module Tables = struct let _v : (Asttypes.label) = # 3524 "parsing/parser.mly" ( _2 ) -# 46327 "parsing/parser.ml" +# 46315 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46364,7 +46352,7 @@ module Tables = struct # 3525 "parsing/parser.mly" ( unclosed "(" _loc__1_ ")" _loc__3_ ) -# 46368 "parsing/parser.ml" +# 46356 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46397,7 +46385,7 @@ module Tables = struct # 3526 "parsing/parser.mly" ( expecting _loc__2_ "operator" ) -# 46401 "parsing/parser.ml" +# 46389 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46437,7 +46425,7 @@ module Tables = struct # 3527 "parsing/parser.mly" ( expecting _loc__3_ "module-expr" ) -# 46441 "parsing/parser.ml" +# 46429 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46458,7 +46446,7 @@ module Tables = struct let _1 : ( # 705 "parsing/parser.mly" (string) -# 46462 "parsing/parser.ml" +# 46450 "parsing/parser.ml" ) = Obj.magic _1 in let _endpos__0_ = _menhir_stack.MenhirLib.EngineTypes.endp in let _startpos = _startpos__1_ in @@ -46466,7 +46454,7 @@ module Tables = struct let _v : (Asttypes.label) = # 3530 "parsing/parser.mly" ( _1 ) -# 46470 "parsing/parser.ml" +# 46458 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46491,7 +46479,7 @@ module Tables = struct let _v : (Asttypes.label) = # 3531 "parsing/parser.mly" ( _1 ) -# 46495 "parsing/parser.ml" +# 46483 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46516,7 +46504,7 @@ module Tables = struct let _v : (Longident.t) = # 3599 "parsing/parser.mly" ( _1 ) -# 46520 "parsing/parser.ml" +# 46508 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46563,7 +46551,7 @@ module Tables = struct let _1_inlined1 : ( # 705 "parsing/parser.mly" (string) -# 46567 "parsing/parser.ml" +# 46555 "parsing/parser.ml" ) = Obj.magic _1_inlined1 in let mutable_ : (Asttypes.mutable_flag) = Obj.magic mutable_ in let _1 : (Parsetree.attributes) = Obj.magic _1 in @@ -46577,7 +46565,7 @@ module Tables = struct let _1 = # 3498 "parsing/parser.mly" ( _1 ) -# 46581 "parsing/parser.ml" +# 46569 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -46585,23 +46573,23 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 46589 "parsing/parser.ml" +# 46577 "parsing/parser.ml" in let attrs = # 3840 "parsing/parser.mly" ( _1 ) -# 46595 "parsing/parser.ml" +# 46583 "parsing/parser.ml" in let _1 = # 3739 "parsing/parser.mly" ( Fresh ) -# 46600 "parsing/parser.ml" +# 46588 "parsing/parser.ml" in # 1951 "parsing/parser.mly" ( (label, mutable_, Cfk_virtual ty), attrs ) -# 46605 "parsing/parser.ml" +# 46593 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46648,7 +46636,7 @@ module Tables = struct let _1_inlined1 : ( # 705 "parsing/parser.mly" (string) -# 46652 "parsing/parser.ml" +# 46640 "parsing/parser.ml" ) = Obj.magic _1_inlined1 in let _3 : (Asttypes.mutable_flag) = Obj.magic _3 in let _1 : (Parsetree.attributes) = Obj.magic _1 in @@ -46662,7 +46650,7 @@ module Tables = struct let _1 = # 3498 "parsing/parser.mly" ( _1 ) -# 46666 "parsing/parser.ml" +# 46654 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -46670,23 +46658,23 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 46674 "parsing/parser.ml" +# 46662 "parsing/parser.ml" in let _2 = # 3840 "parsing/parser.mly" ( _1 ) -# 46680 "parsing/parser.ml" +# 46668 "parsing/parser.ml" in let _1 = # 3742 "parsing/parser.mly" ( Fresh ) -# 46685 "parsing/parser.ml" +# 46673 "parsing/parser.ml" in # 1953 "parsing/parser.mly" ( (_4, _3, Cfk_concrete (_1, _6)), _2 ) -# 46690 "parsing/parser.ml" +# 46678 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46739,7 +46727,7 @@ module Tables = struct let _1_inlined2 : ( # 705 "parsing/parser.mly" (string) -# 46743 "parsing/parser.ml" +# 46731 "parsing/parser.ml" ) = Obj.magic _1_inlined2 in let _3 : (Asttypes.mutable_flag) = Obj.magic _3 in let _1_inlined1 : (Parsetree.attributes) = Obj.magic _1_inlined1 in @@ -46754,7 +46742,7 @@ module Tables = struct let _1 = # 3498 "parsing/parser.mly" ( _1 ) -# 46758 "parsing/parser.ml" +# 46746 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -46762,7 +46750,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 46766 "parsing/parser.ml" +# 46754 "parsing/parser.ml" in let _2 = @@ -46770,18 +46758,18 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 46774 "parsing/parser.ml" +# 46762 "parsing/parser.ml" in let _1 = # 3743 "parsing/parser.mly" ( Override ) -# 46780 "parsing/parser.ml" +# 46768 "parsing/parser.ml" in # 1953 "parsing/parser.mly" ( (_4, _3, Cfk_concrete (_1, _6)), _2 ) -# 46785 "parsing/parser.ml" +# 46773 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46835,7 +46823,7 @@ module Tables = struct let _1_inlined1 : ( # 705 "parsing/parser.mly" (string) -# 46839 "parsing/parser.ml" +# 46827 "parsing/parser.ml" ) = Obj.magic _1_inlined1 in let _3 : (Asttypes.mutable_flag) = Obj.magic _3 in let _1 : (Parsetree.attributes) = Obj.magic _1 in @@ -46849,7 +46837,7 @@ module Tables = struct let _1 = # 3498 "parsing/parser.mly" ( _1 ) -# 46853 "parsing/parser.ml" +# 46841 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -46857,20 +46845,20 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 46861 "parsing/parser.ml" +# 46849 "parsing/parser.ml" in let _startpos__4_ = _startpos__1_inlined1_ in let _2 = # 3840 "parsing/parser.mly" ( _1 ) -# 46868 "parsing/parser.ml" +# 46856 "parsing/parser.ml" in let (_endpos__2_, _startpos__2_) = (_endpos__1_, _startpos__1_) in let _1 = # 3742 "parsing/parser.mly" ( Fresh ) -# 46874 "parsing/parser.ml" +# 46862 "parsing/parser.ml" in let (_endpos__1_, _startpos__1_) = (_endpos__0_, _endpos__0_) in let _endpos = _endpos__7_ in @@ -46890,7 +46878,7 @@ module Tables = struct ( let e = mkexp_constraint ~loc:_sloc _7 _5 in (_4, _3, Cfk_concrete (_1, e)), _2 ) -# 46894 "parsing/parser.ml" +# 46882 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -46950,7 +46938,7 @@ module Tables = struct let _1_inlined2 : ( # 705 "parsing/parser.mly" (string) -# 46954 "parsing/parser.ml" +# 46942 "parsing/parser.ml" ) = Obj.magic _1_inlined2 in let _3 : (Asttypes.mutable_flag) = Obj.magic _3 in let _1_inlined1 : (Parsetree.attributes) = Obj.magic _1_inlined1 in @@ -46965,7 +46953,7 @@ module Tables = struct let _1 = # 3498 "parsing/parser.mly" ( _1 ) -# 46969 "parsing/parser.ml" +# 46957 "parsing/parser.ml" in let _endpos = _endpos__1_ in let _symbolstartpos = _startpos__1_ in @@ -46973,7 +46961,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 46977 "parsing/parser.ml" +# 46965 "parsing/parser.ml" in let _startpos__4_ = _startpos__1_inlined2_ in @@ -46982,14 +46970,14 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 46986 "parsing/parser.ml" +# 46974 "parsing/parser.ml" in let (_endpos__2_, _startpos__2_) = (_endpos__1_inlined1_, _startpos__1_inlined1_) in let _1 = # 3743 "parsing/parser.mly" ( Override ) -# 46993 "parsing/parser.ml" +# 46981 "parsing/parser.ml" in let _endpos = _endpos__7_ in let _symbolstartpos = if _startpos__1_ != _endpos__1_ then @@ -47008,7 +46996,7 @@ module Tables = struct ( let e = mkexp_constraint ~loc:_sloc _7 _5 in (_4, _3, Cfk_concrete (_1, e)), _2 ) -# 47012 "parsing/parser.ml" +# 47000 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47077,7 +47065,7 @@ module Tables = struct # 3836 "parsing/parser.mly" ( _1 ) -# 47081 "parsing/parser.ml" +# 47069 "parsing/parser.ml" in let _endpos_attrs2_ = _endpos__1_inlined3_ in @@ -47089,7 +47077,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 47093 "parsing/parser.ml" +# 47081 "parsing/parser.ml" in let attrs1 = @@ -47097,7 +47085,7 @@ module Tables = struct # 3840 "parsing/parser.mly" ( _1 ) -# 47101 "parsing/parser.ml" +# 47089 "parsing/parser.ml" in let _endpos = _endpos_attrs2_ in @@ -47110,7 +47098,7 @@ module Tables = struct let docs = symbol_docs _sloc in Val.mk id ty ~attrs ~loc ~docs, ext ) -# 47114 "parsing/parser.ml" +# 47102 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47128,7 +47116,7 @@ module Tables = struct let _v : (Asttypes.virtual_flag) = # 3703 "parsing/parser.mly" ( Concrete ) -# 47132 "parsing/parser.ml" +# 47120 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47153,7 +47141,7 @@ module Tables = struct let _v : (Asttypes.virtual_flag) = # 3704 "parsing/parser.mly" ( Virtual ) -# 47157 "parsing/parser.ml" +# 47145 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47178,7 +47166,7 @@ module Tables = struct let _v : (Asttypes.mutable_flag) = # 3727 "parsing/parser.mly" ( Immutable ) -# 47182 "parsing/parser.ml" +# 47170 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47210,7 +47198,7 @@ module Tables = struct let _v : (Asttypes.mutable_flag) = # 3728 "parsing/parser.mly" ( Mutable ) -# 47214 "parsing/parser.ml" +# 47202 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47242,7 +47230,7 @@ module Tables = struct let _v : (Asttypes.mutable_flag) = # 3729 "parsing/parser.mly" ( Mutable ) -# 47246 "parsing/parser.ml" +# 47234 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47267,7 +47255,7 @@ module Tables = struct let _v : (Asttypes.private_flag) = # 3734 "parsing/parser.mly" ( Public ) -# 47271 "parsing/parser.ml" +# 47259 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47299,7 +47287,7 @@ module Tables = struct let _v : (Asttypes.private_flag) = # 3735 "parsing/parser.mly" ( Private ) -# 47303 "parsing/parser.ml" +# 47291 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47331,7 +47319,7 @@ module Tables = struct let _v : (Asttypes.private_flag) = # 3736 "parsing/parser.mly" ( Private ) -# 47335 "parsing/parser.ml" +# 47323 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47393,18 +47381,18 @@ module Tables = struct let xs = # 253 "<standard.mly>" ( List.rev xs ) -# 47397 "parsing/parser.ml" +# 47385 "parsing/parser.ml" in # 967 "parsing/parser.mly" ( xs ) -# 47402 "parsing/parser.ml" +# 47390 "parsing/parser.ml" in # 2971 "parsing/parser.mly" ( _1 ) -# 47408 "parsing/parser.ml" +# 47396 "parsing/parser.ml" in let _endpos__6_ = _endpos_xs_ in @@ -47413,7 +47401,7 @@ module Tables = struct # 3294 "parsing/parser.mly" ( _1 ) -# 47417 "parsing/parser.ml" +# 47405 "parsing/parser.ml" in let _3 = @@ -47424,7 +47412,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 47428 "parsing/parser.ml" +# 47416 "parsing/parser.ml" in let _endpos = _endpos__6_ in @@ -47441,7 +47429,7 @@ module Tables = struct ~manifest:_5 ~priv:_4 ~loc:(make_loc _sloc))) ) -# 47445 "parsing/parser.ml" +# 47433 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47496,7 +47484,7 @@ module Tables = struct # 3294 "parsing/parser.mly" ( _1 ) -# 47500 "parsing/parser.ml" +# 47488 "parsing/parser.ml" in let _endpos__5_ = _endpos__1_inlined2_ in @@ -47508,7 +47496,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 47512 "parsing/parser.ml" +# 47500 "parsing/parser.ml" in let _endpos = _endpos__5_ in @@ -47523,7 +47511,7 @@ module Tables = struct ~params:_2 ~manifest:_5 ~loc:(make_loc _sloc))) ) -# 47527 "parsing/parser.ml" +# 47515 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47574,7 +47562,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 47578 "parsing/parser.ml" +# 47566 "parsing/parser.ml" in let _2 = @@ -47585,13 +47573,13 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 47589 "parsing/parser.ml" +# 47577 "parsing/parser.ml" in # 3234 "parsing/parser.mly" ( Pwith_module (_2, _4) ) -# 47595 "parsing/parser.ml" +# 47583 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47642,7 +47630,7 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 47646 "parsing/parser.ml" +# 47634 "parsing/parser.ml" in let _2 = @@ -47653,13 +47641,13 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 47657 "parsing/parser.ml" +# 47645 "parsing/parser.ml" in # 3236 "parsing/parser.mly" ( Pwith_modsubst (_2, _4) ) -# 47663 "parsing/parser.ml" +# 47651 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47717,13 +47705,13 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 47721 "parsing/parser.ml" +# 47709 "parsing/parser.ml" in # 3238 "parsing/parser.mly" ( Pwith_modtype (l, rhs) ) -# 47727 "parsing/parser.ml" +# 47715 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47781,13 +47769,13 @@ module Tables = struct # 883 "parsing/parser.mly" ( mkrhs _1 _sloc ) -# 47785 "parsing/parser.ml" +# 47773 "parsing/parser.ml" in # 3240 "parsing/parser.mly" ( Pwith_modtypesubst (l, rhs) ) -# 47791 "parsing/parser.ml" +# 47779 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47812,7 +47800,7 @@ module Tables = struct let _v : (Asttypes.private_flag) = # 3243 "parsing/parser.mly" ( Public ) -# 47816 "parsing/parser.ml" +# 47804 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47844,7 +47832,7 @@ module Tables = struct let _v : (Asttypes.private_flag) = # 3244 "parsing/parser.mly" ( Private ) -# 47848 "parsing/parser.ml" +# 47836 "parsing/parser.ml" in { MenhirLib.EngineTypes.state = _menhir_s; @@ -47981,9 +47969,9 @@ end # 3872 "parsing/parser.mly" -# 47985 "parsing/parser.ml" +# 47973 "parsing/parser.ml" # 269 "<standard.mly>" -# 47990 "parsing/parser.ml" +# 47978 "parsing/parser.ml" diff --git a/parsing/parser.mly b/parsing/parser.mly index f089a7f872..999679c271 100644 --- a/parsing/parser.mly +++ b/parsing/parser.mly @@ -208,8 +208,8 @@ let mkstrexp e attrs = let mkexp_constraint ~loc e (t1, t2) = match t1, t2 with - | Some t, None -> ghexp ~loc (Pexp_constraint(e, t)) - | _, Some t -> ghexp ~loc (Pexp_coerce(e, t1, t)) + | Some t, None -> mkexp ~loc (Pexp_constraint(e, t)) + | _, Some t -> mkexp ~loc (Pexp_coerce(e, t1, t)) | None, None -> assert false let mkexp_opt_constraint ~loc e = function @@ -218,7 +218,7 @@ let mkexp_opt_constraint ~loc e = function let mkpat_opt_constraint ~loc p = function | None -> p - | Some typ -> ghpat ~loc (Ppat_constraint(p, typ)) + | Some typ -> mkpat ~loc (Ppat_constraint(p, typ)) let syntax_error () = raise Syntaxerr.Escape_error @@ -389,12 +389,12 @@ let loc_last (id : Longident.t Location.loc) : string Location.loc = let loc_lident (id : string Location.loc) : Longident.t Location.loc = loc_map (fun x -> Lident x) id -let exp_of_longident ~loc lid = - let lid = make_ghost (loc_map (fun id -> Lident (Longident.last id)) lid) in - ghexp ~loc (Pexp_ident lid) +let exp_of_longident lid = + let lid = loc_map (fun id -> Lident (Longident.last id)) lid in + Exp.mk ~loc:lid.loc (Pexp_ident lid) -let exp_of_label ~loc lbl = - mkexp ~loc (Pexp_ident (loc_lident lbl)) +let exp_of_label lbl = + Exp.mk ~loc:lbl.loc (Pexp_ident (loc_lident lbl)) let pat_of_label lbl = Pat.mk ~loc:lbl.loc (Ppat_var (loc_last lbl)) @@ -2632,15 +2632,15 @@ record_expr_content: | label = mkrhs(label_longident) c = type_constraint? eo = preceded(EQUAL, expr)? - { let e = + { let constraint_loc, label, e = match eo with | None -> (* No pattern; this is a pun. Desugar it. *) - exp_of_longident ~loc:$sloc label + $sloc, make_ghost label, exp_of_longident label | Some e -> - e + ($startpos(c), $endpos), label, e in - label, mkexp_opt_constraint ~loc:$sloc e c } + label, mkexp_opt_constraint ~loc:constraint_loc e c } ; %inline object_expr_content: xs = separated_or_terminated_nonempty_list(SEMI, object_expr_field) @@ -2649,13 +2649,13 @@ record_expr_content: %inline object_expr_field: label = mkrhs(label) oe = preceded(EQUAL, expr)? - { let e = + { let label, e = match oe with | None -> (* No expression; this is a pun. Desugar it. *) - exp_of_label ~loc:$sloc label + make_ghost label, exp_of_label label | Some e -> - e + label, e in label, e } ; @@ -2843,18 +2843,18 @@ pattern_comma_list(self): label = mkrhs(label_longident) octy = preceded(COLON, core_type)? opat = preceded(EQUAL, pattern)? - { let label, pat = + { let constraint_loc, label, pat = match opat with | None -> (* No pattern; this is a pun. Desugar it. But that the pattern was there and the label reconstructed (which piece of AST is marked as ghost is important for warning emission). *) - make_ghost label, pat_of_label label + $sloc, make_ghost label, pat_of_label label | Some pat -> - label, pat + ($startpos(octy), $endpos), label, pat in - label, mkpat_opt_constraint ~loc:$sloc pat octy + label, mkpat_opt_constraint ~loc:constraint_loc pat octy } ; diff --git a/parsing/pprintast.ml b/parsing/pprintast.ml index 285702e6b4..3c2f98fbe3 100644 --- a/parsing/pprintast.ml +++ b/parsing/pprintast.ml @@ -95,6 +95,8 @@ let needs_parens txt = let needs_spaces txt = first_is '*' txt || last_is '*' txt +let string_loc ppf x = fprintf ppf "%s" x.txt + (* add parentheses to binders when they are in fact infix or prefix operators *) let protect_ident ppf txt = let format : (_, _, _) format = @@ -446,7 +448,7 @@ and pattern1 ctxt (f:Format.formatter) (x:pattern) : unit = pp f "%a@;%a" longident_loc li (simple_pattern ctxt) x | Some (vl, x) -> pp f "%a@ (type %a)@;%a" longident_loc li - (list ~sep:"@ " tyvar_loc) vl + (list ~sep:"@ " string_loc) vl (simple_pattern ctxt) x | None -> pp f "%a" longident_loc li) | _ -> simple_pattern ctxt f x diff --git a/testsuite/tests/parsetree/locations_test.compilers.reference b/testsuite/tests/parsetree/locations_test.compilers.reference index 1b9e93bf70..054a7db232 100644 --- a/testsuite/tests/parsetree/locations_test.compilers.reference +++ b/testsuite/tests/parsetree/locations_test.compilers.reference @@ -231,7 +231,7 @@ Ptop_def core_type (//toplevel//[4,29+8]..[4,29+11]) Ptyp_constr "int" (//toplevel//[4,29+8]..[4,29+11]) [] - expression (//toplevel//[4,29+4]..[4,29+15]) ghost + expression (//toplevel//[4,29+4]..[4,29+15]) Pexp_constraint expression (//toplevel//[4,29+14]..[4,29+15]) Pexp_constant PConst_int (3,None) @@ -359,9 +359,9 @@ Ptop_def expression (//toplevel//[4,17+17]..[4,17+29]) Pexp_record [ - "contents" (//toplevel//[4,17+19]..[4,17+27]) - expression (//toplevel//[4,17+19]..[4,17+27]) ghost - Pexp_ident "contents" (//toplevel//[4,17+19]..[4,17+27]) ghost + "contents" (//toplevel//[4,17+19]..[4,17+27]) ghost + expression (//toplevel//[4,17+19]..[4,17+27]) + Pexp_ident "contents" (//toplevel//[4,17+19]..[4,17+27]) ] None ] @@ -380,7 +380,7 @@ Ptop_def Pexp_record [ "contents" (//toplevel//[2,1+10]..[2,1+18]) - expression (//toplevel//[2,1+10]..[2,1+28]) ghost + expression (//toplevel//[2,1+19]..[2,1+28]) Pexp_constraint expression (//toplevel//[2,1+27]..[2,1+28]) Pexp_constant PConst_int (3,None) @@ -410,11 +410,11 @@ Ptop_def expression (//toplevel//[2,1+17]..[2,1+35]) Pexp_record [ - "contents" (//toplevel//[2,1+19]..[2,1+27]) - expression (//toplevel//[2,1+19]..[2,1+33]) ghost + "contents" (//toplevel//[2,1+19]..[2,1+27]) ghost + expression (//toplevel//[2,1+19]..[2,1+33]) Pexp_constraint - expression (//toplevel//[2,1+19]..[2,1+33]) ghost - Pexp_ident "contents" (//toplevel//[2,1+19]..[2,1+27]) ghost + expression (//toplevel//[2,1+19]..[2,1+27]) + Pexp_ident "contents" (//toplevel//[2,1+19]..[2,1+27]) core_type (//toplevel//[2,1+30]..[2,1+33]) Ptyp_constr "int" (//toplevel//[2,1+30]..[2,1+33]) [] @@ -466,7 +466,7 @@ Ptop_def Ppat_record Closed [ "contents" (//toplevel//[2,1+19]..[2,1+27]) ghost - pattern (//toplevel//[2,1+19]..[2,1+33]) ghost + pattern (//toplevel//[2,1+19]..[2,1+33]) Ppat_constraint pattern (//toplevel//[2,1+19]..[2,1+27]) Ppat_var "contents" (//toplevel//[2,1+19]..[2,1+27]) @@ -497,7 +497,7 @@ Ptop_def Ppat_record Closed [ "contents" (//toplevel//[2,1+19]..[2,1+27]) - pattern (//toplevel//[2,1+19]..[2,1+37]) ghost + pattern (//toplevel//[2,1+28]..[2,1+37]) Ppat_constraint pattern (//toplevel//[2,1+36]..[2,1+37]) Ppat_var "i" (//toplevel//[2,1+36]..[2,1+37]) @@ -514,6 +514,51 @@ Ptop_def val x : int ref -> int = <fun> Ptop_def [ + structure_item (//toplevel//[2,1+0]..[3,9+50]) + Pstr_value Nonrec + [ + <def> + pattern (//toplevel//[2,1+4]..[2,1+5]) + Ppat_any + expression (//toplevel//[3,9+2]..[3,9+50]) + Pexp_object + class_structure + pattern (//toplevel//[3,9+8]..[3,9+8]) ghost + Ppat_any + [ + class_field (//toplevel//[3,9+9]..[3,9+21]) + Pcf_val Immutable + "foo" (//toplevel//[3,9+13]..[3,9+16]) + Concrete Fresh + expression (//toplevel//[3,9+19]..[3,9+21]) + Pexp_constant PConst_int (12,None) + class_field (//toplevel//[3,9+22]..[3,9+46]) + Pcf_method Public + "x" (//toplevel//[3,9+29]..[3,9+30]) + Concrete Fresh + expression (//toplevel//[3,9+31]..[3,9+46]) ghost + Pexp_poly + expression (//toplevel//[3,9+31]..[3,9+46]) ghost + Pexp_fun + Nolabel + None + pattern (//toplevel//[3,9+31]..[3,9+34]) + Ppat_var "foo" (//toplevel//[3,9+31]..[3,9+34]) + expression (//toplevel//[3,9+37]..[3,9+46]) + Pexp_override + [ + <override> "foo" (//toplevel//[3,9+40]..[3,9+43]) ghost + expression (//toplevel//[3,9+40]..[3,9+43]) + Pexp_ident "foo" (//toplevel//[3,9+40]..[3,9+43]) + ] + None + ] + ] + ] + +- : < x : int -> 'a > as 'a = <obj> +Ptop_def + [ structure_item (//toplevel//[4,19+0]..[4,19+26]) Pstr_value Nonrec [ @@ -1356,7 +1401,7 @@ Ptop_def [ <arg> Labelled "y" - expression (//toplevel//[5,98+5]..[5,98+12]) ghost + expression (//toplevel//[5,98+5]..[5,98+12]) Pexp_constraint expression (//toplevel//[5,98+6]..[5,98+7]) Pexp_ident "y" (//toplevel//[5,98+6]..[5,98+7]) diff --git a/testsuite/tests/parsetree/locations_test.ml b/testsuite/tests/parsetree/locations_test.ml index 0c2db99282..e295d9a4ca 100644 --- a/testsuite/tests/parsetree/locations_test.ml +++ b/testsuite/tests/parsetree/locations_test.ml @@ -57,6 +57,10 @@ let x = function { contents : int } -> contents;; let x = function { contents : int = i } -> i;; +let _ = + object val foo = 12 method x foo = {< foo >} end +;; + (* Local open *) let x = M.{ contents = 3 };; diff --git a/testsuite/tests/parsetree/source.ml b/testsuite/tests/parsetree/source.ml index 2d55b8214a..82bb8d697a 100644 --- a/testsuite/tests/parsetree/source.ml +++ b/testsuite/tests/parsetree/source.ml @@ -7441,3 +7441,5 @@ f object method f = 1 end let g y = let f ~y = y + 1 in f ~(y:int) + +let goober a = match a with C (type a b) y -> y diff --git a/testsuite/tests/typing-objects/field_kind.ml b/testsuite/tests/typing-objects/field_kind.ml new file mode 100644 index 0000000000..097c074810 --- /dev/null +++ b/testsuite/tests/typing-objects/field_kind.ml @@ -0,0 +1,73 @@ +(* TEST + * expect +*) + +type _ t = Int : int t;; +[%%expect{| +type _ t = Int : int t +|}] + +let o = + object (self) + method private x = 3 + method m : type a. a t -> a = fun Int -> (self#x : int) + end;; +[%%expect{| +val o : < m : 'a. 'a t -> 'a > = <obj> +|}] + +let o' = + object (self : 's) + method private x = 3 + method m : type a. a t -> 's -> a = fun Int other -> (other#x : int) + end;; + +let aargh = assert (o'#m Int o' = 3);; +[%%expect{| +Lines 2-5, characters 2-5: +2 | ..object (self : 's) +3 | method private x = 3 +4 | method m : type a. a t -> 's -> a = fun Int other -> (other#x : int) +5 | end.. +Warning 15 [implicit-public-methods]: the following private methods were made public implicitly: + x. +val o' : < m : 'a. 'a t -> 'b -> 'a; x : int > as 'b = <obj> +val aargh : unit = () +|}] + +let o2 = + object (self : 's) + method private x = 3 + method m : 's -> int = fun other -> (other#x : int) + end;; +[%%expect{| +Lines 2-5, characters 2-5: +2 | ..object (self : 's) +3 | method private x = 3 +4 | method m : 's -> int = fun other -> (other#x : int) +5 | end.. +Warning 15 [implicit-public-methods]: the following private methods were made public implicitly: + x. +val o2 : < m : 'a -> int; x : int > as 'a = <obj> +|}] + +let o3 = + object (self : 's) + method private x = 3 + method m : 's -> int = fun other -> + let module M = struct let other = other end in (M.other#x : int) + end;; + +let aargh = assert (o3#m o3 = 3);; +[%%expect{| +Lines 2-6, characters 2-5: +2 | ..object (self : 's) +3 | method private x = 3 +4 | method m : 's -> int = fun other -> +5 | let module M = struct let other = other end in (M.other#x : int) +6 | end.. +Warning 15 [implicit-public-methods]: the following private methods were made public implicitly: + x. +val o3 : < m : 'a -> int; x : int > as 'a = <obj> +val aargh : unit = () +|}] diff --git a/toplevel/toploop.ml b/toplevel/toploop.ml index 4fdd1eaaff..9feac35660 100644 --- a/toplevel/toploop.ml +++ b/toplevel/toploop.ml @@ -96,6 +96,8 @@ let mod_use_input ppf name = use_input ppf ~wrap_in_module:true name let use_input ppf name = use_input ppf ~wrap_in_module:false name +let use_file ppf name = + use_input ppf (File name) let use_silently ppf name = Misc.protect_refs diff --git a/toplevel/toploop.mli b/toplevel/toploop.mli index 262b35ee1d..c5b6cb2fc6 100644 --- a/toplevel/toploop.mli +++ b/toplevel/toploop.mli @@ -95,6 +95,7 @@ val use_input : formatter -> input -> bool val use_output : formatter -> string -> bool val use_silently : formatter -> input -> bool val mod_use_input : formatter -> input -> bool +val use_file : formatter -> string -> bool (* Read and execute commands from a file. [use_input] prints the types and values of the results. [use_silently] does not print them. diff --git a/typing/btype.ml b/typing/btype.ml index 3bc54c3a6e..78a2a2cb24 100644 --- a/typing/btype.ml +++ b/typing/btype.ml @@ -494,19 +494,11 @@ module For_copy : sig val redirect_desc: copy_scope -> type_expr -> type_desc -> unit - val dup_kind: copy_scope -> field_kind option ref -> unit - val with_scope: (copy_scope -> 'a) -> 'a end = struct type copy_scope = { mutable saved_desc : (transient_expr * type_desc) list; (* Save association of generic nodes with their description. *) - - mutable saved_kinds: field_kind option ref list; - (* duplicated kind variables *) - - mutable new_kinds : field_kind option ref list; - (* new kind variables *) } let redirect_desc copy_scope ty desc = @@ -514,22 +506,12 @@ end = struct copy_scope.saved_desc <- (ty, ty.desc) :: copy_scope.saved_desc; Transient_expr.set_desc ty desc - let dup_kind copy_scope r = - assert (Option.is_none !r); - if not (List.memq r copy_scope.new_kinds) then begin - copy_scope.saved_kinds <- r :: copy_scope.saved_kinds; - let r' = ref None in - copy_scope.new_kinds <- r' :: copy_scope.new_kinds; - r := Some (Fvar r') - end - (* Restore type descriptions. *) - let cleanup { saved_desc; saved_kinds; _ } = - List.iter (fun (ty, desc) -> Transient_expr.set_desc ty desc) saved_desc; - List.iter (fun r -> r := None) saved_kinds + let cleanup { saved_desc; _ } = + List.iter (fun (ty, desc) -> Transient_expr.set_desc ty desc) saved_desc let with_scope f = - let scope = { saved_desc = []; saved_kinds = []; new_kinds = [] } in + let scope = { saved_desc = [] } in let res = f scope in cleanup scope; res diff --git a/typing/btype.mli b/typing/btype.mli index 38ac4cbd07..1798a307fe 100644 --- a/typing/btype.mli +++ b/typing/btype.mli @@ -185,9 +185,6 @@ module For_copy : sig val redirect_desc: copy_scope -> type_expr -> type_desc -> unit (* Temporarily change a type description *) - val dup_kind: copy_scope -> field_kind option ref -> unit - (* Save a None field_kind, and make it point to a fresh Fvar *) - val with_scope: (copy_scope -> 'a) -> 'a (* [with_scope f] calls [f] and restores saved type descriptions before returning its result. *) diff --git a/typing/ctype.ml b/typing/ctype.ml index 2875c82f97..805e415de3 100644 --- a/typing/ctype.ml +++ b/typing/ctype.ml @@ -1119,14 +1119,6 @@ let rec copy ?partial ?keep_names scope ty = (* Return a new copy *) Tvariant (copy_row copy true row keep more') end - | Tfield (_p, k, _ty1, ty2) -> - begin match field_kind_repr k with - Fabsent -> Tlink (copy ty2) - | Fpresent -> copy_type_desc copy desc - | Fvar r -> - For_copy.dup_kind scope r; - copy_type_desc copy desc - end | Tobject (ty1, _) when partial <> None -> Tobject (copy ty1, ref None) | _ -> copy_type_desc ?keep_names copy desc |