Changeset 1189 for code/branches

Timestamp:

Apr 26, 2008, 2:56:39 AM (17 years ago)

Author:

landauf

Message:

removed some debug output

Location:

code/branches/console/src

Files:

• core/CommandExecutor.cc (modified) (4 diffs)
• core/TclBind.cc (modified) (1 diff)
• orxonox/objects/Ambient.h (modified) (1 diff)

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

@@ -376 +376 @@
     bool CommandExecutor::execute(const std::string& command)
     {
-std::cout << "CE_execute: " << command << "\n";
         if ((CommandExecutor::getEvaluation().processedCommand_ != command) || (CommandExecutor::getEvaluation().state_ == CS_Uninitialized))
-{std::cout << "CE_execute->parse\n";
-            CommandExecutor::parse(command);}
+            CommandExecutor::parse(command);
 
         return CommandExecutor::execute(CommandExecutor::getEvaluation());
@@ -387 +385 @@
     bool CommandExecutor::execute(const CommandEvaluation& evaluation)
     {
+std::cout << "CE_execute: " << evaluation.processedCommand_ << "\n";
         SubString tokens(evaluation.processedCommand_, " ", SubString::WhiteSpaces, false, '\\', false, '"', false, '(', ')', false, '\0');
 
@@ -637 +636 @@
     {
         CommandExecutor::parse(command, true);
-std::cout << "1_1: " << command << std::endl;
+
         if (CommandExecutor::getEvaluation().tokens_.size() > 0)
         {
@@ -646 +645 @@
             CommandExecutor::getEvaluation().tokens_.append(SubString(lastToken, " "));
         }
-std::cout << "1_2: " << CommandExecutor::getEvaluation().tokens_[CommandExecutor::getEvaluation().tokens_.size() - 1] << std::endl;
+
         CommandExecutor::getEvaluation().evaluateParams();
         return CommandExecutor::getEvaluation();

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

@@ -46 +46 @@
     std::string Tcl_execute(Tcl::object const &args)
     {
-std::cout << "1\n";
-std::cout << "args: " << args.get() << std::endl;
+std::cout << "Tcl_execute: args: " << args.get() << std::endl;
         std::string command = args.get();
+
         if (command.size() >= 2 && command[0] == '{' && command[command.size() - 1] == '}')
             command = command.substr(1, command.size() - 2);
+
         CommandEvaluation evaluation = CommandExecutor::evaluate(command);
-std::cout << "2\n";
+
         if (!CommandExecutor::execute(evaluation))
             COUT(1) << "Error: Can't execute command \"" << command << "\"!" << std::endl;
-std::cout << "3\n";
+
         if (evaluation.hasReturnvalue())
-        {
-std::cout << "4\n";
             return evaluation.getReturnvalue().toString();
-        }
-std::cout << "5\n";
+
         return "";
     }

code/branches/console/src/orxonox/objects/Ambient.h

@@ -48 +48 @@
 
             static void setAmbientLightTest(const ColourValue& colour)
-                { std::cout << "setambientlight: " << colour << std::endl; Ambient::instance_s->setAmbientLight(colour); }
+                { Ambient::instance_s->setAmbientLight(colour); }
 
         private: