From 2ccff94aa2eda7957035261b3cc44bb604e15518 Mon Sep 17 00:00:00 2001
From: Ludovic Jacomme <alliance-cvs@asim.lip6.fr>
Date: Wed, 14 Jul 2004 17:13:15 +0000
Subject: [PATCH] - Cygwin Porting / W2K

---
 alliance/src/pcbs/src/bvl/bvl_bcomp_l.l |  4 ++--
 alliance/src/pcbs/src/bvl/bvl_bcomp_y.y | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/alliance/src/pcbs/src/bvl/bvl_bcomp_l.l b/alliance/src/pcbs/src/bvl/bvl_bcomp_l.l
index 585e5aad..59149f7f 100644
--- a/alliance/src/pcbs/src/bvl/bvl_bcomp_l.l
+++ b/alliance/src/pcbs/src/bvl/bvl_bcomp_l.l
@@ -231,7 +231,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       );
@@ -289,7 +289,7 @@ char  *key;
     addhtitem (pt_hash, namealloc("next")         , _NEXT        );
     addhtitem (pt_hash, namealloc("nor")          , _NOR         );
     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("on")           , ON           );
diff --git a/alliance/src/pcbs/src/bvl/bvl_bcomp_y.y b/alliance/src/pcbs/src/bvl/bvl_bcomp_y.y
index 453de553..37f520e2 100644
--- a/alliance/src/pcbs/src/bvl/bvl_bcomp_y.y
+++ b/alliance/src/pcbs/src/bvl/bvl_bcomp_y.y
@@ -29,7 +29,7 @@
         struct g_type dble;
 	};
 
-%token         _AND
+%token         tok_AND
 %token         _BEGIN
 %token         _END
 %token         _EQSym
@@ -48,7 +48,7 @@
 %token         _NEXT
 %token         _NOR
 %token         _NOT
-%token         _NULL
+%token         tok_NULL
 %token         _OR
 %token         _OUT
 %token         _XOR
@@ -157,7 +157,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
 
@@ -1489,11 +1489,11 @@ expression
 
 relation..AND__relation..
 	: relation
-	  _AND
+	  tok_AND
 	  relation
 		{ $$ = bvl_crtabl (AND ,$1 ,$3 ,-1,-1); }
 	| relation..AND__relation..
-	  _AND
+	  tok_AND
 	  relation
 		{ $$ = bvl_crtabl (AND ,$1 ,$3 ,-1,-1); }
 	;