resolve the last fixme's in the new tblgen parser.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@44277 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/TableGen/TGParser.cpp b/utils/TableGen/TGParser.cpp
index d6515e8..2f0533a 100644
--- a/utils/TableGen/TGParser.cpp
+++ b/utils/TableGen/TGParser.cpp
@@ -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());