Typo.

[oota-llvm.git] / utils / TableGen / LLVMCConfigurationEmitter.cpp

diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp
index bb4321c9b4019831bfce506d65c74f5dbc055207..8bdafbb8ab8f9b3465ce0b707b16876a69e30457 100644 (file)
--- a/utils/TableGen/LLVMCConfigurationEmitter.cpp
+++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp
@@ -86,8 +86,8 @@ const DagInit& InitPtrToDag(const Init* ptr) {
 // less than or equal to min_arguments, otherwise throw an exception.
 void checkNumberOfArguments (const DagInit* d, unsigned min_arguments) {
   if (!d || d->getNumArgs() < min_arguments)
-    throw "Property " + d->getOperator()->getAsString()
-      + " has too few arguments!";
+    throw d->getOperator()->getAsString()
+      + ": too few arguments!";
 }
 
 // isDagEmpty - is this DAG marked with an empty marker?
@@ -1265,7 +1265,6 @@ StrVector::const_iterator SubstituteSpecialCommands
   assert(Leftover.at(0) == ')');
   if (Leftover.size() != 1)
     O << " + std::string(\"" << (Leftover.c_str() + 1) << "\")";
-  O << ')';
 
   return Pos;
 }
@@ -1284,6 +1283,7 @@ void EmitCmdLineVecFill(const Init* CmdLine, const std::string& ToolName,
   StrVector::const_iterator I = StrVec.begin(), E = StrVec.end();
 
   // If there is a hook invocation on the place of the first command, skip it.
+  assert(!StrVec[0].empty());
   if (StrVec[0][0] == '$') {
     while (I != E && (*I)[0] != ')' )
       ++I;
@@ -1297,7 +1297,7 @@ void EmitCmdLineVecFill(const Init* CmdLine, const std::string& ToolName,
 
   for (; I != E; ++I) {
     const std::string& cmd = *I;
-    //    std::cerr << cmd;
+    assert(!cmd.empty());
     O << IndentLevel;
     if (cmd.at(0) == '$') {
       if (cmd == "$INFILE") {
@@ -1444,7 +1444,7 @@ class EmitActionHandler {
     else if (ActionName == "forward_as") {
       checkNumberOfArguments(&Dag, 2);
       const std::string& Name = InitPtrToString(Dag.getArg(0));
-      const std::string& NewName = InitPtrToString(Dag.getArg(0));
+      const std::string& NewName = InitPtrToString(Dag.getArg(1));
       EmitForwardOptionPropertyHandlingCode(OptDescs.FindOption(Name),
                                             IndentLevel, NewName, O);
     }
@@ -1652,11 +1652,11 @@ void EmitToolClassDefinition (const ToolDescription& D,
 
 }
 
-/// EmitOptionDefintions - Iterate over a list of option descriptions
+/// EmitOptionDefinitions - Iterate over a list of option descriptions
 /// and emit registration code.
-void EmitOptionDefintions (const OptionDescriptions& descs,
-                           bool HasSink, bool HasExterns,
-                           std::ostream& O)
+void EmitOptionDefinitions (const OptionDescriptions& descs,
+                            bool HasSink, bool HasExterns,
+                            std::ostream& O)
 {
   std::vector<OptionDescription> Aliases;
 
@@ -2081,7 +2081,7 @@ void EmitPluginCode(const PluginData& Data, std::ostream& O) {
   EmitIncludes(O);
 
   // Emit global option registration code.
-  EmitOptionDefintions(Data.OptDescs, Data.HasSink, Data.HasExterns, O);
+  EmitOptionDefinitions(Data.OptDescs, Data.HasSink, Data.HasExterns, O);
 
   // Emit hook declarations.
   EmitHookDeclarations(Data.ToolDescs, O);