(Invalid inputs): Remove cascaded diagnostic that is no longer emitted.

[bison.git] / tests / regression.at

diff --git a/tests/regression.at b/tests/regression.at
index 456f5a8f372a994c8ffb1d85360295fd8a355282..3f83ac46be4ef8010fed44e546579a7e4a5c2bf1 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 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,8 +50,8 @@ exp: MY_TOKEN;
 %%
 ]])
 
 %%
 ]])
 

-AT_CHECK([bison input.y -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -c])
+AT_CHECK([bison -o input.c input.y])
+AT_COMPILE([input.o], [-c input.c])

 
 AT_CLEANUP
 
 
 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
 
 
 AT_CLEANUP
 


@@ -99,8 +99,8 @@ exp: '(' exp ')' | NUM ;
 %%
 ]])
 
 %%
 ]])
 

-AT_CHECK([bison -v input.y -o input.c], 0, [],
-[[input.y:6: warning: symbol `"<="' used more than once as a literal string
+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

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -144,13 +144,13 @@ 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], [],
 [[Grammar
 
 
 # Check the contents of the report.
 AT_CHECK([cat input.output], [],
 [[Grammar
 

-    0 $axiom: expr $
+    0 $accept: expr $end

 
     1 @1: /* empty */
 
 
     1 @1: /* empty */
 


@@ -163,7 +163,7 @@ AT_CHECK([cat input.output], [],
 
 Terminals, with rules where they appear
 
 
 Terminals, with rules where they appear
 

-$ (0) 0
+$end (0) 0

 'a' (97) 2
 'b' (98) 2
 'c' (99) 4
 'a' (97) 2
 'b' (98) 2
 'c' (99) 4


@@ -172,7 +172,7 @@ error (256)
 
 Nonterminals, with rules where they appear
 
 
 Nonterminals, with rules where they appear
 

-$axiom (6)
+$accept (6)

     on left: 0
 expr (7)
     on left: 2 4, on right: 0
     on left: 0
 expr (7)
     on left: 2 4, on right: 0


@@ -184,74 +184,65 @@ expr (7)
 
 state 0
 
 
 state 0
 

-    0 $axiom: . expr $
-
-    'a'        shift, and go to state 1
+    0 $accept: . expr $end

 
 

-    $default   reduce using rule 3 (@2)
+    'a'  shift, and go to state 1

 
 

-    expr       go to state 2
-    @2         go to state 3
+    $default  reduce using rule 3 (@2)

 
 

+    expr  go to state 2
+    @2    go to state 3

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

-    $default   reduce using rule 1 (@1)
-
-    @1         go to state 4
+    $default  reduce using rule 1 (@1)

 
 

+    @1  go to state 4

 
 
 state 2
 
 
 
 state 2
 

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

 
 

+    $end  shift, and go to state 5

 
 
 state 3
 
     4 expr: @2 . 'c'
 
 
 
 state 3
 
     4 expr: @2 . 'c'
 

-    'c'        shift, and go to state 6
-
+    'c'  shift, and go to state 6

 
 
 state 4
 
     2 expr: 'a' @1 . 'b'
 
 
 
 state 4
 
     2 expr: 'a' @1 . 'b'
 

-    'b'        shift, and go to state 7
-
+    'b'  shift, and go to state 7

 
 
 state 5
 
 
 
 state 5
 

-    0 $axiom: expr $ .
+    0 $accept: expr $end .

 
 

-    $default   accept
+    $default  accept

 
 
 state 6
 
     4 expr: @2 'c' .
 
 
 
 state 6
 
     4 expr: @2 'c' .
 

-    $default   reduce using rule 4 (expr)
-
+    $default  reduce using rule 4 (expr)

 
 
 state 7
 
     2 expr: 'a' @1 'b' .
 
 
 
 state 7
 
     2 expr: 'a' @1 'b' .
 

-    $default   reduce using rule 2 (expr)
-
-
-
+    $default  reduce using rule 2 (expr)

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -275,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
 


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

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

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


@@ -303,12 +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 PROLOGUE, expecting ";" or "|"
-input.y:5.2: symbol a is used, but is not defined as a token and has no rules
+input.y:7.1-8.0: missing `%}' at end of file

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -323,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'


@@ -337,8 +326,35 @@ int yylex (void);
 exp: "a";
 ]])
 
 exp: "a";
 ]])
 

-AT_CHECK([bison input.y -o input.c])
-AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -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
 
 
 AT_CLEANUP
 
 


@@ -378,24 +394,34 @@ CONST_DEC:
 ]])
 
 AT_CHECK([bison -v input.y])
 ]])
 
 AT_CHECK([bison -v input.y])

-sed -n 's/  *$//;/^$/!p' input.output >input.report
-AT_CHECK([cat input.report], 0,
+AT_CHECK([cat input.output], 0,

 [[Grammar
 [[Grammar

-    0 $axiom: CONST_DEC_PART $
+
+    0 $accept: CONST_DEC_PART $end
+

     1 CONST_DEC_PART: CONST_DEC_LIST
     1 CONST_DEC_PART: CONST_DEC_LIST

+

     2 CONST_DEC_LIST: CONST_DEC
     3               | CONST_DEC_LIST CONST_DEC
     2 CONST_DEC_LIST: CONST_DEC
     3               | CONST_DEC_LIST CONST_DEC

+

     4 @1: /* empty */
     4 @1: /* empty */

+

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

+
+

 Terminals, with rules where they appear
 Terminals, with rules where they appear

-$ (0) 0
+
+$end (0) 0

 ';' (59) 5
 '=' (61) 5
 error (256)
 undef_id_tok (258) 5
 const_id_tok (259) 5
 ';' (59) 5
 '=' (61) 5
 error (256)
 undef_id_tok (258) 5
 const_id_tok (259) 5

+
+

 Nonterminals, with rules where they appear
 Nonterminals, with rules where they appear

-$axiom (7)
+
+$accept (7)

     on left: 0
 CONST_DEC_PART (8)
     on left: 1, on right: 0
     on left: 0
 CONST_DEC_PART (8)
     on left: 1, on right: 0


@@ -405,47 +431,93 @@ CONST_DEC (10)
     on left: 5, on right: 2 3
 @1 (11)
     on left: 4, on right: 5
     on left: 5, on right: 2 3
 @1 (11)
     on left: 4, on right: 5

+
+

 state 0
 state 0

-    0 $axiom: . CONST_DEC_PART $
-    $default   reduce using rule 4 (@1)
-    CONST_DEC_PART     go to state 1
-    CONST_DEC_LIST     go to state 2
-    CONST_DEC  go to state 3
-    @1         go to state 4
+
+    0 $accept: . CONST_DEC_PART $end
+
+    $default  reduce using rule 4 (@1)
+
+    CONST_DEC_PART  go to state 1
+    CONST_DEC_LIST  go to state 2
+    CONST_DEC       go to state 3
+    @1              go to state 4
+
+

 state 1
 state 1

-    0 $axiom: CONST_DEC_PART . $
-    $          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

-    undef_id_tok       reduce using rule 4 (@1)
-    $default   reduce using rule 1 (CONST_DEC_PART)
-    CONST_DEC  go to state 6
-    @1         go to state 4
+
+    undef_id_tok  reduce using rule 4 (@1)
+    $default      reduce using rule 1 (CONST_DEC_PART)
+
+    CONST_DEC  go to state 6
+    @1         go to state 4
+
+

 state 3
 state 3

+

     2 CONST_DEC_LIST: CONST_DEC .
     2 CONST_DEC_LIST: CONST_DEC .

-    $default   reduce using rule 2 (CONST_DEC_LIST)
+
+    $default  reduce using rule 2 (CONST_DEC_LIST)
+
+

 state 4
 state 4

+

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

-    undef_id_tok       shift, and go to state 7
+
+    undef_id_tok  shift, and go to state 7
+
+

 state 5
 state 5

-    0 $axiom: CONST_DEC_PART $ .
-    $default   accept
+
+    0 $accept: CONST_DEC_PART $end .
+
+    $default  accept
+
+

 state 6
 state 6

+

     3 CONST_DEC_LIST: CONST_DEC_LIST CONST_DEC .
     3 CONST_DEC_LIST: CONST_DEC_LIST CONST_DEC .

-    $default   reduce using rule 3 (CONST_DEC_LIST)
+
+    $default  reduce using rule 3 (CONST_DEC_LIST)
+
+

 state 7
 state 7

+

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

-    '='        shift, and go to state 8
+
+    '='  shift, and go to state 8
+
+

 state 8
 state 8

+

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

-    const_id_tok       shift, and go to state 9
+
+    const_id_tok  shift, and go to state 9
+
+

 state 9
 state 9

+

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

-    ';'        shift, and go to state 10
+
+    ';'  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 ';' .

-    $default   reduce using rule 5 (CONST_DEC)
+
+    $default  reduce using rule 5 (CONST_DEC)

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -486,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.


@@ -527,7 +599,7 @@ static const unsigned char yyprhs[] =
 {
        0,     0,     3,     5,     6,     9,    14
 };
 {
        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
 {
        8,     0,    -1,     9,    -1,    -1,    10,    11,    -1,     3,
        4,     5,     8,    -1,     6,     8,    -1


@@ -538,12 +610,12 @@ static const unsigned char yyrline[] =
 };
 static const char *const yytname[] =
 {
 };
 static const char *const yytname[] =
 {

-  "$", "error", "$undefined.", "\"if\"", "\"const\"", "\"then\"",
-  "\"else\"", "$axiom", "statement", "struct_stat", "if", "else", 0
+  "$end", "error", "$undefined", "\"if\"", "\"const\"", "\"then\"",
+  "\"else\"", "$accept", "statement", "struct_stat", "if", "else", 0

 };
 };

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

 {
 {

-       0,   256,   257,   258,   259,   260,   261,    -1
+       0,   256,   257,   258,   259,   260,   261

 };
 static const unsigned char yyr1[] =
 {
 };
 static const unsigned char yyr1[] =
 {


@@ -553,29 +625,29 @@ static const unsigned char yyr2[] =
 {
        0,     2,     1,     0,     2,     4,     2
 };
 {
        0,     2,     1,     0,     2,     4,     2
 };

-static const short yydefact[] =
+static const unsigned char yydefact[] =

 {
 {

-       3,     0,     0,     2,     0,     0,     0,     3,     4,     3,
+       3,     0,     0,     2,     0,     0,     1,     3,     4,     3,

        6,     5
 };
        6,     5
 };

-static const short yydefgoto[] =
+static const yysigned_char yydefgoto[] =

 {
       -1,     2,     3,     4,     8
 };
 {
       -1,     2,     3,     4,     8
 };

-static const short yypact[] =
+static const yysigned_char yypact[] =

 {
 {

-      -2,    -1,     4,-32768,     0,     2,-32768,    -2,-32768,    -2,
-  -32768,-32768
+      -2,    -1,     4,    -8,     0,     2,    -8,    -2,    -8,    -2,
+      -8,    -8

 };
 };

-static const short yypgoto[] =
+static const yysigned_char yypgoto[] =

 {
 {

-  -32768,    -7,-32768,-32768,-32768
+      -8,    -7,    -8,    -8,    -8

 };
 };

-static const short yytable[] =
+static const unsigned char yytable[] =

 {
       10,     1,    11,     5,     6,     0,     7,     9
 };
 {
       10,     1,    11,     5,     6,     0,     7,     9
 };

-static const short yycheck[] =
+static const yysigned_char yycheck[] =

 {
        7,     3,     9,     4,     0,    -1,     6,     5
 };
 {
        7,     3,     9,     4,     0,    -1,     6,     5
 };


@@ -587,3 +659,136 @@ 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],
+[%{
+AT_LALR1_CC_IF(
+[static int yylex (int *lval);],
+[#include <stdio.h>
+static void yyerror (const char *s);
+static int yylex ();])
+%}
+$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(
+[/* Currently, print_ is required in C++. */
+void
+yy::Parser::print_ ()
+{
+}
+
+/* A C++ error reporting function. */
+void
+yy::Parser::error_ ()
+{
+  std::cerr << message << std::endl;
+}
+
+int
+yyparse (void)
+{
+  yy::Parser parser (!!YYDEBUG);
+  return parser.parse ();
+}
+],
+[static void
+yyerror (const char *s)
+{
+  fprintf (stderr, "%s\n", s);
+}])
+
+static int
+yylex (AT_LALR1_CC_IF([int *lval]))
+[{
+  static int toknum = 0;
+  int tokens[] =
+    {
+      ':', -1
+    };
+  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_COMPILE_CXX([dancer])],
+               [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"])