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

[Chris Lattner]

Changes in directory llvm/lib/AsmParser:

Lexer.l updated: 1.41 -> 1.42
llvmAsmParser.y updated: 1.134 -> 1.135

---
Log message:

Change the Opcode enum for PHI nodes from "Instruction::PHINode" to "Instruction::PHI" to be more consistent with the other instructions.



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

Index: llvm/lib/AsmParser/Lexer.l
diff -u llvm/lib/AsmParser/Lexer.l:1.41 llvm/lib/AsmParser/Lexer.l:1.42
--- llvm/lib/AsmParser/Lexer.l:1.41	Sat Oct 18 00:53:13 2003
+++ llvm/lib/AsmParser/Lexer.l	Sun Oct 19 16:34:27 2003
@@ -219,7 +219,7 @@
 setle           { RET_TOK(BinaryOpVal, SetLE, SETLE); }
 setge           { RET_TOK(BinaryOpVal, SetGE, SETGE); }
 
-phi             { RET_TOK(OtherOpVal, PHINode, PHI); }
+phi             { RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 call            { RET_TOK(OtherOpVal, Call, CALL); }
 cast            { RET_TOK(OtherOpVal, Cast, CAST); }
 shl             { RET_TOK(OtherOpVal, Shl, SHL); }


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.134 llvm/lib/AsmParser/llvmAsmParser.y:1.135
--- llvm/lib/AsmParser/llvmAsmParser.y:1.134	Sat Oct 18 00:53:13 2003
+++ llvm/lib/AsmParser/llvmAsmParser.y	Sun Oct 19 16:34:27 2003
@@ -785,7 +785,7 @@
 
 // Other Operators
 %type  <OtherOpVal> ShiftOps
-%token <OtherOpVal> PHI CALL CAST SHL SHR VAARG VANEXT
+%token <OtherOpVal> PHI_TOK CALL CAST SHL SHR VAARG VANEXT
 %token VA_ARG // FIXME: OBSOLETE
 
 %start Module
@@ -1747,7 +1747,7 @@
     $$ = new VANextInst($2, *$4);
     delete $4;
   }
-  | PHI PHIList {
+  | PHI_TOK PHIList {
     const Type *Ty = $2->front().first->getType();
     $$ = new PHINode(Ty);
     $$->op_reserve($2->size()*2);