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

[Chris Lattner]

Changes in directory llvm/lib/AsmParser:

llvmAsmParser.y updated: 1.246 -> 1.247
Lexer.l updated: 1.69 -> 1.70
---
Log message:

syntax change


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

 Lexer.l         |    1 +
 llvmAsmParser.y |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.246 llvm/lib/AsmParser/llvmAsmParser.y:1.247
--- llvm/lib/AsmParser/llvmAsmParser.y:1.246	Mon Jan 23 17:05:15 2006
+++ llvm/lib/AsmParser/llvmAsmParser.y	Mon Jan 23 18:40:17 2006
@@ -967,7 +967,7 @@
 %token DECLARE GLOBAL CONSTANT SECTION VOLATILE
 %token TO DOTDOTDOT NULL_TOK UNDEF CONST INTERNAL LINKONCE WEAK  APPENDING
 %token OPAQUE NOT EXTERNAL TARGET TRIPLE ENDIAN POINTERSIZE LITTLE BIG ALIGN
-%token DEPLIBS CALL TAIL ASM_TOK
+%token DEPLIBS CALL TAIL ASM_TOK MODULE
 %token CC_TOK CCC_TOK FASTCC_TOK COLDCC_TOK
 %type <UIntVal> OptCallingConv
 
@@ -1571,7 +1571,7 @@
   | FunctionList FunctionProto {
     $$ = $1;
   }
-  | FunctionList ASM_TOK AsmBlock {
+  | FunctionList MODULE ASM_TOK AsmBlock {
     $$ = $1;
   }  
   | FunctionList IMPLEMENTATION {
@@ -1612,7 +1612,7 @@
   }
   | ConstPool FunctionProto {       // Function prototypes can be in const pool
   }
-  | ConstPool ASM_TOK AsmBlock {    // Asm blocks can be in the const pool
+  | ConstPool MODULE ASM_TOK AsmBlock {  // Asm blocks can be in the const pool
   }
   | ConstPool OptAssign OptLinkage GlobalType ConstVal {
     if ($5 == 0) ThrowException("Global value initializer is not a constant!");


Index: llvm/lib/AsmParser/Lexer.l
diff -u llvm/lib/AsmParser/Lexer.l:1.69 llvm/lib/AsmParser/Lexer.l:1.70
--- llvm/lib/AsmParser/Lexer.l:1.69	Mon Jan 23 17:05:15 2006
+++ llvm/lib/AsmParser/Lexer.l	Mon Jan 23 18:40:17 2006
@@ -212,6 +212,7 @@
 volatile        { return VOLATILE; }
 align           { return ALIGN;  }
 section         { return SECTION; }
+module          { return MODULE; }
 asm             { return ASM_TOK; }
 
 cc              { return CC_TOK; }