move CreateTableFromArrayB and ReadArrayFromTableB into LuaHelpers; L argument first, like Lua functions (it was only at the end because it was an optional parameter)

stepmania/src/LuaManager.cpp

@@ -96,7 +96,7 @@ bool LuaHelpers::FromStack( CString &Object, int iOffset, lua_State *L )
 	return pStr != NULL;
 }
 
-void LuaManager::CreateTableFromArrayB( const vector<bool> &aIn, Lua *L )
+void LuaHelpers::CreateTableFromArrayB( Lua *L, const vector<bool> &aIn )
 {
 	lua_newtable( L );
 	for( unsigned i = 0; i < aIn.size(); ++i )
@@ -106,7 +106,7 @@ void LuaManager::CreateTableFromArrayB( const vector<bool> &aIn, Lua *L )
 	}
 }
 
-void LuaManager::ReadArrayFromTableB( vector<bool> &aOut, Lua *L )
+void LuaHelpers::ReadArrayFromTableB( Lua *L, vector<bool> &aOut )
 {
 	luaL_checktype( L, -1, LUA_TTABLE );
 

stepmania/src/LuaManager.h

@@ -88,12 +88,6 @@ public:
 
 	void SetGlobal( const CString &sName );
 
-	/* Create a Lua array (a table with indices starting at 1) of the given vector,
-	 * and push it on the stack. */
-	static void CreateTableFromArrayB( const vector<bool> &aIn, Lua *L );
-	/* Read the table at the top of the stack back into a vector. */
-	static void ReadArrayFromTableB( vector<bool> &aOut, Lua *L );
-
 	lua_State *L;
 
 private:
@@ -106,6 +100,13 @@ private:
 
 namespace LuaHelpers
 {
+	/* Create a Lua array (a table with indices starting at 1) of the given vector,
+	 * and push it on the stack. */
+	void CreateTableFromArrayB( Lua *L, const vector<bool> &aIn );
+
+	/* Read the table at the top of the stack back into a vector. */
+	void ReadArrayFromTableB( Lua *L, vector<bool> &aOut );
+
 	template<class T>
 	void ReadArrayFromTable( vector<T> &aOut, lua_State *L )
 	{

stepmania/src/OptionRowHandler.cpp

@@ -703,7 +703,7 @@ public:
 				vbSelOut[i] = false;
 
 			/* Create the vbSelectedOut table. */
-			LUA->CreateTableFromArrayB( vbSelOut, LUA->L );
+			LuaHelpers::CreateTableFromArrayB( LUA->L, vbSelOut );
 			ASSERT( lua_gettop(LUA->L) == 1 ); /* vbSelectedOut table */
 
 			/* Get the function to call from m_LuaTable. */
@@ -731,7 +731,7 @@ public:
 
 			lua_pop( LUA->L, 1 ); /* pop option table */
 
-			LUA->ReadArrayFromTableB( vbSelOut, LUA->L );
+			LuaHelpers::ReadArrayFromTableB( LUA->L, vbSelOut );
 			
 			lua_pop( LUA->L, 1 ); /* pop vbSelectedOut table */
 
@@ -753,7 +753,7 @@ public:
 			vector<bool> vbSelectedCopy = vbSel;
 
 			/* Create the vbSelectedOut table. */
-			LUA->CreateTableFromArrayB( vbSelectedCopy, LUA->L );
+			LuaHelpers::CreateTableFromArrayB( LUA->L, vbSelectedCopy );
 			ASSERT( lua_gettop(LUA->L) == 1 ); /* vbSelectedOut table */
 
 			/* Get the function to call. */