X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f32b346d84dd03a3b0178749916cc32bf6cde408..ff020c3061aeab8a20a4a6fd48c434e3e5aeb29b:/tests/synclines.at diff --git a/tests/synclines.at b/tests/synclines.at index 0128e6b8..041ae194 100644 --- a/tests/synclines.at +++ b/tests/synclines.at @@ -1,20 +1,20 @@ # Executing Actions. -*- 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. +# Copyright (C) 2002, 2004-2005, 2007, 2009-2012 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 3 of the License, 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. +# along with this program. If not, see . AT_BANNER([[User Actions.]]) @@ -23,26 +23,65 @@ 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 -# (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]) + +# 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 input.y:4.2: #error "4" +# input.y:4:2: #error "4" or +# input.y:4.2: #error "4" or +# input.y:4:2: error: #error "4" # => # input.y:4: #error "4" # -AT_CHECK([[sed 's/^\([^:]*:[^:.]*\)[.:][^:]*:\(.*\)$/\1:\2/' stderr]], 0, [stdout]) +# It may also issue more context information: +# +# input.y: In function 'yyparse': +# input.y:8: #error "8" +# => +# input.y:4: #error "8" +# +# The message may include a caret-error: +# +# input.y:1:2: error: #error "1" +# #error "1" +# ^ +# +# And possibly distcc adds its bits. +# +# distcc[33187] ERROR: compile (null) on localhost failed +# syncline.c:1:2: error: #error "1" +# distcc[33185] ERROR: compile syncline.c on localhost failed +# +# or even +# +# 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 + +AT_CHECK([[$PERL -p -0777 - stderr <<\EOF + s/^distcc\[\d+\] .*\n//gm; + s/^([^:]+:\d+)[.:][^:]+:(.+)$/$][1:$][2/gm; + s/^([^:]+:\d+):[^#]*( #error)/$][1:$][2/gm; + s/^[^:]*: In function '[^']+':\n//gm; + s/^\ +#error.*\n\ *\^\n//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. -m4_define([AT_TEST_SYNCLINE], +m4_pushdef([AT_TEST], [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: @@ -62,64 +101,69 @@ m4_define([AT_TEST_SYNCLINE], AT_DATA([syncline.c], [[#error "1" +int i; // avoids -pedantic warning about an empty translation unit ]]) 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 -o input.c input.y]) +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 ]) -## --------------------- ## -## Prologue synch line. ## -## --------------------- ## +## ------------------- ## +## Prologue syncline. ## +## ------------------- ## -AT_TEST_SYNCLINE([Prologue synch line], +AT_TEST([Prologue syncline], [[%{ #error "2" -void yyerror (const char *s); -int yylex (void); +]AT_YYERROR_DECLARE_EXTERN[ +]AT_YYLEX_DECLARE_EXTERN[ %} %% exp: '0'; +%% ]], [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; } %{ -void yyerror (const char *s); -int yylex (void); +]AT_YYERROR_DECLARE_EXTERN[ +]AT_YYLEX_DECLARE_EXTERN[ %} %% exp: '0'; +%% ]], [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 { @@ -130,19 +174,20 @@ int yylex (void); %} %% exp: '0'; +%% ]], [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: @@ -154,14 +199,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'; @@ -170,3 +215,5 @@ exp: '0'; ]], [input.y:8: #error "8" ]) + +m4_popdef([AT_TEST])