X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/642cb8f8294e9ff6e8b17211e7119d4563fc2c2d..c97011bfc1cabd3f7aa8e263f83d9e8a18a262bf:/tests/synclines.at

diff --git a/tests/synclines.at b/tests/synclines.at
index c7501fde..1a7d4483 100644
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -1,5 +1,5 @@
 # Executing Actions.                               -*- Autotest -*-
-# Copyright 2002 Free Software Foundation, Inc.
+# 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
@@ -18,6 +18,22 @@
 
 AT_BANNER([[User Actions.]])
 
+
+# AT_SYNCLINES_COMPILE(FILE)
+# --------------------------
+# Compile FILE expecting an error, and save in the file stdout the normalized
+# output.
+m4_define([AT_SYNCLINES_COMPILE],
+[AT_CHECK([$CC $CFLAGS $CPPFLAGS -c $1 || (exit 1)], 1, [], [stderr])
+# In case GCC displays column information, strip it down.
+#
+#   input.y:4:2: #error "4"    or input.y:4.2: #error "4"
+# =>
+#   input.y:4: #error "4"
+#
+AT_CHECK([[sed 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' stderr]], 0, [stdout])
+])
+
 # AT_TEST_SYNCLINE(TITLE, INPUT, ERROR-MSG)
 # -----------------------------------------
 # Check that compiling the parser produced from INPUT cause GCC
@@ -25,15 +41,34 @@ AT_BANNER([[User Actions.]])
 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])
-
+# It seems impossible to find a generic scheme to check the location
+# of an error.  Even requiring GCC is not sufficient, since for instance
+# the version modified by Apple:
+#
+# | Reading specs from /usr/libexec/gcc/darwin/ppc/2.95.2/specs
+# | Apple Computer, Inc. version gcc-934.3, based on gcc version 2.95.2
+# | 19991024 (release) configure:2124: $? = 0
+#
+# instead of:
+#
+# | input.y:2: #error "2"
+#
+# it reports:
+#
+# | input.y:2: "2"
+# | cpp-precomp: warning: errors during smart preprocessing, retrying in basic mode
+
+AT_DATA([syncline.c],
+[[#error "1"
+]])
+
+AT_SYNCLINES_COMPILE([syncline.c])
+AT_CHECK([[test "`cat stdout`" = 'syncline.c:1: @%:@error "1"' || 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_SYNCLINES_COMPILE([input.c])
+AT_CHECK([cat stdout], 0, [$3])
 AT_CLEANUP
 ])
 
@@ -46,6 +81,8 @@ AT_CLEANUP
 AT_TEST_SYNCLINE([Prologue synch line],
 [[%{
 #error "2"
+void yyerror (const char *s);
+int yylex (void);
 %}
 %%
 exp: '0';
@@ -62,6 +99,10 @@ AT_TEST_SYNCLINE([%union synch line],
 [[%union {
 #error "2"
 }
+%{
+void yyerror (const char *s);
+int yylex (void);
+%}
 %%
 exp: '0';
 ]],
@@ -75,19 +116,20 @@ exp: '0';
 
 AT_TEST_SYNCLINE([Postprologue synch line],
 [[%{
-/* Nothing here. */
+void yyerror (const char *s);
+int yylex (void);
 %}
 %union
 {
   int ival;
 }
 %{
-#error "9"
+#error "10"
 %}
 %%
 exp: '0';
 ]],
-[input.y:9: #error "9"
+[input.y:10: #error "10"
 ])
 
 
@@ -96,13 +138,17 @@ exp: '0';
 ## ------------------- ##
 
 AT_TEST_SYNCLINE([Action synch line],
-[[%%
+[[%{
+void yyerror (const char *s);
+int yylex (void);
+%}
+%%
 exp:
 {
-#error "4"
+#error "8"
 };
 ]],
-[input.y:4: #error "4"
+[input.y:8: #error "8"
 ])
 
 
@@ -111,10 +157,14 @@ exp:
 ## --------------------- ##
 
 AT_TEST_SYNCLINE([Epilogue synch line],
-[[%%
+[[%{
+void yyerror (const char *s);
+int yylex (void);
+%}
+%%
 exp: '0';
 %%
-#error "4"
+#error "8"
 ]],
-[input.y:4: #error "4"
+[input.y:8: #error "8"
 ])