* src/output.c (header_output): Don't forget to export YYLTYPE and

yylloc.
* tests/headers.at (export YYLTYPE): New, make sure it does.
* tests/regression.at (%union and --defines, Invalid CPP headers):
Move to...
* tests/headers.at: here.

diff --git a/ChangeLog b/ChangeLog
index 50a9cc6c1607eda8ff3e79e6da18326385b9d7fa..5a9f6f992632d980fc3e17d89e89fe74a7fa4945 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-12-29  Akim Demaille  <akim@epita.fr>
+
+       * src/output.c (header_output): Don't forget to export YYLTYPE and
+       yylloc.
+       * tests/headers.at (export YYLTYPE): New, make sure it does.
+       * tests/regression.at (%union and --defines, Invalid CPP headers):
+       Move to...
+       * tests/headers.at: here.
+
+       

 2001-12-29  Akim Demaille  <akim@epita.fr>
 
        * src/gram.h (rule_s): Member `assoc' is of type `associativity'.
 2001-12-29  Akim Demaille  <akim@epita.fr>
 
        * src/gram.h (rule_s): Member `assoc' is of type `associativity'.

diff --git a/src/output.c b/src/output.c
index 60b79790037936f19295230cd0d0481ad6e115d4..4b1f999ea99eef3507ad95711bb75106f6107c5c 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -1128,6 +1128,26 @@ yystype;\n\
   if (!pure_parser)
     fprintf (out, "\nextern YYSTYPE %slval;\n",
             spec_name_prefix);
   if (!pure_parser)
     fprintf (out, "\nextern YYSTYPE %slval;\n",
             spec_name_prefix);

+
+  if (locations_flag)
+    {
+      fputs ("\n\n", out);
+      fprintf (out, "\
+#ifndef YYLTYPE\n\
+typedef struct yyltype\n\
+{\n\
+  int first_line;\n\
+  int first_column;\n\
+  int last_line;\n\
+  int last_column;\n\
+} yyltype;\n\
+# define YYLTYPE yyltype\n\
+#endif\n");
+      if (!pure_parser)
+       fprintf (out, "\nextern YYLTYPE %slloc;\n",
+                spec_name_prefix);
+    }
+

   if (semantic_parser)
     {
       int i;
   if (semantic_parser)
     {
       int i;

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c20501cf095ec68b1402b0ca6e1f9ce0917fe2c6..caf1d9b32055801257ae1217160aced93c5a612f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,7 +25,8 @@ MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
 
 TESTSUITE_AT = \
        testsuite.at \
 
 TESTSUITE_AT = \
        testsuite.at \

-       output.at sets.at reduce.at actions.at calc.at \
+       output.at sets.at reduce.at \
+       headers.at actions.at calc.at \

         torture.at regression.at \
         semantic.at
 
         torture.at regression.at \
         semantic.at
 

diff --git a/tests/headers.at b/tests/headers.at
new file mode 100644 (file)
index 0000000..5e2facb
--- /dev/null
+++ b/tests/headers.at
@@ -0,0 +1,127 @@
+# Bison Parser Headers.                               -*- Autotest -*-
+# Copyright 2001 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([[Parser Headers.]])
+
+
+## ---------------------- ##
+## %union and --defines.  ##
+## ---------------------- ##
+
+
+AT_SETUP([%union and --defines])
+
+AT_DATA([input.y],
+[%union
+{
+  int   integer;
+  char *string ;
+}
+%%
+exp: {};
+])
+
+AT_CHECK([bison --defines input.y])
+
+AT_CLEANUP
+
+
+
+## --------------------- ##
+## Invalid CPP headers.  ##
+## --------------------- ##
+
+# AT_TEST_CPP_GUARD_H([INPUT-FILE-BASE)
+# -------------------------------------
+m4_define([AT_TEST_CPP_GUARD_H],
+[AT_SETUP([Invalid CPP guards: $1])
+
+# Possibly create inner directories.
+dirname=`AS_DIRNAME([$1])`
+AS_MKDIR_P([$dirname])
+
+AT_DATA([$1.y],
+[%%
+dummy:
+])
+
+AT_CHECK([bison --defines=$1.h $1.y])
+
+# CPP should be happy with it.
+AT_CHECK([$CC -E $1.h], 0, [ignore])
+
+AT_CLEANUP
+])
+
+AT_TEST_CPP_GUARD_H([input/input])
+AT_TEST_CPP_GUARD_H([9foo])
+
+
+
+## ---------------- ##
+## export YYLTYPE.  ##
+## ---------------- ##
+
+
+AT_SETUP([export YYLTYPE])
+
+AT_DATA([input.y],
+[%locations
+%{
+#include <stdio.h>
+#include <stdlib.h>
+
+static int
+yylex (void)
+{
+  return EOF;
+}
+
+static void
+yyerror (const char *msg)
+{
+  fprintf (stderr, "%s\n", msg);
+}
+
+%}
+%%
+exp:;
+])
+
+AT_CHECK([bison --defines input.y -o input.c])
+
+# YYLTYPE should be defined, and YYLLOC declared.
+AT_DATA([caller.c],
+[[#include "input.h"
+YYLTYPE *yyllocp = &yylloc;
+
+int yyparse (void);
+
+int
+main (void)
+{
+  return yyparse ();
+}
+]])
+
+# Link and execute, just to make sure everything is fine (and in
+# particular, that YYLLOC is indeed defined somewhere).
+AT_CHECK([$CC $CFLAGS $CPPFLAGS caller.c input.c -o caller], 0, [], [ignore])
+AT_CHECK([caller])
+
+AT_CLEANUP

diff --git a/tests/regression.at b/tests/regression.at
index 9d55cf64dc52ec81013ed6c841962307a31419d3..7617012476fc29c0dc7fcf41febf9e12529657e4 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -478,28 +478,6 @@ AT_CLEANUP
 
 
 
 
 
 

-## ---------------------- ##
-## %union and --defines.  ##
-## ---------------------- ##
-
-
-AT_SETUP([%union and --defines])
-
-AT_DATA([input.y],
-[%union
-{
-  int   integer;
-  char *string ;
-}
-%%
-exp: {};
-])
-
-AT_CHECK([bison --defines input.y])
-
-AT_CLEANUP
-
-

 ## ----------------- ##
 ## Invalid input 1.  ##
 ## ----------------- ##
 ## ----------------- ##
 ## Invalid input 1.  ##
 ## ----------------- ##


@@ -561,37 +539,6 @@ AT_CLEANUP
 
 
 
 
 
 

-## --------------------- ##
-## Invalid CPP headers.  ##
-## --------------------- ##
-
-# AT_TEST_CPP_GUARD_H([INPUT-FILE-BASE)
-# -------------------------------------
-m4_define([AT_TEST_CPP_GUARD_H],
-[AT_SETUP([Invalid CPP guards: $1])
-
-# Possibly create inner directories.
-dirname=`AS_DIRNAME([$1])`
-AS_MKDIR_P([$dirname])
-
-AT_DATA([$1.y],
-[%%
-dummy:
-])
-
-AT_CHECK([bison --defines=$1.h $1.y])
-
-# CPP should be happy with it.
-AT_CHECK([$CC -E $1.h], 0, [ignore])
-
-AT_CLEANUP
-])
-
-AT_TEST_CPP_GUARD_H([input/input])
-AT_TEST_CPP_GUARD_H([9foo])
-
-
-

 ## -------------- ##
 ## Web2c Report.  ##
 ## -------------- ##
 ## -------------- ##
 ## Web2c Report.  ##
 ## -------------- ##

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 7005519f7ef9e1be8b953b0aa55cd0690d67052d..eaaddbbf79e8ecb0421be3958c816f9f37a5f1a9 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -28,6 +28,7 @@ AT_TESTED([bison])
 m4_include([output.at])
 m4_include([sets.at])
 m4_include([reduce.at])
 m4_include([output.at])
 m4_include([sets.at])
 m4_include([reduce.at])

+m4_include([headers.at])

 m4_include([actions.at])
 m4_include([calc.at])
 m4_include([torture.at])
 m4_include([actions.at])
 m4_include([calc.at])
 m4_include([torture.at])