For push mode, add pull wrappers around yypush_parse.

[bison.git] / tests / input.at

diff --git a/tests/input.at b/tests/input.at
index 7b0097583419be8ed469e00657669591804c0741..fd389a5843c37de52c9d747bf85739d6c2ec3d62 100644 (file)
--- a/tests/input.at
+++ b/tests/input.at
@@ -25,7 +25,7 @@ AT_BANNER([[Input Processing.]])
 ## Invalid $n.  ##
 ## ------------ ##
 
 ## Invalid $n.  ##
 ## ------------ ##
 

-AT_SETUP([Invalid \$n and @n])
+AT_SETUP([Invalid $n and @n])

 
 AT_DATA([input.y],
 [[%%
 
 AT_DATA([input.y],
 [[%%


@@ -80,13 +80,15 @@ m4_define([_AT_UNUSED_VALUES_DECLARATIONS],
 %destructor { destroy ($$); } INT a b c d e f g h i j k l;]]])
 
 
 %destructor { destroy ($$); } INT a b c d e f g h i j k l;]]])
 
 

-# AT_CHECK_UNUSED_VALUES(DECLARATIONS_AFTER)
-# --------------------------------------------
+# AT_CHECK_UNUSED_VALUES(DECLARATIONS_AFTER, CHECK_MIDRULE_VALUES)
+# ------------------------------------------------------------------

 # Generate a grammar to test unused values,
 # compile it, run it.  If DECLARATIONS_AFTER
 # is set, then the token, type, and destructor
 # declarations are generated after the rules
 # Generate a grammar to test unused values,
 # compile it, run it.  If DECLARATIONS_AFTER
 # is set, then the token, type, and destructor
 # declarations are generated after the rules

-# rather than before.
+# rather than before.  If CHECK_MIDRULE_VALUES
+# is set, then --warnings=midrule-values is
+# set.

 
 m4_define([AT_CHECK_UNUSED_VALUES],
 [AT_DATA([input.y],
 
 m4_define([AT_CHECK_UNUSED_VALUES],
 [AT_DATA([input.y],


@@ -103,8 +105,8 @@ start:
 
 a: INT | INT { } INT { } INT { };
 b: INT | /* empty */;
 
 a: INT | INT { } INT { } INT { };
 b: INT | /* empty */;

-c: INT | INT { $]1[ } INT { } INT { };
-d: INT | INT { } INT { $]1[ } INT { };
+c: INT | INT { $]1[ } INT { $<integer>2 } INT { $<integer>4 };
+d: INT | INT { } INT { $]1[ } INT { $<integer>2 };

 e: INT | INT { } INT {  } INT { $]1[ };
 f: INT | INT { } INT {  } INT { $]$[ = $]1[ + $]3[ + $]5[; };
 g: INT | INT { $<integer>$; } INT { $<integer>$; } INT { };
 e: INT | INT { } INT {  } INT { $]1[ };
 f: INT | INT { } INT {  } INT { $]$[ = $]1[ + $]3[ + $]5[; };
 g: INT | INT { $<integer>$; } INT { $<integer>$; } INT { };


@@ -116,38 +118,41 @@ l: INT | INT { $<integer>$ = $<integer>1; } INT { $<integer>$ = $<integer>2 + $<
 _AT_UNUSED_VALUES_DECLARATIONS])
 )
 
 _AT_UNUSED_VALUES_DECLARATIONS])
 )
 

-AT_CHECK([bison input.y], [0], [],
+AT_CHECK([bison]m4_ifval($2, [ --warnings=midrule-values ])[ input.y], [0], [],

 [[input.y:11.10-32: warning: unset value: $]$[
 input.y:11.10-32: warning: unused value: $]1[
 input.y:11.10-32: warning: unused value: $]3[
 input.y:11.10-32: warning: unused value: $]5[
 input.y:12.9: warning: empty rule for typed nonterminal, and no action
 [[input.y:11.10-32: warning: unset value: $]$[
 input.y:11.10-32: warning: unused value: $]1[
 input.y:11.10-32: warning: unused value: $]3[
 input.y:11.10-32: warning: unused value: $]5[
 input.y:12.9: warning: empty rule for typed nonterminal, and no action

-input.y:13.10-35: warning: unset value: $]$[
-input.y:13.10-35: warning: unused value: $]3[
-input.y:13.10-35: warning: unused value: $]5[
-input.y:14.10-35: warning: unset value: $]$[
-input.y:14.10-35: warning: unused value: $]3[
-input.y:14.10-35: warning: unused value: $]5[
+]]m4_ifval($2, [[[input.y:13.14-19: warning: unset value: $$
+input.y:13.25-39: warning: unset value: $$
+]]])[[input.y:13.10-59: warning: unset value: $]$[
+input.y:13.10-59: warning: unused value: $]3[
+input.y:13.10-59: warning: unused value: $]5[
+]]m4_ifval($2, [[[input.y:14.14-16: warning: unset value: $$
+]]])[[input.y:14.10-47: warning: unset value: $]$[
+input.y:14.10-47: warning: unused value: $]3[
+input.y:14.10-47: warning: unused value: $]5[

 input.y:15.10-36: warning: unset value: $]$[
 input.y:15.10-36: warning: unused value: $]3[
 input.y:15.10-36: warning: unused value: $]5[
 input.y:17.10-58: warning: unset value: $]$[
 input.y:17.10-58: warning: unused value: $]1[
 input.y:15.10-36: warning: unset value: $]$[
 input.y:15.10-36: warning: unused value: $]3[
 input.y:15.10-36: warning: unused value: $]5[
 input.y:17.10-58: warning: unset value: $]$[
 input.y:17.10-58: warning: unused value: $]1[

-input.y:17.10-58: warning: unused value: $]2[
-input.y:17.10-58: warning: unused value: $]3[
-input.y:17.10-58: warning: unused value: $]4[
-input.y:17.10-58: warning: unused value: $]5[
+]]m4_ifval($2, [[[input.y:17.10-58: warning: unused value: $]2[
+]]])[[input.y:17.10-58: warning: unused value: $]3[
+]]m4_ifval($2, [[[input.y:17.10-58: warning: unused value: $]4[
+]]])[[input.y:17.10-58: warning: unused value: $]5[

 input.y:18.10-72: warning: unset value: $]$[
 input.y:18.10-72: warning: unused value: $]1[
 input.y:18.10-72: warning: unused value: $]3[
 input.y:18.10-72: warning: unset value: $]$[
 input.y:18.10-72: warning: unused value: $]1[
 input.y:18.10-72: warning: unused value: $]3[

-input.y:18.10-72: warning: unused value: $]4[
-input.y:18.10-72: warning: unused value: $]5[
-input.y:20.10-55: warning: unused value: $]3[
-input.y:21.10-68: warning: unset value: $]$[
+]]m4_ifval($2, [[[input.y:18.10-72: warning: unused value: $]4[
+]]])[[input.y:18.10-72: warning: unused value: $]5[
+]]m4_ifval($2, [[[input.y:20.10-55: warning: unused value: $]3[
+]]])[[input.y:21.10-68: warning: unset value: $]$[

 input.y:21.10-68: warning: unused value: $]1[
 input.y:21.10-68: warning: unused value: $]2[
 input.y:21.10-68: warning: unused value: $]1[
 input.y:21.10-68: warning: unused value: $]2[

-input.y:21.10-68: warning: unused value: $]4[
-]])])
+]]m4_ifval($2, [[[input.y:21.10-68: warning: unused value: $]4[
+]]]))])

 
 
 ## --------------- ##
 
 
 ## --------------- ##


@@ -156,6 +161,7 @@ input.y:21.10-68: warning: unused value: $]4[
 
 AT_SETUP([Unused values])
 AT_CHECK_UNUSED_VALUES
 
 AT_SETUP([Unused values])
 AT_CHECK_UNUSED_VALUES

+AT_CHECK_UNUSED_VALUES(, [1])

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -165,6 +171,7 @@ AT_CLEANUP
 
 AT_SETUP([Unused values before symbol declarations])
 AT_CHECK_UNUSED_VALUES([1])
 
 AT_SETUP([Unused values before symbol declarations])
 AT_CHECK_UNUSED_VALUES([1])

+AT_CHECK_UNUSED_VALUES([1], [1])

 AT_CLEANUP
 
 
 AT_CLEANUP
 
 


@@ -175,33 +182,54 @@ AT_CLEANUP
 AT_SETUP([Default %printer and %destructor redeclared])
 
 AT_DATA([[input.y]],
 AT_SETUP([Default %printer and %destructor redeclared])
 
 AT_DATA([[input.y]],

-[[%destructor { destroy ($$); } %symbol-default %symbol-default
-%printer { destroy ($$); } %symbol-default %symbol-default
+[[%destructor { destroy ($$); } <*> <*>
+%printer { destroy ($$); } <*> <*>
+
+%destructor { destroy ($$); } <*>
+%printer { destroy ($$); } <*>

 
 

-%destructor { destroy ($$); } %symbol-default
-%printer { destroy ($$); } %symbol-default
+%destructor { destroy ($$); } <> <>
+%printer { destroy ($$); } <> <>
+
+%destructor { destroy ($$); } <>
+%printer { destroy ($$); } <>

 
 %%
 
 start: ;
 
 
 %%
 
 start: ;
 

-%destructor { destroy ($$); } %symbol-default;
-%printer { destroy ($$); } %symbol-default;
+%destructor { destroy ($$); } <*>;
+%printer { destroy ($$); } <*>;
+
+%destructor { destroy ($$); } <>;
+%printer { destroy ($$); } <>;

 ]])
 
 AT_CHECK([bison input.y], [1], [],
 ]])
 
 AT_CHECK([bison input.y], [1], [],

-[[input.y:1.13-29: redeclaration for default %destructor
+[[input.y:1.13-29: redeclaration for default tagged %destructor

 input.y:1.13-29: previous declaration
 input.y:1.13-29: previous declaration

-input.y:2.10-26: redeclaration for default %printer
+input.y:2.10-26: redeclaration for default tagged %printer

 input.y:2.10-26: previous declaration
 input.y:2.10-26: previous declaration

-input.y:4.13-29: redeclaration for default %destructor
+input.y:4.13-29: redeclaration for default tagged %destructor

 input.y:1.13-29: previous declaration
 input.y:1.13-29: previous declaration

-input.y:5.10-26: redeclaration for default %printer
+input.y:5.10-26: redeclaration for default tagged %printer

 input.y:2.10-26: previous declaration
 input.y:2.10-26: previous declaration

-input.y:11.13-29: redeclaration for default %destructor
+input.y:7.13-29: redeclaration for default tagless %destructor
+input.y:7.13-29: previous declaration
+input.y:8.10-26: redeclaration for default tagless %printer
+input.y:8.10-26: previous declaration
+input.y:10.13-29: redeclaration for default tagless %destructor
+input.y:7.13-29: previous declaration
+input.y:11.10-26: redeclaration for default tagless %printer
+input.y:8.10-26: previous declaration
+input.y:17.13-29: redeclaration for default tagged %destructor

 input.y:4.13-29: previous declaration
 input.y:4.13-29: previous declaration

-input.y:12.10-26: redeclaration for default %printer
+input.y:18.10-26: redeclaration for default tagged %printer

 input.y:5.10-26: previous declaration
 input.y:5.10-26: previous declaration

+input.y:20.13-29: redeclaration for default tagless %destructor
+input.y:10.13-29: previous declaration
+input.y:21.10-26: redeclaration for default tagless %printer
+input.y:11.10-26: previous declaration

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -257,18 +285,36 @@ AT_CLEANUP
 AT_SETUP([Unused values with default %destructor])
 
 AT_DATA([[input.y]],
 AT_SETUP([Unused values with default %destructor])
 
 AT_DATA([[input.y]],

-[[%destructor { destroy ($$); } %symbol-default
+[[%destructor { destroy ($$); } <>
+%type <tag> tagged

 
 %%
 
 
 %%
 

-start: end end { $1; } ;
-end: { }  ;
+start: end end tagged tagged { $<tag>1; $3; } ;
+end: { } ;
+tagged: { } ;
+]])
+
+AT_CHECK([bison input.y], [0], [],
+[[input.y:6.8-45: warning: unset value: $$
+input.y:6.8-45: warning: unused value: $2
+input.y:7.6-8: warning: unset value: $$
+]])
+
+AT_DATA([[input.y]],
+[[%destructor { destroy ($$); } <*>
+%type <tag> tagged
+
+%%
+
+start: end end tagged tagged { $<tag>1; $3; } ;
+end: { } ;
+tagged: { } ;

 ]])
 
 AT_CHECK([bison input.y], [0], [],
 ]])
 
 AT_CHECK([bison input.y], [0], [],

-[[input.y:5.8-22: warning: unset value: $$
-input.y:5.8-22: warning: unused value: $2
-input.y:6.6-8: warning: unset value: $$
+[[input.y:6.8-45: warning: unused value: $4
+input.y:8.9-11: warning: unset value: $$

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -396,6 +442,7 @@ char apostrophe = '\'';
 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>

+#include <stdlib.h>

 %}
 /* %{ and %} can be here too. */
 
 %}
 /* %{ and %} can be here too. */
 


@@ -423,7 +470,7 @@ char quote[] = "@:>@@:>@,";
 
 %{
 static void yyerror (const char *s);
 
 %{
 static void yyerror (const char *s);

-static int yylex (void);
+int yylex (void);

 %}
 
 %type <ival> '@<:@'
 %}
 
 %type <ival> '@<:@'


@@ -456,14 +503,17 @@ value_as_yystype (value val)
   return res;
 }
 
   return res;
 }
 

-static int
+int

 yylex (void)
 {
 yylex (void)
 {

-  static const char *input = "@<:@\1\2$@{@oline@__@&t@oline__\
+  static char const input[] = "@<:@\1\2$@{@oline@__@&t@oline__\

 #output "; /* "
   */
 #output "; /* "
   */

-  yylval = value_as_yystype (*input);
-  return *input++;
+  static size_t toknum;
+  if (! (toknum < sizeof input))
+    abort ();
+  yylval = value_as_yystype (input[toknum]);
+  return input[toknum++];

 }
 
 static void
 }
 
 static void


@@ -479,7 +529,11 @@ AT_DATA([main.c],
 [[typedef int value;
 #include "input.h"
 
 [[typedef int value;
 #include "input.h"
 

+#ifndef YYPUSH_DECLS

 int yyparse (void);
 int yyparse (void);

+#else
+int yylex (void);
+#endif

 
 int
 main (void)
 
 int
 main (void)


@@ -630,3 +684,24 @@ start: false_start ;
 AT_CHECK([bison -o input.c input.y])
 
 AT_CLEANUP
 AT_CHECK([bison -o input.c input.y])
 
 AT_CLEANUP

+
+
+## --------------------- ##
+## %prec takes a token.  ##
+## --------------------- ##
+
+AT_SETUP([%prec takes a token])
+
+# Bison once allowed %prec sym where sym was a nonterminal.
+
+AT_DATA([input.y],
+[[%%
+start: PREC %prec PREC ;
+PREC: ;
+]])
+
+AT_CHECK([bison input.y], [1], [],
+[[input.y:3.1-4: rule given for PREC, which is a token
+]])
+
+AT_CLEANUP