Changeset 1437

Timestamp:

May 27, 2008, 4:15:47 AM (16 years ago)

Author:

landauf

Message:

removed debug output and fixed a small stupid bug

Location:

code/branches/console/src/core

Files:

• CommandExecutor.cc (modified) (6 diffs)
• ConsoleCommandCompilation.cc (modified) (1 diff)

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

@@ -146 +146 @@
     void CommandExecutor::parse(const std::string& command, bool bInitialize)
     {
-std::cout << "parse (" << bInitialize << "): command: >" << command << "<" << std::endl;
         if (bInitialize)
             CommandExecutor::getEvaluation().initialize(command);
@@ -344 +343 @@
                 }
             }
-std::cout << "1\n";
             case CS_ParamPreparation:
-std::cout << "2\n";
             {
                 if (CommandExecutor::getEvaluation().function_->getParamCount() == 0 || CommandExecutor::enoughArgumentsGiven(CommandExecutor::getEvaluation().function_))
@@ -359 +356 @@
                         argumentNumber -= 1;
 
-std::cout << "arglist: " << CommandExecutor::getLastArgument() << ", " << CommandExecutor::getEvaluation().function_->getName() << ", " << argumentNumber << std::endl;
                     CommandExecutor::createListOfPossibleArguments(CommandExecutor::getLastArgument(), CommandExecutor::getEvaluation().function_, argumentNumber);
                     CommandExecutor::getEvaluation().state_ = CS_Params;
@@ -371 +367 @@
             }
             case CS_Params:
-std::cout << "3\n";
             {
                 if (CommandExecutor::getEvaluation().listOfPossibleArguments_.size() == 1)
                 {
-std::cout << "3_1\n";
                     // There is exactly one possible argument
                     CommandExecutor::getEvaluation().argument_ = (*CommandExecutor::getEvaluation().listOfPossibleArguments_.begin()).second;
@@ -384 +378 @@
                 else if (CommandExecutor::getEvaluation().listOfPossibleArguments_.size() == 0)
                 {
-std::cout << "3_2\n";
                     // The user tries something new - we let him do
                     CommandExecutor::getEvaluation().state_ = CS_ParamPreparation;
@@ -392 +385 @@
                 else
                 {
-std::cout << "3_3\n";
                     // There are several possibilities
                     unsigned int argumentNumber = CommandExecutor::argumentsGiven();
                     if (argumentNumber > 0)
                         --argumentNumber;
-std::cout << "3_3_1\n";
                     if (CommandExecutor::getEvaluation().functionclass_ && argumentNumber > 0)
                         --argumentNumber;
 
-std::cout << "3_3_2\n";
                     CommandExecutor::getEvaluation().argument_ = CommandExecutor::getCommonBegin(CommandExecutor::getEvaluation().listOfPossibleArguments_);
-std::cout << "3_3_3\n";
                     CommandExecutor::getEvaluation().possibleArgument_ = CommandExecutor::getPossibleArgument(CommandExecutor::getLastArgument(), CommandExecutor::getEvaluation().function_, argumentNumber);
-std::cout << "3_3_4\n";
                     CommandExecutor::getEvaluation().state_ = CS_ParamPreparation;
-std::cout << "3_3_5\n";
                     return;
                 }
             }
             case CS_Finished:
-std::cout << "4\n";
             {
                 // Nothing more to do

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

@@ -88 +88 @@
     {
         if (newline)
+        {
             COUT(0) << text << std::endl;
+        }
         else
+        {
             COUT(0) << text;
+        }
     }