build: fix VPATH issue

[bison.git] / tests / regression.at

diff --git a/tests/regression.at b/tests/regression.at
index 5911c5377f9e1700d42b65df859dd07fc3c08fa8..c08059e5e4226d958077821b9b41048ad90016e7 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -293,7 +293,7 @@ $@2 (9)
     on left: 3, on right: 4
 
 
     on left: 3, on right: 4
 
 

-state 0
+State 0

 
     0 $accept: . expr $end
 
 
     0 $accept: . expr $end
 


@@ -305,7 +305,7 @@ state 0
     $@2   go to state 3
 
 
     $@2   go to state 3
 
 

-state 1
+State 1

 
     2 expr: 'a' . $@1 'b'
 
 
     2 expr: 'a' . $@1 'b'
 


@@ -314,42 +314,42 @@ state 1
     $@1  go to state 4
 
 
     $@1  go to state 4
 
 

-state 2
+State 2

 
     0 $accept: expr . $end
 
     $end  shift, and go to state 5
 
 
 
     0 $accept: expr . $end
 
     $end  shift, and go to state 5
 
 

-state 3
+State 3

 
     4 expr: $@2 . 'c'
 
     'c'  shift, and go to state 6
 
 
 
     4 expr: $@2 . 'c'
 
     'c'  shift, and go to state 6
 
 

-state 4
+State 4

 
     2 expr: 'a' $@1 . 'b'
 
     'b'  shift, and go to state 7
 
 
 
     2 expr: 'a' $@1 . 'b'
 
     'b'  shift, and go to state 7
 
 

-state 5
+State 5

 
     0 $accept: expr $end .
 
     $default  accept
 
 
 
     0 $accept: expr $end .
 
     $default  accept
 
 

-state 6
+State 6

 
     4 expr: $@2 'c' .
 
     $default  reduce using rule 4 (expr)
 
 
 
     4 expr: $@2 'c' .
 
     $default  reduce using rule 4 (expr)
 
 

-state 7
+State 7

 
     2 expr: 'a' $@1 'b' .
 
 
     2 expr: 'a' $@1 'b' .
 


@@ -401,15 +401,15 @@ default: 'a' }
 ]])
 
 AT_BISON_CHECK([input.y], [1], [],
 ]])
 
 AT_BISON_CHECK([input.y], [1], [],

-[[input.y:2.1: invalid character: '?'
-input.y:3.14: invalid character: '}'
-input.y:4.1: invalid character: '%'
-input.y:4.2: invalid character: '&'
-input.y:5.1-17: invalid directive: '%a-does-not-exist'
-input.y:6.1: invalid character: '%'
-input.y:6.2: invalid character: '-'
-input.y:7.1-8.0: missing '%}' at end of file
-input.y:7.1-8.0: syntax error, unexpected %{...%}
+[[input.y:2.1: error: invalid character: '?'
+input.y:3.14: error: invalid character: '}'
+input.y:4.1: error: invalid character: '%'
+input.y:4.2: error: invalid character: '&'
+input.y:5.1-17: error: invalid directive: '%a-does-not-exist'
+input.y:6.1: error: invalid character: '%'
+input.y:6.2: error: invalid character: '-'
+input.y:7.1-8.0: error: missing '%}' at end of file
+input.y:7.1-8.0: error: syntax error, unexpected %{...%}

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -428,7 +428,7 @@ AT_DATA([input.y],
 ]])
 
 AT_BISON_CHECK([input.y], [1], [],
 ]])
 
 AT_BISON_CHECK([input.y], [1], [],

-[[input.y:3.1-15: syntax error, unexpected %initial-action, expecting {...}
+[[input.y:3.1-15: error: syntax error, unexpected %initial-action, expecting {...}

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -481,6 +481,14 @@ AT_BISON_CHECK([-o input.c input.y], [[0]], [[]],
 [[input.y:22.8-14: warning: symbol SPECIAL redeclared [-Wother]
 input.y:22.8-63: warning: symbol "\\'?\"\a\b\f\n\r\t\v\001\201\001\201??!" used more than once as a literal string [-Wother]
 ]])
 [[input.y:22.8-14: warning: symbol SPECIAL redeclared [-Wother]
 input.y:22.8-63: warning: symbol "\\'?\"\a\b\f\n\r\t\v\001\201\001\201??!" used more than once as a literal string [-Wother]
 ]])

+AT_BISON_CHECK([-fcaret -o input.c input.y], [[0]], [[]],
+[[input.y:22.8-14: warning: symbol SPECIAL redeclared [-Wother]
+ %token SPECIAL "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!"
+        ^^^^^^^
+input.y:22.8-63: warning: symbol "\\'?\"\a\b\f\n\r\t\v\001\201\001\201??!" used more than once as a literal string [-Wother]
+ %token SPECIAL "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!"
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+]])

 AT_COMPILE([input])
 
 # Checking the error message here guarantees that yytname, which does contain
 AT_COMPILE([input])
 
 # Checking the error message here guarantees that yytname, which does contain


@@ -598,7 +606,7 @@ $@1 (11)
     on left: 4, on right: 5
 
 
     on left: 4, on right: 5
 
 

-state 0
+State 0

 
     0 $accept: . CONST_DEC_PART $end
 
 
     0 $accept: . CONST_DEC_PART $end
 


@@ -610,14 +618,14 @@ state 0
     $@1             go to state 4
 
 
     $@1             go to state 4
 
 

-state 1
+State 1

 
     0 $accept: CONST_DEC_PART . $end
 
     $end  shift, and go to state 5
 
 
 
     0 $accept: CONST_DEC_PART . $end
 
     $end  shift, and go to state 5
 
 

-state 2
+State 2

 
     1 CONST_DEC_PART: CONST_DEC_LIST .
     3 CONST_DEC_LIST: CONST_DEC_LIST . CONST_DEC
 
     1 CONST_DEC_PART: CONST_DEC_LIST .
     3 CONST_DEC_LIST: CONST_DEC_LIST . CONST_DEC


@@ -629,56 +637,56 @@ state 2
     $@1        go to state 4
 
 
     $@1        go to state 4
 
 

-state 3
+State 3

 
     2 CONST_DEC_LIST: CONST_DEC .
 
     $default  reduce using rule 2 (CONST_DEC_LIST)
 
 
 
     2 CONST_DEC_LIST: CONST_DEC .
 
     $default  reduce using rule 2 (CONST_DEC_LIST)
 
 

-state 4
+State 4

 
     5 CONST_DEC: $@1 . undef_id_tok '=' const_id_tok ';'
 
     undef_id_tok  shift, and go to state 7
 
 
 
     5 CONST_DEC: $@1 . undef_id_tok '=' const_id_tok ';'
 
     undef_id_tok  shift, and go to state 7
 
 

-state 5
+State 5

 
     0 $accept: CONST_DEC_PART $end .
 
     $default  accept
 
 
 
     0 $accept: CONST_DEC_PART $end .
 
     $default  accept
 
 

-state 6
+State 6

 
     3 CONST_DEC_LIST: CONST_DEC_LIST CONST_DEC .
 
     $default  reduce using rule 3 (CONST_DEC_LIST)
 
 
 
     3 CONST_DEC_LIST: CONST_DEC_LIST CONST_DEC .
 
     $default  reduce using rule 3 (CONST_DEC_LIST)
 
 

-state 7
+State 7

 
     5 CONST_DEC: $@1 undef_id_tok . '=' const_id_tok ';'
 
     '='  shift, and go to state 8
 
 
 
     5 CONST_DEC: $@1 undef_id_tok . '=' const_id_tok ';'
 
     '='  shift, and go to state 8
 
 

-state 8
+State 8

 
     5 CONST_DEC: $@1 undef_id_tok '=' . const_id_tok ';'
 
     const_id_tok  shift, and go to state 9
 
 
 
     5 CONST_DEC: $@1 undef_id_tok '=' . const_id_tok ';'
 
     const_id_tok  shift, and go to state 9
 
 

-state 9
+State 9

 
     5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok . ';'
 
     ';'  shift, and go to state 10
 
 
 
     5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok . ';'
 
     ';'  shift, and go to state 10
 
 

-state 10
+State 10

 
     5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok ';' .
 
 
     5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok ';' .
 


@@ -1116,8 +1124,8 @@ a: 'a' ;
 ]])
 
 AT_BISON_CHECK([[--report=all input.y]])
 ]])
 
 AT_BISON_CHECK([[--report=all input.y]])

-AT_CHECK([[sed -n '/^state 1$/,/^state 2$/p' input.output]], [[0]],
-[[state 1
+AT_CHECK([[sed -n '/^State 1$/,/^State 2$/p' input.output]], [[0]],
+[[State 1

 
     2 start: 'a' . a 'a'
     3 a: . 'a'
 
     2 start: 'a' . a 'a'
     3 a: . 'a'


@@ -1130,7 +1138,7 @@ AT_CHECK([[sed -n '/^state 1$/,/^state 2$/p' input.output]], [[0]],
     a  go to state 5
 
 
     a  go to state 5
 
 

-state 2
+State 2

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1474,17 +1482,17 @@ AT_CHECK([[grep 'syntax error,' stderr.txt]], [[0]],
 
 # Check number of default reductions in inconsistent states to be sure
 # syntax error is detected before unnecessary reductions are performed.
 
 # Check number of default reductions in inconsistent states to be sure
 # syntax error is detected before unnecessary reductions are performed.

-AT_CHECK([[perl -0777 -ne 'print s/inconsistent default reduction//g;' \
+AT_CHECK([[$PERL -0777 -ne 'print s/inconsistent default reduction//g;' \

            < stdout.txt || exit 77]], [[0]], [[14]])
 
 # Check number of default reductions in consistent states to be sure
 # it is performed before the syntax error is detected.
            < stdout.txt || exit 77]], [[0]], [[14]])
 
 # Check number of default reductions in consistent states to be sure
 # it is performed before the syntax error is detected.

-AT_CHECK([[perl -0777 -ne 'print s/\bconsistent default reduction//g;' \
+AT_CHECK([[$PERL -0777 -ne 'print s/\bconsistent default reduction//g;' \

            < stdout.txt || exit 77]], [[0]], [[2]])
 
 # Check number of reallocs to be sure reallocated memory isn't somehow
 # lost between LAC invocations.
            < stdout.txt || exit 77]], [[0]], [[2]])
 
 # Check number of reallocs to be sure reallocated memory isn't somehow
 # lost between LAC invocations.

-AT_CHECK([[perl -0777 -ne 'print s/\(realloc//g;' < stderr.txt \
+AT_CHECK([[$PERL -0777 -ne 'print s/\(realloc//g;' < stderr.txt \

            || exit 77]], [[0]], [[3]])
 
 AT_BISON_OPTION_POPDEFS
            || exit 77]], [[0]], [[3]])
 
 AT_BISON_OPTION_POPDEFS


@@ -1590,14 +1598,14 @@ AT_CLEANUP
 m4_pushdef([AT_TEST],
 [AT_SETUP([[Lex and parse params: $1]])
 
 m4_pushdef([AT_TEST],
 [AT_SETUP([[Lex and parse params: $1]])
 

-AT_BISON_OPTION_PUSHDEFS([%locations %skeleton $1])
+AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" %parse-param { int x } %parse-param { int y }])

 
 ## FIXME: Improve parsing of parse-param and use the generated
 ## yyerror.
 AT_DATA_GRAMMAR([input.y],
 [[%defines
 %locations
 
 ## FIXME: Improve parsing of parse-param and use the generated
 ## yyerror.
 AT_DATA_GRAMMAR([input.y],
 [[%defines
 %locations

-%skeleton $1
+%skeleton "$1"

 %union { int ival; }
 %parse-param { int x }
 // Spaces, tabs, and new lines.
 %union { int ival; }
 %parse-param { int x }
 // Spaces, tabs, and new lines.


@@ -1611,26 +1619,18 @@ AT_DATA_GRAMMAR([input.y],
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 

-]AT_SKEL_CC_IF([], [[
-static
-void
-yyerror (int x, int y, const char *msg)
-{
-  fprintf (stderr, "x: %d, y: %d, %s\n", x, y, msg);
-}]])[
-
+  ]AT_YYERROR_DECLARE[

   ]AT_YYLEX_DECLARE[
 %}
 
 %%
 exp: 'a' { fprintf (stdout, "x: %d, y: %d\n", x, y); };
 %%
   ]AT_YYLEX_DECLARE[
 %}
 
 %%
 exp: 'a' { fprintf (stdout, "x: %d, y: %d\n", x, y); };
 %%

+]AT_YYERROR_DEFINE[

 ]AT_YYLEX_DEFINE(["a"])[
 
 ]AT_SKEL_CC_IF(
 ]AT_YYLEX_DEFINE(["a"])[
 
 ]AT_SKEL_CC_IF(

-[AT_YYERROR_DEFINE
-
-int
+[int

 yyparse (int x, int y)
 {
   yy::parser parser(x, y);
 yyparse (int x, int y)
 {
   yy::parser parser(x, y);


@@ -1646,7 +1646,7 @@ main (void)
 ]])
 
 AT_FULL_COMPILE([input])
 ]])
 
 AT_FULL_COMPILE([input])

-AT_CHECK([./input], 0, [[x: 1, y: 2
+AT_PARSER_CHECK([./input], 0, [[x: 1, y: 2

 ]])
 AT_BISON_OPTION_POPDEFS
 
 ]])
 AT_BISON_OPTION_POPDEFS
 


@@ -1654,9 +1654,9 @@ AT_CLEANUP
 ])
 
 ## FIXME: test Java, and iterate over skeletons.
 ])
 
 ## FIXME: test Java, and iterate over skeletons.

-AT_TEST("yacc.c")
-AT_TEST("glr.c")
-AT_TEST("lalr1.cc")
-AT_TEST("glr.cc")
+AT_TEST([yacc.c])
+AT_TEST([glr.c])
+AT_TEST([lalr1.cc])
+AT_TEST([glr.cc])

 
 m4_popdef([AT_TEST])
 
 m4_popdef([AT_TEST])