X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2c3b392a9ad550ca87f6e5172072cd0b70b15f1d..ff2e3d397a415636bd87a29193aec995f586f433:/tests/cxx-type.at

diff --git a/tests/cxx-type.at b/tests/cxx-type.at
index dcc0810c..2c37c176 100644
--- a/tests/cxx-type.at
+++ b/tests/cxx-type.at
@@ -1,20 +1,19 @@
 # Checking GLR Parsing.                         -*- Autotest -*-
-# Copyright (C) 2002, 2003, 2004, 2005 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
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
+# Copyright (C) 2002-2013 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AT_BANNER([[C++ Type Syntax (GLR).]])
 
@@ -24,61 +23,50 @@ AT_BANNER([[C++ Type Syntax (GLR).]])
 # and with RESOLVE1 and RESOLVE2 as annotations on the conflicted rule for
 # stmt.  Then compile the result.
 m4_define([_AT_TEST_GLR_CXXTYPES],
-[
-AT_BISON_OPTION_PUSHDEFS([$1])
+[AT_BISON_OPTION_PUSHDEFS([%glr-parser $1])
 
 AT_DATA_GRAMMAR([types.y],
 [[/* Simplified C++ Type and Expression Grammar.  */
 
 $1
 
-%{
+%code requires
+{
   #include <stdio.h>
   union Node {
     struct {
-      int type;
+      int isNterm;
       int parents;
-    } node_info;
+    } nodeInfo;
     struct {
-      int type; /* 1 */
+      int isNterm; /* 1 */
       int parents;
       char const *form;
       union Node *children[3];
     } nterm;
     struct {
-      int type; /* 0 */
+      int isNterm; /* 0 */
       int parents;
       char *text;
     } term;
   };
   typedef union Node Node;
+  #define YYSTYPE Node *
+}
+
+%code
+{
   static Node *new_nterm (char const *, Node *, Node *, Node *);
   static Node *new_term (char *);
   static void free_node (Node *);
   static char *node_to_string (Node *);
-  #define YYSTYPE Node *
 ]m4_bmatch([$2], [stmtMerge],
 [ static YYSTYPE stmtMerge (YYSTYPE x0, YYSTYPE x1);])[
   #define YYINITDEPTH 10
   #define YYSTACKEXPANDABLE 1
-  struct YYLTYPE;
-#if YYPURE
-# if YYLSP_NEEDED
-#  define LEX_PARAMETERS YYSTYPE *lvalp, struct YYLTYPE *llocp
-#  define ERROR_PARAMETERS struct YYLTYPE *llocp, char const *s
-# else
-#  define LEX_PARAMETERS YYSTYPE *lvalp
-# endif
-#endif
-#ifndef LEX_PARAMETERS
-# define LEX_PARAMETERS void
-#endif
-#ifndef ERROR_PARAMETERS
-# define ERROR_PARAMETERS char const *s
-#endif
-  int yylex (LEX_PARAMETERS);
-  void yyerror (ERROR_PARAMETERS);
-%}
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[
+}
 
 %token TYPENAME ID
 
@@ -93,35 +81,35 @@ $1
 
 prog :
      | prog stmt   {
-                       char *output;]AT_LOCATION_IF([
-			printf ("%d.%d-%d.%d: ",
-			     @2.first_line, @2.first_column,
-			     @2.last_line, @2.last_column);])[
-                       output = node_to_string (]$[2);
-                       printf ("%s\n", output);
-                       free (output);
-                       free_node (]$[2);
-		   }
+                        char *output;]AT_LOCATION_IF([
+                        printf ("%d.%d-%d.%d: ",
+                             @2.first_line, @2.first_column,
+                             @2.last_line, @2.last_column);])[
+                        output = node_to_string (]$[2);
+                        printf ("%s\n", output);
+                        free (output);
+                        free_node (]$[2);
+                   }
      ;
 
-stmt : expr ';'  $2	{ $$ = ]$[1; }
+stmt : expr ';'  $2     { $$ = ]$[1; }
      | decl      $3
-     | error ';'       { $$ = new_nterm ("<error>", 0, 0, 0); }
-     | '@'		{ YYACCEPT; }
+     | error ';'        { $$ = new_nterm ("<error>", YY_NULL, YY_NULL, YY_NULL); }
+     | '@'              { YYACCEPT; }
      ;
 
 expr : ID
      | TYPENAME '(' expr ')'
-                       { $$ = new_nterm ("<cast>(%s,%s)", ]$[3, ]$[1, 0); }
-     | expr '+' expr   { $$ = new_nterm ("+(%s,%s)", ]$[1, ]$[3, 0); }
-     | expr '=' expr    { $$ = new_nterm ("=(%s,%s)", ]$[1, ]$[3, 0); }
+                        { $$ = new_nterm ("<cast>(%s,%s)", ]$[3, ]$[1, YY_NULL); }
+     | expr '+' expr    { $$ = new_nterm ("+(%s,%s)", ]$[1, ]$[3, YY_NULL); }
+     | expr '=' expr    { $$ = new_nterm ("=(%s,%s)", ]$[1, ]$[3, YY_NULL); }
      ;
 
 decl : TYPENAME declarator ';'
-                       { $$ = new_nterm ("<declare>(%s,%s)", ]$[1, ]$[2, 0); }
+                        { $$ = new_nterm ("<declare>(%s,%s)", ]$[1, ]$[2, YY_NULL); }
      | TYPENAME declarator '=' expr ';'
-                       { $$ = new_nterm ("<init-declare>(%s,%s,%s)", ]$[1,
-                                         ]$[2, ]$[4); }
+                        { $$ = new_nterm ("<init-declare>(%s,%s,%s)", ]$[1,
+                                          ]$[2, ]$[4); }
      ;
 
 declarator : ID
@@ -134,19 +122,20 @@ declarator : ID
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <assert.h>
 
 int
 main (int argc, char **argv)
 {
-  if (argc != 2)
-    abort ();
+  assert (argc == 2);
   if (!freopen (argv[1], "r", stdin))
     return 3;
   return yyparse ();
 }
 
-int
-yylex (LEX_PARAMETERS)
+]AT_YYERROR_DEFINE[
+
+]AT_YYLEX_PROTOTYPE[
 {
   char buffer[256];
   int c;
@@ -155,103 +144,90 @@ yylex (LEX_PARAMETERS)
   static int colNum = 0;
 
 #if YYPURE
+# undef yylloc
 # define yylloc (*llocp)
+# undef yylval
 # define yylval (*lvalp)
 #endif
 
   while (1)
     {
+      assert (!feof (stdin));
       c = getchar ();
       switch (c)
-	{
-	case EOF:
-	  return 0;
-	case '\t':
-	  colNum = (colNum + 7) & ~7;
-	  break;
-	case ' ': case '\f':
-	  colNum += 1;
-	  break;
-	case '\n':
-	  lineNum += 1;
-	  colNum = 0;
-	  break;
-	default:
-	  {
-	    int tok;
-#if YYLSP_NEEDED
-	    yylloc.first_line = yylloc.last_line = lineNum;
-	    yylloc.first_column = colNum;
-#endif
-	    if (isalpha (c))
-	      {
-		i = 0;
-
-		do
-		  {
-		    buffer[i++] = c;
-		    colNum += 1;
-		    if (i == sizeof buffer - 1)
-		      abort ();
-		    c = getchar ();
-		  }
-		while (isalnum (c) || c == '_');
-
-		ungetc (c, stdin);
-		buffer[i++] = 0;
-		tok = isupper ((unsigned char) buffer[0]) ? TYPENAME : ID;
-               yylval = new_term (strcpy ((char *) malloc (i), buffer));
-	      }
-	    else
-	      {
-		colNum += 1;
-		tok = c;
-               yylval = 0;
-	      }
-#if YYLSP_NEEDED
-	    yylloc.last_column = colNum-1;
-#endif
-	    return tok;
-	  }
-	}
+        {
+        case EOF:
+          return 0;
+        case '\t':
+          colNum = (colNum + 7) & ~7;
+          break;
+        case ' ': case '\f':
+          colNum += 1;
+          break;
+        case '\n':
+          lineNum += 1;
+          colNum = 0;
+          break;
+        default:
+          {
+            int tok;]AT_LOCATION_IF([[
+            yylloc.first_line = yylloc.last_line = lineNum;
+            yylloc.first_column = colNum;]])[
+            if (isalpha (c))
+              {
+                i = 0;
+
+                do
+                  {
+                    buffer[i++] = c;
+                    colNum += 1;
+                    assert (i != sizeof buffer - 1);
+                    c = getchar ();
+                  }
+                while (isalnum (c) || c == '_');
+
+                ungetc (c, stdin);
+                buffer[i++] = 0;
+                tok = isupper ((unsigned char) buffer[0]) ? TYPENAME : ID;
+                yylval = new_term (strcpy ((char *) malloc (i), buffer));
+              }
+            else
+              {
+                colNum += 1;
+                tok = c;
+                yylval = YY_NULL;
+              }]AT_LOCATION_IF([[
+            yylloc.last_column = colNum-1;]])[
+            return tok;
+          }
+        }
     }
 }
 
-void
-yyerror (ERROR_PARAMETERS)
-{
-#if YYPURE && YYLSP_NEEDED
-  /* Pacify GCC by using llocp.  */
-  if (! llocp)
-    abort ();
-#endif
-  fprintf (stderr, "%s\n", s);
-}
-
 static Node *
 new_nterm (char const *form, Node *child0, Node *child1, Node *child2)
 {
-  Node *node = malloc (sizeof (Node));
-  node->nterm.type = 1;
+  Node *node = (Node *) malloc (sizeof (Node));
+  node->nterm.isNterm = 1;
   node->nterm.parents = 0;
   node->nterm.form = form;
   node->nterm.children[0] = child0;
   if (child0)
-    child0->node_info.parents += 1;
+    child0->nodeInfo.parents += 1;
   node->nterm.children[1] = child1;
   if (child1)
-    child1->node_info.parents += 1;
+    child1->nodeInfo.parents += 1;
   node->nterm.children[2] = child2;
   if (child2)
-    child2->node_info.parents += 1;
+    child2->nodeInfo.parents += 1;
   return node;
 }
 
 static Node *
 new_term (char *text)
 {
-  Node *node = malloc (sizeof (Node));
-  node->term.type = 0;
+  Node *node = (Node *) malloc (sizeof (Node));
+  node->term.isNterm = 0;
   node->term.parents = 0;
   node->term.text = text;
   return node;
@@ -262,11 +238,11 @@ free_node (Node *node)
 {
   if (!node)
     return;
-  node->node_info.parents -= 1;
+  node->nodeInfo.parents -= 1;
   /* Free only if 0 (last parent) or -1 (no parents).  */
-  if (node->node_info.parents > 0)
+  if (node->nodeInfo.parents > 0)
     return;
-  if (node->node_info.type == 1)
+  if (node->nodeInfo.isNterm == 1)
     {
       free_node (node->nterm.children[0]);
       free_node (node->nterm.children[1]);
@@ -286,16 +262,16 @@ node_to_string (Node *node)
   char *buffer;
   if (!node)
     {
-      buffer = malloc (1);
+      buffer = (char *) malloc (1);
       buffer[0] = 0;
     }
-  else if (node->node_info.type == 1)
+  else if (node->nodeInfo.isNterm == 1)
     {
       child0 = node_to_string (node->nterm.children[0]);
       child1 = node_to_string (node->nterm.children[1]);
       child2 = node_to_string (node->nterm.children[2]);
-      buffer = malloc (strlen (node->nterm.form) + strlen (child0)
-                      + strlen (child1) + strlen (child2) + 1);
+      buffer = (char *) malloc (strlen (node->nterm.form) + strlen (child0)
+                                + strlen (child1) + strlen (child2) + 1);
       sprintf (buffer, node->nterm.form, child0, child1, child2);
       free (child0);
       free (child1);
@@ -311,7 +287,7 @@ m4_bmatch([$2], [stmtMerge],
 [[static YYSTYPE
 stmtMerge (YYSTYPE x0, YYSTYPE x1)
 {
-  return new_nterm ("<OR>(%s,%s)", x0, x1, 0);
+  return new_nterm ("<OR>(%s,%s)", x0, x1, YY_NULL);
 }
 ]])
 )
@@ -342,7 +318,7 @@ z + q;
 This is total garbage, but it should be ignored.
 ]])
 
-AT_CHECK([bison -o types.c types.y], 0, [], ignore)
+AT_BISON_CHECK([-o types.c types.y], 0, [], ignore)
 AT_COMPILE([types])
 AT_BISON_OPTION_POPDEFS
 ])
@@ -399,10 +375,18 @@ m4_define([_AT_GLR_STDERR],
 [[syntax error
 ]])
 
+m4_define([_AT_GLR_STDERR_WITH_LOC],
+[[17.5: syntax error
+]])
+
 m4_define([_AT_VERBOSE_GLR_STDERR],
 [[syntax error, unexpected ID, expecting '=' or '+' or ')'
 ]])
 
+m4_define([_AT_VERBOSE_GLR_STDERR_WITH_LOC],
+[[17.5: syntax error, unexpected ID, expecting '=' or '+' or ')'
+]])
+
 ## ---------------------------------------------------- ##
 ## Compile the grammar described in the documentation.  ##
 ## ---------------------------------------------------- ##
@@ -411,59 +395,59 @@ AT_SETUP([GLR: Resolve ambiguity, impure, no locations])
 _AT_TEST_GLR_CXXTYPES([],
                       [%dprec 1], [%dprec 2])
 AT_PARSER_CHECK([[./types test-input]], 0,
-                _AT_RESOLVED_GLR_OUTPUT, _AT_GLR_STDERR)
+                [_AT_RESOLVED_GLR_OUTPUT], [_AT_GLR_STDERR])
 AT_CLEANUP
 
 AT_SETUP([GLR: Resolve ambiguity, impure, locations])
 _AT_TEST_GLR_CXXTYPES([%locations],[%dprec 1],[%dprec 2])
 AT_PARSER_CHECK([[./types test-input]], 0,
-                _AT_RESOLVED_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR)
+                [_AT_RESOLVED_GLR_OUTPUT_WITH_LOC], [_AT_GLR_STDERR_WITH_LOC])
 AT_CLEANUP
 
 AT_SETUP([GLR: Resolve ambiguity, pure, no locations])
-_AT_TEST_GLR_CXXTYPES([%pure-parser],
+_AT_TEST_GLR_CXXTYPES([%define api.pure],
                       [%dprec 1], [%dprec 2])
 AT_PARSER_CHECK([[./types test-input]], 0,
-                _AT_RESOLVED_GLR_OUTPUT, _AT_GLR_STDERR)
+                [_AT_RESOLVED_GLR_OUTPUT], [_AT_GLR_STDERR])
 AT_CLEANUP
 
 AT_SETUP([GLR: Resolve ambiguity, pure, locations])
-_AT_TEST_GLR_CXXTYPES([%pure-parser %locations],
+_AT_TEST_GLR_CXXTYPES([%define api.pure %locations],
                       [%dprec 1], [%dprec 2])
 AT_PARSER_CHECK([[./types test-input]], 0,
-                _AT_RESOLVED_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR)
+                [_AT_RESOLVED_GLR_OUTPUT_WITH_LOC], [_AT_GLR_STDERR_WITH_LOC])
 AT_CLEANUP
 
 AT_SETUP([GLR: Merge conflicting parses, impure, no locations])
 _AT_TEST_GLR_CXXTYPES([],
                       [%merge <stmtMerge>], [%merge <stmtMerge>])
 AT_PARSER_CHECK([[./types test-input]], 0,
-                _AT_AMBIG_GLR_OUTPUT, _AT_GLR_STDERR)
+                [_AT_AMBIG_GLR_OUTPUT], [_AT_GLR_STDERR])
 AT_CLEANUP
 
 AT_SETUP([GLR: Merge conflicting parses, impure, locations])
 _AT_TEST_GLR_CXXTYPES([%locations],
                       [%merge <stmtMerge>], [%merge <stmtMerge>])
 AT_PARSER_CHECK([[./types test-input]], 0,
-                _AT_AMBIG_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR)
+                [_AT_AMBIG_GLR_OUTPUT_WITH_LOC], [_AT_GLR_STDERR_WITH_LOC])
 AT_CLEANUP
 
 AT_SETUP([GLR: Merge conflicting parses, pure, no locations])
-_AT_TEST_GLR_CXXTYPES([%pure-parser],
+_AT_TEST_GLR_CXXTYPES([%define api.pure],
                       [%merge <stmtMerge>], [%merge <stmtMerge>])
 AT_PARSER_CHECK([[./types test-input]], 0,
-                _AT_AMBIG_GLR_OUTPUT, _AT_GLR_STDERR)
+                [_AT_AMBIG_GLR_OUTPUT], [_AT_GLR_STDERR])
 AT_CLEANUP
 AT_SETUP([GLR: Merge conflicting parses, pure, locations])
-_AT_TEST_GLR_CXXTYPES([%pure-parser %locations],
+_AT_TEST_GLR_CXXTYPES([%define api.pure %locations],
                       [%merge <stmtMerge>],[%merge <stmtMerge>])
 AT_PARSER_CHECK([[./types test-input]], 0,
-                _AT_AMBIG_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR)
+                [_AT_AMBIG_GLR_OUTPUT_WITH_LOC], [_AT_GLR_STDERR_WITH_LOC])
 AT_CLEANUP
 
 AT_SETUP([GLR: Verbose messages, resolve ambiguity, impure, no locations])
 _AT_TEST_GLR_CXXTYPES([%error-verbose],
                       [%merge <stmtMerge>], [%merge <stmtMerge>])
 AT_PARSER_CHECK([[./types test-input]], 0,
-	        _AT_AMBIG_GLR_OUTPUT, _AT_VERBOSE_GLR_STDERR)
+                [_AT_AMBIG_GLR_OUTPUT], [_AT_VERBOSE_GLR_STDERR])
 AT_CLEANUP