diff options
author | Akim Demaille <akim@lrde.epita.fr> | 2013-11-08 10:52:15 +0100 |
---|---|---|
committer | Akim Demaille <akim@lrde.epita.fr> | 2013-11-08 10:52:15 +0100 |
commit | 8d0b7cef7df7fead44b9574cee342de336008625 (patch) | |
tree | 4ff89d2506603b4afc61ee10d5d65e749010b6f0 /tests/regression.at | |
parent | afc4457605a784879fa57435bf45521ad7513771 (diff) | |
download | bison-8d0b7cef7df7fead44b9574cee342de336008625.tar.gz |
parsers: rename YY_NULL as YY_NULLPTR to avoid conflicts with Flex
Flex also defines YY_NULL (to 0). Avoid gratuitous conflicts.
* data/c.m4 (b4_null_define): Rename YY_NULL as YY_NULLPTR.
* data/glr.c, data/lalr1.cc, data/location.cc, data/variant.hh,
* data/yacc.c, src/parse-gram.c, tests/actions.at, tests/c++.at,
* tests/cxx-type.at, tests/glr-regression.at, tests/headers.at,
* tests/push.at, tests/regression.at:
Adjust.
Diffstat (limited to 'tests/regression.at')
-rw-r--r-- | tests/regression.at | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/regression.at b/tests/regression.at index b9ca94c0..223dc06a 100644 --- a/tests/regression.at +++ b/tests/regression.at @@ -770,7 +770,7 @@ static const yytype_uint8 yyrline[] = static const char *const yytname[] = { "$end", "error", "$undefined", "\"if\"", "\"const\"", "\"then\"", - "\"else\"", "$accept", "statement", "struct_stat", "if", "else", YY_NULL + "\"else\"", "$accept", "statement", "struct_stat", "if", "else", YY_NULLPTR }; static const yytype_uint16 yytoknum[] = { |