diff options
| author | Chris Lattner <sabre@nondot.org> | 2002-10-06 22:45:09 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2002-10-06 22:45:09 +0000 |
| commit | 08c0e6af4f82ca6213a7e63d6085633f92c25a81 (patch) | |
| tree | c166532b0ddff31e45708f52d5e2b4935a26aaa4 | |
| parent | 7209bfff92e9d216b6a785f9e41845ee35ebad28 (diff) | |
The parser now accepts "external" global variables, in addition to the backwards
compatible "uninitialized" global variables
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4050 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/AsmParser/Lexer.l | 3 | ||||
| -rw-r--r-- | lib/AsmParser/llvmAsmParser.y | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/AsmParser/Lexer.l b/lib/AsmParser/Lexer.l index b8a795567d..7776c90a90 100644 --- a/lib/AsmParser/Lexer.l +++ b/lib/AsmParser/Lexer.l @@ -155,7 +155,8 @@ global { return GLOBAL; } 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; } diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index de5f469d11..f3436dc782 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -679,8 +679,8 @@ Module *RunVMAsmParser(const string &Filename, FILE *F) { %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 : ConstPool OptAssign CONST ConstVal { } } } - | 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); |