s/TokenizeCmdline/TokenizeCmdLine/

llvm-svn: 91592

1 files changed, 13 insertions, 14 deletions

diff --git a/llvm/utils/TableGen/LLVMCConfigurationEmitter.cpp b/llvm/utils/TableGen/LLVMCConfigurationEmitter.cpp
index 5be9ab71ef1..767e5b71249 100644
--- a/llvm/utils/TableGen/LLVMCConfigurationEmitter.cpp
+++ b/llvm/utils/TableGen/LLVMCConfigurationEmitter.cpp
@@ -26,6 +26,7 @@
 
 using namespace llvm;
 
+namespace {
 
 //===----------------------------------------------------------------------===//
 /// Typedefs
@@ -37,18 +38,16 @@ typedef std::vector<std::string> StrVector;
 /// Constants
 
 // Indentation.
-static const unsigned TabWidth = 4;
-static const unsigned Indent1  = TabWidth*1;
-static const unsigned Indent2  = TabWidth*2;
-static const unsigned Indent3  = TabWidth*3;
+const unsigned TabWidth = 4;
+const unsigned Indent1  = TabWidth*1;
+const unsigned Indent2  = TabWidth*2;
+const unsigned Indent3  = TabWidth*3;
 
 // Default help string.
-static const char * const DefaultHelpString = "NO HELP MESSAGE PROVIDED";
+const char * const DefaultHelpString = "NO HELP MESSAGE PROVIDED";
 
 // Name for the "sink" option.
-static const char * const SinkOptionName = "AutoGeneratedSinkOption";
-
-namespace {
+const char * const SinkOptionName = "AutoGeneratedSinkOption";
 
 //===----------------------------------------------------------------------===//
 /// Helper functions
@@ -1452,10 +1451,10 @@ void EmitCaseConstructHandler(const Init* Case, unsigned IndentLevel,
            EmitCaseStatementCallback<F>(Callback, O), IndentLevel);
 }
 
-/// TokenizeCmdline - converts from
+/// TokenizeCmdLine - converts from
 /// "$CALL(HookName, 'Arg1', 'Arg2')/path -arg1 -arg2" to
 /// ["$CALL(", "HookName", "Arg1", "Arg2", ")/path", "-arg1", "-arg2"].
-void TokenizeCmdline(const std::string& CmdLine, StrVector& Out) {
+void TokenizeCmdLine(const std::string& CmdLine, StrVector& Out) {
   const char* Delimiters = " \t\n\v\f\r";
   enum TokenizerState
   { Normal, SpecialCommand, InsideSpecialCommand, InsideQuotationMarks }
@@ -1642,7 +1641,7 @@ void EmitCmdLineVecFill(const Init* CmdLine, const std::string& ToolName,
                         bool IsJoin, unsigned IndentLevel,
                         raw_ostream& O) {
   StrVector StrVec;
-  TokenizeCmdline(InitPtrToString(CmdLine), StrVec);
+  TokenizeCmdLine(InitPtrToString(CmdLine), StrVec);
 
   if (StrVec.empty())
     throw "Tool '" + ToolName + "' has empty command line!";
@@ -1828,7 +1827,7 @@ class EmitActionHandlersCallback
                           unsigned IndentLevel, raw_ostream& O) const
   {
     StrVector Out;
-    TokenizeCmdline(Str, Out);
+    TokenizeCmdLine(Str, Out);
 
     for (StrVector::const_iterator B = Out.begin(), E = Out.end();
          B != E; ++B) {
@@ -1962,7 +1961,7 @@ class EmitActionHandlersCallback
 
 bool IsOutFileIndexCheckRequiredStr (const Init* CmdLine) {
   StrVector StrVec;
-  TokenizeCmdline(InitPtrToString(CmdLine), StrVec);
+  TokenizeCmdLine(InitPtrToString(CmdLine), StrVec);
 
   for (StrVector::const_iterator I = StrVec.begin(), E = StrVec.end();
        I != E; ++I) {
@@ -2556,7 +2555,7 @@ public:
 
   void onCmdLine(const std::string& Cmd) {
     StrVector cmds;
-    TokenizeCmdline(Cmd, cmds);
+    TokenizeCmdLine(Cmd, cmds);
 
     for (StrVector::const_iterator B = cmds.begin(), E = cmds.end();
          B != E; ++B) {