* data/lalr1.cc (parser::parse): Return a bool instead of an int.

[bison.git] / tests / cxx-type.at

diff --git a/tests/cxx-type.at b/tests/cxx-type.at
index df85fd7e9ebe099dec8a2fcf3b42ef336a32e190..057a4eed12d2e47b4f29b283024903e8b9ae0808 100644 (file)
--- a/tests/cxx-type.at
+++ b/tests/cxx-type.at
@@ -1,5 +1,5 @@
 # Checking GLR Parsing.                         -*- Autotest -*-
 # Checking GLR Parsing.                         -*- Autotest -*-

-# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copyright (C) 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


@@ -18,34 +18,44 @@
 
 AT_BANNER([[C++ Type Syntax (GLR).]])
 
 
 AT_BANNER([[C++ Type Syntax (GLR).]])
 

-# _AT_TEST_GLR_CALC(DECL, RESOLVE1, RESOLVE2)
-# -------------------------------------------
+# _AT_TEST_GLR_CXXTYPES(DECL, RESOLVE1, RESOLVE2)
+# -----------------------------------------------

 # Store into types.y the calc program, with DECL inserted as a declaration,
 # and with RESOLVE1 and RESOLVE2 as annotations on the conflicted rule for
 # stmt.  Then compile the result.
 # Store into types.y the calc program, with DECL inserted as a declaration,
 # and with RESOLVE1 and RESOLVE2 as annotations on the conflicted rule for
 # stmt.  Then compile the result.

-m4_define([_AT_TEST_GLR_CALC],
-[AT_DATA([types.y],
+m4_define([_AT_TEST_GLR_CXXTYPES],
+[
+AT_BISON_OPTION_PUSHDEFS([$1])
+
+AT_DATA_GRAMMAR([types.y],

 [[/* Simplified C++ Type and Expression Grammar.  */
 
 $1
 
 %{
   #include <stdio.h>
 [[/* Simplified C++ Type and Expression Grammar.  */
 
 $1
 
 %{
   #include <stdio.h>

-  #define YYSTYPE const char*
-  #define YYLTYPE int
+  #define YYSTYPE char const *

 ]m4_bmatch([$2], [stmtMerge],
 [ static YYSTYPE stmtMerge (YYSTYPE x0, YYSTYPE x1);])[
   #define YYINITDEPTH 10
 ]m4_bmatch([$2], [stmtMerge],
 [ static YYSTYPE stmtMerge (YYSTYPE x0, YYSTYPE x1);])[
   #define YYINITDEPTH 10

-  int yyerror (const char *s);
-
-  #if YYPURE
-]m4_bmatch([$1], [location],
-[  int yylex (YYSTYPE *lvalp, YYLTYPE *llocp);],
-[  int yylex (YYSTYPE *lvalp);])[
-  #else
-  int yylex (void);
-  #endif
-
+  static char *format (char const *, ...);
+  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);
+  int yyerror (ERROR_PARAMETERS);

 %}
 
 %token TYPENAME ID
 %}
 
 %token TYPENAME ID


@@ -58,101 +68,156 @@ $1
 %%
 
 prog :
 %%
 
 prog :

-     | prog stmt   { printf ("\n"); }
+     | prog stmt   {
+]AT_LOCATION_IF([
+                       printf ("%d.%d-%d.%d: ",
+                            @2.first_line, @2.first_column,
+                            @2.last_line, @2.last_column);])[
+                       printf ("%s\n", ]$[2);
+                  }

      ;
 
      ;
 

-stmt : expr ';'  $2
+stmt : expr ';'  $2    { $$ = ]$[1; }

      | decl      $3
      | decl      $3

-     | error ';'
-     | '@'  { YYACCEPT; }
+     | error ';'       { $$ = "<error>"; }
+     | '@'             { YYACCEPT; }

      ;
 
      ;
 

-expr : ID              { printf ("%s ", $$); }
-     | TYPENAME '(' expr ')'
-                       { printf ("%s <cast> ", ]$[1); }
-     | expr '+' expr   { printf ("+ "); }
-     | expr '=' expr   { printf ("= "); }
+expr : ID
+     | TYPENAME '(' expr ')'  { $$ = format ("<cast>(%s,%s)", ]$[3, ]$[1); }
+     | expr '+' expr         { $$ = format ("+(%s,%s)", ]$[1, ]$[3); }
+     | expr '=' expr          { $$ = format ("=(%s,%s)", ]$[1, ]$[3); }

      ;
 
 decl : TYPENAME declarator ';'
      ;
 
 decl : TYPENAME declarator ';'

-                       { printf ("%s <declare> ", ]$[1); }
+                       { $$ = format ("<declare>(%s,%s)", ]$[1, ]$[2); }

      | TYPENAME declarator '=' expr ';'
      | TYPENAME declarator '=' expr ';'

-                       { printf ("%s <init-declare> ", ]$[1); }
+                       { $$ = format ("<init-declare>(%s,%s,%s)", ]$[1, ]$[2, ]$[4); }

      ;
 
      ;
 

-declarator : ID                { printf ("\"%s\" ", ]$[1); }
-     | '(' declarator ')'
+declarator : ID
+     | '(' declarator ')' { $$ = ]$[2; }

      ;
 
 %%
 
      ;
 
 %%
 

-#include <assert.h>

 #include <ctype.h>
 #include <ctype.h>

+#include <stdlib.h>

 #include <string.h>
 #include <string.h>

+#include <stdarg.h>

 
 int
 
 int

-main (int argc, char** argv)
+main (int argc, char **argv)

 {
 {

-  assert (argc == 2);
+  if (argc != 2)
+    abort ();

   if (!freopen (argv[1], "r", stdin))
     abort ();
   exit (yyparse ());
 }
 
   if (!freopen (argv[1], "r", stdin))
     abort ();
   exit (yyparse ());
 }
 

-#if YYPURE
-int
-]m4_bmatch([$1], [location],
-[yylex (YYSTYPE *lvalp, YYLTYPE *llocp)],
-[yylex (YYSTYPE *lvalp)])[
-#else

 int
 int

-yylex ()
-#endif
+yylex (LEX_PARAMETERS)

 {
   char buffer[256];
   int c;
 {
   char buffer[256];
   int c;

+  unsigned int i;
+  static int lineNum = 1;
+  static int colNum = 0;

 
 #if YYPURE
 
 #if YYPURE

+# define yylloc (*llocp)

 # define yylval (*lvalp)
 # define yylval (*lvalp)

-]m4_bmatch([$1], [location],[  (void) llocp;])[

 #endif
 
 #endif
 

-  while (1) {
-    c = getchar ();
-    switch (c) {
-    case EOF:
-      return 0;
-    case ' ': case '\t': case '\n': case '\f':
-      break;
-    default:
-      if (isalpha (c)) {
-       ungetc (c, stdin);
-       scanf ("%[A-Za-z0-9_]", buffer);
-       yylval = strdup (buffer);
-       return isupper ((unsigned char) buffer[0]) ? TYPENAME : ID;
-      }
-      return c;
+  while (1)
+    {
+      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 = strcpy (malloc (i), buffer);
+             }
+           else
+             {
+               colNum += 1;
+               tok = c;
+               yylval = "";
+             }
+#if YYLSP_NEEDED
+           yylloc.last_column = colNum-1;
+#endif
+           return tok;
+         }
+       }

     }
     }

-  }

 }
 
 int
 }
 
 int

-yyerror (const char *s)
+yyerror (ERROR_PARAMETERS)

 {
 {

+#if YYPURE && YYLSP_NEEDED
+  /* Pacify GCC by using llocp.  */
+  if (! llocp)
+    abort ();
+#endif

   fprintf (stderr, "%s\n", s);
   return 0;
 }
 
   fprintf (stderr, "%s\n", s);
   return 0;
 }
 

+
+static char *
+format (char const *form, ...)
+{
+   char buffer[1024];
+   va_list args;
+   va_start (args, form);
+   vsprintf (buffer, form, args);
+   va_end (args);
+   return strcpy (malloc (strlen (buffer) + 1), buffer);
+}
+

 ]]
 m4_bmatch([$2], [stmtMerge],
 [[static YYSTYPE
 stmtMerge (YYSTYPE x0, YYSTYPE x1)
 {
 ]]
 m4_bmatch([$2], [stmtMerge],
 [[static YYSTYPE
 stmtMerge (YYSTYPE x0, YYSTYPE x1)
 {

-  /* Use the arguments. */
-  (void) x0;
-  (void) x1;
-  printf ("<OR> ");
-  return "";
+  return format ("<OR>(%s,%s)", x0, x1);

 }
 ]])
 )
 }
 ]])
 )


@@ -185,38 +250,63 @@ This is total garbage, but it should be ignored.
 
 AT_CHECK([bison -o types.c types.y], 0, [], ignore)
 AT_COMPILE([types])
 
 AT_CHECK([bison -o types.c types.y], 0, [], ignore)
 AT_COMPILE([types])

+AT_BISON_OPTION_POPDEFS

 ])
 
 m4_define([_AT_RESOLVED_GLR_OUTPUT],
 ])
 
 m4_define([_AT_RESOLVED_GLR_OUTPUT],

-[[z q +
-"x" T <declare>
-"x" y T <init-declare>
-x y =
-x T <cast> y +
-"x" T <declare>
-"y" z q + T <init-declare>
-y
-z q +
+[[+(z,q)
+<declare>(T,x)
+<init-declare>(T,x,y)
+=(x,y)
++(<cast>(x,T),y)
+<declare>(T,x)
+<init-declare>(T,y,+(z,q))
+<error>
++(z,q)
+]])
+
+m4_define([_AT_RESOLVED_GLR_OUTPUT_WITH_LOC],
+[[3.0-3.5: +(z,q)
+5.0-5.3: <declare>(T,x)
+7.0-7.7: <init-declare>(T,x,y)
+9.0-9.5: =(x,y)
+11.0-11.9: +(<cast>(x,T),y)
+13.0-13.5: <declare>(T,x)
+15.0-15.13: <init-declare>(T,y,+(z,q))
+17.0-17.15: <error>
+19.0-19.5: +(z,q)

 ]])
 
 m4_define([_AT_AMBIG_GLR_OUTPUT],
 ]])
 
 m4_define([_AT_AMBIG_GLR_OUTPUT],

-[[z q +
-"x" T <declare>
-"x" y T <init-declare>
-x y =
-x T <cast> y +
-"x" T <declare> x T <cast> <OR>
-"y" z q + T <init-declare> y T <cast> z q + = <OR>
-y
-z q +
+[[+(z,q)
+<declare>(T,x)
+<init-declare>(T,x,y)
+=(x,y)
++(<cast>(x,T),y)
+<OR>(<declare>(T,x),<cast>(x,T))
+<OR>(<init-declare>(T,y,+(z,q)),=(<cast>(y,T),+(z,q)))
+<error>
++(z,q)
+]])
+
+m4_define([_AT_AMBIG_GLR_OUTPUT_WITH_LOC],
+[[3.0-3.5: +(z,q)
+5.0-5.3: <declare>(T,x)
+7.0-7.7: <init-declare>(T,x,y)
+9.0-9.5: =(x,y)
+11.0-11.9: +(<cast>(x,T),y)
+13.0-13.5: <OR>(<declare>(T,x),<cast>(x,T))
+15.0-15.13: <OR>(<init-declare>(T,y,+(z,q)),=(<cast>(y,T),+(z,q)))
+17.0-17.15: <error>
+19.0-19.5: +(z,q)

 ]])
 
 m4_define([_AT_GLR_STDERR],
 ]])
 
 m4_define([_AT_GLR_STDERR],

-[[parse error
+[[syntax error

 ]])
 
 m4_define([_AT_VERBOSE_GLR_STDERR],
 ]])
 
 m4_define([_AT_VERBOSE_GLR_STDERR],

-[[parse error, unexpected ID, expecting '=' or '+' or ')'
+[[syntax error, unexpected ID, expecting '=' or '+' or ')'

 ]])
 
 ## ---------------------------------------------------- ##
 ]])
 
 ## ---------------------------------------------------- ##


@@ -224,63 +314,62 @@ m4_define([_AT_VERBOSE_GLR_STDERR],
 ## ---------------------------------------------------- ##
 
 AT_SETUP([GLR: Resolve ambiguity, impure, no locations])
 ## ---------------------------------------------------- ##
 
 AT_SETUP([GLR: Resolve ambiguity, impure, no locations])

-_AT_TEST_GLR_CALC([],[%dprec 1],[%dprec 2])
-AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0, _AT_RESOLVED_GLR_OUTPUT,
-        _AT_GLR_STDERR)
+_AT_TEST_GLR_CXXTYPES([],
+                      [%dprec 1], [%dprec 2])
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
+                _AT_RESOLVED_GLR_OUTPUT, _AT_GLR_STDERR)

 AT_CLEANUP
 
 AT_SETUP([GLR: Resolve ambiguity, impure, locations])
 AT_CLEANUP
 
 AT_SETUP([GLR: Resolve ambiguity, impure, locations])

-_AT_TEST_GLR_CALC([%locations],[%dprec 1],[%dprec 2])
-AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0, _AT_RESOLVED_GLR_OUTPUT,
-       _AT_GLR_STDERR)
+_AT_TEST_GLR_CXXTYPES([%locations],[%dprec 1],[%dprec 2])
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
+                _AT_RESOLVED_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR)

 AT_CLEANUP
 
 AT_SETUP([GLR: Resolve ambiguity, pure, no locations])
 AT_CLEANUP
 
 AT_SETUP([GLR: Resolve ambiguity, pure, no locations])

-_AT_TEST_GLR_CALC([%pure-parser],[%dprec 1],[%dprec 2])
-AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0, _AT_RESOLVED_GLR_OUTPUT,
-        _AT_GLR_STDERR)
+_AT_TEST_GLR_CXXTYPES([%pure-parser],
+                      [%dprec 1], [%dprec 2])
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
+                _AT_RESOLVED_GLR_OUTPUT, _AT_GLR_STDERR)

 AT_CLEANUP
 
 AT_SETUP([GLR: Resolve ambiguity, pure, locations])
 AT_CLEANUP
 
 AT_SETUP([GLR: Resolve ambiguity, pure, locations])

-_AT_TEST_GLR_CALC([%pure-parser
-%locations],[%dprec 1],[%dprec 2])
+_AT_TEST_GLR_CXXTYPES([%pure-parser %locations],
+                      [%dprec 1], [%dprec 2])

 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,

-                _AT_RESOLVED_GLR_OUTPUT,
-               _AT_GLR_STDERR)
+                _AT_RESOLVED_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR)

 AT_CLEANUP
 
 AT_SETUP([GLR: Merge conflicting parses, impure, no locations])
 AT_CLEANUP
 
 AT_SETUP([GLR: Merge conflicting parses, impure, no locations])

-_AT_TEST_GLR_CALC([],[%merge <stmtMerge>],[%merge <stmtMerge>])
+_AT_TEST_GLR_CXXTYPES([],
+                      [%merge <stmtMerge>], [%merge <stmtMerge>])

 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 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_CLEANUP
 
 AT_SETUP([GLR: Merge conflicting parses, impure, locations])

-_AT_TEST_GLR_CALC([%locations],[%merge <stmtMerge>],[%merge <stmtMerge>])
+_AT_TEST_GLR_CXXTYPES([%locations],
+                      [%merge <stmtMerge>], [%merge <stmtMerge>])

 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,

-                _AT_AMBIG_GLR_OUTPUT,
-               _AT_GLR_STDERR)
+                _AT_AMBIG_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR)

 AT_CLEANUP
 
 AT_SETUP([GLR: Merge conflicting parses, pure, no locations])
 AT_CLEANUP
 
 AT_SETUP([GLR: Merge conflicting parses, pure, no locations])

-_AT_TEST_GLR_CALC([%pure-parser],[%merge <stmtMerge>],[%merge <stmtMerge>])
+_AT_TEST_GLR_CXXTYPES([%pure-parser],
+                      [%merge <stmtMerge>], [%merge <stmtMerge>])

 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 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_CLEANUP
 AT_SETUP([GLR: Merge conflicting parses, pure, locations])

-_AT_TEST_GLR_CALC([%pure-parser
-%locations],[%merge <stmtMerge>],[%merge <stmtMerge>])
+_AT_TEST_GLR_CXXTYPES([%pure-parser %locations],
+                      [%merge <stmtMerge>],[%merge <stmtMerge>])

 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,

-                _AT_AMBIG_GLR_OUTPUT,
-               _AT_GLR_STDERR)
+                _AT_AMBIG_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR)

 AT_CLEANUP
 
 AT_SETUP([GLR: Verbose messages, resolve ambiguity, impure, no locations])
 AT_CLEANUP
 
 AT_SETUP([GLR: Verbose messages, resolve ambiguity, impure, no locations])

-_AT_TEST_GLR_CALC([%error-verbose],
-[%merge <stmtMerge>],[%merge <stmtMerge>])
+_AT_TEST_GLR_CXXTYPES([%error-verbose],
+                      [%merge <stmtMerge>], [%merge <stmtMerge>])

 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,

-               _AT_AMBIG_GLR_OUTPUT,
-                _AT_VERBOSE_GLR_STDERR)
+               _AT_AMBIG_GLR_OUTPUT, _AT_VERBOSE_GLR_STDERR)

 AT_CLEANUP
 AT_CLEANUP