dnl support is rapidly evolving, let's keep that information to be careful.
dnl However, we don't do diffs for canonical LR(1) because the diff is huge.
m4_pushdef([AT_LALR1_DIFF_CHECK],
-[AT_CHECK([[sed 's/^%define lr.type .*$//' input.y > input-lalr.y]])
+[dnl We need diff -u, which is not portable.
+AT_CHECK([diff -u /dev/null /dev/null || exit 77], [0], [ignore])
+
+AT_CHECK([[sed 's/^%define lr.type .*$//' input.y > input-lalr.y]])
AT_BISON_CHECK([[--report=all input-lalr.y]], [[0]], [ignore], [ignore])
AT_CHECK([[diff -u input-lalr.output input.output \
| sed -n '/^@@/,$p' | sed 's/^ $//']],
dnl BISON-STDERR
[AT_COND_CASE([[canonical LR]],
-[[input.y: conflicts: 265 shift/reduce]],
-[[input.y: conflicts: 65 shift/reduce]])[
+[[input.y: warning: 265 shift/reduce conflicts [-Wconflicts-sr]]],
+[[input.y: warning: 65 shift/reduce conflicts [-Wconflicts-sr]]])[
]],
dnl LAST-STATE
$default reduce using rule 45 (statement)
+
+
-+state 320
++State 320
+
+ 139 non_post_simp_exp: . '!' simp_exp
+ 140 | . '(' exp r_paren
+ variable go to state 63
+
+
-+state 321
++State 321
+
+ 146 non_post_simp_exp: INCREMENT . variable
+ 154 variable: . NAME
+ variable go to state 50
+
+
-+state 322
++State 322
+
+ 147 non_post_simp_exp: DECREMENT . variable
+ 154 variable: . NAME
+ variable go to state 51
+
+
-+state 323
++State 323
+
+ 130 simp_exp: . non_post_simp_exp
+ 131 | . simp_exp '^' simp_exp
+ variable go to state 57
+
+
-+state 324
++State 324
+
+ 130 simp_exp: . non_post_simp_exp
+ 131 | . simp_exp '^' simp_exp
+ variable go to state 57
+
+
-+state 325
++State 325
+
+ 130 simp_exp: . non_post_simp_exp
+ 131 | . simp_exp '^' simp_exp
+ variable go to state 57
+
+
-+state 326
++State 326
+
+ 131 simp_exp: simp_exp . '^' simp_exp
+ 132 | simp_exp . '*' simp_exp
+ Conflict between rule 151 and token '-' resolved as reduce ('-' < UNARY).
+
+
-+state 327
++State 327
+
+ 131 simp_exp: simp_exp . '^' simp_exp
+ 132 | simp_exp . '*' simp_exp
+ Conflict between rule 150 and token '-' resolved as reduce ('-' < UNARY).
+
+
-+state 328
++State 328
+
+ 131 simp_exp: simp_exp . '^' simp_exp
+ 132 | simp_exp . '*' simp_exp
dnl BISON-STDERR
[AT_COND_CASE([[canonical LR]],
-[[input.y: conflicts: 1876 shift/reduce, 144 reduce/reduce]],
-[[input.y: conflicts: 78 shift/reduce, 10 reduce/reduce]])[
+[[input.y: warning: 1876 shift/reduce conflicts [-Wconflicts-sr]
+input.y: warning: 144 reduce/reduce conflicts [-Wconflicts-rr]]],
+[[input.y: warning: 78 shift/reduce conflicts [-Wconflicts-sr]
+input.y: warning: 10 reduce/reduce conflicts [-Wconflicts-rr]]])[
]],
dnl LAST-STATE
%token RAND
%token SRAND
%token COPY
-%token THRU
+%token THROUGH
%token TOP
%token BOTTOM
%token UPPER
{}
DELIMITED
| COPY TEXT
- | COPY TEXT THRU
+ | COPY TEXT THROUGH
{}
DELIMITED
{}
until
- | COPY THRU
+ | COPY THROUGH
{}
DELIMITED
{}
[[VARIABLE, '=', LABEL, LEFT, DOT_X]],
dnl BISON-STDERR
-[[input.y:470.11-48: warning: rule useless in parser due to conflicts: path: ORDINAL LAST object_type relative_path
+[[input.y:470.11-48: warning: rule useless in parser due to conflicts: path: ORDINAL LAST object_type relative_path [-Wother]
]],
dnl LAST-STATE
nth_primitive go to state 105
@@ -3256,7 +3256,7 @@
- state 102
+ State 102
- 146 place: label . [$end, LABEL, VARIABLE, NUMBER, TEXT, ORDINAL, LEFT_ARROW_HEAD, RIGHT_ARROW_HEAD, DOUBLE_ARROW_HEAD, LAST, UP, DOWN, LEFT, RIGHT, HEIGHT, RADIUS, WIDTH, DIAMETER, FROM, TO, AT, WITH, BY, THEN, SOLID, DOTTED, DASHED, CHOP, SAME, INVISIBLE, LJUST, RJUST, ABOVE, BELOW, AND, HERE, DOT_X, DOT_Y, DOT_HT, DOT_WID, DOT_RAD, SIN, COS, ATAN2, LOG, EXP, SQRT, K_MAX, K_MIN, INT, RAND, SRAND, CW, CCW, THICKNESS, FILL, COLORED, OUTLINED, SHADED, ALIGNED, SPRINTF, '(', '`', ',', '>', '+', '-', '!', ';', '}', '@:>@', ')']
+ 146 place: label . [$end, LABEL, VARIABLE, NUMBER, TEXT, ORDINAL, LEFT_ARROW_HEAD, RIGHT_ARROW_HEAD, DOUBLE_ARROW_HEAD, LAST, UP, DOWN, LEFT, RIGHT, HEIGHT, RADIUS, WIDTH, DIAMETER, FROM, TO, AT, WITH, BY, THEN, SOLID, DOTTED, DASHED, CHOP, SAME, INVISIBLE, LJUST, RJUST, ABOVE, BELOW, HERE, DOT_X, DOT_Y, DOT_HT, DOT_WID, DOT_RAD, SIN, COS, ATAN2, LOG, EXP, SQRT, K_MAX, K_MIN, INT, RAND, SRAND, CW, CCW, THICKNESS, FILL, COLORED, OUTLINED, SHADED, ALIGNED, SPRINTF, '(', '`', '+', '-', '!', ';', '}', '@:>@']
+ expr go to state 424
- state 165
+ State 165
@@ -7987,7 +7987,7 @@
text_expr go to state 112
text go to state 113
+ between go to state 425
- state 193
+ State 193
@@ -10152,7 +10152,7 @@
expr_pair go to state 317
+ expr go to state 424
- state 238
+ State 238
@@ -12937,7 +12937,7 @@
'!' shift, and go to state 94
+ expr go to state 424
- state 315
+ State 315
@@ -16124,7 +16124,7 @@
$default reduce using rule 239 (expr)
+ expr go to state 424
- state 383
+ State 383
@@ -18071,7 +18071,7 @@
'!' shift, and go to state 94
$default reduce using rule 29 (placeless_element)
+
+
-+state 423
++State 423
+
+ 146 place: label . [$end, AND, DOT_X, DOT_Y, DOT_HT, DOT_WID, DOT_RAD, ',', '>', '+', '-', ';', '}', '@:>@', ')']
+ 147 | label . corner
+ corner go to state 205
+
+
-+state 424
++State 424
+
+ 140 position_not_place: expr . between position AND position
+ 141 | expr . '<' position ',' position '>'
+ between go to state 425
+
+
-+state 425
++State 425
+
+ 134 position: . position_not_place
+ 135 | . place
+ expr go to state 424
+
+
-+state 426
++State 426
+
+ 137 position_not_place: position . '+' expr_pair
+ 138 | position . '-' expr_pair
+ '-' shift, and go to state 198
+
+
-+state 427
++State 427
+
+ 134 position: . position_not_place
+ 135 | . place
projects / bison.git / blobdiff