remove another specialized "parse and evaluate string"

This commit is contained in:
Glenn Maynard
2006-10-29 20:52:25 +00:00
parent ff2b6f697c
commit f9496f96d9
3 changed files with 5 additions and 15 deletions
-11
View File
@@ -523,17 +523,6 @@ bool LuaHelpers::RunExpression( Lua *L, const RString &sExpression, const RStrin
return true; return true;
} }
void LuaHelpers::RunExpressionS( const RString &str, RString &sOut )
{
Lua *L = LUA->Get();
RunExpression( L, str );
LuaHelpers::Pop( L, sOut );
LUA->Release( L );
}
void LuaHelpers::ParseCommandList( Lua *L, const RString &sCommands, const RString &sName ) void LuaHelpers::ParseCommandList( Lua *L, const RString &sCommands, const RString &sName )
{ {
RString sLuaFunction; RString sLuaFunction;
-3
View File
@@ -72,9 +72,6 @@ namespace LuaHelpers
/* Read the table at the top of the stack back into a vector. */ /* Read the table at the top of the stack back into a vector. */
void ReadArrayFromTableB( Lua *L, vector<bool> &aOut ); void ReadArrayFromTableB( Lua *L, vector<bool> &aOut );
/* Run an expression in the global environment, returning the given type. */
void RunExpressionS( const RString &str, RString &sOut );
void ParseCommandList( lua_State *L, const RString &sCommands, const RString &sName ); void ParseCommandList( lua_State *L, const RString &sCommands, const RString &sName );
XNode *GetLuaInformation(); XNode *GetLuaInformation();
+5 -1
View File
@@ -827,8 +827,12 @@ RString ThemeManager::GetClassFallback( const RString &sClassName )
if( !GetMetricRawRecursive(g_pLoadedThemeData->iniMetrics,sClassName,"Fallback",sFallback) ) if( !GetMetricRawRecursive(g_pLoadedThemeData->iniMetrics,sClassName,"Fallback",sFallback) )
return RString(); return RString();
Lua *L = LUA->Get();
LuaHelpers::RunExpression( L, sFallback );
RString sRet; RString sRet;
LuaHelpers::RunExpressionS( sFallback, sRet ); LuaHelpers::Pop( L, sRet );
LUA->Release( L );
return sRet; return sRet;
} }