c++: clean up the handling of empty symbols

[bison.git] / tests / glr-regression.at

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 918bc8d8ef89353fb726fe2cc12a923e30e24bab..71f6e6d56fd7caf22a6d06a74385c27182b6974f 100644 (file)
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -1,6 +1,6 @@
 # Checking GLR Parsing: Regression Tests           -*- Autotest -*-
 
 # Checking GLR Parsing: Regression Tests           -*- Autotest -*-
 

-# Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software
+# Copyright (C) 2002-2003, 2005-2007, 2009-2015 Free Software

 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify


@@ -67,7 +67,7 @@ static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1)
   return 0;
 }
 
   return 0;
 }
 

-const char *input = YY_NULL;
+const char *input = YY_NULLPTR;

 
 int
 main (int argc, const char* argv[])
 
 int
 main (int argc, const char* argv[])


@@ -304,7 +304,7 @@ MergeRule (int x0, int x1)
 }
 ]AT_YYERROR_DEFINE[
 
 }
 ]AT_YYERROR_DEFINE[
 

-FILE *input = YY_NULL;
+FILE *input = YY_NULLPTR;

 
 int P[] = { P1, P2 };
 int O[] = { O1, O2 };
 
 int P[] = { P1, P2 };
 int O[] = { O1, O2 };


@@ -486,8 +486,8 @@ start:
    ;
 
 %%
    ;
 
 %%

-]AT_YYLEX_DEFINE(["a"])[

 ]AT_YYERROR_DEFINE[
 ]AT_YYERROR_DEFINE[

+]AT_YYLEX_DEFINE(["a"])[

 ]AT_MAIN_DEFINE[
 ]])
 AT_BISON_OPTION_POPDEFS
 ]AT_MAIN_DEFINE[
 ]])
 AT_BISON_OPTION_POPDEFS


@@ -1015,17 +1015,17 @@ main (void)
   int exit_status = yyparse ();
   if (parent_rhs_before_value)
     {
   int exit_status = yyparse ();
   if (parent_rhs_before_value)
     {

-      fprintf (stderr, "`parent_rhs_before' destructor not called.\n");
+      fprintf (stderr, "'parent_rhs_before' destructor not called.\n");

       exit_status = 1;
     }
   if (merged_value)
     {
       exit_status = 1;
     }
   if (merged_value)
     {

-      fprintf (stderr, "`merged' destructor not called.\n");
+      fprintf (stderr, "'merged' destructor not called.\n");

       exit_status = 1;
     }
   if (parent_rhs_after_value)
     {
       exit_status = 1;
     }
   if (parent_rhs_after_value)
     {

-      fprintf (stderr, "`PARENT_RHS_AFTER' destructor not called.\n");
+      fprintf (stderr, "'PARENT_RHS_AFTER' destructor not called.\n");

       exit_status = 1;
     }
   return exit_status;
       exit_status = 1;
     }
   return exit_status;


@@ -1449,7 +1449,7 @@ main (void)
   int exit_status = yyparse () != 1;
   if (parent_rhs_before_value)
     {
   int exit_status = yyparse () != 1;
   if (parent_rhs_before_value)
     {

-      fprintf (stderr, "`parent_rhs_before' destructor not called.\n");
+      fprintf (stderr, "'parent_rhs_before' destructor not called.\n");

       exit_status = 1;
     }
   return exit_status;
       exit_status = 1;
     }
   return exit_status;


@@ -1679,8 +1679,8 @@ start:
 b: 'b';
 d: /* nada.  */;
 %%
 b: 'b';
 d: /* nada.  */;
 %%

-]AT_YYLEX_DEFINE(["abc"])[

 ]AT_YYERROR_DEFINE[
 ]AT_YYERROR_DEFINE[

+]AT_YYLEX_DEFINE(["abc"])[

 ]AT_MAIN_DEFINE[
 ]])
 AT_BISON_OPTION_POPDEFS
 ]AT_MAIN_DEFINE[
 ]])
 AT_BISON_OPTION_POPDEFS


@@ -1749,3 +1749,33 @@ Cleanup: popping token 'a' ()
 ])
 
 AT_CLEANUP
 ])
 
 AT_CLEANUP

+
+
+## ----------------------------------------------------------------- ##
+## Predicates.                                                       ##
+##                                                                   ##
+## http://lists.gnu.org/archive/html/bug-bison/2013-10/msg00004.html ##
+## ----------------------------------------------------------------- ##
+
+AT_SETUP([Predicates])
+
+# FIXME: We need genuine test cases with uses of %?.
+
+AT_DATA_GRAMMAR([input.y],
+[[%glr-parser
+%expect-rr 1
+%%
+// Exercise "%?{...}" and "%? {...}".
+widget:
+  %? {new_syntax} "widget" id new_args  { $$ = f($3, $4); }
+| %?{!new_syntax} "widget" id old_args  { $$ = f($3, $4); }
+;
+id:;
+new_args:;
+old_args:;
+%%
+]])
+
+AT_BISON_CHECK([[input.y]])
+
+AT_CLEANUP