[llvm-commits] [llvm] r44277 - /llvm/trunk/utils/TableGen/TGParser.cpp

[Chris Lattner]

Author: lattner
Date: Thu Nov 22 15:06:59 2007
New Revision: 44277

URL: http://llvm.org/viewvc/llvm-project?rev=44277&view=rev
Log:
resolve the last fixme's in the new tblgen parser.

Modified:
    llvm/trunk/utils/TableGen/TGParser.cpp

Modified: llvm/trunk/utils/TableGen/TGParser.cpp
URL: 
http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/TGParser.cpp?rev=44277&r1=44276&r2=44277&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/TGParser.cpp (original)
+++ llvm/trunk/utils/TableGen/TGParser.cpp Thu Nov 22 15:06:59 2007
@@ -116,7 +116,7 @@
   if (RV->setValue(V))
    return Error(Loc, "Value '" + ValName + "' of type '" + 
                 RV->getType()->getAsString() + 
-                "' is incompatible with initializer ''"); // FIXME: Add init!
+                "' is incompatible with initializer '" + V->getAsString() 
+"'");
   return false;
 }
 
@@ -586,9 +586,8 @@
     for (unsigned i = 0, e = Vals.size(); i != e; ++i) {
       Init *Bit = Vals[i]->convertInitializerTo(new BitRecTy());
       if (Bit == 0) {
-        // FIXME: Include value in error.
-        Error(BraceLoc, "Element #" + utostr(i) + " ("/* << *Vals[i]
-             <<*/ ") is not convertable to a bit");
+        Error(BraceLoc, "Element #" + utostr(i) + " (" + 
Vals[i]->getAsString()+
+              ") is not convertable to a bit");
         return 0;
       }
       Result->setBit(Vals.size()-i-1, Bit);
@@ -737,9 +736,8 @@
         return 0;
       }
       if (!Result->getFieldType(Lex.getCurStrVal())) {
-        // FIXME INCLUDE VALUE IN ERROR.
         TokError("Cannot access field '" + Lex.getCurStrVal() + "' of value '" 
+
-                 /*<< *$1 <<*/ "'");
+                 Result->getAsString() + "'");
         return 0;
       }
       Result = new FieldInit(Result, Lex.getCurStrVal());


_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits