Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/console/src/core/CommandExecutor.cc

    r1436 r1437  
    146146    void CommandExecutor::parse(const std::string& command, bool bInitialize)
    147147    {
    148 std::cout << "parse (" << bInitialize << "): command: >" << command << "<" << std::endl;
    149148        if (bInitialize)
    150149            CommandExecutor::getEvaluation().initialize(command);
     
    344343                }
    345344            }
    346 std::cout << "1\n";
    347345            case CS_ParamPreparation:
    348 std::cout << "2\n";
    349346            {
    350347                if (CommandExecutor::getEvaluation().function_->getParamCount() == 0 || CommandExecutor::enoughArgumentsGiven(CommandExecutor::getEvaluation().function_))
     
    359356                        argumentNumber -= 1;
    360357
    361 std::cout << "arglist: " << CommandExecutor::getLastArgument() << ", " << CommandExecutor::getEvaluation().function_->getName() << ", " << argumentNumber << std::endl;
    362358                    CommandExecutor::createListOfPossibleArguments(CommandExecutor::getLastArgument(), CommandExecutor::getEvaluation().function_, argumentNumber);
    363359                    CommandExecutor::getEvaluation().state_ = CS_Params;
     
    371367            }
    372368            case CS_Params:
    373 std::cout << "3\n";
    374369            {
    375370                if (CommandExecutor::getEvaluation().listOfPossibleArguments_.size() == 1)
    376371                {
    377 std::cout << "3_1\n";
    378372                    // There is exactly one possible argument
    379373                    CommandExecutor::getEvaluation().argument_ = (*CommandExecutor::getEvaluation().listOfPossibleArguments_.begin()).second;
     
    384378                else if (CommandExecutor::getEvaluation().listOfPossibleArguments_.size() == 0)
    385379                {
    386 std::cout << "3_2\n";
    387380                    // The user tries something new - we let him do
    388381                    CommandExecutor::getEvaluation().state_ = CS_ParamPreparation;
     
    392385                else
    393386                {
    394 std::cout << "3_3\n";
    395387                    // There are several possibilities
    396388                    unsigned int argumentNumber = CommandExecutor::argumentsGiven();
    397389                    if (argumentNumber > 0)
    398390                        --argumentNumber;
    399 std::cout << "3_3_1\n";
    400391                    if (CommandExecutor::getEvaluation().functionclass_ && argumentNumber > 0)
    401392                        --argumentNumber;
    402393
    403 std::cout << "3_3_2\n";
    404394                    CommandExecutor::getEvaluation().argument_ = CommandExecutor::getCommonBegin(CommandExecutor::getEvaluation().listOfPossibleArguments_);
    405 std::cout << "3_3_3\n";
    406395                    CommandExecutor::getEvaluation().possibleArgument_ = CommandExecutor::getPossibleArgument(CommandExecutor::getLastArgument(), CommandExecutor::getEvaluation().function_, argumentNumber);
    407 std::cout << "3_3_4\n";
    408396                    CommandExecutor::getEvaluation().state_ = CS_ParamPreparation;
    409 std::cout << "3_3_5\n";
    410397                    return;
    411398                }
    412399            }
    413400            case CS_Finished:
    414 std::cout << "4\n";
    415401            {
    416402                // Nothing more to do
  • code/branches/console/src/core/ConsoleCommandCompilation.cc

    r1436 r1437  
    8888    {
    8989        if (newline)
     90        {
    9091            COUT(0) << text << std::endl;
     92        }
    9193        else
     94        {
    9295            COUT(0) << text;
     96        }
    9397    }
    9498
Note: See TracChangeset for help on using the changeset viewer.