diff options
author | Akim Demaille <akim@lrde.epita.fr> | 2013-04-11 15:43:26 +0200 |
---|---|---|
committer | Akim Demaille <akim@lrde.epita.fr> | 2013-04-11 15:54:46 +0200 |
commit | 630a021850386acaee461fccee27718577d0a799 (patch) | |
tree | ddbf2587dfd061121fc2442e5a6067c7167afb49 /tests | |
parent | 75ae8299840bbd854fa2474d38402bbb933c6511 (diff) | |
download | bison-630a021850386acaee461fccee27718577d0a799.tar.gz |
api.token.prefix: use code values
* data/bison.m4: Remove useless (and incorrect: m4_* instead of b4_*)
default assignment to api.token.prefix.
Check that api.token.prefix is assigned code.
* tests/input.at (%define code variables): New test.
* NEWS, doc/bison.texi, tests/c++.at, tests/calc.at,
* tests/java.at, tests/local.at: Adjust to use braces.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/c++.at | 4 | ||||
-rw-r--r-- | tests/calc.at | 8 | ||||
-rw-r--r-- | tests/input.at | 25 | ||||
-rw-r--r-- | tests/java.at | 2 | ||||
-rw-r--r-- | tests/local.at | 4 |
5 files changed, 34 insertions, 9 deletions
diff --git a/tests/c++.at b/tests/c++.at index 387d4878..d1d6975a 100644 --- a/tests/c++.at +++ b/tests/c++.at @@ -325,8 +325,8 @@ AT_TEST([%define parse.assert]) AT_TEST([%locations %define parse.assert]) AT_TEST([[%define parse.assert %code {\n#define TWO_STAGE_BUILD\n}]]) AT_TEST([[%define parse.assert %define api.token.constructor]]) -AT_TEST([[%define parse.assert %define api.token.constructor %define api.token.prefix "TOK_"]]) -AT_TEST([[%locations %define parse.assert %define api.token.constructor %define api.token.prefix "TOK_"]]) +AT_TEST([[%define parse.assert %define api.token.constructor %define api.token.prefix {TOK_}]]) +AT_TEST([[%locations %define parse.assert %define api.token.constructor %define api.token.prefix {TOK_}]]) m4_popdef([AT_TEST]) diff --git a/tests/calc.at b/tests/calc.at index a14f2c21..eedfc897 100644 --- a/tests/calc.at +++ b/tests/calc.at @@ -608,7 +608,7 @@ AT_CHECK_CALC_LALR([%define api.push-pull both %define api.pure full %locations] AT_CHECK_CALC_LALR([%define parse.error verbose %locations]) AT_CHECK_CALC_LALR([%define parse.error verbose %locations %defines %define api.prefix "calc" %verbose %yacc]) -AT_CHECK_CALC_LALR([%define parse.error verbose %locations %defines %name-prefix "calc" %define api.token.prefix "TOK_" %verbose %yacc]) +AT_CHECK_CALC_LALR([%define parse.error verbose %locations %defines %name-prefix "calc" %define api.token.prefix {TOK_} %verbose %yacc]) AT_CHECK_CALC_LALR([%debug]) AT_CHECK_CALC_LALR([%define parse.error verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) @@ -651,7 +651,7 @@ AT_CHECK_CALC_GLR([%define parse.error verbose %locations %defines %name-prefix AT_CHECK_CALC_GLR([%debug]) AT_CHECK_CALC_GLR([%define parse.error verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) -AT_CHECK_CALC_GLR([%define parse.error verbose %debug %locations %defines %define api.prefix "calc" %define api.token.prefix "TOK_" %verbose %yacc]) +AT_CHECK_CALC_GLR([%define parse.error verbose %debug %locations %defines %define api.prefix "calc" %define api.token.prefix {TOK_} %verbose %yacc]) AT_CHECK_CALC_GLR([%define api.pure %define parse.error verbose %debug %locations %defines %name-prefix "calc" %verbose %yacc]) @@ -684,7 +684,7 @@ AT_CHECK_CALC_LALR1_CC([%locations %define parse.error verbose %define api.prefi AT_CHECK_CALC_LALR1_CC([%locations %define parse.error verbose %debug %name-prefix "calc" %verbose %yacc]) AT_CHECK_CALC_LALR1_CC([%locations %pure-parser %define parse.error verbose %debug %define api.prefix "calc" %verbose %yacc]) -AT_CHECK_CALC_LALR1_CC([%locations %pure-parser %define parse.error verbose %debug %define api.prefix "calc" %define api.token.prefix "TOK_" %verbose %yacc]) +AT_CHECK_CALC_LALR1_CC([%locations %pure-parser %define parse.error verbose %debug %define api.prefix "calc" %define api.token.prefix {TOK_} %verbose %yacc]) AT_CHECK_CALC_LALR1_CC([%defines %locations %pure-parser %define parse.error verbose %debug %name-prefix "calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}]) @@ -719,7 +719,7 @@ AT_CHECK_CALC_GLR_CC([%debug]) AT_CHECK_CALC_GLR_CC([%define parse.error verbose %debug %name-prefix "calc" %verbose %yacc]) AT_CHECK_CALC_GLR_CC([%pure-parser %define parse.error verbose %debug %name-prefix "calc" %verbose %yacc]) -AT_CHECK_CALC_GLR_CC([%pure-parser %define parse.error verbose %debug %name-prefix "calc" %define api.token.prefix "TOK_" %verbose %yacc]) +AT_CHECK_CALC_GLR_CC([%pure-parser %define parse.error verbose %debug %name-prefix "calc" %define api.token.prefix {TOK_} %verbose %yacc]) AT_CHECK_CALC_GLR_CC([%locations %defines %pure-parser %define parse.error verbose %debug %name-prefix "calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}]) AT_CHECK_CALC_GLR_CC([%locations %defines %pure-parser %define parse.error verbose %debug %define api.prefix "calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count}]) diff --git a/tests/input.at b/tests/input.at index aec855d7..3dfed32d 100644 --- a/tests/input.at +++ b/tests/input.at @@ -1435,6 +1435,31 @@ AT_BISON_CHECK([[Input.y]], [1], [], AT_CLEANUP ## ------------------------ ## +## %define code variables. ## +## ------------------------ ## + +AT_SETUP([["%define" code variables]]) + +m4_pushdef([AT_TEST], +[AT_DATA([input.y], +[[%define api.token.prefix ]$1[ +%% +start: %empty; +]]) + +AT_BISON_CHECK([[input.y]], [0], [], +[[input.y:1.9-24: warning: %define variable 'api.token.prefix' requires '{...}' values [-Wdeprecated] +]]) +]) + +AT_TEST(["abc"]) +AT_TEST([abcde]) +m4_popdef([AT_TEST]) + +AT_CLEANUP + + +## ------------------------ ## ## %define enum variables. ## ## ------------------------ ## diff --git a/tests/java.at b/tests/java.at index 7f77f283..3f729260 100644 --- a/tests/java.at +++ b/tests/java.at @@ -461,7 +461,7 @@ AT_CHECK_JAVA_GREP([[class YYParser]]) AT_CHECK_JAVA_MINIMAL([[%name-prefix "Prefix"]]) AT_CHECK_JAVA_GREP([[class PrefixParser]]) -AT_CHECK_JAVA_MINIMAL([[%define api.token.prefix "TOK_"]]) +AT_CHECK_JAVA_MINIMAL([[%define api.token.prefix {TOK_}]]) AT_CHECK_JAVA_GREP([[.*TOK_END.*]]) AT_CHECK_JAVA_MINIMAL([[%define parser_class_name "ParserClassName"]]) diff --git a/tests/local.at b/tests/local.at index 46bbfeda..0428b6e8 100644 --- a/tests/local.at +++ b/tests/local.at @@ -190,8 +190,8 @@ m4_pushdef([AT_NAME_PREFIX], m4_pushdef([AT_TOKEN_CTOR_IF], [m4_bmatch([$3], [%define api\.token\.constructor], [$1], [$2])]) m4_pushdef([AT_TOKEN_PREFIX], -[m4_bmatch([$3], [%define api\.token\.prefix ".*"], - [m4_bregexp([$3], [%define api\.token\.prefix "\(.*\)"], [\1])])]) +[m4_bmatch([$3], [%define api\.token\.prefix {.*}], + [m4_bregexp([$3], [%define api\.token\.prefix {\(.*\)}], [\1])])]) m4_pushdef([AT_VARIANT_IF], [m4_bmatch([$3], [%define api\.value\.type "?variant"?], [$1], [$2])]) m4_pushdef([AT_API_prefix], |