Changeset 1255 for code/branches/console/src/core/CommandExecutor.cc

Timestamp:

May 12, 2008, 2:50:21 PM (17 years ago)

Author:

landauf

Message:

• after a total rewrite of the TclThreadManager, there are some new problems, but most of the old ones are fixed. i commit this version to have a backup, not because it's finished.
• 'exec' command is now called 'source' (tcl and orxonox)
• 'orxonox' command is now called 'query' (tcl only)
• added 'crossquery' command (tcl only)

File:

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

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

@@ -48 +48 @@
     ConsoleCommandShortcutGeneric(keyword3, createExecutor((FunctorStatic*)0, "bind", AccessLevel::User));
 
-    ConsoleCommandShortcutExtern(exec, AccessLevel::None);
+    ConsoleCommandShortcutExtern(source, AccessLevel::None);
     ConsoleCommandShortcutExtern(echo, AccessLevel::None);
     ConsoleCommandShortcutExtern(puts, AccessLevel::None);
@@ -56 +56 @@
     ConsoleCommandShortcutExtern(write, AccessLevel::None);
 
-    void exec(const std::string& filename)
+    void source(const std::string& filename)
     {
         static std::set<std::string> executingFiles;
@@ -63 +63 @@
         if (it != executingFiles.end())
         {
-            COUT(1) << "Error: Recurring exec command in \"" << filename << "\". Stopped execution." << std::endl;
+            COUT(1) << "Error: Recurring source command in \"" << filename << "\". Stopped execution." << std::endl;
             return;
         }
@@ -73 +73 @@
         if (!file.is_open())
         {
-            COUT(1) << "Error: Couldn't execute file \"" << filename << "\"." << std::endl;
+            COUT(1) << "Error: Couldn't open file \"" << filename << "\"." << std::endl;
             return;
         }