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

[Chris Lattner]

Changes in directory llvm/lib/AsmParser:

Lexer.l updated: 1.28 -> 1.29
llvmAsmParser.y updated: 1.93 -> 1.94

---
Log message:

The parser now accepts "external" global variables, in addition to the backwards
compatible "uninitialized" global variables



---
Diffs of the changes:

Index: llvm/lib/AsmParser/Lexer.l
diff -u llvm/lib/AsmParser/Lexer.l:1.28 llvm/lib/AsmParser/Lexer.l:1.29
--- llvm/lib/AsmParser/Lexer.l:1.28	Fri Aug 16 16:14:39 2002
+++ llvm/lib/AsmParser/Lexer.l	Sun Oct  6 17:45:08 2002
@@ -155,7 +155,8 @@
 constant        { return CONSTANT; }
 const           { return CONST; }
 internal        { return INTERNAL; }
-uninitialized   { return UNINIT; }
+uninitialized   { return EXTERNAL; }    /* Deprecated, turn into external */
+external        { return EXTERNAL; }
 implementation  { return IMPLEMENTATION; }
 \.\.\.          { return DOTDOTDOT; }
 null            { return NULL_TOK; }


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.93 llvm/lib/AsmParser/llvmAsmParser.y:1.94
--- llvm/lib/AsmParser/llvmAsmParser.y:1.93	Fri Sep 13 17:28:45 2002
+++ llvm/lib/AsmParser/llvmAsmParser.y	Sun Oct  6 17:45:09 2002
@@ -679,8 +679,8 @@
 %type  <StrVal>  OptVAR_ID OptAssign FuncName
 
 
-%token IMPLEMENTATION TRUE FALSE BEGINTOK ENDTOK DECLARE GLOBAL CONSTANT UNINIT
-%token TO EXCEPT DOTDOTDOT NULL_TOK CONST INTERNAL OPAQUE NOT
+%token IMPLEMENTATION TRUE FALSE BEGINTOK ENDTOK DECLARE GLOBAL CONSTANT
+%token TO EXCEPT DOTDOTDOT NULL_TOK CONST INTERNAL OPAQUE NOT EXTERNAL
 
 // Basic Block Terminating Operators 
 %token <TermOpVal> RET BR SWITCH
@@ -1145,7 +1145,7 @@
       }
     }
   }
-  | ConstPool OptAssign OptInternal UNINIT GlobalType Types {
+  | ConstPool OptAssign OptInternal EXTERNAL GlobalType Types {
     const Type *Ty = *$6;
     // Global declarations appear in Constant Pool
     GlobalVariable *GV = new GlobalVariable(Ty, $5, $3);