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

Timestamp:

May 26, 2008, 3:08:39 AM (16 years ago)

Author:

landauf

Message:

CommandExecutor seems to work very well right now. yet to come: autocompletion lists

File:

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

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

@@ -57 +57 @@
         this->functionclass_ = 0;
         this->function_ = 0;
+        this->possibleArgument_ = "";
+        this->argument_ = "";
 
         this->errorMessage_ = "";
@@ -97 +99 @@
         if (!this->bNewCommand_)
         {
-std::cout << "ASDF" << std::endl;
+std::cout << "not new" << std::endl;
             switch (this->state_)
             {
@@ -106 +108 @@
                 case CS_ShortcutOrIdentifier:
                     if (this->function_)
-                        return CommandExecutor::complete(this->function_->getName() + " ");
+                    {
+                        if (this->function_->getParamCount() == 0)
+                            return /*CommandExecutor::complete*/(this->command_ = this->function_->getName());
+                        else
+                            return /*CommandExecutor::complete*/(this->command_ = this->function_->getName() + " ");
+                    }
                     else if (this->functionclass_)
-                        return CommandExecutor::complete(this->functionclass_->getName() + " ");
+                        return /*CommandExecutor::complete*/(this->command_ = this->functionclass_->getName() + " ");
                     break;
                 case CS_Function:
                     if (this->function_)
-                        return CommandExecutor::complete(this->functionclass_->getName() + " " + this->function_->getName() + " ");
-                    break;
+                    {
+                        if (this->function_->getParamCount() == 0)
+                            return /*CommandExecutor::complete*/(this->command_ = this->functionclass_->getName() + " " + this->function_->getName());
+                        else
+                            return /*CommandExecutor::complete*/(this->command_ = this->functionclass_->getName() + " " + this->function_->getName() + " ");
+                    }
+                    break;
+                case CS_ParamPreparation:
                 case CS_Params:
-                    break;
+                {
+                    unsigned int maxIndex = this->commandTokens_.size();
+                    if (this->command_[this->command_.size() - 1] != ' ')
+                        maxIndex -= 1;
+                    std::string whitespace = "";
+                    if (this->function_->getParamCount() > (maxIndex + 1 - this->getStartindex()))
+                        whitespace = " ";
+
+                    if (this->possibleArgument_ != "")
+                    {
+                        maxIndex -= 1;
+                        this->argument_ = this->possibleArgument_;
+                    }
+
+                    return /*CommandExecutor::complete*/(this->command_ = this->commandTokens_.subSet(0, maxIndex).join() + " " + this->argument_ + whitespace);
+                    break;
+                }
                 case CS_Finished:
                     break;
@@ -144 +173 @@
                 return CommandEvaluation::dump(this->listOfPossibleFunctions_);
                 break;
+            case CS_ParamPreparation:
             case CS_Params:
                 if (this->listOfPossibleArguments_.size() > 0)
@@ -241 +271 @@
     std::string CommandEvaluation::dump(const ConsoleCommand* command)
     {
-        std::string output = command->getName() + ": ";
+        std::string output = command->getName();
+        if (command->getParamCount() > 0)
+            output += ": ";
+
         for (unsigned int i = 0; i < command->getParamCount(); i++)
         {