* doc/bison.texinfo (Introduction): Mention GLR and C++ as on the web

[bison.git] / tests / local.at

diff --git a/tests/local.at b/tests/local.at
index 35b82ece7d41414ca874b34137ad704946964236..daace07cc37b009ce2a5ab8daba8cf5dbd3f9288 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -60,41 +60,41 @@ m4_pushdef([AT_PURE_IF],
 [m4_bmatch([$3], [%pure-parser], [$1], [$2])])
 m4_pushdef([AT_PURE_AND_LOC_IF],
 [m4_bmatch([$3], [%locations.*%pure-parser\|%pure-parser.*%locations],
 [m4_bmatch([$3], [%pure-parser], [$1], [$2])])
 m4_pushdef([AT_PURE_AND_LOC_IF],
 [m4_bmatch([$3], [%locations.*%pure-parser\|%pure-parser.*%locations],

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

 m4_pushdef([AT_GLR_OR_PARAM_IF],
 [m4_bmatch([$3], [%glr-parser\|%parse-param], [$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])],
 m4_pushdef([AT_GLR_OR_PARAM_IF],
 [m4_bmatch([$3], [%glr-parser\|%parse-param], [$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.
 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.
 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 %pure-parser, or because we
 # are using the C++ parsers.
 m4_pushdef([AT_PURE_LEX_IF],
 [AT_PURE_IF([$1],
 
 # The interface is pure: either because %pure-parser, or because we
 # are using the C++ parsers.
 m4_pushdef([AT_PURE_LEX_IF],
 [AT_PURE_IF([$1],

-            [AT_LALR1_CC_IF([$1], [$2])])])
+           [AT_LALR1_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], [(yylloc)])
  m4_pushdef([AT_VAL], [(yylval)])
 ],
 [m4_pushdef([AT_LOC], [(yylloc)])
  m4_pushdef([AT_VAL], [(yylval)])


@@ -144,7 +144,7 @@ m4_popdef([AT_LALR1_CC_IF])
 # meant to be compiled.
 m4_define([AT_DATA_GRAMMAR_PROLOGUE],
 [[%{
 # meant to be compiled.
 m4_define([AT_DATA_GRAMMAR_PROLOGUE],
 [[%{

-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H

 # include <config.h>
   /* We don't need perfect functions for these tests. */
 # undef malloc
 # include <config.h>
   /* We don't need perfect functions for these tests. */
 # undef malloc


@@ -188,7 +188,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])])