Changeset 7276 for code/branches/consolecommands3/src/libraries/core

Timestamp:

Aug 31, 2010, 1:00:20 AM (14 years ago)

Author:

landauf

Message:

until now we could group words and values in console commands and XML values using parentheses (…). now we have to use braces {…}, because that works better in connection with Tcl. in practice however this feature was never used before, so this change shouldn't affect anything.

Location:

code/branches/consolecommands3/src/libraries/core

Files:

• CommandLineParser.h (modified) (1 diff)
• ConfigValueContainer.cc (modified) (1 diff)
• GraphicsManager.cc (modified) (1 diff)
• command/ArgumentCompletionFunctions.cc (modified) (1 diff)
• command/CommandEvaluation.cc (modified) (1 diff)
• command/Executor.cc (modified) (1 diff)
• input/Button.cc (modified) (2 diffs)

code/branches/consolecommands3/src/libraries/core/CommandLineParser.h

@@ -64 +64 @@
         Note the difference between "-" and "--"!
         Also, there is no restriction to the number of strings you add after --name.
-        So "--startVector (2, 4, 5)" is perfectly legal.
+        So "--startVector {2, 4, 5}" is perfectly legal.
 
         Retrieving an argument is possible with the getCommandLineArgument function of the

code/branches/consolecommands3/src/libraries/core/ConfigValueContainer.cc

@@ -302 +302 @@
     bool ConfigValueContainer::callFunctionWithIndex(bool (ConfigValueContainer::* function) (unsigned int, const MultiType&), const std::string& input)
     {
-        SubString token(input, " ", SubString::WhiteSpaces, true, '\\', false, '"', false, '(', ')', false, '\0');
+        SubString token(input, " ", SubString::WhiteSpaces, true, '\\', false, '"', false, '\0', '\0', false, '\0');
         int index = -1;
         bool success = false;

code/branches/consolecommands3/src/libraries/core/GraphicsManager.cc

@@ -293 +293 @@
         boost::filesystem::path folder(ogrePluginsDirectory_);
         // Do some SubString magic to get the comma separated list of plugins
-        SubString plugins(ogrePlugins_, ",", " ", false, '\\', false, '"', false, '(', ')', false, '\0');
+        SubString plugins(ogrePlugins_, ",", " ", false, '\\', false, '"', false, '{', '}', false, '\0');
         // Use backslash paths on Windows! file_string() already does that though.
         for (unsigned int i = 0; i < plugins.size(); ++i)

code/branches/consolecommands3/src/libraries/core/command/ArgumentCompletionFunctions.cc

@@ -147 +147 @@
         ARGUMENT_COMPLETION_FUNCTION_IMPLEMENTATION_MULTI(hiddencommand)(const std::string& fragment)
         {
-            SubString tokens(fragment, " ", SubString::WhiteSpaces, false, '\\', true, '"', true, '(', ')', true, '\0');
+            SubString tokens(fragment, " ", SubString::WhiteSpaces, false, '\\', true, '"', true, '{', '}', true, '\0');
 
             if (tokens.size() == 0)

code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.cc

@@ -53 +53 @@
         this->numberOfEvaluatedParams_ = 0;
 
-        this->tokens_.split(command, " ", SubString::WhiteSpaces, false, '\\', true, '"', true, '(', ')', true, '\0');
+        this->tokens_.split(command, " ", SubString::WhiteSpaces, false, '\\', true, '"', true, '{', '}', true, '\0');
     }
 

code/branches/consolecommands3/src/libraries/core/command/Executor.cc

@@ -59 +59 @@
     MultiType Executor::parse(const std::string& arguments, int* error, const std::string& delimiter, bool bPrintError) const
     {
-        return this->parse(SubString(arguments, delimiter, SubString::WhiteSpaces, false, '\\', true, '"', true, '(', ')', true, '\0'), error, delimiter, bPrintError);
+        return this->parse(SubString(arguments, delimiter, SubString::WhiteSpaces, false, '\\', true, '"', true, '{', '}', true, '\0'), error, delimiter, bPrintError);
     }
 

code/branches/consolecommands3/src/libraries/core/input/Button.cc

@@ -117 +117 @@
         // separate the commands
         SubString commandStrings(bindingString_, "|", SubString::WhiteSpaces, false,
-            '\\', false, '"', false, '(', ')', false, '\0');
+            '\\', false, '"', false, '{', '}', false, '\0');
 
         for (unsigned int iCommand = 0; iCommand < commandStrings.size(); iCommand++)
@@ -124 +124 @@
             {
                 SubString tokens(commandStrings[iCommand], " ", SubString::WhiteSpaces, false,
-                    '\\', false, '"', false, '(', ')', false, '\0');
+                    '\\', false, '"', false, '{', '}', false, '\0');
 
                 KeybindMode::Value mode = KeybindMode::None;