Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-09 12:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: remove useless %defines

Browse Source 
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.
This commit is contained in:
Akim Demaille
2013-01-28 15:37:49 +01:00
parent 7d1aa2d636
commit 66fb016e1d
4 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/actions.at
View File

@@ -77,8 +77,7 @@ m4_pushdef([AT_TEST],
AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" $2]) AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" $2])
AT_DATA_GRAMMAR([[input.y]], AT_DATA_GRAMMAR([[input.y]],
[[%defines /* FIXME: Required by lalr1.cc in Bison 2.6. */ [[%locations
%locations
%debug %debug
%skeleton "$1" %skeleton "$1"
]$2[ ]$2[
@@ -182,8 +181,7 @@ m4_pushdef([AT_TEST],
AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" $2]) AT_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" $2])
AT_DATA_GRAMMAR([[input.y]], AT_DATA_GRAMMAR([[input.y]],
[[%defines /* FIXME: Required by lalr1.cc in Bison 2.6. */ [[%locations
%locations
%debug %debug
%skeleton "$1" %skeleton "$1"
]$2[ ]$2[

6
tests/c++.at
View File

@@ -118,7 +118,6 @@ AT_BISON_OPTION_PUSHDEFS([%skeleton "lalr1.cc" %debug $1])
AT_DATA_GRAMMAR([list.yy], AT_DATA_GRAMMAR([list.yy],
[[%debug [[%debug
%skeleton "lalr1.cc" %skeleton "lalr1.cc"
%defines
%define api.value.type variant %define api.value.type variant
]m4_bpatsubst([$1], [\\n], [ ]m4_bpatsubst([$1], [\\n], [
])[ ])[
@@ -288,7 +287,6 @@ AT_DATA([input.yy],
[[%skeleton "lalr1.cc" [[%skeleton "lalr1.cc"
%locations %locations
%debug %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_BISON_OPTION_PUSHDEFS([%language "C++" %define api.namespace "$1"])
AT_DATA_GRAMMAR([[input.y]], AT_DATA_GRAMMAR([[input.y]],
[[%language "C++" [[%language "C++"
%defines
%define api.namespace "]$1[" %define api.namespace "]$1["
%union { int i; } %union { int i; }
%define global_tokens_and_yystype %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 %define parse.error verbose
%nonassoc 'a' ; %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 api.value.type variant
%define parse.error verbose %define parse.error verbose
%define parse.trace %define parse.trace
@@ -600,7 +595,6 @@ AT_BISON_OPTION_PUSHDEFS([%skeleton "lalr1.cc"])
AT_DATA_GRAMMAR([[input.yy]], AT_DATA_GRAMMAR([[input.yy]],
[[%skeleton "lalr1.cc" [[%skeleton "lalr1.cc"
%defines // FIXME: Mandated in 2.6.
%debug %debug
%error-verbose %error-verbose

8
tests/input.at
View File

@@ -1477,10 +1477,10 @@ AT_BISON_CHECK([[input.y]], [[1]], [],
]]) ]])
]) ])
AT_CHECK_API_PURE([[%language "c++" %defines]], [[]]) AT_CHECK_API_PURE([[%language "c++"]], [[]])
AT_CHECK_API_PURE([[%language "c++" %defines]], [[false]]) AT_CHECK_API_PURE([[%language "c++"]], [[false]])
AT_CHECK_API_PURE([[%language "c++" %defines %glr-parser]], [[""]]) AT_CHECK_API_PURE([[%language "c++" %glr-parser]], [[""]])
AT_CHECK_API_PURE([[%language "c++" %defines %glr-parser]], [[false]]) AT_CHECK_API_PURE([[%language "c++" %glr-parser]], [[false]])
AT_CHECK_API_PURE([[%language "java"]], [[true]]) AT_CHECK_API_PURE([[%language "java"]], [[true]])
AT_CHECK_API_PURE([[%language "java"]], [[false]]) AT_CHECK_API_PURE([[%language "java"]], [[false]])

5
tests/regression.at
View File

@@ -837,7 +837,6 @@ m4_define([_AT_DATA_DANCER_Y],
} }
$1 $1
%token ARROW INVALID NUMBER STRING DATA %token ARROW INVALID NUMBER STRING DATA
%defines
%verbose %verbose
%error-verbose %error-verbose
/* Grammar follows */ /* Grammar follows */
@@ -922,7 +921,6 @@ AT_LALR1_CC_IF([[#include <cstdlib>]],
]AT_YYERROR_DECLARE])[ ]AT_YYERROR_DECLARE])[
%} %}
$1 $1
%defines
%error-verbose %error-verbose
%token A 1000 %token A 1000
%token B %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_BISON_OPTION_PUSHDEFS([%locations %skeleton "$1" %parse-param { int x } %parse-param { int y }])
AT_DATA_GRAMMAR([input.y], AT_DATA_GRAMMAR([input.y],
[[%defines [[%locations
%locations
%skeleton "$1" %skeleton "$1"
%union { int ival; } %union { int ival; }
%parse-param { int x } %parse-param { int x }