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

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2005-02-15 02:07:59 +00:00
parent 2103eb0531
commit 004d774889
2 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LuaManager.cpp
+8 -37
View File
@@ -301,46 +301,17 @@ bool LuaManager::RunScript( const CString &sScript, int iReturnValues )
} }
bool LuaManager::RunExpression( const CString &str, int iReturnValues ) bool LuaManager::RunExpression( const CString &sExpression )
{ {
// load string if( !RunScript( "return " + sExpression, 1 ) )
{ return false;
ChunkReaderData data;
CString sStatement = "return " + str;
data.buf = &sStatement;
int ret = lua_load( L, ChunkReaderString, &data, "in" );
if( ret ) ASSERT_M( lua_gettop(L) == 1, ssprintf("%i", lua_gettop(L)) );
{
CString err;
LuaManager::PopStack( err );
CString sError = ssprintf( "Lua runtime error parsing \"%s\": %s", str.c_str(), err.c_str() );
Dialog::OK( sError, "LUA_ERROR" );
return false;
}
ASSERT_M( lua_gettop(L) == 1, ssprintf("%i", lua_gettop(L)) ); /* Don't accept a function as a return value; if you really want to use a function
} * as a boolean, convert it before returning. */
if( lua_isfunction( L, -1 ) )
// evaluate RageException::Throw( "result is a function; did you forget \"()\"?" );
{
int ret = lua_pcall( L, 0, iReturnValues, 0 );
if( ret )
{
CString err;
LuaManager::PopStack( err );
CString sError = ssprintf( "Lua runtime error evaluating \"%s\": %s", str.c_str(), err.c_str() );
Dialog::OK( sError, "LUA_ERROR" );
return false;
}
ASSERT_M( lua_gettop(L) == 1, ssprintf("%i", lua_gettop(L)) );
/* Don't accept a function as a return value; if you really want to use a function
* as a boolean, convert it before returning. */
if( lua_isfunction( L, -1 ) )
RageException::Throw( "result is a function; did you forget \"()\"?" );
}
return true; return true;
} }
stepmania/src/LuaManager.h
+1 -1
View File
@@ -56,7 +56,7 @@ public:
static void ReadArrayFromTable( vector<bool> &aOut, lua_State *L = NULL ); static void ReadArrayFromTable( vector<bool> &aOut, lua_State *L = NULL );
/* Run an expression. The result is left on the Lua stack. */ /* Run an expression. The result is left on the Lua stack. */
bool RunExpression( const CString &str, int iReturnValues = 1 ); bool RunExpression( const CString &sExpression );
lua_State *L; lua_State *L;
}; };