Changeset 1230

Timestamp:

May 4, 2008, 4:44:24 PM (17 years ago)

Author:

landauf

Message:

added a tcl-thread, but there are still some bugs and problems

Location:

code/branches/console

Files:

• cmake/FindBoost.cmake (modified) (3 diffs)
• src/core/CMakeLists.txt (modified) (2 diffs)
• src/core/CommandExecutor.cc (modified) (3 diffs)
• src/core/CommandExecutor.h (modified) (1 diff)
• src/core/InputBuffer.cc (modified) (1 diff)
• src/core/OutputHandler.cc (modified) (1 diff)
• src/core/OutputHandler.h (modified) (1 diff)
• src/core/TclBind.cc (modified) (4 diffs)
• src/core/TclBind.h (modified) (1 diff)
• src/core/TclThreadManager.cc (added)
• src/core/TclThreadManager.h (added)

code/branches/console/cmake/FindBoost.cmake

@@ -101 +101 @@
 # Add in some path suffixes. These will have to be updated whenever a new Boost version comes out.
 SET(SUFFIX_FOR_PATH
+ boost-1_35_0
+ boost-1_35
  boost-1_34_1
  boost-1_34_0
@@ -112 +114 @@
 #
 IF(WIN32)
-  SET(Boost_INCLUDE_DIR ../libs/boost_1_33_1)
+  SET(Boost_INCLUDE_DIR
+#    ../libs/boost_1_33_1
+    ../libs/boost_1_35_0
+  )
 ELSE(WIN32)
   FIND_PATH(Boost_INCLUDE_DIR NAMES boost/config.hpp PATH_SUFFIXES ${SUFFIX_FOR_PATH} PATHS
@@ -187 +192 @@
   gcc-1_33_1
   gcc-mt-1_33_1
+  mgw34-mt-1_35
 )
 

code/branches/console/src/core/CMakeLists.txt

@@ -27 +27 @@
   Script.cc
   TclBind.cc
+  TclThreadManager.cc
 )
 
@@ -37 +38 @@
   ${Lua_LIBRARIES}
   ${OIS_LIBRARIES}
+  ${Boost_thread_LIBRARIES}
 )

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

@@ -50 +50 @@
     ConsoleCommandShortcutExtern(exec, AccessLevel::None);
     ConsoleCommandShortcutExtern(echo, AccessLevel::None);
+    ConsoleCommandShortcutExtern(puts, AccessLevel::None);
 
     ConsoleCommandShortcutExtern(read, AccessLevel::None);
@@ -92 +93 @@
     std::string echo(const std::string& text)
     {
+        std::cout << text << std::endl;
         return text;
+    }
+
+    void puts(bool newline, const std::string& text)
+    {
+        if (newline)
+            std::cout << text << std::endl;
+        else
+            std::cout << text;
     }
 
@@ -384 +394 @@
         if (useTcl)
         {
-            return TclBind::eval(command);
-        }
-        else
-        {
-            if ((CommandExecutor::getEvaluation().processedCommand_ != command) || (CommandExecutor::getEvaluation().state_ == CS_Uninitialized))
-                CommandExecutor::parse(command);
-
-            return CommandExecutor::execute(CommandExecutor::getEvaluation());
-        }
+            std::string temp = getLowercase(removeTrailingWhitespaces(command));
+            if (!(temp.find("tclthread") == 0 || temp.find("tclthreadmanager") == 0))
+                return TclBind::eval(command);
+        }
+
+        if ((CommandExecutor::getEvaluation().processedCommand_ != command) || (CommandExecutor::getEvaluation().state_ == CS_Uninitialized))
+            CommandExecutor::parse(command);
+
+        return CommandExecutor::execute(CommandExecutor::getEvaluation());
     }
 

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

@@ -65 +65 @@
     void exec(const std::string& filename);
     std::string echo(const std::string& text);
+    void puts(bool newline, const std::string& test);
 
     void write(const std::string& filename, const std::string& text);

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

@@ -39 +39 @@
     {
         //this->bActivated_ = false;
-        this->allowedChars_ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZäöüÄÖÜ0123456789 \\\"(){}[]<>.:,;_-+*/=!?|$&%^";
+        this->allowedChars_ = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZäöüÄÖÜ0123456789 \\\"(){}[]<>.:,;_-+*/=!?|$&%^~";
         this->keyboard_ = InputManager::getSingleton().getKeyboard();
         this->buffer_ = "";

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

@@ -38 +38 @@
 namespace orxonox
 {
-    ConsoleCommandShortcutGeneric(log, createExecutor(createFunctor(&OutputHandler::log), "log", AccessLevel::None));
+    ConsoleCommandShortcutGeneric(log,     createExecutor(createFunctor(&OutputHandler::log),     "log",     AccessLevel::None));
+    ConsoleCommandShortcutGeneric(error,   createExecutor(createFunctor(&OutputHandler::error),   "error",   AccessLevel::None));
+    ConsoleCommandShortcutGeneric(warning, createExecutor(createFunctor(&OutputHandler::warning), "warning", AccessLevel::None));
+    ConsoleCommandShortcutGeneric(info,    createExecutor(createFunctor(&OutputHandler::info),    "info",    AccessLevel::None));
+    ConsoleCommandShortcutGeneric(debug,   createExecutor(createFunctor(&OutputHandler::debug),   "debug",   AccessLevel::None));
 
     /**

code/branches/console/src/core/OutputHandler.h

@@ -63 +63 @@
             static inline std::string log(const std::string& text)
                 { OutputHandler::getOutStream().setOutputLevel(0); OutputHandler::getOutStream().output(text + "\n"); return text; }
+
+            /** @brief Puts an error on the outstream. @param text The text */
+            static inline std::string error(const std::string& text)
+                { OutputHandler::getOutStream().setOutputLevel(1); OutputHandler::getOutStream().output(text + "\n"); return text; }
+
+            /** @brief Puts a warning on the outstream. @param text The text */
+            static inline std::string warning(const std::string& text)
+                { OutputHandler::getOutStream().setOutputLevel(2); OutputHandler::getOutStream().output(text + "\n"); return text; }
+
+            /** @brief Puts an info on the outstream. @param text The text */
+            static inline std::string info(const std::string& text)
+                { OutputHandler::getOutStream().setOutputLevel(3); OutputHandler::getOutStream().output(text + "\n"); return text; }
+
+            /** @brief Puts some debug output on the outstream. @param text The text */
+            static inline std::string debug(const std::string& text)
+                { OutputHandler::getOutStream().setOutputLevel(4); OutputHandler::getOutStream().output(text + "\n"); return text; }
 
             /** @brief Returns a reference to the logfile. @return The logfile */

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

@@ -70 +70 @@
         {
             this->interpreter_ = new Tcl::interpreter(this->tclLibPath_);
-            this->interpreter_->def("puts", TclBind::puts, Tcl::variadic());
-            this->interpreter_->def("orxonox", TclBind::orxonox, Tcl::variadic());
-            this->interpreter_->def("execute", TclBind::execute, Tcl::variadic());
-            this->interpreter_->eval("proc unknown {args} { return [orxonox $args] }");
+            this->interpreter_->def("orxonox", TclBind::tcl_orxonox, Tcl::variadic());
+            this->interpreter_->def("execute", TclBind::tcl_execute, Tcl::variadic());
             this->interpreter_->eval("rename exit tclexit; proc exit {} { orxonox exit }");
+            this->interpreter_->eval("redef_puts");
         }
     }
@@ -89 +88 @@
     }
 
-    void TclBind::puts(Tcl::object const &args)
+    void TclBind::tcl_puts(Tcl::object const &args)
     {
         COUT(0) << args.get() << std::endl;
     }
 
-    std::string TclBind::orxonox(Tcl::object const &args)
+    std::string TclBind::tcl_orxonox(Tcl::object const &args)
     {
-std::cout << "Tcl_execute: args: " << args.get() << std::endl;
+std::cout << "Tcl_orxonox: args: " << args.get() << std::endl;
         std::string command = args.get();
 
@@ -111 +110 @@
     }
 
-    void TclBind::execute(Tcl::object const &args)
+    void TclBind::tcl_execute(Tcl::object const &args)
     {
+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);
+
+        if (!CommandExecutor::execute(command, false))
+            COUT(1) << "Error: Can't execute command \"" << command << "\"!" << std::endl;
     }
 
@@ -145 +152 @@
         catch (Tcl::tcl_error const &e)
         {
-            COUT(1) << "Error: " << e.what() << std::endl;
+            COUT(1) << "Tcl error: " << e.what() << std::endl;
         }
         catch (std::exception const &e)

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

@@ -36 +36 @@
 namespace orxonox
 {
-    class TclBind
+    class _CoreExport TclBind
     {
         public:
             static TclBind& getInstance();
 
+            static std::string tcl(const std::string& tclcode);
+
             void setDataPath(const std::string& datapath);
+            std::string getTclLibPath() const { return this->tclLibPath_; }
             void createTclInterpreter();
             void createNewTclInterpreter();
 
-            static void puts(Tcl::object const &args);
-            static void execute(Tcl::object const &args);
-            static std::string orxonox(Tcl::object const &args);
-            static std::string tcl(const std::string& tclcode);
+            static void tcl_puts(Tcl::object const &args);
+
+            static void tcl_execute(Tcl::object const &args);
+            static std::string tcl_orxonox(Tcl::object const &args);
+
             static bool eval(const std::string& tclcode);