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

examples: clang 5 defines nullptr as a macro

Browse Source 
* examples/variant.yy: So don't do it.
* examples/variant-11.yy: Fix comment.
This commit is contained in:
Akim Demaille
2018-10-22 18:27:27 +02:00
parent 121da2cbdb
commit 05d702422a
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/variant-11.yy
View File

@@ -116,7 +116,8 @@ namespace yy
// TEXT "I have three numbers for you." // TEXT "I have three numbers for you."
// NUMBER 1 // NUMBER 1
// NUMBER 2 // NUMBER 2
// NUMBER 3 // NUMBER ...
// NUMBER max - 1
// TEXT "And that's all!" // TEXT "And that's all!"
// END_OF_FILE // END_OF_FILE

6
examples/variant.yy
View File

@@ -99,7 +99,9 @@ namespace yy
{ {
// Use nullptr with pre-C++11. // Use nullptr with pre-C++11.
#if defined __cplusplus && __cplusplus < 201103L #if defined __cplusplus && __cplusplus < 201103L
# define nullptr 0 # define NULLPTR 0
#else
# define NULLPTR nullptr
#endif #endif
// The yylex function providing subsequent tokens: // The yylex function providing subsequent tokens:
@@ -117,7 +119,7 @@ namespace yy
static int count = 0; static int count = 0;
const int stage = count; const int stage = count;
++count; ++count;
parser::location_type loc (nullptr, unsigned (stage + 1), unsigned (stage + 1)); parser::location_type loc (NULLPTR, unsigned (stage + 1), unsigned (stage + 1));
switch (stage) switch (stage)
{ {
case 0: case 0: