X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/3d38c03a861993c3c8e3c05dd76a3881601e10c2..fcbfa6b01c0222b01254730c66d539ed2c841a4e:/tests/regression.at

diff --git a/tests/regression.at b/tests/regression.at
index 5895fd06..a9746bc8 100644
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -29,7 +29,7 @@ AT_SETUP([Early token definitions])
 # Found in GCJ: they expect the tokens to be defined before the user
 # prologue, so that they can use the token definitions in it.
 
-AT_DATA([input.y],
+AT_DATA_GRAMMAR([input.y],
 [[%{
 void yyerror (const char *s);
 int yylex (void);
@@ -50,7 +50,7 @@ exp: MY_TOKEN;
 %%
 ]])
 
-AT_CHECK([bison input.y -o input.c])
+AT_CHECK([bison -o input.c input.y])
 AT_COMPILE([input.o], [-c input.c])
 
 AT_CLEANUP
@@ -72,9 +72,9 @@ exp: { tests = {{{{{{{{{{}}}}}}}}}}; };
 %%
 ]])
 
-AT_CHECK([bison -v input.y -o input.c])
+AT_CHECK([bison -v -o input.c input.y])
 
-AT_CHECK([fgrep 'tests = {{{{{{{{{{}}}}}}}}}};' input.c], 0, [ignore])
+AT_CHECK([grep 'tests = {{{{{{{{{{}}}}}}}}}};' input.c], 0, [ignore])
 
 AT_CLEANUP
 
@@ -99,7 +99,7 @@ exp: '(' exp ')' | NUM ;
 %%
 ]])
 
-AT_CHECK([bison -v input.y -o input.c], 0, [],
+AT_CHECK([bison -v -o input.c input.y], 0, [],
 [[input.y:6.8-14: warning: symbol `"<="' used more than once as a literal string
 ]])
 
@@ -144,7 +144,7 @@ expr:
 };
 ]])
 
-AT_CHECK([bison input.y -o input.c -v])
+AT_CHECK([bison -o input.c -v input.y])
 
 # Check the contents of the report.
 AT_CHECK([cat input.output], [],
@@ -266,7 +266,7 @@ exp: ;
 %%
 ]])
 
-AT_CHECK([bison -v input.y -o input.c])
+AT_CHECK([bison -v -o input.c input.y])
 
 AT_CLEANUP
 
@@ -284,7 +284,7 @@ AT_DATA([input.y],
 ?
 default: 'a' }
 %&
-%a
+%a-does-not-exist
 %-
 %{
 ]])
@@ -294,11 +294,11 @@ AT_CHECK([bison input.y], [1], [],
 input.y:3.14: invalid character: `}'
 input.y:4.1: invalid character: `%'
 input.y:4.2: invalid character: `&'
-input.y:5.1: 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: unexpected end of file in a prologue
-input.y:7.1-8.0: parse error, unexpected "%{...}%", expecting ";" or "|"
+input.y:7.1-8.0: missing `%}' at end of file
+input.y:7.1-8.0: syntax error, unexpected "%{...%}"
 ]])
 
 AT_CLEANUP
@@ -313,12 +313,12 @@ AT_CLEANUP
 AT_SETUP([Token definitions])
 
 # Bison managed, when fed with `%token 'f' "f"' to #define 'f'!
-AT_DATA([input.y],
+AT_DATA_GRAMMAR([input.y],
 [%{
 void yyerror (const char *s);
 int yylex (void);
 %}
-[%token YYEOF 0 "end of file"
+[%token MYEOF 0 "end of file"
 %token 'a' "a"
 %token b "b"
 %token c 'c'
@@ -327,7 +327,34 @@ int yylex (void);
 exp: "a";
 ]])
 
-AT_CHECK([bison input.y -o input.c])
+AT_CHECK([bison -o input.c input.y])
+AT_COMPILE([input.o], [-c input.c])
+AT_CLEANUP
+
+
+
+## -------------------- ##
+## Characters Escapes.  ##
+## -------------------- ##
+
+
+AT_SETUP([Characters Escapes])
+
+AT_DATA_GRAMMAR([input.y],
+[%{
+void yyerror (const char *s);
+int yylex (void);
+%}
+[%%
+exp:
+  '\'' "\'"
+| '\"' "\""
+| '"'  "'"
+;
+]])
+# Pacify font-lock-mode: "
+
+AT_CHECK([bison -o input.c input.y])
 AT_COMPILE([input.o], [-c input.c])
 AT_CLEANUP
 
@@ -532,7 +559,7 @@ else: "else" statement;
 %%
 ]])
 
-AT_CHECK([bison -v input.y -o input.c])
+AT_CHECK([bison -v -o input.c input.y])
 
 # Check only the tables.  We don't use --no-parser, because it is
 # still to be implemented in the experimental branch of Bison.
@@ -573,7 +600,7 @@ static const unsigned char yyprhs[] =
 {
        0,     0,     3,     5,     6,     9,    14
 };
-static const signed char yyrhs[] =
+static const yysigned_char yyrhs[] =
 {
        8,     0,    -1,     9,    -1,    -1,    10,    11,    -1,     3,
        4,     5,     8,    -1,     6,     8,    -1
@@ -604,16 +631,16 @@ static const unsigned char yydefact[] =
        3,     0,     0,     2,     0,     0,     1,     3,     4,     3,
        6,     5
 };
-static const signed char yydefgoto[] =
+static const yysigned_char yydefgoto[] =
 {
       -1,     2,     3,     4,     8
 };
-static const signed char yypact[] =
+static const yysigned_char yypact[] =
 {
       -2,    -1,     4,    -8,     0,     2,    -8,    -2,    -8,    -2,
       -8,    -8
 };
-static const signed char yypgoto[] =
+static const yysigned_char yypgoto[] =
 {
       -8,    -7,    -8,    -8,    -8
 };
@@ -621,7 +648,7 @@ static const unsigned char yytable[] =
 {
       10,     1,    11,     5,     6,     0,     7,     9
 };
-static const signed char yycheck[] =
+static const yysigned_char yycheck[] =
 {
        7,     3,     9,     4,     0,    -1,     6,     5
 };