actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Unused. The purpose of this connivence function as stated in the comments (which isn't quite what it did) is exactly what RunExpression does.

Browse Source
This commit is contained in:
Steve Checkoway
2006-09-26 05:35:24 +00:00
parent 4a545228a9
commit 6fe6baa241
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LuaManager.cpp
+3 -12
View File
@@ -504,27 +504,18 @@ bool LuaHelpers::RunScript( Lua *L, const RString &sScript, const RString &sName
return true; return true;
} }
bool LuaHelpers::RunExpression( Lua *L, const RString &sExpression, const RString &sName )
bool LuaHelpers::RunScript( Lua *L, const RString &sExpression, const RString &sName, int iReturnValues )
{ {
RString sError; RString sError;
if( !LuaHelpers::RunScript( L, sExpression, sName.size()? sName:RString("in"), sError, iReturnValues ) ) if( !LuaHelpers::RunScript(L, "return " + sExpression, sName.empty() ? RString("in") : sName, sError, 1) )
{ {
sError = ssprintf( "Lua runtime error parsing \"%s\": %s", sName.size()? sName.c_str():sExpression.c_str(), sError.c_str() ); sError = ssprintf( "Lua runtime error parsing \"%s\": %s", sName.size() ? sName.c_str() : sExpression.c_str(), sError.c_str() );
Dialog::OK( sError, "LUA_ERROR" ); Dialog::OK( sError, "LUA_ERROR" );
return false; return false;
} }
return true; return true;
} }
bool LuaHelpers::RunExpression( Lua *L, const RString &sExpression, const RString &sName )
{
RString sFullExpression = "return " + sExpression;
return LuaHelpers::RunScript( L, sFullExpression, sName, 1 );
}
bool LuaHelpers::RunExpressionB( const RString &str ) bool LuaHelpers::RunExpressionB( const RString &str )
{ {
Lua *L = LUA->Get(); Lua *L = LUA->Get();
stepmania/src/LuaManager.h
-4
View File
@@ -51,10 +51,6 @@ namespace LuaHelpers
* false is returned. */ * false is returned. */
bool RunScript( Lua *L, const RString &sScript, const RString &sName, RString &sError, int iReturnValues = 0 ); bool RunScript( Lua *L, const RString &sScript, const RString &sName, RString &sError, int iReturnValues = 0 );
/* Convenience: run a script with one return value, displaying an error on failure.
* The return value is left on the Lua stack. */
bool RunScript( Lua *L, const RString &sExpression, const RString &sName = "", int iReturnValues = 0 );
/* Run the given expression, returning a single value, and leave the return value on the /* Run the given expression, returning a single value, and leave the return value on the
* stack. On error, push nil. */ * stack. On error, push nil. */
bool RunExpression( Lua *L, const RString &sExpression, const RString &sName = "" ); bool RunExpression( Lua *L, const RString &sExpression, const RString &sName = "" );