Changeset 7235 for code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.cc

Timestamp:

Aug 28, 2010, 1:25:04 AM (14 years ago)

Author:

landauf

Message:

• fixed error if a command doesn't exist not being shown while using auto-completion
• fixed error if a command doesn't exist not being redirected to sub-command auto-completion
• fixed unneeded line-breaks in auto-completion list

File:

• code/branches/consolecommands3/src/libraries/core/command/CommandEvaluation.cc (modified) (4 diffs)

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

@@ -197 +197 @@
             this->retrievePossibleArguments();
 
-        if (!this->possibleArguments_.empty())
+        if (CommandEvaluation::getSize(this->possibleArguments_) > 0 || (!this->possibleArguments_.empty() && this->isValid()))
             return CommandEvaluation::dump(this->possibleArguments_);
 
@@ -256 +256 @@
             }
         }
+    }
+
+    /* static */ size_t CommandEvaluation::getSize(const ArgumentCompletionList& list)
+    {
+        size_t count = 0;
+        for (ArgumentCompletionList::const_iterator it = list.begin(); it != list.end(); ++it)
+            if (it->getComparable() != "")
+                ++count;
+        return count;
     }
 
@@ -294 +303 @@
             }
         }
-    }
-
-    /* static */ size_t CommandEvaluation::getSize(const ArgumentCompletionList& list)
-    {
-        size_t count = 0;
-        for (ArgumentCompletionList::const_iterator it = list.begin(); it != list.end(); ++it)
-            if (it->getComparable() != "")
-                ++count;
-        return count;
-    }
-
-    /* static */ std::string CommandEvaluation::dump(const ArgumentCompletionList& list)
-    {
-        std::string output;
-        for (ArgumentCompletionList::const_iterator it = list.begin(); it != list.end(); ++it)
-        {
-            output += it->getDisplay();
-
-            if (it->getComparable() != "")
-                output += ' ';
-        }
-        return output;
-    }
-
-    /* static */ std::string CommandEvaluation::dump(const _ConsoleCommand* command)
-    {
-        std::string output = command->getName();
-        if (command->getExecutor()->getParamCount() > 0)
-            output += ": ";
-
-        for (unsigned int i = 0; i < command->getExecutor()->getParamCount(); i++)
-        {
-            if (i != 0)
-                output += ' ';
-
-            if (command->getExecutor()->defaultValueSet(i))
-                output += '[';
-            else
-                output += '{';
-
-            output += command->getExecutor()->getTypenameParam(i);
-
-            if (command->getExecutor()->defaultValueSet(i))
-                output += '=' + command->getExecutor()->getDefaultValue(i).getString() + ']';
-            else
-                output += '}';
-        }
-        return output;
     }
 
@@ -405 +366 @@
         }
     }
+
+    /* static */ std::string CommandEvaluation::dump(const ArgumentCompletionList& list)
+    {
+        std::string output;
+        for (ArgumentCompletionList::const_iterator it = list.begin(); it != list.end(); ++it)
+        {
+            output += it->getDisplay();
+
+            if (it->getComparable() != "")
+                output += ' ';
+        }
+        return output;
+    }
+
+    /* static */ std::string CommandEvaluation::dump(const _ConsoleCommand* command)
+    {
+        std::string output = command->getName();
+        if (command->getExecutor()->getParamCount() > 0)
+            output += ": ";
+
+        for (unsigned int i = 0; i < command->getExecutor()->getParamCount(); i++)
+        {
+            if (i != 0)
+                output += ' ';
+
+            if (command->getExecutor()->defaultValueSet(i))
+                output += '[';
+            else
+                output += '{';
+
+            output += command->getExecutor()->getTypenameParam(i);
+
+            if (command->getExecutor()->defaultValueSet(i))
+                output += '=' + command->getExecutor()->getDefaultValue(i).getString() + ']';
+            else
+                output += '}';
+        }
+        return output;
+    }
 }