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

Timestamp:

May 26, 2008, 8:30:33 PM (16 years ago)

Author:

landauf

Message:

I start to like it

File:

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

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

@@ -110 +110 @@
                     {
                         if (this->function_->getParamCount() == 0)
-                            return /*CommandExecutor::complete*/(this->command_ = this->function_->getName());
+                            return (this->command_ = this->function_->getName());
                         else
-                            return /*CommandExecutor::complete*/(this->command_ = this->function_->getName() + " ");
+                            return (this->command_ = this->function_->getName() + " ");
                     }
                     else if (this->functionclass_)
-                        return /*CommandExecutor::complete*/(this->command_ = this->functionclass_->getName() + " ");
+                        return (this->command_ = this->functionclass_->getName() + " ");
                     break;
                 case CS_Function:
@@ -121 +121 @@
                     {
                         if (this->function_->getParamCount() == 0)
-                            return /*CommandExecutor::complete*/(this->command_ = this->functionclass_->getName() + " " + this->function_->getName());
+                            return (this->command_ = this->functionclass_->getName() + " " + this->function_->getName());
                         else
-                            return /*CommandExecutor::complete*/(this->command_ = this->functionclass_->getName() + " " + this->function_->getName() + " ");
+                            return (this->command_ = this->functionclass_->getName() + " " + this->function_->getName() + " ");
                     }
                     break;
@@ -129 +129 @@
                 case CS_Params:
                 {
+                    if (this->argument_ == "" && this->possibleArgument_ == "")
+                        break;
+
                     unsigned int maxIndex = this->commandTokens_.size();
                     if (this->command_[this->command_.size() - 1] != ' ')
@@ -142 +145 @@
                     }
 
-                    return /*CommandExecutor::complete*/(this->command_ = this->commandTokens_.subSet(0, maxIndex).join() + " " + this->argument_ + whitespace);
+                    return (this->command_ = this->commandTokens_.subSet(0, maxIndex).join() + " " + this->argument_ + whitespace);
                     break;
                 }