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

Timestamp:

Aug 28, 2010, 12:02:03 AM (14 years ago)

Author:

landauf

Message:

• console commands "setMMSoundPath" and "printObjects" are now hidden.
• added "unhide" command to show hidden commands
• extended auto-completion capability by allowing multi-word ArgumentCompleter and more
• added new auto-completion function that allows other commands as argument for a command (for example "delay [time] [command]")

File:

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

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

@@ -177 +177 @@
             this->retrievePossibleArguments();
 
-        if (this->possibleArguments_.empty())
+        if (CommandEvaluation::getSize(this->possibleArguments_) == 0)
         {
             return this->string_;
@@ -184 +184 @@
         {
             std::string output = this->string_.substr(0, this->string_.find_last_of(' ') + 1);
-
             output += CommandEvaluation::getCommonBegin(this->possibleArguments_);
             return output;
@@ -234 +233 @@
             MultiType param[MAX_FUNCTOR_ARGUMENTS];
 
+            size_t max = this->hintArgumentsOffset_ + this->hintCommand_->getExecutor()->getParamCount();
+
             for (size_t i = 0; i < argumentID; ++i)
-                param[i] = this->getToken(this->getNumberOfArguments() - i - 1);
-
-            this->possibleArguments_ = (*ac)(param[0], param[1], param[2], param[3], param[4]);
-
-            CommandEvaluation::strip(this->possibleArguments_, param[0]);
+                param[i] = this->getToken(std::min(this->getNumberOfArguments(), max) - i - 1);
+
+            if (this->getNumberOfArguments() > max)
+            {
+                if (ac->useMultipleWords())
+                {
+                    std::string surplusArguments = this->tokens_.subSet(max - 1).join();
+                    if (this->string_[this->string_.size() - 1] == ' ')
+                        surplusArguments += ' ';
+
+                    this->possibleArguments_ = (*ac)(surplusArguments, param[1], param[2], param[3], param[4]);
+                    CommandEvaluation::strip(this->possibleArguments_, this->getToken(this->getNumberOfArguments() - 1));
+                }
+            }
+            else
+            {
+                this->possibleArguments_ = (*ac)(param[0], param[1], param[2], param[3], param[4]);
+                CommandEvaluation::strip(this->possibleArguments_, param[0]);
+            }
         }
     }
@@ -250 +265 @@
         {
             const std::string& entry = it->getComparable();
+
+            if (entry == "")
+            {
+                ++it;
+                continue;
+            }
 
             if (entry.size() < fragmentLC.size())
@@ -275 +296 @@
     }
 
+    /* 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)
     {
@@ -280 +310 @@
         for (ArgumentCompletionList::const_iterator it = list.begin(); it != list.end(); ++it)
         {
-            if (it != list.begin())
+            output += it->getDisplay();
+
+            if (it->getComparable() != "")
                 output += ' ';
-
-            output += it->getDisplay();
         }
         return output;
@@ -316 +346 @@
     /* static */ std::string CommandEvaluation::getCommonBegin(const ArgumentCompletionList& list)
     {
-        if (list.size() == 0)
+        if (CommandEvaluation::getSize(list) == 0)
         {
             return "";
         }
-        else if (list.size() == 1)
-        {
-            if (list.begin()->hasDisplay())
-                return (list.begin()->getString());
-            else
-                return (list.begin()->getString() + ' ');
+        else if (CommandEvaluation::getSize(list) == 1)
+        {
+            for (ArgumentCompletionList::const_iterator it = list.begin(); it != list.end(); ++it)
+            {
+                if (it->getComparable() != "")
+                {
+                    if (it->hasDisplay())
+                        return (it->getString());
+                    else
+                        return (it->getString() + ' ');
+                }
+            }
+
+            return "";
         }
         else
@@ -338 +376 @@
                     const std::string& argumentComparable = it->getComparable();
                     const std::string& argument = it->getString();
+
+                    if (argumentComparable == "")
+                        continue;
+
                     if (argument.size() > i)
                     {
-                        if (it == list.begin())
+                        if (tempComparable == 0)
                         {
                             tempComparable = argumentComparable[i];