Simplify the C++ parser constructor.

[bison.git] / tests / regression.at

diff --git a/tests/regression.at b/tests/regression.at
index bd3391f050a0bb695617255d70ea6357ac0fe152..ab0b71e8ac57fa81508a13c81413b9876d59d7a4 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -1,5 +1,5 @@
 # Bison Regressions.                               -*- Autotest -*-
 # Bison Regressions.                               -*- Autotest -*-

-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.

 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -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.
 
 # 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);
 [[%{
 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
 AT_COMPILE([input.o], [-c input.c])
 
 AT_CLEANUP


@@ -72,7 +72,7 @@ exp: { tests = {{{{{{{{{{}}}}}}}}}}; };
 %%
 ]])
 
 %%
 ]])
 

-AT_CHECK([bison -v input.y -o input.c])
+AT_CHECK([bison -v -o input.c input.y])

 
 AT_CHECK([grep 'tests = {{{{{{{{{{}}}}}}}}}};' input.c], 0, [ignore])
 
 
 AT_CHECK([grep 'tests = {{{{{{{{{{}}}}}}}}}};' input.c], 0, [ignore])
 


@@ -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
 ]])
 
 [[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], [],
 
 # 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
 
 
 AT_CLEANUP
 


@@ -284,7 +284,7 @@ AT_DATA([input.y],
 ?
 default: 'a' }
 %&
 ?
 default: 'a' }
 %&

-%a
+%a-does-not-exist

 %-
 %{
 ]])
 %-
 %{
 ]])


@@ -294,11 +294,10 @@ 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: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: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

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -313,12 +312,12 @@ AT_CLEANUP
 AT_SETUP([Token definitions])
 
 # Bison managed, when fed with `%token 'f' "f"' to #define 'f'!
 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);
 %}
 [%{
 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'
 %token 'a' "a"
 %token b "b"
 %token c 'c'


@@ -327,7 +326,7 @@ int yylex (void);
 exp: "a";
 ]])
 
 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
 
 AT_COMPILE([input.o], [-c input.c])
 AT_CLEANUP
 


@@ -340,7 +339,7 @@ AT_CLEANUP
 
 AT_SETUP([Characters Escapes])
 
 
 AT_SETUP([Characters Escapes])
 

-AT_DATA([input.y],
+AT_DATA_GRAMMAR([input.y],

 [%{
 void yyerror (const char *s);
 int yylex (void);
 [%{
 void yyerror (const char *s);
 int yylex (void);


@@ -352,8 +351,9 @@ exp:
 | '"'  "'"
 ;
 ]])
 | '"'  "'"
 ;
 ]])

+# Pacify font-lock-mode: "

 
 

-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
 
 AT_COMPILE([input.o], [-c input.c])
 AT_CLEANUP
 


@@ -535,7 +535,7 @@ AT_CLEANUP
 #
 # It used to be wrong on yydefact only:
 #
 #
 # It used to be wrong on yydefact only:
 #

-# static const short yydefact[] =
+# static const short int yydefact[] =

 #  {
 # -       2,     0,     1,     0,     0,     2,     3,     2,     5,     4,
 # +       2,     0,     1,     0,     0,     0,     3,     2,     5,     4,
 #  {
 # -       2,     0,     1,     0,     0,     2,     3,     2,     5,     4,
 # +       2,     0,     1,     0,     0,     0,     3,     2,     5,     4,


@@ -558,7 +558,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.
 
 # Check only the tables.  We don't use --no-parser, because it is
 # still to be implemented in the experimental branch of Bison.


@@ -613,7 +613,7 @@ static const char *const yytname[] =
   "$end", "error", "$undefined", "\"if\"", "\"const\"", "\"then\"",
   "\"else\"", "$accept", "statement", "struct_stat", "if", "else", 0
 };
   "$end", "error", "$undefined", "\"if\"", "\"const\"", "\"then\"",
   "\"else\"", "$accept", "statement", "struct_stat", "if", "else", 0
 };

-static const unsigned short yytoknum[] =
+static const unsigned short int yytoknum[] =

 {
        0,   256,   257,   258,   259,   260,   261
 };
 {
        0,   256,   257,   258,   259,   260,   261
 };


@@ -659,3 +659,134 @@ static const unsigned char yystos[] =
 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP

+
+
+## ------------------------- ##
+## yycheck Bound Violation.  ##
+## ------------------------- ##
+
+
+# _AT_DATA_DANCER_Y(BISON-OPTIONS)
+# --------------------------------
+# The following grammar, taken from Andrew Suffield's GPL'd implementation
+# of DGMTP, the Dancer Generic Message Transport Protocol, used to violate
+# yycheck's bounds where issuing a verbose error message.  Keep this test
+# so that possible bound checking compilers could check all the skeletons.
+m4_define([_AT_DATA_DANCER_Y],
+[AT_DATA_GRAMMAR([dancer.y],
+[%{
+static int yylex (AT_LALR1_CC_IF([int *], [void]));
+AT_LALR1_CC_IF([],
+[#include <stdio.h>
+static void yyerror (const char *);])
+%}
+$1
+%token ARROW INVALID NUMBER STRING DATA
+%defines
+%verbose
+%error-verbose
+/* Grammar follows */
+%%
+line: header body
+   ;
+
+header: '<' from ARROW to '>' type ':'
+   | '<' ARROW to '>' type ':'
+   | ARROW to type ':'
+   | type ':'
+   | '<' '>'
+   ;
+
+from: DATA
+   | STRING
+   | INVALID
+   ;
+
+to: DATA
+   | STRING
+   | INVALID
+   ;
+
+type: DATA
+   | STRING
+   | INVALID
+   ;
+
+body: /* empty */
+   | body member
+   ;
+
+member: STRING
+   | DATA
+   | '+' NUMBER
+   | '-' NUMBER
+   | NUMBER
+   | INVALID
+   ;
+%%
+AT_LALR1_CC_IF(
+[/* A C++ error reporting function. */
+void
+yy::Parser::error_ ()
+{
+  std::cerr << message << std::endl;
+}
+
+int
+yyparse (void)
+{
+  yy::Parser parser;
+  parser.set_debug_level (!!YYDEBUG);
+  return parser.parse ();
+}
+],
+[static void
+yyerror (const char *s)
+{
+  fprintf (stderr, "%s\n", s);
+}])
+
+static int
+yylex (AT_LALR1_CC_IF([int *lval], [void]))
+[{
+  static int toknum = 0;
+  int tokens[] =
+    {
+      ':', -1
+    };
+  ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC.  */])[
+  return tokens[toknum++];
+}]
+
+int
+main (void)
+{
+  return yyparse ();
+}
+])
+])# _AT_DATA_DANCER_Y
+
+
+# AT_CHECK_DANCER(BISON-OPTIONS)
+# ------------------------------
+# Generate the grammar, compile it, run it.
+m4_define([AT_CHECK_DANCER],
+[AT_SETUP([Dancer $1])
+AT_BISON_OPTION_PUSHDEFS([$1])
+_AT_DATA_DANCER_Y([$1])
+AT_CHECK([bison -o dancer.c dancer.y])
+AT_LALR1_CC_IF(
+  [AT_CHECK([bison -o dancer.cc dancer.y])
+   AT_COMPILE_CXX([dancer])],
+  [AT_CHECK([bison -o dancer.c dancer.y])
+   AT_COMPILE([dancer])])
+AT_PARSER_CHECK([./dancer], 1, [],
+[syntax error, unexpected ':'
+])
+AT_BISON_OPTION_POPDEFS
+AT_CLEANUP
+])
+
+AT_CHECK_DANCER()
+AT_CHECK_DANCER([%glr-parser])
+AT_CHECK_DANCER([%skeleton "lalr1.cc"])