- Porting cygwin W2K

This commit is contained in:
Ludovic Jacomme 2004-07-13 21:36:47 +00:00
parent d1a361e867
commit 1a87960363
2 changed files with 7 additions and 7 deletions

View File

@ -266,7 +266,7 @@ char *key;
addhtitem (pt_hash, namealloc("after") , AFTER );
addhtitem (pt_hash, namealloc("alias") , ALIAS );
addhtitem (pt_hash, namealloc("all") , ALL );
addhtitem (pt_hash, namealloc("and") , _AND );
addhtitem (pt_hash, namealloc("and") , tok_AND );
addhtitem (pt_hash, namealloc("architecture") , ARCHITECTURE );
addhtitem (pt_hash, namealloc("array") , ARRAY );
addhtitem (pt_hash, namealloc("assert") , ASSERT );
@ -326,7 +326,7 @@ char *key;
addhtitem (pt_hash, namealloc("nor") , _NOR );
addhtitem (pt_hash, namealloc("not") , _NOT );
addhtitem (pt_hash, namealloc("ns") , _NS );
addhtitem (pt_hash, namealloc("null") , _NULL );
addhtitem (pt_hash, namealloc("null") , tok_NULL );
addhtitem (pt_hash, namealloc("of") , OF );
addhtitem (pt_hash, namealloc("on") , ON );

View File

@ -60,7 +60,7 @@
struct g_type dble;
};
%token _AND
%token tok_AND
%token <valu> PRAGMA
%token _BEGIN
%token _END
@ -80,7 +80,7 @@
%token _NEXT
%token _NOR
%token _NOT
%token _NULL
%token tok_NULL
%token _OR
%token _OUT
%token _XOR
@ -192,7 +192,7 @@
%token WOR_BIT
%token WOR_VECTOR
%left _AND _OR _NAND _NOR _XOR
%left tok_AND _OR _NAND _NOR _XOR
%left _EQSym _NESym
%left _NOT
@ -1581,11 +1581,11 @@ expression
relation..AND__relation..
: relation
_AND
tok_AND
relation
{ $$ = bvl_crtabl (ABL_AND ,$1 ,$3 ,-1,-1); }
| relation..AND__relation..
_AND
tok_AND
relation
{ $$ = bvl_crtabl (ABL_AND ,$1 ,$3 ,-1,-1); }
;