tests: remove useless %defines

Many tests were using %defines because C++ skeletons used to require
it.

* tests/actions.at, tests/c++.at, tests/input.at, tests/regression.at:
Remove useless %defines.

diff --git a/tests/actions.at b/tests/actions.at
index 80b5239e807e4ed9efd53ba210cb3083bd5aa806..302c1bbb1985a138eff817f94175838c630ccff0 100644 (file)
--- a/tests/actions.at
+++ b/tests/actions.at
@@ -77,8 +77,7 @@ m4_pushdef([AT_TEST],
 
 AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" $2])
 AT_DATA_GRAMMAR([[input.y]],
 
 AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" $2])
 AT_DATA_GRAMMAR([[input.y]],

-[[%defines /* FIXME: Required by lalr1.cc in Bison 2.6. */
-%locations
+[[%locations

 %debug
 %skeleton "$1"
 ]$2[
 %debug
 %skeleton "$1"
 ]$2[


@@ -182,8 +181,7 @@ m4_pushdef([AT_TEST],
 
 AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" $2])
 AT_DATA_GRAMMAR([[input.y]],
 
 AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" $2])
 AT_DATA_GRAMMAR([[input.y]],

-[[%defines /* FIXME: Required by lalr1.cc in Bison 2.6. */
-%locations
+[[%locations

 %debug
 %skeleton "$1"
 ]$2[
 %debug
 %skeleton "$1"
 ]$2[

diff --git a/tests/c++.at b/tests/c++.at
index 0f3d2354defe4a10cf00a1036d21dfe751699ae1..21f567f91f863dcc7241aae321bfacd377d42545 100644 (file)
--- a/tests/c++.at
+++ b/tests/c++.at
@@ -118,7 +118,6 @@ AT_BISON_OPTION_PUSHDEFS([%skeleton "lalr1.cc" %debug $1])
 AT_DATA_GRAMMAR([list.yy],
 [[%debug
 %skeleton "lalr1.cc"
 AT_DATA_GRAMMAR([list.yy],
 [[%debug
 %skeleton "lalr1.cc"

-%defines

 %define api.value.type variant
 ]m4_bpatsubst([$1], [\\n], [
 ])[
 %define api.value.type variant
 ]m4_bpatsubst([$1], [\\n], [
 ])[


@@ -288,7 +287,6 @@ AT_DATA([input.yy],
 [[%skeleton "lalr1.cc"
 %locations
 %debug
 [[%skeleton "lalr1.cc"
 %locations
 %debug

-%defines

 %%
 exp: /* empty */;
 %%
 %%
 exp: /* empty */;
 %%


@@ -368,7 +366,6 @@ m4_pushdef([AT_TEST],
 [AT_BISON_OPTION_PUSHDEFS([%language "C++" %define api.namespace "$1"])
 AT_DATA_GRAMMAR([[input.y]],
 [[%language "C++"
 [AT_BISON_OPTION_PUSHDEFS([%language "C++" %define api.namespace "$1"])
 AT_DATA_GRAMMAR([[input.y]],
 [[%language "C++"

-%defines

 %define api.namespace "]$1["
 %union { int i; }
 %define global_tokens_and_yystype
 %define api.namespace "]$1["
 %union { int i; }
 %define global_tokens_and_yystype


@@ -454,7 +451,6 @@ AT_DATA_GRAMMAR([[input.yy]],
   #define USE(Args)
 }
 
   #define USE(Args)
 }
 

-%defines

 %define parse.error verbose
 
 %nonassoc 'a' ;
 %define parse.error verbose
 
 %nonassoc 'a' ;


@@ -529,7 +525,6 @@ AT_DATA_GRAMMAR([[input.yy]],
   int yylex (yy::parser::semantic_type *);
 }
 
   int yylex (yy::parser::semantic_type *);
 }
 

-%defines

 %define api.value.type variant
 %define parse.error verbose
 %define parse.trace
 %define api.value.type variant
 %define parse.error verbose
 %define parse.trace


@@ -600,7 +595,6 @@ AT_BISON_OPTION_PUSHDEFS([%skeleton "lalr1.cc"])
 
 AT_DATA_GRAMMAR([[input.yy]],
 [[%skeleton "lalr1.cc"
 
 AT_DATA_GRAMMAR([[input.yy]],
 [[%skeleton "lalr1.cc"

-%defines // FIXME: Mandated in 2.6.

 %debug
 %error-verbose
 
 %debug
 %error-verbose
 

diff --git a/tests/input.at b/tests/input.at
index b46f8fab2a89700661516cf6718185b5e2a7a901..8184b03e6cb609df3a0a2651dbb8875168ebfc74 100644 (file)
--- a/tests/input.at
+++ b/tests/input.at
@@ -1477,10 +1477,10 @@ AT_BISON_CHECK([[input.y]], [[1]], [],
 ]])
 ])
 
 ]])
 ])
 

-AT_CHECK_API_PURE([[%language "c++" %defines]], [[]])
-AT_CHECK_API_PURE([[%language "c++" %defines]], [[false]])
-AT_CHECK_API_PURE([[%language "c++" %defines %glr-parser]], [[""]])
-AT_CHECK_API_PURE([[%language "c++" %defines %glr-parser]], [[false]])
+AT_CHECK_API_PURE([[%language "c++"]], [[]])
+AT_CHECK_API_PURE([[%language "c++"]], [[false]])
+AT_CHECK_API_PURE([[%language "c++" %glr-parser]], [[""]])
+AT_CHECK_API_PURE([[%language "c++" %glr-parser]], [[false]])

 AT_CHECK_API_PURE([[%language "java"]], [[true]])
 AT_CHECK_API_PURE([[%language "java"]], [[false]])
 
 AT_CHECK_API_PURE([[%language "java"]], [[true]])
 AT_CHECK_API_PURE([[%language "java"]], [[false]])
 

diff --git a/tests/regression.at b/tests/regression.at
index 26df108f084c4a4170f5ada0781236eb2246a406..418faf056a1b2a30e00f3b3c60292124337956af 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -837,7 +837,6 @@ m4_define([_AT_DATA_DANCER_Y],
 }
 $1
 %token ARROW INVALID NUMBER STRING DATA
 }
 $1
 %token ARROW INVALID NUMBER STRING DATA

-%defines

 %verbose
 %error-verbose
 /* Grammar follows */
 %verbose
 %error-verbose
 /* Grammar follows */


@@ -922,7 +921,6 @@ AT_LALR1_CC_IF([[#include <cstdlib>]],
 ]AT_YYERROR_DECLARE])[
 %}
 $1
 ]AT_YYERROR_DECLARE])[
 %}
 $1

-%defines

 %error-verbose
 %token A 1000
 %token B
 %error-verbose
 %token A 1000
 %token B


@@ -1541,8 +1539,7 @@ m4_pushdef([AT_TEST],
 AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" %parse-param { int x } %parse-param { int y }])
 
 AT_DATA_GRAMMAR([input.y],
 AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" %parse-param { int x } %parse-param { int y }])
 
 AT_DATA_GRAMMAR([input.y],

-[[%defines
-%locations
+[[%locations

 %skeleton "$1"
 %union { int ival; }
 %parse-param { int x }
 %skeleton "$1"
 %union { int ival; }
 %parse-param { int x }