Commit b2ebb393 authored by POTTIER Francois's avatar POTTIER Francois

Fix the expected test output after changes in [standard.mly].

parent 454a40fa
File "duplicate-formal.mly", line 6, characters 0-3:
Error: several parameters of this rule are named "X25".
Error: several parameters of this rule are named "X27".
File "option.mly", line 6, characters 0-6:
File "../../src/standard.mly", line 98, characters 8-14:
File "../../src/standard.mly", line 112, characters 8-14:
Error: the symbol option is defined with arities 0 and 1.
File "unification-error-in-args.mly", line 7, characters 6-7:
Error: does the symbol "X25" expect 0 or 1 argument?
Error: does the symbol "X27" expect 0 or 1 argument?
......@@ -1397,4 +1397,3 @@ assignment_operator:
......@@ -1008,4 +1008,3 @@ check_expr:
%%
......@@ -1021,4 +1021,3 @@ exp_case:
%%
......@@ -287,4 +287,3 @@ phrase:
%%
......@@ -567,4 +567,3 @@ ty0s:
%%
......@@ -132,4 +132,3 @@ atom:
%%
......@@ -4,18 +4,18 @@ Grammar has 9 productions.
nullable(seplist(A)) = false
nullable(phrase) = false
nullable(other) = false
nullable(midrule(__anonymous_1)) = false
nullable(list(__anonymous_0(A,B))) = true
nullable(embedded(__anonymous_1)) = false
first(seplist(A)) = A
first(phrase) = C
first(other) = A
first(midrule(__anonymous_1)) = D C
first(list(__anonymous_0(A,B))) = B A
first(embedded(__anonymous_1)) = D C
follow(seplist(A)) = EOF
follow(phrase) = #
follow(other) = #
follow(midrule(__anonymous_1)) = A
follow(list(__anonymous_0(A,B))) = EOF D
follow(embedded(__anonymous_1)) = A
Built an LR(0) automaton with 20 states.
The grammar is SLR(1).
Built an LR(1) automaton with 20 states.
......
......@@ -32,4 +32,4 @@ other:
D and is NOT parameterized over X. *)
seplist(X):
X {}
| X embedded(C {} | D {}) seplist(X) {}
| X midrule(C {} | D {}) seplist(X) {}
......@@ -10,17 +10,17 @@
%type <(int, int) either> phrase
%%
embedded___anonymous_1_:
midrule___anonymous_1_:
_10 = C
{let x =
let _1 = _10 in
()
()
in
( x )}
| _10 = D
{let x =
let _1 = _10 in
()
()
in
( x )}
......@@ -61,10 +61,9 @@ other:
seplist_A_:
_1 = A
{ ()}
| _1 = A _2 = embedded___anonymous_1_ _3 = seplist_A_
{ ()}
| _1 = A _2 = midrule___anonymous_1_ _3 = seplist_A_
{ ()}
%%
......@@ -47,4 +47,3 @@ phrase:
%%
......@@ -277,4 +277,3 @@ field_name:
%%
......@@ -257,4 +257,3 @@ TyBinder:
%%
......@@ -299,4 +299,3 @@ pattern0s:
%%
......@@ -30,4 +30,3 @@ liste_C_ [@happy true] [@liste true]:
%%
......@@ -13,4 +13,3 @@ main [@main ()] [@cost 0]:
%%
......@@ -32,4 +32,3 @@ exprl:
%%
......@@ -45,4 +45,3 @@ empty:
......@@ -33,4 +33,3 @@ debut:
%%
......@@ -834,4 +834,3 @@ ext_sigdef:
%%
......@@ -635,4 +635,3 @@ function_definition:
%%
......@@ -678,4 +678,3 @@ function_definition:
%%
......@@ -36,4 +36,3 @@ expr:
%%
......@@ -1927,4 +1927,3 @@ actualParameter:
%%
......@@ -474,4 +474,3 @@ typedef_name:
......@@ -1479,4 +1479,3 @@ asmcloberlst_ne:
......@@ -1496,4 +1496,3 @@ maybe_init:
......@@ -129,4 +129,3 @@ rule:
%%
......@@ -111,4 +111,3 @@ expr:
%%
......@@ -615,4 +615,3 @@ term_eof:
%%
......@@ -198,4 +198,3 @@ symbol_status:
%%
......@@ -160,4 +160,3 @@ semicolonlist:
%%
......@@ -104,4 +104,3 @@ ordered_list:
%%
......@@ -389,4 +389,3 @@ opt_type:
%%
......@@ -2768,4 +2768,3 @@ never_used:
%%
......@@ -591,4 +591,3 @@ pattern1s:
%%
......@@ -2288,5 +2288,4 @@ let _endpos = _endpos__5_ in
%%
Note: the nonterminal symbol option (from compcert_pre_parser.mly) is renamed compcert_pre_parser_option.
......@@ -1614,4 +1614,3 @@ name_of_system_function:
%%
......@@ -499,4 +499,3 @@ clock_expression:
......@@ -526,4 +526,3 @@ list_sugar_items:
......@@ -126,4 +126,3 @@ precedence:
%%
......@@ -46,4 +46,3 @@ left_hand_side:
%%
......@@ -33,4 +33,3 @@ item:
%%
......@@ -705,4 +705,3 @@ case_clauses:
%%
......@@ -658,4 +658,3 @@ core:
......@@ -52,4 +52,3 @@ parse_filename:
......@@ -620,4 +620,3 @@ skeleton_mo_set_body:
%%
......@@ -272,4 +272,3 @@ termDefs:
%%
......@@ -286,4 +286,3 @@ BinPredInf:
%%
......@@ -1571,4 +1571,3 @@ subtractive:
......@@ -86,4 +86,3 @@ let parse_it rgl s =
......@@ -26,4 +26,3 @@ let op = ( fun x y -> x + y ) in
%%
......@@ -875,4 +875,3 @@ program:
%%
......@@ -137,5 +137,4 @@ fctlist:
Note: the nonterminal symbol list (from fp.mly) is renamed fp_list.
......@@ -1898,4 +1898,3 @@ asmlabels:
......@@ -3075,4 +3075,3 @@ opt_HIGH_PRECEDENCE_TYAPP:
%%
......@@ -128,4 +128,3 @@ charset:
%%
......@@ -1301,4 +1301,3 @@ constant:
%%
......@@ -118,4 +118,3 @@ optprec:
%%
......@@ -314,4 +314,3 @@ confopts:
......@@ -188,4 +188,3 @@ constructor_list:
......@@ -226,4 +226,3 @@ case_pattern:
%%
......@@ -152,4 +152,3 @@ pattern:
%%
......@@ -119,4 +119,3 @@ nonseparated_list_SEMI_bizarre_nonseparated_list_SEMI__:
%%
......@@ -854,4 +854,3 @@ null:
%%
......@@ -768,4 +768,3 @@ ident:
%%
......@@ -789,4 +789,3 @@ optname:
......@@ -9935,4 +9935,3 @@ idlFile:
......@@ -562,4 +562,3 @@ actualTypSpecs:
%%
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.