New regression test for GLR

[Paul Hilfinger]

I have checked in a new regression test for GLR parsers.   During
table compression, states with GLR conflicts are incorrectly
collapsed.  A patch for the problem will follow.

P. Hilfinger


ChangeLog:

* tests/glr-regr1.at: New test for reported regressions.
* tests/testsuite.at: Add glr-regr1.at test.
* tests/Makefile.am: Add glr-regr1.at test.
        
--------------------------------------------------


Index: bison-1_5.43/tests/testsuite.at
--- bison-1_5.43/tests/testsuite.at Sun, 30 Jun 2002 12:35:12 -0700 hilfingr 
(glrbison/c/41_testsuite. 1.1.1.3 644)
+++ bison-1_5.47(w)/tests/testsuite.at Tue, 29 Oct 2002 17:58:38 -0800 hilfingr 
(glrbison/c/41_testsuite. 1.1.1.4 644)
@@ -77,5 +77,8 @@ m4_include([existing.at])
 # Some old bugs.
 m4_include([regression.at])
 
-# GLR tests: C++ types, simplified
+# GLR tests: 
+# C++ types, simplified
 m4_include([cxx-type.at])
+# Regression test for state-folding optimization
+m4_include([glr-regr1.at])
Index: bison-1_5.43/tests/Makefile.am
--- bison-1_5.43/tests/Makefile.am Mon, 21 Oct 2002 11:33:36 -0700 hilfingr 
(glrbison/c/45_Makefile.a 1.1.1.3 644)
+++ bison-1_5.47(w)/tests/Makefile.am Tue, 29 Oct 2002 17:58:38 -0800 hilfingr 
(glrbison/c/45_Makefile.a 1.1.1.4 644)
@@ -48,7 +48,7 @@ TESTSUITE_AT = \
        synclines.at headers.at actions.at conflicts.at \
        calc.at \
         torture.at existing.at regression.at \
-       cxx-type.at
+       cxx-type.at glr-regr1.at
 
 TESTSUITE = $(srcdir)/testsuite
 
Index: bison-1_5.43/tests/glr-regr1.at
--- bison-1_5.43/tests/glr-regr1.at Tue, 29 Oct 2002 18:06:35 -0800 hilfingr ()
+++ bison-1_5.47(w)/tests/glr-regr1.at Tue, 29 Oct 2002 17:58:38 -0800 hilfingr 
(glrbison/h/9_glr-regr1. 1.1 644)
@@ -0,0 +1,101 @@
+# Checking GLR Parsing: Regression Test           -*- Autotest -*-
+# Copyright (C) 2002 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.
+
+# 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., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AT_BANNER([[GLR Regression Test #1.]])
+
+AT_SETUP([Badly Collapsed GLR States])
+
+AT_DATA([glr-regr1.y],
+[[/* Regression Test: Improper state compression */
+/* Reported by Scott McPeak */
+
+%{
+#include <stdio.h>    // fgetc, printf
+
+#define YYSTYPE int
+static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1);
+%}
+
+
+%glr-parser
+
+
+/* -------- productions ------ */
+%%
+
+StartSymbol: E  { $$=0; }                   %merge <exprMerge>
+           ;
+
+E: E 'P' E { $$=1; printf("E -> E 'P' E\n"); }  %merge <exprMerge>
+ | 'B'     { $$=2; printf("E -> 'B'\n"); }      %merge <exprMerge>
+ ;
+
+
+
+/* ---------- C code ----------- */
+%%
+
+static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1)
+{
+  printf ("<OR>\n");
+  return 0;
+}
+
+int main()
+{
+  yyparse();
+  return 0;
+}
+
+int yyerror(char const *msg)
+{
+  printf("%s\n", msg);
+  exit(4);
+}
+
+
+int yylex()
+{
+  while (1) {
+    int ch = fgetc(stdin);
+    if (ch == EOF) {
+      return 0;   // bison's EOF
+    } else if (ch == 'B' || ch == 'P') {
+      return ch;
+    }
+  }
+}
+]])
+
+AT_CHECK([[bison -o glr-regr1.c glr-regr1.y]], 0, [],
+[glr-regr1.y: warning: 1 shift/reduce conflict
+])
+AT_COMPILE([glr-regr1])
+AT_CHECK([[echo BPBPB | ./glr-regr1]], 0, 
+[[E -> 'B'
+E -> 'B'
+E -> E 'P' E
+E -> 'B'
+E -> E 'P' E
+E -> 'B'
+E -> E 'P' E
+E -> E 'P' E
+<OR>
+]], [])
+
+AT_CLEANUP