Minor test formatting changes

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * tests/calc.at: Change all the AT_CHECK_CALC_LALR and
        AT_CHECK_CALC_GLR invocations to use % directives, instead of
        command line options.
        * tests/cxx-type.at: Formatting changes.

Index: tests/calc.at
===================================================================
RCS file: /cvsroot/bison/bison/tests/calc.at,v
retrieving revision 1.37
diff -u -u -r1.37 calc.at
--- tests/calc.at       25 Oct 2002 05:13:44 -0000      1.37
+++ tests/calc.at       3 Nov 2002 12:15:24 -0000
@@ -323,8 +323,7 @@
 # -------------------------------
 # Produce `calc.y'.
 m4_define([AT_DATA_CALC_Y],
-[_AT_DATA_CALC_Y($[1], $[2], $[3],
-                 [m4_bpatsubst([$1], [--[^ ]*])])
+[_AT_DATA_CALC_Y($[1], $[2], $[3], [$1])
 ])


@@ -360,7 +359,7 @@
 # If INPUT starts with a slash, it is used as absolute input file name,
 # otherwise as contents.
 #
-# If BISON-OPTIONS contains `--location', then make sure the ERROR-LOCATION
+# If BISON-OPTIONS contains `%location', then make sure the ERROR-LOCATION
 # is correctly output on stderr.
 #
 # If BISON-OPTIONS contains `%error-verbose', then make sure the
@@ -426,7 +425,7 @@
 AT_DATA_CALC_Y([$1])

 # Specify the output files to avoid problems on different file systems.
-AT_CHECK([bison -o calc.c m4_bpatsubst([$1], [%[^ ]*]) calc.y],
+AT_CHECK([bison -o calc.c calc.y],
          [0], [], [])

 AT_COMPILE([calc])
@@ -495,22 +494,21 @@

 AT_CHECK_CALC_LALR()

-AT_CHECK_CALC_LALR([--defines])
+AT_CHECK_CALC_LALR([%defines])
 AT_CHECK_CALC_LALR([%locations])
-AT_CHECK_CALC_LALR([--name-prefix=calc])
-AT_CHECK_CALC_LALR([--verbose])
-AT_CHECK_CALC_LALR([--yacc])
+AT_CHECK_CALC_LALR([%name-prefix="calc"])
+AT_CHECK_CALC_LALR([%verbose])
+AT_CHECK_CALC_LALR([%yacc])
 AT_CHECK_CALC_LALR([%error-verbose])

 AT_CHECK_CALC_LALR([%error-verbose %locations])

-AT_CHECK_CALC_LALR([%error-verbose %locations --defines --name-prefix=calc 
--verbose --yacc])
+AT_CHECK_CALC_LALR([%error-verbose %locations %defines %name-prefix="calc" 
%verbose %yacc])

 AT_CHECK_CALC_LALR([%debug])
-AT_CHECK_CALC_LALR([%error-verbose %debug %locations --defines 
--name-prefix=calc --verbose --yacc])
+AT_CHECK_CALC_LALR([%error-verbose %debug %locations %defines 
%name-prefix="calc" %verbose %yacc])

-# FIXME: Not ready yet.
-# AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations --defines 
--name-prefix=calc --verbose --yacc])
+# AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations %defines 
%name-prefix="calc" %verbose %yacc])


 # ----------------------- #
@@ -529,18 +527,18 @@

 AT_CHECK_CALC_GLR()

-AT_CHECK_CALC_GLR([--defines])
+AT_CHECK_CALC_GLR([%defines])
 AT_CHECK_CALC_GLR([%locations])
-AT_CHECK_CALC_GLR([--name-prefix=calc])
-AT_CHECK_CALC_GLR([--verbose])
-AT_CHECK_CALC_GLR([--yacc])
+AT_CHECK_CALC_GLR([%name-prefix="calc"])
+AT_CHECK_CALC_GLR([%verbose])
+AT_CHECK_CALC_GLR([%yacc])
 AT_CHECK_CALC_GLR([%error-verbose])

 AT_CHECK_CALC_GLR([%error-verbose %locations])

-AT_CHECK_CALC_GLR([%error-verbose %locations --defines --name-prefix=calc 
--verbose --yacc])
+AT_CHECK_CALC_GLR([%error-verbose %locations %defines %name-prefix="calc" 
%verbose %yacc])

 AT_CHECK_CALC_GLR([%debug])
-AT_CHECK_CALC_GLR([%error-verbose %debug %locations --defines 
--name-prefix=calc --verbose --yacc])
+AT_CHECK_CALC_GLR([%error-verbose %debug %locations %defines 
%name-prefix="calc" %verbose %yacc])

-# AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations --defines 
--name-prefix=calc --verbose --yacc])
+# AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations %defines 
%name-prefix="calc" %verbose %yacc])
Index: tests/cxx-type.at
===================================================================
RCS file: /cvsroot/bison/bison/tests/cxx-type.at,v
retrieving revision 1.6
diff -u -u -r1.6 cxx-type.at
--- tests/cxx-type.at   25 Oct 2002 05:13:24 -0000      1.6
+++ tests/cxx-type.at   3 Nov 2002 12:15:24 -0000
@@ -241,62 +241,56 @@

 AT_SETUP([GLR: Resolve ambiguity, impure, no locations])
 _AT_TEST_GLR_CALC([],[%dprec 1],[%dprec 2])
-AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0, 
_AT_RESOLVED_GLR_OUTPUT,
-        _AT_GLR_STDERR)
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
+                _AT_RESOLVED_GLR_OUTPUT, _AT_GLR_STDERR)
 AT_CLEANUP

 AT_SETUP([GLR: Resolve ambiguity, impure, locations])
 _AT_TEST_GLR_CALC([%locations],[%dprec 1],[%dprec 2])
-AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0, 
_AT_RESOLVED_GLR_OUTPUT,
-       _AT_GLR_STDERR)
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
+                _AT_RESOLVED_GLR_OUTPUT, _AT_GLR_STDERR)
 AT_CLEANUP

 AT_SETUP([GLR: Resolve ambiguity, pure, no locations])
 _AT_TEST_GLR_CALC([%pure-parser],[%dprec 1],[%dprec 2])
-AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0, 
_AT_RESOLVED_GLR_OUTPUT,
-        _AT_GLR_STDERR)
+AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
+                _AT_RESOLVED_GLR_OUTPUT, _AT_GLR_STDERR)
 AT_CLEANUP

 AT_SETUP([GLR: Resolve ambiguity, pure, locations])
 _AT_TEST_GLR_CALC([%pure-parser
 %locations],[%dprec 1],[%dprec 2])
 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
-                _AT_RESOLVED_GLR_OUTPUT,
-               _AT_GLR_STDERR)
+                _AT_RESOLVED_GLR_OUTPUT, _AT_GLR_STDERR)
 AT_CLEANUP

 AT_SETUP([GLR: Merge conflicting parses, impure, no locations])
 _AT_TEST_GLR_CALC([],[%merge <stmtMerge>],[%merge <stmtMerge>])
 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
-                _AT_AMBIG_GLR_OUTPUT,
-               _AT_GLR_STDERR)
+                _AT_AMBIG_GLR_OUTPUT, _AT_GLR_STDERR)
 AT_CLEANUP

 AT_SETUP([GLR: Merge conflicting parses, impure, locations])
 _AT_TEST_GLR_CALC([%locations],[%merge <stmtMerge>],[%merge <stmtMerge>])
 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
-                _AT_AMBIG_GLR_OUTPUT,
-               _AT_GLR_STDERR)
+                _AT_AMBIG_GLR_OUTPUT, _AT_GLR_STDERR)
 AT_CLEANUP

 AT_SETUP([GLR: Merge conflicting parses, pure, no locations])
 _AT_TEST_GLR_CALC([%pure-parser],[%merge <stmtMerge>],[%merge <stmtMerge>])
 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
-                _AT_AMBIG_GLR_OUTPUT,
-               _AT_GLR_STDERR)
+                _AT_AMBIG_GLR_OUTPUT, _AT_GLR_STDERR)
 AT_CLEANUP
 AT_SETUP([GLR: Merge conflicting parses, pure, locations])
 _AT_TEST_GLR_CALC([%pure-parser
 %locations],[%merge <stmtMerge>],[%merge <stmtMerge>])
 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
-                _AT_AMBIG_GLR_OUTPUT,
-               _AT_GLR_STDERR)
+                _AT_AMBIG_GLR_OUTPUT, _AT_GLR_STDERR)
 AT_CLEANUP

 AT_SETUP([GLR: Verbose messages, resolve ambiguity, impure, no locations])
 _AT_TEST_GLR_CALC([%error-verbose],
 [%merge <stmtMerge>],[%merge <stmtMerge>])
 AT_PARSER_CHECK([[./types test-input | sed 's/  *$//']], 0,
-               _AT_AMBIG_GLR_OUTPUT,
-                _AT_VERBOSE_GLR_STDERR)
+               _AT_AMBIG_GLR_OUTPUT, _AT_VERBOSE_GLR_STDERR)
 AT_CLEANUP