[llvm-commits] CVS: llvm/lib/AsmParser/Lexer.l llvmAsmParser.y

[Chris Lattner]

Changes in directory llvm/lib/AsmParser:

Lexer.l updated: 1.44 -> 1.45
llvmAsmParser.y updated: 1.148 -> 1.149

---
Log message:

Change the 'exception' destination to the 'unwind' destination.  We will always
allow 'except' instead of 'unwind' here though.


---
Diffs of the changes:  (+3 -3)

Index: llvm/lib/AsmParser/Lexer.l
diff -u llvm/lib/AsmParser/Lexer.l:1.44 llvm/lib/AsmParser/Lexer.l:1.45
--- llvm/lib/AsmParser/Lexer.l:1.44	Tue Nov 11 16:41:32 2003
+++ llvm/lib/AsmParser/Lexer.l	Sun Feb  8 15:48:25 2004
@@ -191,7 +191,7 @@
 \.\.\.          { return DOTDOTDOT; }
 null            { return NULL_TOK; }
 to              { return TO; }
-except          { return EXCEPT; }
+except          { RET_TOK(TermOpVal, Unwind, UNWIND); }
 not             { return NOT; }  /* Deprecated, turned into XOR */
 target          { return TARGET; }
 endian          { return ENDIAN; }


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.148 llvm/lib/AsmParser/llvmAsmParser.y:1.149
--- llvm/lib/AsmParser/llvmAsmParser.y:1.148	Mon Jan 12 13:06:28 2004
+++ llvm/lib/AsmParser/llvmAsmParser.y	Sun Feb  8 15:48:25 2004
@@ -816,7 +816,7 @@
 
 %token IMPLEMENTATION ZEROINITIALIZER TRUE FALSE BEGINTOK ENDTOK
 %token DECLARE GLOBAL CONSTANT VOLATILE
-%token TO EXCEPT DOTDOTDOT NULL_TOK CONST INTERNAL LINKONCE WEAK  APPENDING
+%token TO DOTDOTDOT NULL_TOK CONST INTERNAL LINKONCE WEAK  APPENDING
 %token OPAQUE NOT EXTERNAL TARGET ENDIAN POINTERSIZE LITTLE BIG
 
 // Basic Block Terminating Operators 
@@ -1611,7 +1611,7 @@
     $$ = S;
   }
   | INVOKE TypesV ValueRef '(' ValueRefListE ')' TO ResolvedVal 
-    EXCEPT ResolvedVal {
+    UNWIND ResolvedVal {
     const PointerType *PFTy;
     const FunctionType *Ty;