03-synclines.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>
        Test and fix the #line outputs.
        
        * tests/atlocal.at (GCC): New.
        * tests/synclines.at (AT_TEST_SYNCLINE): New macro.
        (Prologue synch line, ,%union synch line, Postprologue synch line)
        (Action synch line, Epilogue synch line): New tests.
        * src/reader.c (parse_union_decl): Define the muscle stype_line.
        * data/bison.simple, data/bison.c++: Use it.
        
        
Index: src/reader.c
--- src/reader.c Sat, 16 Mar 2002 13:01:57 +0100 akim
+++ src/reader.c Sat, 16 Mar 2002 13:16:23 +0100 akim
@@ -759,6 +759,7 @@
 
   typed = 1;
 
+  MUSCLE_INSERT_INT ("stype_line", lineno);
   obstack_init (&union_obstack);
   obstack_sgrow (&union_obstack, "union");
 
Index: data/bison.simple
--- data/bison.simple Sat, 16 Mar 2002 13:05:54 +0100 akim
+++ data/bison.simple Sat, 16 Mar 2002 13:22:57 +0100 akim
@@ -110,6 +110,9 @@ m4_define([b4_token_defines],
 #endif
 
 #ifndef YYSTYPE
+m4_ifdef([b4_stype_line],
+[#line b4_stype_line "b4_filename"
+])dnl
 typedef b4_stype yystype;
 # define YYSTYPE yystype
 #endif
@@ -1161,6 +1164,9 @@ yyreturn:
 b4_token_defines(b4_tokens)
 
 #ifndef YYSTYPE
+m4_ifdef([b4_stype_line],
+[#line b4_stype_line "b4_filename"
+])dnl
 typedef b4_stype
 yystype;
 # define YYSTYPE yystype
Index: data/bison.c++
--- data/bison.c++ Sat, 16 Mar 2002 13:05:54 +0100 akim
+++ data/bison.c++ Sat, 16 Mar 2002 13:23:03 +0100 akim
@@ -109,6 +109,9 @@ m4_define([b4_copyright],
 #endif
 
 #ifndef YYSTYPE
+m4_ifdef([b4_stype_line],
+[#line b4_stype_line "b4_filename"
+])dnl
 typedef b4_stype
 yystype;
 # define YYSTYPE yystype
Index: tests/Makefile.am
--- tests/Makefile.am Sat, 16 Mar 2002 13:10:21 +0100 akim
+++ tests/Makefile.am Sat, 16 Mar 2002 13:12:04 +0100 akim
@@ -47,7 +47,8 @@
        testsuite.at \
        input.at \
        output.at sets.at reduce.at \
-       headers.at actions.at conflicts.at calc.at \
+       synclines.at headers.at actions.at conflicts.at \
+       calc.at \
         torture.at regression.at \
         semantic.at
 
Index: tests/atlocal.in
--- tests/atlocal.in Tue, 08 Jan 2002 23:21:49 +0100 akim
+++ tests/atlocal.in Sat, 16 Mar 2002 13:13:45 +0100 akim
@@ -8,3 +8,6 @@
 
 # We need `config.h'.
 CPPFLAGS="-I$abs_top_builddir @CPPFLAGS@"
+
+# Is the compiler GCC?
+GCC='@GCC@'
Index: tests/testsuite.at
--- tests/testsuite.at Sat, 16 Mar 2002 13:10:21 +0100 akim
+++ tests/testsuite.at Sat, 16 Mar 2002 13:13:06 +0100 akim
@@ -37,6 +37,9 @@
 # Testing grammar reduction.
 m4_include([reduce.at])
 
+# Testing that #lines are correct.
+m4_include([synclines.at])
+
 # Testing that headers are sane.
 m4_include([headers.at])
 
Index: tests/synclines.at
--- tests/synclines.at Sat, 16 Mar 2002 13:28:21 +0100 akim
+++ tests/synclines.at Sat, 16 Mar 2002 13:24:25 +0100 akim
@@ -0,0 +1,120 @@
+# Executing Actions.                               -*- Autotest -*-
+# Copyright 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([[User Actions.]])
+
+# AT_TEST_SYNCLINE(TITLE, INPUT, ERROR-MSG)
+# -----------------------------------------
+# Check that compiling the parser produced from INPUT cause GCC
+# to issue ERROR-MSG.
+m4_define([AT_TEST_SYNCLINE],
+[AT_SETUP([$1])
+
+# I'm not sure I can find a generic scheme to check the location
+# of an error, so we keep this for GCC only.
+AT_CHECK([test "$GCC" = yes || exit 77])
+
+AT_DATA([[input.y]],
+[$2])
+
+AT_CHECK([bison input.y -o input.c])
+AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -o input], 1, [], [$3])
+AT_CLEANUP
+])
+
+
+## --------------------- ##
+## Prologue synch line.  ##
+## --------------------- ##
+
+
+AT_TEST_SYNCLINE([Prologue synch line],
+[[%{
+#error "2"
+%}
+%%
+exp: '0';
+]],
+[input.y:2: #error "2"
+])
+
+
+## ------------------- ##
+## %union synch line.  ##
+## ------------------- ##
+
+AT_TEST_SYNCLINE([%union synch line],
+[[%union {
+#error "2"
+}
+%%
+exp: '0';
+]],
+[input.y:2: #error "2"
+])
+
+
+## ------------------------- ##
+## Postprologue synch line.  ##
+## ------------------------- ##
+
+AT_TEST_SYNCLINE([Postprologue synch line],
+[[%{
+/* Nothing here. */
+%}
+%union
+{
+  int ival;
+}
+%{
+#error "9"
+%}
+%%
+exp: '0';
+]],
+[input.y:9: #error "9"
+])
+
+
+## ------------------- ##
+## Action synch line.  ##
+## ------------------- ##
+
+AT_TEST_SYNCLINE([Action synch line],
+[[%%
+exp:
+{
+#error "4"
+};
+]],
+[input.y:4: #error "4"
+])
+
+
+## --------------------- ##
+## Epilogue synch line.  ##
+## --------------------- ##
+
+AT_TEST_SYNCLINE([Epilogue synch line],
+[[%%
+exp: '0';
+%%
+#error "4"
+]],
+[input.y:4: #error "4"
+])