regen

[bison.git] / tests / local.at

diff --git a/tests/local.at b/tests/local.at
index 62e05709d7f923be4149130cbec4d47f25a9e932..4499e13f41dee5c3428180fb4075a4e5aee4c488 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -53,6 +53,8 @@ m4_divert_text([PREPARE_TESTS],
 {
   for at_save_file in stderr experr expout
   do
 {
   for at_save_file in stderr experr expout
   do

+    test ! -f at-bison-check-$at_save_file.bak ||
+      as_fn_error 1 "fatal error: back-up on top of a back-up"

     test ! -f $at_save_file || mv $at_save_file at-bison-check-$at_save_file.bak
   done
 }
     test ! -f $at_save_file || mv $at_save_file at-bison-check-$at_save_file.bak
   done
 }


@@ -107,7 +109,7 @@ m4_define([AT_BISON_OPTION_PUSHDEFS],
 # --------------------------------------------------
 # This macro works around the impossibility to define macros
 # inside macros, because issuing `[$1]' is not possible in M4 :(.
 # --------------------------------------------------
 # This macro works around the impossibility to define macros
 # inside macros, because issuing `[$1]' is not possible in M4 :(.

-# This sucks hard, GNU M4 should really provide M5 like $$1.
+# This sucks hard, GNU M4 should really provide M5-like $$1.

 m4_define([_AT_BISON_OPTION_PUSHDEFS],
 [m4_if([$1$2], $[1]$[2], [],
        [m4_fatal([$0: Invalid arguments: $@])])dnl
 m4_define([_AT_BISON_OPTION_PUSHDEFS],
 [m4_if([$1$2], $[1]$[2], [],
        [m4_fatal([$0: Invalid arguments: $@])])dnl


@@ -150,6 +152,9 @@ m4_pushdef([AT_NAME_PREFIX],
 [m4_bmatch([$3], [\(%define api\.prefix\|%name-prefix\) ".*"],
            [m4_bregexp([$3], [\(%define api\.prefix\|%name-prefix\) "\([^""]*\)"], [\2])],
            [yy])])
 [m4_bmatch([$3], [\(%define api\.prefix\|%name-prefix\) ".*"],
            [m4_bregexp([$3], [\(%define api\.prefix\|%name-prefix\) "\([^""]*\)"], [\2])],
            [yy])])

+m4_pushdef([AT_TOKEN_PREFIX],
+[m4_bmatch([$3], [%define api.tokens.prefix ".*"],
+           [m4_bregexp([$3], [%define api.tokens.prefix "\(.*\)"], [\1])])])

 m4_pushdef([AT_API_prefix],
 [m4_bmatch([$3], [%define api\.prefix ".*"],
            [m4_bregexp([$3], [%define api\.prefix "\([^""]*\)"], [\1])],
 m4_pushdef([AT_API_prefix],
 [m4_bmatch([$3], [%define api\.prefix ".*"],
            [m4_bregexp([$3], [%define api\.prefix "\([^""]*\)"], [\1])],


@@ -159,20 +164,20 @@ m4_pushdef([AT_API_PREFIX],
 # yyerror receives the location if %location & %pure & (%glr or %parse-param).
 m4_pushdef([AT_YYERROR_ARG_LOC_IF],
 [AT_GLR_OR_PARAM_IF([AT_PURE_AND_LOC_IF([$1], [$2])],
 # yyerror receives the location if %location & %pure & (%glr or %parse-param).
 m4_pushdef([AT_YYERROR_ARG_LOC_IF],
 [AT_GLR_OR_PARAM_IF([AT_PURE_AND_LOC_IF([$1], [$2])],

-                   [$2])])
+                    [$2])])

 # yyerror always sees the locations (when activated), except if
 # (yacc & pure & !param).  FIXME: This is wrong.  See the manual.
 m4_pushdef([AT_YYERROR_SEES_LOC_IF],
 [AT_LOCATION_IF([AT_YACC_IF([AT_PURE_IF([AT_PARAM_IF([$1], [$2])],
 # yyerror always sees the locations (when activated), except if
 # (yacc & pure & !param).  FIXME: This is wrong.  See the manual.
 m4_pushdef([AT_YYERROR_SEES_LOC_IF],
 [AT_LOCATION_IF([AT_YACC_IF([AT_PURE_IF([AT_PARAM_IF([$1], [$2])],

-                                       [$1])],
-                           [$1])],
-               [$2])])
+                                        [$1])],
+                            [$1])],
+                [$2])])

 
 # The interface is pure: either because %define api.pure, or because we
 # are using the C++ parsers.
 m4_pushdef([AT_PURE_LEX_IF],
 [AT_PURE_IF([$1],
 
 # The interface is pure: either because %define api.pure, or because we
 # are using the C++ parsers.
 m4_pushdef([AT_PURE_LEX_IF],
 [AT_PURE_IF([$1],

-           [AT_SKEL_CC_IF([$1], [$2])])])
+            [AT_SKEL_CC_IF([$1], [$2])])])

 
 m4_pushdef([AT_YYSTYPE],
 [AT_SKEL_CC_IF([AT_NAME_PREFIX[::parser::semantic_type]],
 
 m4_pushdef([AT_YYSTYPE],
 [AT_SKEL_CC_IF([AT_NAME_PREFIX[::parser::semantic_type]],


@@ -186,15 +191,15 @@ AT_PURE_LEX_IF(
 [m4_pushdef([AT_LOC], [(*llocp)])
  m4_pushdef([AT_VAL], [(*lvalp)])
  m4_pushdef([AT_YYLEX_FORMALS],
 [m4_pushdef([AT_LOC], [(*llocp)])
  m4_pushdef([AT_VAL], [(*lvalp)])
  m4_pushdef([AT_YYLEX_FORMALS],

-           [AT_YYSTYPE *lvalp[]AT_LOCATION_IF([, AT_YYLTYPE *llocp])])
+            [AT_YYSTYPE *lvalp[]AT_LOCATION_IF([, AT_YYLTYPE *llocp])])

  m4_pushdef([AT_YYLEX_ARGS],
  m4_pushdef([AT_YYLEX_ARGS],

-           [lvalp[]AT_LOCATION_IF([, llocp])])
+            [lvalp[]AT_LOCATION_IF([, llocp])])

  m4_pushdef([AT_USE_LEX_ARGS],
  m4_pushdef([AT_USE_LEX_ARGS],

-           [(void) lvalp;AT_LOCATION_IF([(void) llocp])])
+            [(void) lvalp;AT_LOCATION_IF([(void) llocp])])

  m4_pushdef([AT_YYLEX_PRE_FORMALS],
  m4_pushdef([AT_YYLEX_PRE_FORMALS],

-           [AT_YYLEX_FORMALS, ])
+            [AT_YYLEX_FORMALS, ])

  m4_pushdef([AT_YYLEX_PRE_ARGS],
  m4_pushdef([AT_YYLEX_PRE_ARGS],

-           [AT_YYLEX_ARGS, ])
+            [AT_YYLEX_ARGS, ])

 ],
 [m4_pushdef([AT_LOC], [[(]AT_NAME_PREFIX[lloc)]])
  m4_pushdef([AT_VAL], [[(]AT_NAME_PREFIX[lval)]])
 ],
 [m4_pushdef([AT_LOC], [[(]AT_NAME_PREFIX[lloc)]])
  m4_pushdef([AT_VAL], [[(]AT_NAME_PREFIX[lval)]])


@@ -213,6 +218,8 @@ AT_SKEL_CC_IF(
     [AT_LOC_PUSHDEF([begin.line], [begin.column], [end.line], [end.column])])],
   [AT_LOC_PUSHDEF([first_line], [first_column], [last_line], [last_column])])
 
     [AT_LOC_PUSHDEF([begin.line], [begin.column], [end.line], [end.column])])],
   [AT_LOC_PUSHDEF([first_line], [first_column], [last_line], [last_column])])
 

+
+AT_GLR_IF([AT_KEYWORDS([glr])])

 ])# _AT_BISON_OPTION_PUSHDEFS
 
 
 ])# _AT_BISON_OPTION_PUSHDEFS
 
 


@@ -331,7 +338,7 @@ static
   static size_t toknum = 0;
   int res;
   ]AT_USE_LEX_ARGS[;
   static size_t toknum = 0;
   int res;
   ]AT_USE_LEX_ARGS[;

-  assert (toknum < sizeof input);
+  assert (toknum < sizeof input / sizeof input[0]);

   res = input[toknum++];
   ]$2[;]AT_LOCATION_IF([[
   ]AT_LOC_FIRST_LINE[ = ]AT_LOC_LAST_LINE[ = 1;
   res = input[toknum++];
   ]$2[;]AT_LOCATION_IF([[
   ]AT_LOC_FIRST_LINE[ = ]AT_LOC_LAST_LINE[ = 1;


@@ -387,13 +394,11 @@ static
 }]],
 [c++], [[/* A C++ error reporting function.  */
 void
 }]],
 [c++], [[/* A C++ error reporting function.  */
 void

-]AT_NAME_PREFIX[::parser::error (const location_type& l, const std::string& m)
-{
-  (void) l;
-  std::cerr << ]AT_LOCATION_IF([l << ": " << ])[m << std::endl;
+]AT_NAME_PREFIX[::parser::error (]AT_LOCATION_IF([[const location_type& l, ]])[const std::string& m)
+{  std::cerr << ]AT_LOCATION_IF([l << ": " << ])[m << std::endl;

 }]],
 [java], [AT_LOCATION_IF([[public void yyerror (Calc.Location l, String s)
 }]],
 [java], [AT_LOCATION_IF([[public void yyerror (Calc.Location l, String s)

-  {
+{

     if (l == null)
       System.err.println (s);
     else
     if (l == null)
       System.err.println (s);
     else


@@ -403,7 +408,7 @@ void
   public void yyerror (String s)
   {
     System.err.println (s);
   public void yyerror (String s)
   {
     System.err.println (s);

-  }]])])dnl
+}]])])dnl

 ])
 
 
 ])
 
 


@@ -450,17 +455,16 @@ m4_define([AT_BISON_CHECK_],
 [AT_CHECK(AT_QUELL_VALGRIND[[ bison ]]$@)])
 
 
 [AT_CHECK(AT_QUELL_VALGRIND[[ bison ]]$@)])
 
 

-# AT_BISON_CHECK_NO_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS])
-# --------------------------------------------------------
-# Same as AT_BISON_CHECK except don't perform XML/XSLT checks.  This is useful
-# when a tortured grammar's XML is known to be too large for xsltproc to
-# handle.
-m4_define([AT_BISON_CHECK_NO_XML],
-[AT_CHECK(m4_if(m4_quote($2), [0], [], m4_quote($2), [], [],
-                [AT_QUELL_VALGRIND ])[[bison ]]$@)
-m4_if(m4_bregexp([$4], [: warning: ]), [-1], [],
-      m4_quote(m4_if(m4_quote($2), [], [0], [$2])), [0], [[
-        # Defining POSIXLY_CORRECT causes bison to complain if options
+# AT_BISON_CHECK_WARNINGS(BISON_ARGS, [OTHER_AT_CHECK_ARGS])
+# ----------------------------------------------------------
+# Check that warnings (if some are expected) are correctly
+# turned into errors with -Werror, etc.
+m4_define([AT_BISON_CHECK_WARNINGS],
+[m4_if(m4_bregexp([$4], [: warning: ]), [-1], [],
+      [m4_null_if([$2], [AT_BISON_CHECK_WARNINGS_($@)])])])
+
+m4_define([AT_BISON_CHECK_WARNINGS_],
+[[# Defining POSIXLY_CORRECT causes bison to complain if options

         # are added after the grammar file name, so skip these checks
         # in that case.
         if test -z "${POSIXLY_CORRECT+set}"; then
         # are added after the grammar file name, so skip these checks
         # in that case.
         if test -z "${POSIXLY_CORRECT+set}"; then


@@ -470,7 +474,7 @@ m4_if(m4_bregexp([$4], [: warning: ]), [-1], [],
           ]AT_DATA([expout], [$3])[
 
           # Run with -Werror.
           ]AT_DATA([expout], [$3])[
 
           # Run with -Werror.

-          ]AT_BISON_CHECK_([$1[ -Werror]], [[1]], [expout], [stderr])[
+  ]AT_BISON_CHECK_([$1[ -Werror]], [[1]], [expout], [stderr])[

 
           # Build expected stderr up to and including the "warnings being
           # treated as errors" message.
 
           # Build expected stderr up to and including the "warnings being
           # treated as errors" message.


@@ -504,19 +508,27 @@ m4_if(m4_bregexp([$4], [: warning: ]), [-1], [],
 
           # Now check --warnings=error.
           cp stderr experr
 
           # Now check --warnings=error.
           cp stderr experr

-          ]AT_BISON_CHECK_([$1[ --warnings=error]], [[1]], [expout], [experr])[
+  ]AT_BISON_CHECK_([$1[ --warnings=error]], [[1]], [expout], [experr])[

 
           # Now check -Wnone and --warnings=none by making sure that
           # -Werror doesn't change the exit status when -Wnone or
           # --warnings=none is specified.
 
           # Now check -Wnone and --warnings=none by making sure that
           # -Werror doesn't change the exit status when -Wnone or
           # --warnings=none is specified.

-          ]AT_BISON_CHECK_([$1[ -Wnone -Werror]], [[0]], [expout])[
-          ]AT_BISON_CHECK_([$1[ --warnings=none -Werror]], [[0]], [expout])[
+  ]AT_BISON_CHECK_([$1[ -Wnone -Werror]], [[0]], [expout])[
+  ]AT_BISON_CHECK_([$1[ --warnings=none -Werror]], [[0]], [expout])[

 
           ]AT_RESTORE_SPECIAL_FILES[
 
           ]AT_RESTORE_SPECIAL_FILES[

-        fi
-      ]])
+fi]dnl

 ])
 
 ])
 

+# AT_BISON_CHECK_NO_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS])
+# --------------------------------------------------------
+# Same as AT_BISON_CHECK except don't perform XML/XSLT checks.  This is useful
+# when a tortured grammar's XML is known to be too large for xsltproc to
+# handle.
+m4_define([AT_BISON_CHECK_NO_XML],
+[AT_CHECK(m4_null_if([$2], [], [AT_QUELL_VALGRIND ])[[bison ]]$@)
+AT_BISON_CHECK_WARNINGS($@)])
+

 # AT_BISON_CHECK_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS])
 # -----------------------------------------------------
 # Run AT_BISON_CHECK's XML/XSLT checks if $BISON_TEST_XML=1 and $XSLTPROC is
 # AT_BISON_CHECK_XML(BISON_ARGS, [OTHER_AT_CHECK_ARGS])
 # -----------------------------------------------------
 # Run AT_BISON_CHECK's XML/XSLT checks if $BISON_TEST_XML=1 and $XSLTPROC is


@@ -534,10 +546,10 @@ m4_define([AT_BISON_CHECK_XML],
   # Don't combine these Bison invocations since we want to be sure that
   # --report=all isn't required to get the full XML file.
   AT_BISON_CHECK_([[--report=all --report-file=xml-tests/test.output \
   # Don't combine these Bison invocations since we want to be sure that
   # --report=all isn't required to get the full XML file.
   AT_BISON_CHECK_([[--report=all --report-file=xml-tests/test.output \

-                  --graph=xml-tests/test.dot ]]AT_BISON_ARGS,
-                  [[0]], [ignore], [ignore])
+             --graph=xml-tests/test.dot ]]AT_BISON_ARGS,
+           [[0]], [ignore], [ignore])

   AT_BISON_CHECK_([[--xml=xml-tests/test.xml ]]AT_BISON_ARGS,
   AT_BISON_CHECK_([[--xml=xml-tests/test.xml ]]AT_BISON_ARGS,

-                 [[0]], [ignore], [ignore])
+           [[0]], [ignore], [ignore])

   m4_popdef([AT_BISON_ARGS])dnl
   [cp xml-tests/test.output expout]
   AT_CHECK([[$XSLTPROC \
   m4_popdef([AT_BISON_ARGS])dnl
   [cp xml-tests/test.output expout]
   AT_CHECK([[$XSLTPROC \


@@ -565,6 +577,8 @@ m4_define([AT_BISON_CHECK_XML],
 m4_define([AT_QUELL_VALGRIND],
 [[[VALGRIND_OPTS="$VALGRIND_OPTS --leak-check=summary --show-reachable=no"; export VALGRIND_OPTS;]]])
 
 m4_define([AT_QUELL_VALGRIND],
 [[[VALGRIND_OPTS="$VALGRIND_OPTS --leak-check=summary --show-reachable=no"; export VALGRIND_OPTS;]]])
 

+
+

 ## ------------------------ ##
 ## Compiling C, C++ Files.  ##
 ## ------------------------ ##
 ## ------------------------ ##
 ## Compiling C, C++ Files.  ##
 ## ------------------------ ##


@@ -584,7 +598,7 @@ m4_define([AT_COMPILE],
                   [-o $1],
                   [m4_default([$2], [m4_bpatsubst([$1], [\.o$]).c])],
                   [m4_bmatch([$1], [[.]], [], [$LIBS])]),
                   [-o $1],
                   [m4_default([$2], [m4_bpatsubst([$1], [\.o$]).c])],
                   [m4_bmatch([$1], [[.]], [], [$LIBS])]),

-          0, [ignore], [ignore])])
+           0, [ignore], [ignore])])

 
 # AT_COMPILE_CXX(OUTPUT, [SOURCES = OUTPUT.cc])
 # ---------------------------------------------
 
 # AT_COMPILE_CXX(OUTPUT, [SOURCES = OUTPUT.cc])
 # ---------------------------------------------


@@ -603,7 +617,7 @@ AT_CHECK(m4_join([ ],
                  [-o $1],
                  [m4_default([$2], [m4_bpatsubst([$1], [\.o$]).cc])],
                  [m4_bmatch([$1], [[.]], [], [$LIBS])]),
                  [-o $1],
                  [m4_default([$2], [m4_bpatsubst([$1], [\.o$]).cc])],
                  [m4_bmatch([$1], [[.]], [], [$LIBS])]),

-        0, [ignore], [ignore])])
+         0, [ignore], [ignore])])

 
 # AT_JAVA_COMPILE(SOURCES)
 # ------------------------
 
 # AT_JAVA_COMPILE(SOURCES)
 # ------------------------


@@ -643,23 +657,23 @@ m4_define([AT_FULL_COMPILE],
 [java],
   [AT_BISON_CHECK([-o $1.java $1.y])
    AT_LANG_COMPILE([$1],
 [java],
   [AT_BISON_CHECK([-o $1.java $1.y])
    AT_LANG_COMPILE([$1],

-                   m4_join([ ],
-                           [$1.java],
-                           m4_ifval($2, [[$1-$2.java]]),
+                    m4_join([ ],
+                            [$1.java],
+                            m4_ifval($2, [[$1-$2.java]]),

                            m4_ifval($3, [[$1-$3.java]])))],
 [c++],
   [AT_BISON_CHECK([-o $1.cc $1.y])
    AT_LANG_COMPILE([$1],
                            m4_ifval($3, [[$1-$3.java]])))],
 [c++],
   [AT_BISON_CHECK([-o $1.cc $1.y])
    AT_LANG_COMPILE([$1],

-                   m4_join([ ],
-                           [$1.cc],
-                           m4_ifval($2, [[$1-$2.cc]]),
+                     m4_join([ ],
+                             [$1.cc],
+                             m4_ifval($2, [[$1-$2.cc]]),

                            m4_ifval($3, [[$1-$3.cc]])))],
 [c],
   [AT_BISON_CHECK([-o $1.c $1.y])
    AT_LANG_COMPILE([$1],
                            m4_ifval($3, [[$1-$3.cc]])))],
 [c],
   [AT_BISON_CHECK([-o $1.c $1.y])
    AT_LANG_COMPILE([$1],

-                   m4_join([ ],
-                           [$1.c],
-                           m4_ifval($2, [[$1-$2.c]]),
+                  m4_join([ ],
+                          [$1.c],
+                          m4_ifval($2, [[$1-$2.c]]),

                            m4_ifval($3, [[$1-$3.c]])))])
 ])
 
                            m4_ifval($3, [[$1-$3.c]])))])
 ])