File tree Expand file tree Collapse file tree 2 files changed +10
-10
lines changed Expand file tree Collapse file tree 2 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -824,7 +824,7 @@ The precedences must be listed from low to high.
824
824
%nonassoc below_DOT
825
825
%nonassoc DOT DOTOP
826
826
/* Finally, the first tokens of simple_expr are above everything else . */
827
- %nonassoc BACKQUOTE BANG BEGIN CHAR FALSE FLOAT INT
827
+ %nonassoc BACKQUOTE BANG BEGIN CHAR FALSE FLOAT INT OBJECT
828
828
LBRACE LBRACELESS LBRACKET LBRACKETBAR LIDENT LPAREN
829
829
NEW PREFIXOP STRING TRUE UIDENT UNDERSCORE
830
830
LBRACKETPERCENT QUOTED_STRING_EXPR
@@ -2319,10 +2319,6 @@ expr:
2319
2319
{ Pexp_assert $ 3 , $ 2 }
2320
2320
| LAZY ext_attributes simple_expr % prec below_HASH
2321
2321
{ Pexp_lazy $ 3 , $ 2 }
2322
- | OBJECT ext_attributes class_structure END
2323
- { Pexp_object $ 3 , $ 2 }
2324
- | OBJECT ext_attributes class_structure error
2325
- { unclosed " object" $ loc($ 1 ) " end" $ loc($ 4 ) }
2326
2322
;
2327
2323
% inline expr_:
2328
2324
| simple_expr nonempty_llist(labeled_simple_expr)
@@ -2375,6 +2371,10 @@ simple_expr:
2375
2371
{ Pexp_constraint (ghexp ~loc: $ sloc (Pexp_pack $ 4 ), $ 6 ), $ 3 }
2376
2372
| LPAREN MODULE ext_attributes module_expr COLON error
2377
2373
{ unclosed " (" $ loc($ 1 ) " )" $ loc($ 6 ) }
2374
+ | OBJECT ext_attributes class_structure END
2375
+ { Pexp_object $ 3 , $ 2 }
2376
+ | OBJECT ext_attributes class_structure error
2377
+ { unclosed " object" $ loc($ 1 ) " end" $ loc($ 4 ) }
2378
2378
;
2379
2379
% inline simple_expr_:
2380
2380
| mkrhs(val_longident)
Original file line number Diff line number Diff line change @@ -821,7 +821,7 @@ The precedences must be listed from low to high.
821
821
%nonassoc below_DOT
822
822
%nonassoc DOT DOTOP
823
823
/* Finally, the first tokens of simple_expr are above everything else . */
824
- %nonassoc BACKQUOTE BANG BEGIN CHAR FALSE FLOAT INT
824
+ %nonassoc BACKQUOTE BANG BEGIN CHAR FALSE FLOAT INT OBJECT
825
825
LBRACE LBRACELESS LBRACKET LBRACKETBAR LIDENT LPAREN
826
826
NEW PREFIXOP STRING TRUE UIDENT
827
827
LBRACKETPERCENT QUOTED_STRING_EXPR
@@ -2311,10 +2311,6 @@ expr [@recover.expr Annot.Exp.mk ()]:
2311
2311
{ Pexp_assert $ 3 , $ 2 }
2312
2312
| LAZY ext_attributes simple_expr % prec below_HASH
2313
2313
{ Pexp_lazy $ 3 , $ 2 }
2314
- | OBJECT ext_attributes class_structure END
2315
- { Pexp_object $ 3 , $ 2 }
2316
- (* | OBJECT ext_attributes class_structure error
2317
- { unclosed "object" $loc($1) "end" $loc($4) }*)
2318
2314
;
2319
2315
% inline expr_:
2320
2316
| simple_expr nonempty_llist(labeled_simple_expr)
@@ -2367,6 +2363,10 @@ simple_expr:
2367
2363
{ Pexp_constraint (ghexp ~loc: $ sloc (Pexp_pack $ 4 ), $ 6 ), $ 3 }
2368
2364
(* | LPAREN MODULE ext_attributes module_expr COLON error
2369
2365
{ unclosed "(" $loc($1) ")" $loc($6) }*)
2366
+ | OBJECT ext_attributes class_structure END
2367
+ { Pexp_object $ 3 , $ 2 }
2368
+ (* | OBJECT ext_attributes class_structure error
2369
+ { unclosed "object" $loc($1) "end" $loc($4) }*)
2370
2370
;
2371
2371
% inline simple_expr_:
2372
2372
| mkrhs(val_longident)
You can’t perform that action at this time.
0 commit comments