djgpp/config.sed: Adjust config.sed for the use of autoconf 2.60.

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

diff --git a/tests/cxx-type.at b/tests/cxx-type.at
index 78a4f68f268344f00716aa557c14b9f1f675d3e7..260457287f9159f58d33b9dccc006c9cddb58b96 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, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006 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


@@ -36,17 +36,17 @@ $1
   #include <stdio.h>
   union Node {
     struct {
   #include <stdio.h>
   union Node {
     struct {

-      int type;
+      int isNterm;

       int parents;
       int parents;

-    } node_info;
+    } nodeInfo;

     struct {
     struct {

-      int type; /* 1 */
+      int isNterm; /* 1 */

       int parents;
       char const *form;
       union Node *children[3];
     } nterm;
     struct {
       int parents;
       char const *form;
       union Node *children[3];
     } nterm;
     struct {

-      int type; /* 0 */
+      int isNterm; /* 0 */

       int parents;
       char *text;
     } term;
       int parents;
       char *text;
     } term;


@@ -93,35 +93,35 @@ $1
 
 prog :
      | prog stmt   {
 
 prog :
      | prog stmt   {

-                       char *output;]AT_LOCATION_IF([
+                       char *output;]AT_LOCATION_IF([

                        printf ("%d.%d-%d.%d: ",
                             @2.first_line, @2.first_column,
                             @2.last_line, @2.last_column);])[
                        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);
+                       output = node_to_string (]$[2);
+                       printf ("%s\n", output);
+                       free (output);
+                       free_node (]$[2);

                   }
      ;
 
 stmt : expr ';'  $2    { $$ = ]$[1; }
      | decl      $3
                   }
      ;
 
 stmt : expr ';'  $2    { $$ = ]$[1; }
      | decl      $3

-     | error ';'       { $$ = new_nterm ("<error>", 0, 0, 0); }
+     | error ';'       { $$ = new_nterm ("<error>", 0, 0, 0); }

      | '@'             { YYACCEPT; }
      ;
 
 expr : ID
      | TYPENAME '(' expr ')'
      | '@'             { YYACCEPT; }
      ;
 
 expr : ID
      | TYPENAME '(' expr ')'

-                       { $$ = new_nterm ("<cast>(%s,%s)", ]$[3, ]$[1, 0); }
-     | expr '+' expr   { $$ = new_nterm ("+(%s,%s)", ]$[1, ]$[3, 0); }
+                       { $$ = 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); }
      ;
 
 decl : TYPENAME declarator ';'
      | expr '=' expr    { $$ = new_nterm ("=(%s,%s)", ]$[1, ]$[3, 0); }
      ;
 
 decl : TYPENAME declarator ';'

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

      | TYPENAME declarator '=' expr ';'
      | 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
      ;
 
 declarator : ID


@@ -155,12 +155,16 @@ yylex (LEX_PARAMETERS)
   static int colNum = 0;
 
 #if YYPURE
   static int colNum = 0;
 
 #if YYPURE

+# undef yylloc

 # define yylloc (*llocp)
 # define yylloc (*llocp)

+# undef yylval

 # define yylval (*lvalp)
 #endif
 
   while (1)
     {
 # define yylval (*lvalp)
 #endif
 
   while (1)
     {

+      if (feof (stdin))
+       abort ();

       c = getchar ();
       switch (c)
        {
       c = getchar ();
       switch (c)
        {


@@ -200,13 +204,13 @@ yylex (LEX_PARAMETERS)
                ungetc (c, stdin);
                buffer[i++] = 0;
                tok = isupper ((unsigned char) buffer[0]) ? TYPENAME : ID;
                ungetc (c, stdin);
                buffer[i++] = 0;
                tok = isupper ((unsigned char) buffer[0]) ? TYPENAME : ID;

-               yylval = new_term (strcpy ((char *) malloc (i), buffer));
+               yylval = new_term (strcpy ((char *) malloc (i), buffer));

              }
            else
              {
                colNum += 1;
                tok = c;
              }
            else
              {
                colNum += 1;
                tok = c;

-               yylval = 0;
+               yylval = 0;

              }
 #if YYLSP_NEEDED
            yylloc.last_column = colNum-1;
              }
 #if YYLSP_NEEDED
            yylloc.last_column = colNum-1;


@@ -232,18 +236,18 @@ static Node *
 new_nterm (char const *form, Node *child0, Node *child1, Node *child2)
 {
   Node *node = (Node *) malloc (sizeof (Node));
 new_nterm (char const *form, Node *child0, Node *child1, Node *child2)
 {
   Node *node = (Node *) malloc (sizeof (Node));

-  node->nterm.type = 1;
+  node->nterm.isNterm = 1;

   node->nterm.parents = 0;
   node->nterm.form = form;
   node->nterm.children[0] = child0;
   if (child0)
   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)
   node->nterm.children[1] = child1;
   if (child1)

-    child1->node_info.parents += 1;
+    child1->nodeInfo.parents += 1;

   node->nterm.children[2] = child2;
   if (child2)
   node->nterm.children[2] = child2;
   if (child2)

-    child2->node_info.parents += 1;
+    child2->nodeInfo.parents += 1;

   return node;
 }
 
   return node;
 }
 


@@ -251,7 +255,7 @@ static Node *
 new_term (char *text)
 {
   Node *node = (Node *) malloc (sizeof (Node));
 new_term (char *text)
 {
   Node *node = (Node *) malloc (sizeof (Node));

-  node->term.type = 0;
+  node->term.isNterm = 0;

   node->term.parents = 0;
   node->term.text = text;
   return node;
   node->term.parents = 0;
   node->term.text = text;
   return node;


@@ -262,11 +266,11 @@ free_node (Node *node)
 {
   if (!node)
     return;
 {
   if (!node)
     return;

-  node->node_info.parents -= 1;
+  node->nodeInfo.parents -= 1;

   /* Free only if 0 (last parent) or -1 (no parents).  */
   /* Free only if 0 (last parent) or -1 (no parents).  */

-  if (node->node_info.parents > 0)
+  if (node->nodeInfo.parents > 0)

     return;
     return;

-  if (node->node_info.type == 1)
+  if (node->nodeInfo.isNterm == 1)

     {
       free_node (node->nterm.children[0]);
       free_node (node->nterm.children[1]);
     {
       free_node (node->nterm.children[0]);
       free_node (node->nterm.children[1]);


@@ -289,7 +293,7 @@ node_to_string (Node *node)
       buffer = (char *) malloc (1);
       buffer[0] = 0;
     }
       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]);
     {
       child0 = node_to_string (node->nterm.children[0]);
       child1 = node_to_string (node->nterm.children[1]);


@@ -409,61 +413,61 @@ m4_define([_AT_VERBOSE_GLR_STDERR],
 
 AT_SETUP([GLR: Resolve ambiguity, impure, no locations])
 _AT_TEST_GLR_CXXTYPES([],
 
 AT_SETUP([GLR: Resolve ambiguity, impure, no locations])
 _AT_TEST_GLR_CXXTYPES([],

-                      [%dprec 1], [%dprec 2])
+                     [%dprec 1], [%dprec 2])

 AT_PARSER_CHECK([[./types test-input]], 0,
 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_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)

 AT_CLEANUP
 
 AT_SETUP([GLR: Resolve ambiguity, pure, no locations])
 _AT_TEST_GLR_CXXTYPES([%pure-parser],
 AT_CLEANUP
 
 AT_SETUP([GLR: Resolve ambiguity, pure, no locations])
 _AT_TEST_GLR_CXXTYPES([%pure-parser],

-                      [%dprec 1], [%dprec 2])
+                     [%dprec 1], [%dprec 2])

 AT_PARSER_CHECK([[./types test-input]], 0,
 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_CLEANUP
 
 AT_SETUP([GLR: Resolve ambiguity, pure, locations])
 _AT_TEST_GLR_CXXTYPES([%pure-parser %locations],

-                      [%dprec 1], [%dprec 2])
+                     [%dprec 1], [%dprec 2])

 AT_PARSER_CHECK([[./types test-input]], 0,
 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)

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

-                      [%merge <stmtMerge>], [%merge <stmtMerge>])
+                     [%merge <stmtMerge>], [%merge <stmtMerge>])

 AT_PARSER_CHECK([[./types test-input]], 0,
 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],
 AT_CLEANUP
 
 AT_SETUP([GLR: Merge conflicting parses, impure, locations])
 _AT_TEST_GLR_CXXTYPES([%locations],

-                      [%merge <stmtMerge>], [%merge <stmtMerge>])
+                     [%merge <stmtMerge>], [%merge <stmtMerge>])

 AT_PARSER_CHECK([[./types test-input]], 0,
 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)

 AT_CLEANUP
 
 AT_SETUP([GLR: Merge conflicting parses, pure, no locations])
 _AT_TEST_GLR_CXXTYPES([%pure-parser],
 AT_CLEANUP
 
 AT_SETUP([GLR: Merge conflicting parses, pure, no locations])
 _AT_TEST_GLR_CXXTYPES([%pure-parser],

-                      [%merge <stmtMerge>], [%merge <stmtMerge>])
+                     [%merge <stmtMerge>], [%merge <stmtMerge>])

 AT_PARSER_CHECK([[./types test-input]], 0,
 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_CLEANUP
 AT_SETUP([GLR: Merge conflicting parses, pure, locations])
 _AT_TEST_GLR_CXXTYPES([%pure-parser %locations],

-                      [%merge <stmtMerge>],[%merge <stmtMerge>])
+                     [%merge <stmtMerge>],[%merge <stmtMerge>])

 AT_PARSER_CHECK([[./types test-input]], 0,
 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)

 AT_CLEANUP
 
 AT_SETUP([GLR: Verbose messages, resolve ambiguity, impure, no locations])
 _AT_TEST_GLR_CXXTYPES([%error-verbose],
 AT_CLEANUP
 
 AT_SETUP([GLR: Verbose messages, resolve ambiguity, impure, no locations])
 _AT_TEST_GLR_CXXTYPES([%error-verbose],

-                      [%merge <stmtMerge>], [%merge <stmtMerge>])
+                     [%merge <stmtMerge>], [%merge <stmtMerge>])

 AT_PARSER_CHECK([[./types test-input]], 0,
 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
 AT_CLEANUP