- Cygwin Porting / W2K

This commit is contained in:
Ludovic Jacomme 2004-07-14 17:13:15 +00:00
parent 92c36826e2
commit 2ccff94aa2
2 changed files with 7 additions and 7 deletions

View File

@ -231,7 +231,7 @@ char *key;
addhtitem (pt_hash, namealloc("after") , AFTER ); addhtitem (pt_hash, namealloc("after") , AFTER );
addhtitem (pt_hash, namealloc("alias") , ALIAS ); addhtitem (pt_hash, namealloc("alias") , ALIAS );
addhtitem (pt_hash, namealloc("all") , ALL ); 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("architecture") , ARCHITECTURE );
addhtitem (pt_hash, namealloc("array") , ARRAY ); addhtitem (pt_hash, namealloc("array") , ARRAY );
addhtitem (pt_hash, namealloc("assert") , ASSERT ); addhtitem (pt_hash, namealloc("assert") , ASSERT );
@ -289,7 +289,7 @@ char *key;
addhtitem (pt_hash, namealloc("next") , _NEXT ); addhtitem (pt_hash, namealloc("next") , _NEXT );
addhtitem (pt_hash, namealloc("nor") , _NOR ); addhtitem (pt_hash, namealloc("nor") , _NOR );
addhtitem (pt_hash, namealloc("not") , _NOT ); addhtitem (pt_hash, namealloc("not") , _NOT );
addhtitem (pt_hash, namealloc("null") , _NULL ); addhtitem (pt_hash, namealloc("null") , tok_NULL );
addhtitem (pt_hash, namealloc("of") , OF ); addhtitem (pt_hash, namealloc("of") , OF );
addhtitem (pt_hash, namealloc("on") , ON ); addhtitem (pt_hash, namealloc("on") , ON );

View File

@ -29,7 +29,7 @@
struct g_type dble; struct g_type dble;
}; };
%token _AND %token tok_AND
%token _BEGIN %token _BEGIN
%token _END %token _END
%token _EQSym %token _EQSym
@ -48,7 +48,7 @@
%token _NEXT %token _NEXT
%token _NOR %token _NOR
%token _NOT %token _NOT
%token _NULL %token tok_NULL
%token _OR %token _OR
%token _OUT %token _OUT
%token _XOR %token _XOR
@ -157,7 +157,7 @@
%token WOR_BIT %token WOR_BIT
%token WOR_VECTOR %token WOR_VECTOR
%left _AND _OR _NAND _NOR _XOR %left tok_AND _OR _NAND _NOR _XOR
%left _EQSym _NESym %left _EQSym _NESym
%left _NOT %left _NOT
@ -1489,11 +1489,11 @@ expression
relation..AND__relation.. relation..AND__relation..
: relation : relation
_AND tok_AND
relation relation
{ $$ = bvl_crtabl (AND ,$1 ,$3 ,-1,-1); } { $$ = bvl_crtabl (AND ,$1 ,$3 ,-1,-1); }
| relation..AND__relation.. | relation..AND__relation..
_AND tok_AND
relation relation
{ $$ = bvl_crtabl (AND ,$1 ,$3 ,-1,-1); } { $$ = bvl_crtabl (AND ,$1 ,$3 ,-1,-1); }
; ;