Avoid TRUE and FALSE which apparently conflict with some macros on OSX
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@12566 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/projects/Stacker/lib/compiler/Lexer.l b/projects/Stacker/lib/compiler/Lexer.l
index 6087f88..65f1a97 100644
--- a/projects/Stacker/lib/compiler/Lexer.l
+++ b/projects/Stacker/lib/compiler/Lexer.l
@@ -117,10 +117,10 @@
{Colon} { return COLON; }
{Semi} { return SEMI; }
-TRUE { return TRUE; }
-FALSE { return FALSE; }
-ON { return TRUE; }
-OFF { return FALSE; }
+TRUE { return TRUETOK; }
+FALSE { return FALSETOK; }
+ON { return TRUETOK; }
+OFF { return FALSETOK; }
{Less} { return LESS; }
LT { return LESS; }
{More} { return MORE; }
diff --git a/projects/Stacker/lib/compiler/StackerCompiler.cpp b/projects/Stacker/lib/compiler/StackerCompiler.cpp
index 1183979..12151a5 100644
--- a/projects/Stacker/lib/compiler/StackerCompiler.cpp
+++ b/projects/Stacker/lib/compiler/StackerCompiler.cpp
@@ -820,13 +820,13 @@
}
// Logical Operations
- case TRUE : // -- -1
+ case TRUETOK : // -- -1
{
if (echo) bb->setName("TRUE");
push_integer(bb,-1);
break;
}
- case FALSE : // -- 0
+ case FALSETOK : // -- 0
{
if (echo) bb->setName("FALSE");
push_integer(bb,0);
diff --git a/projects/Stacker/lib/compiler/StackerParser.y b/projects/Stacker/lib/compiler/StackerParser.y
index 5913912..e45cc1a 100644
--- a/projects/Stacker/lib/compiler/StackerParser.y
+++ b/projects/Stacker/lib/compiler/StackerParser.y
@@ -55,7 +55,7 @@
/* Terminal Tokens */
%token SEMI COLON FORWARD MAIN DUMP
-%token TRUE FALSE LESS MORE LESS_EQUAL MORE_EQUAL NOT_EQUAL EQUAL
+%token TRUETOK FALSETOK LESS MORE LESS_EQUAL MORE_EQUAL NOT_EQUAL EQUAL
%token PLUS MINUS INCR DECR MULT DIV MODULUS NEGATE ABS MIN MAX STAR_SLASH
%token AND OR XOR LSHIFT RSHIFT
%token DROP DROP2 NIP NIP2 DUP DUP2 SWAP SWAP2 OVER OVER2 ROT ROT2
@@ -109,8 +109,8 @@
Word : INTEGER { $$ = SCI->handle_integer( $1 ); } ;
/* Everything else is a terminal symbol and goes to handle_word */
-Word : TRUE { $$ = SCI->handle_word( TRUE ); } ;
-Word : FALSE { $$ = SCI->handle_word( FALSE ); } ;
+Word : TRUETOK { $$ = SCI->handle_word( TRUETOK ); } ;
+Word : FALSETOK { $$ = SCI->handle_word( FALSETOK ); } ;
Word : LESS { $$ = SCI->handle_word( LESS ); } ;
Word : MORE { $$ = SCI->handle_word( MORE ); } ;
Word : LESS_EQUAL { $$ = SCI->handle_word( LESS_EQUAL ); } ;