6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-28 19:25:00 +00:00
Code Issues Projects Releases Wiki Activity

Avoid TRUE and FALSE which apparently conflict with some macros on OSX

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@12566 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2004-03-31 03:49:47 +00:00
parent 1438102576
commit 91ef460285
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
projects/Stacker/lib/compiler/Lexer.l
View File

@@ -117,10 +117,10 @@ OutChar \>c
{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; }

4
projects/Stacker/lib/compiler/StackerCompiler.cpp
View File

@@ -820,13 +820,13 @@ StackerCompiler::handle_word( int tkn )
}
// 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);

6
projects/Stacker/lib/compiler/StackerParser.y
View File

@@ -55,7 +55,7 @@ int yyparse();
/* 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 : STRING { $$ = SCI->handle_string( $1 ); } ;
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 ); } ;