diagnostics: improve -fcaret for list of accepted values

[bison.git] / tests / existing.at

diff --git a/tests/existing.at b/tests/existing.at
index b972a1fe4d794f04899e59e238f2a04aaf76615f..9d30479e8971d7221f0c26cc7255e0f59eb1f10a 100644 (file)
--- a/tests/existing.at
+++ b/tests/existing.at
@@ -1,6 +1,6 @@
 # Exercising Bison on actual grammars.                   -*- Autotest -*-
 
 # Exercising Bison on actual grammars.                   -*- Autotest -*-
 

-# Copyright (C) 1989-1992, 2000-2005, 2007, 2009-2011 Free Software
+# Copyright (C) 1989-1992, 2000-2005, 2007, 2009-2012 Free Software

 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify


@@ -35,7 +35,10 @@ dnl time comes, just use sed to drop the line numbers.  For now, as LR(1)
 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],
 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/^ $//']],
 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/^ $//']],


@@ -424,8 +427,8 @@ dnl don't like even `print $!4;'.
 
 dnl BISON-STDERR
 [AT_COND_CASE([[canonical LR]],
 
 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
 ]],
 
 dnl LAST-STATE


@@ -486,7 +489,7 @@ dnl   - 61 -> 328: reduce -> shift on '*', '/', and '%'
      $default  reduce using rule 45 (statement)
 +
 +
      $default  reduce using rule 45 (statement)
 +
 +

-+state 320
++State 320

 +
 +  139 non_post_simp_exp: . '!' simp_exp
 +  140                  | . '(' exp r_paren
 +
 +  139 non_post_simp_exp: . '!' simp_exp
 +  140                  | . '(' exp r_paren


@@ -524,7 +527,7 @@ dnl   - 61 -> 328: reduce -> shift on '*', '/', and '%'
 +    variable           go to state 63
 +
 +
 +    variable           go to state 63
 +
 +

-+state 321
++State 321

 +
 +  146 non_post_simp_exp: INCREMENT . variable
 +  154 variable: . NAME
 +
 +  146 non_post_simp_exp: INCREMENT . variable
 +  154 variable: . NAME


@@ -537,7 +540,7 @@ dnl   - 61 -> 328: reduce -> shift on '*', '/', and '%'
 +    variable  go to state 50
 +
 +
 +    variable  go to state 50
 +
 +

-+state 322
++State 322

 +
 +  147 non_post_simp_exp: DECREMENT . variable
 +  154 variable: . NAME
 +
 +  147 non_post_simp_exp: DECREMENT . variable
 +  154 variable: . NAME


@@ -550,7 +553,7 @@ dnl   - 61 -> 328: reduce -> shift on '*', '/', and '%'
 +    variable  go to state 51
 +
 +
 +    variable  go to state 51
 +
 +

-+state 323
++State 323

 +
 +  130 simp_exp: . non_post_simp_exp
 +  131         | . simp_exp '^' simp_exp
 +
 +  130 simp_exp: . non_post_simp_exp
 +  131         | . simp_exp '^' simp_exp


@@ -598,7 +601,7 @@ dnl   - 61 -> 328: reduce -> shift on '*', '/', and '%'
 +    variable           go to state 57
 +
 +
 +    variable           go to state 57
 +
 +

-+state 324
++State 324

 +
 +  130 simp_exp: . non_post_simp_exp
 +  131         | . simp_exp '^' simp_exp
 +
 +  130 simp_exp: . non_post_simp_exp
 +  131         | . simp_exp '^' simp_exp


@@ -646,7 +649,7 @@ dnl   - 61 -> 328: reduce -> shift on '*', '/', and '%'
 +    variable           go to state 57
 +
 +
 +    variable           go to state 57
 +
 +

-+state 325
++State 325

 +
 +  130 simp_exp: . non_post_simp_exp
 +  131         | . simp_exp '^' simp_exp
 +
 +  130 simp_exp: . non_post_simp_exp
 +  131         | . simp_exp '^' simp_exp


@@ -694,7 +697,7 @@ dnl   - 61 -> 328: reduce -> shift on '*', '/', and '%'
 +    variable           go to state 57
 +
 +
 +    variable           go to state 57
 +
 +

-+state 326
++State 326

 +
 +  131 simp_exp: simp_exp . '^' simp_exp
 +  132         | simp_exp . '*' simp_exp
 +
 +  131 simp_exp: simp_exp . '^' simp_exp
 +  132         | simp_exp . '*' simp_exp


@@ -715,7 +718,7 @@ dnl   - 61 -> 328: reduce -> shift on '*', '/', and '%'
 +    Conflict between rule 151 and token '-' resolved as reduce ('-' < UNARY).
 +
 +
 +    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
 +
 +  131 simp_exp: simp_exp . '^' simp_exp
 +  132         | simp_exp . '*' simp_exp


@@ -736,7 +739,7 @@ dnl   - 61 -> 328: reduce -> shift on '*', '/', and '%'
 +    Conflict between rule 150 and token '-' resolved as reduce ('-' < UNARY).
 +
 +
 +    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
 +
 +  131 simp_exp: simp_exp . '^' simp_exp
 +  132         | simp_exp . '*' simp_exp


@@ -1365,8 +1368,10 @@ dnl INPUT
 
 dnl BISON-STDERR
 [AT_COND_CASE([[canonical LR]],
 
 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
 ]],
 
 dnl LAST-STATE


@@ -1478,7 +1483,7 @@ AT_TEST_EXISTING_GRAMMAR([[GNU pic (Groff 1.18.1) Grammar]],
 %token RAND
 %token SRAND
 %token COPY
 %token RAND
 %token SRAND
 %token COPY

-%token THRU
+%token THROUGH

 %token TOP
 %token BOTTOM
 %token UPPER
 %token TOP
 %token BOTTOM
 %token UPPER


@@ -1604,12 +1609,12 @@ placeless_element:
                 {}
           DELIMITED
         | COPY TEXT
                 {}
           DELIMITED
         | COPY TEXT

-        | COPY TEXT THRU
+        | COPY TEXT THROUGH

                 {}
           DELIMITED
                 {}
           until
                 {}
           DELIMITED
                 {}
           until

-        | COPY THRU
+        | COPY THROUGH

                 {}
           DELIMITED
                 {}
                 {}
           DELIMITED
                 {}


@@ -1948,7 +1953,7 @@ dnl without being followed by "of".)
 [[VARIABLE, '=', LABEL, LEFT, DOT_X]],
 
 dnl BISON-STDERR
 [[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
 ]],
 
 dnl LAST-STATE


@@ -2037,7 +2042,7 @@ dnl   - 383 -> 427
      nth_primitive          go to state 105
 @@ -3256,7 +3256,7 @@
 
      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, '(', '`', '+', '-', '!', ';', '}', '@:>@']
 
 -  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, '(', '`', '+', '-', '!', ';', '}', '@:>@']


@@ -2202,7 +2207,7 @@ dnl   - 383 -> 427
 +    expr                   go to state 424
 
 
 +    expr                   go to state 424
 
 

- state 165
+ State 165

 @@ -7987,7 +7987,7 @@
      text_expr              go to state 112
      text                   go to state 113
 @@ -7987,7 +7987,7 @@
      text_expr              go to state 112
      text                   go to state 113


@@ -2319,7 +2324,7 @@ dnl   - 383 -> 427
 +    between  go to state 425
 
 
 +    between  go to state 425
 
 

- state 193
+ State 193

 @@ -10152,7 +10152,7 @@
 
      expr_pair              go to state 317
 @@ -10152,7 +10152,7 @@
 
      expr_pair              go to state 317


@@ -2487,7 +2492,7 @@ dnl   - 383 -> 427
 +    expr                   go to state 424
 
 
 +    expr                   go to state 424
 
 

- state 238
+ State 238

 @@ -12937,7 +12937,7 @@
      '!'           shift, and go to state 94
 
 @@ -12937,7 +12937,7 @@
      '!'           shift, and go to state 94
 


@@ -2574,7 +2579,7 @@ dnl   - 383 -> 427
 +    expr                   go to state 424
 
 
 +    expr                   go to state 424
 
 

- state 315
+ State 315

 @@ -16124,7 +16124,7 @@
 
      $default  reduce using rule 239 (expr)
 @@ -16124,7 +16124,7 @@
 
      $default  reduce using rule 239 (expr)


@@ -2625,7 +2630,7 @@ dnl   - 383 -> 427
 +    expr                   go to state 424
 
 
 +    expr                   go to state 424
 
 

- state 383
+ State 383

 @@ -18071,7 +18071,7 @@
      '!'           shift, and go to state 94
 
 @@ -18071,7 +18071,7 @@
      '!'           shift, and go to state 94
 


@@ -2668,7 +2673,7 @@ dnl   - 383 -> 427
      $default  reduce using rule 29 (placeless_element)
 +
 +
      $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
 +
 +  146 place: label .  [$end, AND, DOT_X, DOT_Y, DOT_HT, DOT_WID, DOT_RAD, ',', '>', '+', '-', ';', '}', '@:>@', ')']
 +  147      | label . corner


@@ -2739,7 +2744,7 @@ dnl   - 383 -> 427
 +    corner  go to state 205
 +
 +
 +    corner  go to state 205
 +
 +

-+state 424
++State 424

 +
 +  140 position_not_place: expr . between position AND position
 +  141                   | expr . '<' position ',' position '>'
 +
 +  140 position_not_place: expr . between position AND position
 +  141                   | expr . '<' position ',' position '>'


@@ -2782,7 +2787,7 @@ dnl   - 383 -> 427
 +    between  go to state 425
 +
 +
 +    between  go to state 425
 +
 +

-+state 425
++State 425

 +
 +  134 position: . position_not_place
 +  135         | . place
 +
 +  134 position: . position_not_place
 +  135         | . place


@@ -2938,7 +2943,7 @@ dnl   - 383 -> 427
 +    expr                   go to state 424
 +
 +
 +    expr                   go to state 424
 +
 +

-+state 426
++State 426

 +
 +  137 position_not_place: position . '+' expr_pair
 +  138                   | position . '-' expr_pair
 +
 +  137 position_not_place: position . '+' expr_pair
 +  138                   | position . '-' expr_pair


@@ -2949,7 +2954,7 @@ dnl   - 383 -> 427
 +    '-'  shift, and go to state 198
 +
 +
 +    '-'  shift, and go to state 198
 +
 +

-+state 427
++State 427

 +
 +  134 position: . position_not_place
 +  135         | . place
 +
 +  134 position: . position_not_place
 +  135         | . place