symtab: refactoring

[bison.git] / tests / local.at

diff --git a/tests/local.at b/tests/local.at
index 65e528f98637e48f2713826c4e8320324036d51b..f43ffde8aeaa79ecdd5ce00aa0cfe8dd5fb28613 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -98,7 +98,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


@@ -109,7 +109,7 @@ m4_pushdef([AT_SKEL_CC_IF],
 m4_pushdef([AT_SKEL_JAVA_IF],
 [m4_bmatch([$3], [%language "[Jj][Aa][Vv][Aa]"\|%skeleton "[a-z0-9]+\.java"], [$1], [$2])])
 m4_pushdef([AT_GLR_IF],
 m4_pushdef([AT_SKEL_JAVA_IF],
 [m4_bmatch([$3], [%language "[Jj][Aa][Vv][Aa]"\|%skeleton "[a-z0-9]+\.java"], [$1], [$2])])
 m4_pushdef([AT_GLR_IF],

-[m4_bmatch([$3], [%glr-parser\|%skeleton "glr\.], [$1], [$2])])
+[m4_bmatch([$3], [%glr-parser\|%skeleton "glr\..*"], [$1], [$2])])

 m4_pushdef([AT_LALR1_CC_IF],
 [AT_SKEL_CC_IF([AT_GLR_IF([$2], [$1])], [$2])])
 m4_pushdef([AT_GLR_CC_IF],
 m4_pushdef([AT_LALR1_CC_IF],
 [AT_SKEL_CC_IF([AT_GLR_IF([$2], [$1])], [$2])])
 m4_pushdef([AT_GLR_CC_IF],


@@ -135,39 +135,46 @@ m4_pushdef([AT_GLR_OR_PARAM_IF],
 [m4_bmatch([$3], [%glr-parser\|%parse-param], [$1], [$2])])
 m4_pushdef([AT_NAME_PREFIX],
 [m4_bmatch([$3], [%name-prefix ".*"],
 [m4_bmatch([$3], [%glr-parser\|%parse-param], [$1], [$2])])
 m4_pushdef([AT_NAME_PREFIX],
 [m4_bmatch([$3], [%name-prefix ".*"],

-           [m4_bregexp([$3], [name-prefix "\([^"]*\)"], [\1])],
+           [m4_bregexp([$3], [name-prefix "\([^""]*\)"], [\1])],

            [yy])])
            [yy])])

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

 # 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])])])

 
 AT_PURE_LEX_IF(
 [m4_pushdef([AT_LOC], [(*llocp)])
  m4_pushdef([AT_VAL], [(*lvalp)])
  m4_pushdef([AT_LEX_FORMALS],
 
 AT_PURE_LEX_IF(
 [m4_pushdef([AT_LOC], [(*llocp)])
  m4_pushdef([AT_VAL], [(*lvalp)])
  m4_pushdef([AT_LEX_FORMALS],

-           [YYSTYPE *lvalp[]AT_LOCATION_IF([, YYLTYPE *llocp])])
+            [YYSTYPE *lvalp[]AT_LOCATION_IF([, YYLTYPE *llocp])])

  m4_pushdef([AT_LEX_ARGS],
  m4_pushdef([AT_LEX_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_LEX_PRE_FORMALS],
  m4_pushdef([AT_LEX_PRE_FORMALS],

-           [AT_LEX_FORMALS, ])
+            [AT_LEX_FORMALS, ])

  m4_pushdef([AT_LEX_PRE_ARGS],
  m4_pushdef([AT_LEX_PRE_ARGS],

-           [AT_LEX_ARGS, ])
+            [AT_LEX_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)]])


@@ -186,6 +193,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
 
 


@@ -202,6 +211,7 @@ m4_popdef([AT_LOC])
 m4_popdef([AT_PURE_LEX_IF])
 m4_popdef([AT_YYERROR_SEES_LOC_IF])
 m4_popdef([AT_YYERROR_ARG_LOC_IF])
 m4_popdef([AT_PURE_LEX_IF])
 m4_popdef([AT_YYERROR_SEES_LOC_IF])
 m4_popdef([AT_YYERROR_ARG_LOC_IF])

+m4_popdef([AT_API_PREFIX])

 m4_popdef([AT_NAME_PREFIX])
 m4_popdef([AT_GLR_OR_PARAM_IF])
 m4_popdef([AT_PURE_AND_LOC_IF])
 m4_popdef([AT_NAME_PREFIX])
 m4_popdef([AT_GLR_OR_PARAM_IF])
 m4_popdef([AT_PURE_AND_LOC_IF])


@@ -267,6 +277,70 @@ m4_define([AT_DATA_GRAMMAR],
 $2])
 ])
 
 $2])
 ])
 

+# AT_YYLEX_DECLARE_EXTERN
+# AT_YYLEX_DECLARE
+# AT_YYLEX_DEFINE(INPUT-STRING, [ACTION])
+# ---------------------------------------
+m4_define([AT_YYLEX_DECLARE_EXTERN],
+[int AT_API_PREFIX[]lex (void);dnl
+])
+
+m4_define([AT_YYLEX_DECLARE],
+[static AT_YYLEX_DECLARE_EXTERN[]dnl
+])
+
+m4_define([AT_YYLEX_DEFINE],
+[[#include <stdlib.h> /* abort */
+static int
+]AT_API_PREFIX[lex (void)
+{
+  static char const input[] = "$1";
+  static size_t toknum = 0;
+  int res;
+  if (! (toknum < sizeof input))
+    abort ();
+  res = input[toknum++];
+  ]$2;[]AT_LOCATION_IF([[
+  ]AT_API_PREFIX[lloc.first_line = ]AT_API_PREFIX[lloc.last_line = 1;
+  ]AT_API_PREFIX[lloc.first_column = ]AT_API_PREFIX[lloc.last_column = toknum;]])[
+  return res;
+}]dnl
+])
+
+# AT_YYERROR_DECLARE_EXTERN
+# AT_YYERROR_DECLARE
+# AT_YYERROR_DEFINE
+# -------------------------
+# Beware that must be called inside a AT_BISON_OPTION_PUSHDEFS/POPDEFS
+# pair.
+m4_define([AT_YYERROR_DECLARE_EXTERN],
+[void AT_API_PREFIX[]error (const char *msg);dnl
+])
+
+m4_define([AT_YYERROR_DECLARE],
+[static AT_YYERROR_DECLARE_EXTERN[]dnl
+])
+
+m4_define([AT_YYERROR_DEFINE],
+[AT_SKEL_JAVA_IF([[public void yyerror (String msg)
+{
+  System.err.println (msg);
+}]], [AT_SKEL_CC_IF([[void
+yy::parser::error (]AT_LOCATION_IF([[const yy::location &, ]])[std::string const &msg)
+{
+  std::cerr << msg << std::endl;
+}]], [[#include <stdio.h>
+static void
+]AT_API_PREFIX[error (char const *msg)
+{
+  fprintf (stderr, "%s\n", msg);
+}]])])dnl
+])
+
+## --------------- ##
+## Running Bison.  ##
+## --------------- ##
+

 # AT_BISON_CHECK(BISON_ARGS, [OTHER_AT_CHECK_ARGS])
 # -------------------------------------------------
 # Check Bison by invoking `bison BISON_ARGS'.  BISON_ARGS should not contain
 # AT_BISON_CHECK(BISON_ARGS, [OTHER_AT_CHECK_ARGS])
 # -------------------------------------------------
 # Check Bison by invoking `bison BISON_ARGS'.  BISON_ARGS should not contain


@@ -426,7 +500,7 @@ m4_define([AT_QUELL_VALGRIND],
 # assume that we are linking too; this is a hack.
 m4_define([AT_COMPILE],
 [AT_CHECK([$CC $CFLAGS $CPPFLAGS m4_bmatch([$1], [[.]], [], [$LDFLAGS ])-o $1 m4_default([$2], [$1.c])[]m4_bmatch([$1], [[.]], [], [ $LIBS])],
 # assume that we are linking too; this is a hack.
 m4_define([AT_COMPILE],
 [AT_CHECK([$CC $CFLAGS $CPPFLAGS m4_bmatch([$1], [[.]], [], [$LDFLAGS ])-o $1 m4_default([$2], [$1.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])
 # --------------------------------------------


@@ -437,7 +511,7 @@ m4_define([AT_COMPILE_CXX],
 [AT_KEYWORDS(c++)
 AT_CHECK([$BISON_CXX_WORKS], 0, ignore, ignore)
 AT_CHECK([$CXX $CXXFLAGS $CPPFLAGS m4_bmatch([$1], [[.]], [], [$LDFLAGS ])-o $1 m4_default([$2], [$1.cc])[]m4_bmatch([$1], [[.]], [], [ $LIBS])],
 [AT_KEYWORDS(c++)
 AT_CHECK([$BISON_CXX_WORKS], 0, ignore, ignore)
 AT_CHECK([$CXX $CXXFLAGS $CPPFLAGS m4_bmatch([$1], [[.]], [], [$LDFLAGS ])-o $1 m4_default([$2], [$1.cc])[]m4_bmatch([$1], [[.]], [], [ $LIBS])],

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

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


@@ -450,8 +524,8 @@ AT_CHECK([[test -n "$CONF_JAVA" || exit 77
 AT_CHECK([[$SHELL ../../../javacomp.sh ]$1],
          [[0]], [ignore], [ignore])])
 
 AT_CHECK([[$SHELL ../../../javacomp.sh ]$1],
          [[0]], [ignore], [ignore])])
 

-# AT_FULL_COMPILE(OUTPUT, [OTHER])
-# --------------------------------
+# AT_FULL_COMPILE(OUTPUT, [OTHER1], [OTHER2])
+# -------------------------------------------

 # Compile OUTPUT.y to OUTPUT.c, OUTPUT.cc, or OUTPUT.java, and then
 # compile it to OUTPUT or OUTPUT.class.  If OTHER is specified, compile
 # OUTPUT-OTHER.c, OUTPUT-OTHER.cc, or OUTPUT-OTHER.java to OUTPUT or
 # Compile OUTPUT.y to OUTPUT.c, OUTPUT.cc, or OUTPUT.java, and then
 # compile it to OUTPUT or OUTPUT.class.  If OTHER is specified, compile
 # OUTPUT-OTHER.c, OUTPUT-OTHER.cc, or OUTPUT-OTHER.java to OUTPUT or


@@ -459,16 +533,27 @@ AT_CHECK([[$SHELL ../../../javacomp.sh ]$1],
 # AT_SKEL_JAVA_IF.
 m4_define([AT_FULL_COMPILE], [
   AT_SKEL_JAVA_IF([
 # AT_SKEL_JAVA_IF.
 m4_define([AT_FULL_COMPILE], [
   AT_SKEL_JAVA_IF([

-    AT_BISON_CHECK([[-o ]$1[.java ]$1[.y]])
-    AT_JAVA_COMPILE([$1[.java]]m4_ifval($2,
-                                        [[$1[.java ]$1[-]$2[.java]]]))
+    AT_BISON_CHECK([-o $1.java $1.y])
+    AT_JAVA_COMPILE([$1.java],
+                    m4_join([ ],
+                            [$1.java],
+                            m4_ifval($2, [[$1-$2.java]]),
+                            m4_ifval($3, [[$1-$3.java]])))

   ], [
     AT_SKEL_CC_IF([
   ], [
     AT_SKEL_CC_IF([

-      AT_BISON_CHECK([[-o ]$1[.cc ]$1[.y]])
-      AT_COMPILE_CXX([$1]m4_ifval($2, [, [$1[.cc ]$1[-]$2[.cc]]]))
+      AT_BISON_CHECK([-o $1.cc $1.y])
+      AT_COMPILE_CXX([$1],
+                     m4_join([ ],
+                             [$1.cc],
+                             m4_ifval($2, [[$1-$2.cc]]),
+                             m4_ifval($3, [[$1-$3.cc]])))

     ], [
     ], [

-      AT_BISON_CHECK([[-o ]$1[.c ]$1[.y]])
-      AT_COMPILE([$1]m4_ifval($2, [, [$1[.c ]$1[-]$2[.c]]]))
+      AT_BISON_CHECK([-o $1.c $1.y])
+      AT_COMPILE([$1],
+                  m4_join([ ],
+                          [$1.c],
+                          m4_ifval($2, [[$1-$2.c]]),
+                          m4_ifval($3, [[$1-$3.c]])))

     ])
   ])
 ])
     ])
   ])
 ])


@@ -577,12 +662,12 @@ m4_define([AT_TEST_TABLES_AND_PARSE],
 [m4_pushdef([AT_COND_CASE], [m4_case([$2], $][@)])
 
 AT_SETUP([$1])
 [m4_pushdef([AT_COND_CASE], [m4_case([$2], $][@)])
 
 AT_SETUP([$1])

-
+AT_BISON_OPTION_PUSHDEFS([$4])

 AT_DATA_GRAMMAR([[input.y]],
 [[%code {
   #include <stdio.h>
 AT_DATA_GRAMMAR([[input.y]],
 [[%code {
   #include <stdio.h>

-  static void yyerror (char const *msg);
-  static int yylex (void);
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[

 }
 
 ]$4[
 }
 
 ]$4[


@@ -592,13 +677,7 @@ AT_DATA_GRAMMAR([[input.y]],
 ]$5[
 
 %%
 ]$5[
 
 %%

-
-static void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[

 static int
 yylex (void)
 {
 static int
 yylex (void)
 {


@@ -619,7 +698,7 @@ main (void)
 # In some versions of Autoconf, AT_CHECK invokes AS_ESCAPE before
 # expanding macros, so it corrupts some special characters in the
 # macros.  To avoid this, expand now and pass it the result with proper
 # In some versions of Autoconf, AT_CHECK invokes AS_ESCAPE before
 # expanding macros, so it corrupts some special characters in the
 # macros.  To avoid this, expand now and pass it the result with proper

-# string quotation.  Assume args 7 thru 12 expand to properly quoted
+# string quotation.  Assume args 7 through 12 expand to properly quoted

 # strings.
 
 m4_if(m4_index(m4_quote($3), [no-xml]), -1,
 # strings.
 
 m4_if(m4_index(m4_quote($3), [no-xml]), -1,


@@ -654,6 +733,7 @@ AT_PARSER_CHECK([[./input]],
                 m4_ifval([$11], [m4_dquote($11)]),
                 m4_ifval([$12], [m4_dquote($12)]))
 
                 m4_ifval([$11], [m4_dquote($11)]),
                 m4_ifval([$12], [m4_dquote($12)]))
 

+AT_BISON_OPTION_POPDEFS

 AT_CLEANUP
 
 m4_popdef([AT_COND_CASE])])
 AT_CLEANUP
 
 m4_popdef([AT_COND_CASE])])