commit 3a9b22234ff43c58315c1397d096f78229f85af1
author Reid Spencer <rspencer@reidspencer.com> Thu Oct 28 04:04:38 2004 +0000
committer Reid Spencer <rspencer@reidspencer.com> Thu Oct 28 04:04:38 2004 +0000
tree 4b7721e4a95e2faec1242ea8799973716886add9
parent 5a7f13b2ae556dcc99f1fb44bb4af86a06ed14e3

Eliminate the force flag, configuration item, and related support


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17296 91177308-0d34-0410-b5e6-96231b3b80d8

tools/llvmc/Configuration.cpp

diff --git a/tools/llvmc/Configuration.cpp b/tools/llvmc/Configuration.cpp
index 6b5d339..6a835e2 100644
--- a/tools/llvmc/Configuration.cpp
+++ b/tools/llvmc/Configuration.cpp
@@ -71,8 +71,8 @@
       std::ifstream F;
   };
 
-  cl::opt<bool> DumpTokens("dump-tokens", cl::Optional, cl::Hidden, cl::init(false),
-    cl::desc("Dump lexical tokens (debug use only)."));
+  cl::opt<bool> DumpTokens("dump-tokens", cl::Optional, cl::Hidden, 
+    cl::init(false), cl::desc("Dump lexical tokens (debug use only)."));
 
   struct Parser
   {
@@ -157,7 +157,6 @@
       switch (token) {
         case ARGS_SUBST:        optList.push_back("%args%"); break;
         case DEFS_SUBST:        optList.push_back("%defs%"); break;
-        case FORCE_SUBST:       optList.push_back("%force%"); break;
         case IN_SUBST:          optList.push_back("%in%"); break;
         case INCLS_SUBST:       optList.push_back("%incls%"); break;
         case LIBS_SUBST:        optList.push_back("%libs%"); break;
@@ -349,8 +348,8 @@
             confDat->Translator.clear(CompilerDriver::OUTPUT_IS_ASM_FLAG);
           break;
         default:
-          error(std::string("Expecting 'command', 'preprocesses', ") +
-              "'translates' or 'output' but found '" + 
+          error(std::string("Expecting 'command', 'preprocesses', " 
+              "'translates' or 'output' but found '") + 
               ConfigLexerState.StringVal + "' instead");
           break;
       }
@@ -381,7 +380,7 @@
 
     void parseAssignment() {
       switch (token) {
-        case VERSION:       parseVersion(); break;
+        case VERSION_TOK:   parseVersion(); break;
         case LANG:          parseLang(); break;
         case PREPROCESSOR:  parsePreprocessor(); break;
         case TRANSLATOR:    parseTranslator(); break;
@@ -407,14 +406,15 @@
     }
   };
 
-  void
-  ParseConfigData(InputProvider& provider, CompilerDriver::ConfigData& confDat) {
-    Parser p;
-    p.token = EOFTOK;
-    p.provider = &provider;
-    p.confDat = &confDat;
-    p.parseFile();
+void
+ParseConfigData(InputProvider& provider, CompilerDriver::ConfigData& confDat) {
+  Parser p;
+  p.token = EOFTOK;
+  p.provider = &provider;
+  p.confDat = &confDat;
+  p.parseFile();
   }
+
 }
 
 CompilerDriver::ConfigData*