From bee1df15b2707caeeda551d8ae316c64d4797c08 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 5 Dec 2008 09:26:38 -0700 Subject: [PATCH] Build testsuite with newer autoconf. * tests/output.at (m4_expand): Don't override in newer autoconf, where the underlying implementation changed. * tests/cxx-type.at (_AT_RESOLVED_GLR_OUTPUT) (_AT_RESOLVED_GLR_OUTPUT_WITH_LOC, _AT_AMBIG_GLR_OUTPUT) (_AT_AMBIG_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR) (_AT_VERBOSE_GLR_STDERR): Expand to double-quoted strings, since some of them contain unbalanced ')'. Signed-off-by: Eric Blake --- ChangeLog | 23 +++++++++++++++++------ tests/cxx-type.at | 28 ++++++++++++++-------------- tests/output.at | 5 +++-- 3 files changed, 34 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc754133..b6da40d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-12-05 Eric Blake + + Build testsuite with newer autoconf. + * tests/output.at (m4_expand): Don't override in newer autoconf, + where the underlying implementation changed. + * tests/cxx-type.at (_AT_RESOLVED_GLR_OUTPUT) + (_AT_RESOLVED_GLR_OUTPUT_WITH_LOC, _AT_AMBIG_GLR_OUTPUT) + (_AT_AMBIG_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR) + (_AT_VERBOSE_GLR_STDERR): Expand to double-quoted strings, + since some of them contain unbalanced ')'. + 2008-11-19 Joel E. Denny * NEWS: Clarify a little. @@ -280,9 +291,9 @@ 2008-08-29 Akim Demaille Clarify UPDATED use. - * doc/bison.texinfo: It refers to the last edition of this file, + * doc/bison.texinfo: It refers to the last edition of this file, not to the release date of Bison. - Reported by Joel E. Denny. + Reported by Joel E. Denny. 2008-08-29 Akim Demaille @@ -302,15 +313,15 @@ 2008-08-27 Akim Demaille Check yyerrok in calc.at. - * tests/calc.at (calc.y): Use yyerrok on "( error )". - (AT_CHECK_CALC): Add a check that ensures that yyerrok works as - expected. + * tests/calc.at (calc.y): Use yyerrok on "( error )". + (AT_CHECK_CALC): Add a check that ensures that yyerrok works as + expected. 2008-08-27 Akim Demaille Support yyerrok in lalr1.cc. YYBACKUP is still to import back into lalr1.cc. - * data/lalr1.cc (yyerrork, yyclearin, YYRECOVERING): Define. + * data/lalr1.cc (yyerrork, yyclearin, YYRECOVERING): Define. 2008-08-26 Joel E. Denny diff --git a/tests/cxx-type.at b/tests/cxx-type.at index 0725bfc1..923dc237 100644 --- a/tests/cxx-type.at +++ b/tests/cxx-type.at @@ -1,6 +1,6 @@ # Checking GLR Parsing. -*- Autotest -*- -# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, -# Inc. +# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 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 @@ -351,7 +351,7 @@ AT_BISON_OPTION_POPDEFS ]) m4_define([_AT_RESOLVED_GLR_OUTPUT], -[[+(z,q) +[[[+(z,q) (T,x) (T,x,y) =(x,y) @@ -360,10 +360,10 @@ m4_define([_AT_RESOLVED_GLR_OUTPUT], (T,y,+(z,q)) +(z,q) -]]) +]]]) m4_define([_AT_RESOLVED_GLR_OUTPUT_WITH_LOC], -[[3.0-3.5: +(z,q) +[[[3.0-3.5: +(z,q) 5.0-5.3: (T,x) 7.0-7.7: (T,x,y) 9.0-9.5: =(x,y) @@ -372,10 +372,10 @@ m4_define([_AT_RESOLVED_GLR_OUTPUT_WITH_LOC], 15.0-15.13: (T,y,+(z,q)) 17.0-17.15: 19.0-19.5: +(z,q) -]]) +]]]) m4_define([_AT_AMBIG_GLR_OUTPUT], -[[+(z,q) +[[[+(z,q) (T,x) (T,x,y) =(x,y) @@ -384,10 +384,10 @@ m4_define([_AT_AMBIG_GLR_OUTPUT], ((T,y,+(z,q)),=((y,T),+(z,q))) +(z,q) -]]) +]]]) m4_define([_AT_AMBIG_GLR_OUTPUT_WITH_LOC], -[[3.0-3.5: +(z,q) +[[[3.0-3.5: +(z,q) 5.0-5.3: (T,x) 7.0-7.7: (T,x,y) 9.0-9.5: =(x,y) @@ -396,15 +396,15 @@ m4_define([_AT_AMBIG_GLR_OUTPUT_WITH_LOC], 15.0-15.13: ((T,y,+(z,q)),=((y,T),+(z,q))) 17.0-17.15: 19.0-19.5: +(z,q) -]]) +]]]) m4_define([_AT_GLR_STDERR], -[[syntax error -]]) +[[[syntax error +]]]) m4_define([_AT_VERBOSE_GLR_STDERR], -[[syntax error, unexpected ID, expecting '=' or '+' or ')' -]]) +[[[syntax error, unexpected ID, expecting '=' or '+' or ')' +]]]) ## ---------------------------------------------------- ## ## Compile the grammar described in the documentation. ## diff --git a/tests/output.at b/tests/output.at index 1e37347f..ce0a2b27 100644 --- a/tests/output.at +++ b/tests/output.at @@ -200,9 +200,10 @@ AT_CLEANUP AT_CHECK_OUTPUT_FILE_NAME([[`~!@#$%^&*()-=_+{}[]|\:;<>, .']]) dnl Work around a bug in m4_expand that broke AT_SETUP in autoconf 2.62, dnl by using the definition from 2.63. -m4_define([m4_expand], [_$0(-=<{($1)}>=-)]) +m4_version_prereq([2.63], [], +[m4_define([m4_expand], [_$0(-=<{($1)}>=-)]) m4_define([_m4_expand], -[m4_changequote([-=<{(], [)}>=-])$1m4_changequote([, ])]) +[m4_changequote([-=<{(], [)}>=-])$1m4_changequote([, ])])]) AT_CHECK_OUTPUT_FILE_NAME([[(]]) AT_CHECK_OUTPUT_FILE_NAME([[)]]) AT_CHECK_OUTPUT_FILE_NAME([[#]]) -- 2.45.2