Changeset 7189 for code/branches/consolecommands3/src/libraries/core/LuaState.cc

Timestamp:

Aug 19, 2010, 4:57:06 PM (15 years ago)

Author:

landauf

Message:

changed passing of the returnvalue in the command execution pipeline:

• Functor: operator() directly returns the returnvalue of the executed function (if any, otherwise a MultiType whose null() function evaluates to true). The returnvalue is no longer stored in the Functor.
• Executor: The same behavior of operator() like in Functor. Additionally the parse() function returns the returnvalue of the executed function instead of a boolean status. The status can be retrieved by passing a pointer to a bool to the function.
• CommandExecutor: execute() works like before (returns only a boolean status), but added a new function query() which returns the returnvalue of the executed command. The status of query() can be retrieved by optionally passing an pointer to a bool.
• CommandEvaluation: same as for CommandExecutor: execute() like before, added query()
• TclBind::eval() returns the returnvalue of the evaluated tcl command. The status can also be retrieved by passing a pointer to a bool.
• The Shell prints the returnvalue (if available) of an executed command

• added a constructor to MultiType to directly create it from an mbool. The mbool will be converted to a bool, so it loses it's internal state.

File:

• code/branches/consolecommands3/src/libraries/core/LuaState.cc (modified) (1 diff)

code/branches/consolecommands3/src/libraries/core/LuaState.cc

@@ -370 +370 @@
     }
 
-    void LuaFunctor::operator()(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5)
+    MultiType LuaFunctor::operator()(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5)
     {
         lua_->doString(this->code_);
+        return MT_Type::Null;
     }
 }