Changeset 1434 for code/branches/console/src/core/CommandEvaluation.cc

Timestamp:

May 27, 2008, 12:27:13 AM (16 years ago)

Author:

landauf

Message:

autocompletion is almost done

File:

• code/branches/console/src/core/CommandEvaluation.cc (modified) (7 diffs)

code/branches/console/src/core/CommandEvaluation.cc

@@ -30 +30 @@
 #include "ConsoleCommand.h"
 #include "Debug.h"
+#include "util/String.h"
 
 namespace orxonox
@@ -81 +82 @@
         }
 
-        if (!this->bCommandChanged_)
+        if (!this->bCommandChanged_ || removeTrailingWhitespaces(this->command_) == removeTrailingWhitespaces(this->originalCommand_))
         {
             COUT(4) << "CE_execute: " << this->command_ << "\n";
@@ -136 +137 @@
                         maxIndex -= 1;
                     std::string whitespace = "";
-                    if (this->function_->getParamCount() > (maxIndex + 1 - this->getStartindex()))
-                        whitespace = " ";
 
                     if (this->possibleArgument_ != "")
                     {
-                        maxIndex -= 1;
                         this->argument_ = this->possibleArgument_;
+                        if (this->function_->getParamCount() > (maxIndex + 1 - this->getStartindex()))
+                            whitespace = " ";
                     }
 
@@ -163 +163 @@
         {
             case CS_Uninitialized:
+std::cout << "hint: CS_Uninitialized" << std::endl;
                 break;
             case CS_Empty:
+std::cout << "hint: CS_Empty" << std::endl;
             case CS_ShortcutOrIdentifier:
+std::cout << "hint: CS_ShortcutOrIdentifier" << std::endl;
                 if (this->listOfPossibleFunctions_.size() == 0)
                     return CommandEvaluation::dump(this->listOfPossibleIdentifiers_);
@@ -174 +177 @@
                 break;
             case CS_Function:
+std::cout << "hint: CS_Function" << std::endl;
                 return CommandEvaluation::dump(this->listOfPossibleFunctions_);
                 break;
             case CS_ParamPreparation:
+std::cout << "hint: CS_ParamPreparation" << std::endl;
             case CS_Params:
+std::cout << "hint: CS_Params" << std::endl;
                 if (this->listOfPossibleArguments_.size() > 0)
                     return CommandEvaluation::dump(this->listOfPossibleArguments_);
@@ -183 +189 @@
                     return CommandEvaluation::dump(this->function_);
             case CS_Finished:
+std::cout << "hint: CS_Finished" << std::endl;
                 if (this->function_)
                     return CommandEvaluation::dump(this->function_);
                 break;
             case CS_Error:
+std::cout << "hint: CS_Error" << std::endl;
                 return this->errorMessage_;
                 break;
@@ -272 +280 @@
     }
 
+    std::string CommandEvaluation::dump(const std::list<std::pair<std::string, std::string> >& list)
+    {
+        std::string output = "";
+        for (std::list<std::pair<std::string, std::string> >::const_iterator it = list.begin(); it != list.end(); ++it)
+        {
+            if (it != list.begin())
+                output += " ";
+
+            output += (*it).second;
+        }
+        return output;
+    }
+
     std::string CommandEvaluation::dump(const ConsoleCommand* command)
     {