diagnostics: no longer pretty-print rules in error messages, carets suffice

[bison.git] / tests / synclines.at

diff --git a/tests/synclines.at b/tests/synclines.at
index 83a26d05279c667070e32de1165ba4a5981321a2..3c85e7d4a9f55e9ffe7bf20b902a9ded523b9a0d 100644 (file)
--- a/tests/synclines.at
+++ b/tests/synclines.at
@@ -1,5 +1,6 @@
 # Executing Actions.                               -*- Autotest -*-
 # Executing Actions.                               -*- Autotest -*-

-# Copyright (C) 2002, 2004-2005, 2007, 2009-2010 Free Software
+
+# Copyright (C) 2002, 2004-2005, 2007, 2009-2013 Free Software

 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify


@@ -22,10 +23,15 @@ AT_BANNER([[User Actions.]])
 # --------------------------
 # Compile FILE expecting an error, and save in the file stdout the
 # normalized output.  Ignore the exit status, since some compilers
 # --------------------------
 # Compile FILE expecting an error, and save in the file stdout the
 # normalized output.  Ignore the exit status, since some compilers

-# (e.g. c89 on IRIX 6.5) triger warnings on `#error', instead of
+# (e.g. c89 on IRIX 6.5) trigger warnings on `#error', instead of

 # errors.
 m4_define([AT_SYNCLINES_COMPILE],
 [AT_CHECK([$CC $CFLAGS $CPPFLAGS -c $1], [ignore], [], [stderr])
 # errors.
 m4_define([AT_SYNCLINES_COMPILE],
 [AT_CHECK([$CC $CFLAGS $CPPFLAGS -c $1], [ignore], [], [stderr])

+
+# Transform stderr into something like this:
+#
+#   input.y:4: #error "4"
+#

 # In case GCC displays column information, strip it down.
 #
 #   input.y:4:2: #error "4"    or
 # In case GCC displays column information, strip it down.
 #
 #   input.y:4:2: #error "4"    or


@@ -41,8 +47,14 @@ m4_define([AT_SYNCLINES_COMPILE],
 # =>
 #   input.y:4: #error "8"
 #
 # =>
 #   input.y:4: #error "8"
 #

+# The message may include a caret-error (indented by GCC 4.8,
+# not by clang 3.2):
+#
+#   input.y:1:2: error: #error "1"
+#    #error "1"
+#     ^

 #
 #

-# And possibly distcc adds its bits.
+# Possibly distcc adds its bits.

 #
 #   distcc[33187] ERROR: compile (null) on localhost failed
 #   syncline.c:1:2: error: #error "1"
 #
 #   distcc[33187] ERROR: compile (null) on localhost failed
 #   syncline.c:1:2: error: #error "1"


@@ -52,22 +64,50 @@ m4_define([AT_SYNCLINES_COMPILE],
 #
 #   distcc[35882] (dcc_connect_by_name) ERROR: failed to look up host "chrisimac": Unknown host
 #   distcc[35882] Warning: failed to distribute input.c to chrisimac/4, running locally instead
 #
 #   distcc[35882] (dcc_connect_by_name) ERROR: failed to look up host "chrisimac": Unknown host
 #   distcc[35882] Warning: failed to distribute input.c to chrisimac/4, running locally instead

+#
+# The compiler might end by the number of messages issued (Clang 3.2):
+#
+#    syncline.c:1:2: error: "1"
+#    #error "1"
+#     ^
+#    1 error generated.
+#
+# When c++ is used to compiler C, we might have more messages (Clang 3.2):
+#
+#    clang: warning: treating 'c' input as 'c++' when in C++ mode, this behavior is deprecated
+
+AT_CHECK([[$PERL -p -0777 - stderr <<\EOF
+  # 1. Remove useless lines.
+
+  # distcc clutter.
+  s/^distcc\[\d+\] .*\n//gm;
+  # c vs. c++.
+  s/^clang: warning: treating 'c' input as 'c\+\+'.*\n//gm;
+  # Function context.
+  s/^[^:]*: In function '[^']+':\n//gm;
+  # Caret error.
+  s/^ *#error.*\n *\^\n//gm;
+  # Number of errors.
+  s/^1 error generated\.\n//gm;
+
+  # 2. Normalize the lines we kept.

 
 

-AT_CHECK([[sed -e '/^distcc\[[0-9]*\] /d'                            \
-               -e 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/'      \
-               -e 's/^\([^:]*:[^:]*:\)[^@%:@]*\( @%:@error\)/\1\2/'  \
-               -e "/^[^:]*: In function '[^\']*':$/d"                \
-            stderr]],
-         0, [stdout])
+  # Remove column.
+  s/^([^:]+:\d+)[.:][^:]+:(.+)$/$][1:$][2/gm;
+  # Map all combinations of "error: " and "#error: " to "#error ".
+  s/^([^:]+:\d+):( |#error|error|:)+/$][1: #error /gm;
+EOF
+]],
+  0, [stdout])

 ])
 
 ])
 

-# AT_TEST_SYNCLINE(TITLE, INPUT, ERROR-MSG)
-# -----------------------------------------
+# AT_TEST(TITLE, INPUT, ERROR-MSG)
+# --------------------------------

 # Check that compiling the parser produced from INPUT cause GCC
 # to issue ERROR-MSG.
 # Check that compiling the parser produced from INPUT cause GCC
 # to issue ERROR-MSG.

-m4_define([AT_TEST_SYNCLINE],
+m4_pushdef([AT_TEST],

 [AT_SETUP([$1])
 [AT_SETUP([$1])

-
+AT_BISON_OPTION_PUSHDEFS

 # 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:
 # 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:


@@ -87,6 +127,7 @@ m4_define([AT_TEST_SYNCLINE],
 
 AT_DATA([syncline.c],
 [[#error "1"
 
 AT_DATA([syncline.c],
 [[#error "1"

+int i; /* avoids -pedantic warning about an empty translation unit. */

 ]])
 
 AT_SYNCLINES_COMPILE([syncline.c])
 ]])
 
 AT_SYNCLINES_COMPILE([syncline.c])


@@ -96,56 +137,59 @@ AT_DATA([[input.y]], [$2])
 AT_BISON_CHECK([-o input.c input.y])
 AT_SYNCLINES_COMPILE([input.c])
 AT_CHECK([cat stdout], 0, [$3])
 AT_BISON_CHECK([-o input.c input.y])
 AT_SYNCLINES_COMPILE([input.c])
 AT_CHECK([cat stdout], 0, [$3])

+AT_BISON_OPTION_POPDEFS

 AT_CLEANUP
 ])
 
 
 AT_CLEANUP
 ])
 
 

-## --------------------- ##
-## Prologue synch line.  ##
-## --------------------- ##
+## ------------------- ##
+## Prologue syncline.  ##
+## ------------------- ##

 
 
 
 

-AT_TEST_SYNCLINE([Prologue synch line],
+AT_TEST([Prologue syncline],

 [[%{
 #error "2"
 [[%{
 #error "2"

-void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[

 %}
 %%
 exp: '0';
 %}
 %%
 exp: '0';

+%%

 ]],
 [input.y:2: #error "2"
 ])
 
 
 ]],
 [input.y:2: #error "2"
 ])
 
 

-## ------------------- ##
-## %union synch line.  ##
-## ------------------- ##
+## ----------------- ##
+## %union syncline.  ##
+## ----------------- ##

 
 

-AT_TEST_SYNCLINE([%union synch line],
+AT_TEST([%union syncline],

 [[%union {
 #error "2"
   char dummy;
 }
 %{
 [[%union {
 #error "2"
   char dummy;
 }
 %{

-void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[

 %}
 %%
 exp: '0';
 %}
 %%
 exp: '0';

+%%

 ]],
 [input.y:2: #error "2"
 ])
 
 
 ]],
 [input.y:2: #error "2"
 ])
 
 

-## ------------------------- ##
-## Postprologue synch line.  ##
-## ------------------------- ##
+## ----------------------- ##
+## Postprologue syncline.  ##
+## ----------------------- ##

 
 

-AT_TEST_SYNCLINE([Postprologue synch line],
+AT_TEST([Postprologue syncline],

 [[%{
 [[%{

-void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[

 %}
 %union
 {
 %}
 %union
 {


@@ -156,19 +200,20 @@ int yylex (void);
 %}
 %%
 exp: '0';
 %}
 %%
 exp: '0';

+%%

 ]],
 [input.y:10: #error "10"
 ])
 
 
 ]],
 [input.y:10: #error "10"
 ])
 
 

-## ------------------- ##
-## Action synch line.  ##
-## ------------------- ##
+## ----------------- ##
+## Action syncline.  ##
+## ----------------- ##

 
 

-AT_TEST_SYNCLINE([Action synch line],
+AT_TEST([Action syncline],

 [[%{
 [[%{

-void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[

 %}
 %%
 exp:
 %}
 %%
 exp:


@@ -180,14 +225,14 @@ exp:
 ])
 
 
 ])
 
 

-## --------------------- ##
-## Epilogue synch line.  ##
-## --------------------- ##
+## ------------------- ##
+## Epilogue syncline.  ##
+## ------------------- ##

 
 

-AT_TEST_SYNCLINE([Epilogue synch line],
+AT_TEST([Epilogue syncline],

 [[%{
 [[%{

-void yyerror (const char *s);
-int yylex (void);
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[

 %}
 %%
 exp: '0';
 %}
 %%
 exp: '0';


@@ -196,3 +241,55 @@ exp: '0';
 ]],
 [input.y:8: #error "8"
 ])
 ]],
 [input.y:8: #error "8"
 ])

+
+## -------------------- ##
+## %code top syncline.  ##
+## -------------------- ##
+
+AT_TEST([%code top syncline],
+[[%code top {
+#error "2"
+}
+%{
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[
+%}
+%%
+exp: '0';
+%%
+]],
+[input.y:2: #error "2"
+])
+
+m4_popdef([AT_TEST])
+
+## ----------- ##
+## %no-lines.  ##
+## ----------- ##
+
+m4_pushdef([AT_TEST],
+[AT_SETUP([%no-lines: $1])
+
+AT_BISON_OPTION_PUSHDEFS([%skeleton "$1" %defines])
+AT_DATA_GRAMMAR([input.y],
+[%skeleton "$1" %defines
+%{
+]AT_YYERROR_DECLARE_EXTERN[
+]AT_YYLEX_DECLARE_EXTERN[
+%}
+%%
+exp: '0'
+])
+AT_BISON_CHECK([--no-lines -o input.AT_SKEL_CC_IF([cc], [c]) -d input.y])
+AT_CHECK([[grep '#line' ]AT_SKEL_CC_IF([*.cc *.hh], [*.c *.h])], 1)
+AT_BISON_OPTION_POPDEFS
+
+AT_CLEANUP
+])
+
+AT_TEST([yacc.c])
+AT_TEST([glr.c])
+AT_TEST([lalr1.cc])
+AT_TEST([glr.cc])
+
+m4_popdef([AT_TEST])