Skip to content

Commit 594a0f3

Browse files
author
nitrocaster
committed
Move inline implementations to main hpp/cpp.
1 parent 3ed4224 commit 594a0f3

File tree

5 files changed

+43
-59
lines changed

5 files changed

+43
-59
lines changed

src/xrScriptEngine/script_engine.cpp

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,6 +1167,37 @@ bool CScriptEngine::function_object(LPCSTR function_to_call, luabind::object &ob
11671167
return true;
11681168
}
11691169

1170+
void CScriptEngine::add_script_process(const ScriptProcessor &process_id, CScriptProcess *script_process)
1171+
{
1172+
VERIFY(m_script_processes.find(process_id)==m_script_processes.end());
1173+
m_script_processes.insert(std::make_pair(process_id, script_process));
1174+
}
1175+
1176+
CScriptProcess *CScriptEngine::script_process(const ScriptProcessor &process_id) const
1177+
{
1178+
auto it = m_script_processes.find(process_id);
1179+
if (it!=m_script_processes.end())
1180+
return it->second;
1181+
return nullptr;
1182+
}
1183+
1184+
void CScriptEngine::parse_script_namespace(const char *name, char *ns, u32 nsSize, char *func, u32 funcSize)
1185+
{
1186+
auto p = strrchr(name, '.');
1187+
if (!p)
1188+
{
1189+
xr_strcpy(ns, nsSize, GlobalNamespace);
1190+
p = name-1;
1191+
}
1192+
else
1193+
{
1194+
VERIFY(p-name+1<=nsSize);
1195+
strncpy(ns, name, p-name);
1196+
ns[p-name] = 0;
1197+
}
1198+
xr_strcpy(func, funcSize, p+1);
1199+
}
1200+
11701201
#if defined(USE_DEBUGGER) && !defined(USE_LUA_STUDIO)
11711202
void CScriptEngine::stopDebugger()
11721203
{

src/xrScriptEngine/script_engine.hpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,16 @@ class XRSCRIPTENGINE_API CScriptEngine
157157
#endif
158158
void setup_callbacks();
159159
bool load_file(const char *scriptName, const char *namespaceName);
160-
IC CScriptProcess *script_process(const ScriptProcessor &process_id) const;
161-
IC void add_script_process(const ScriptProcessor &process_id, CScriptProcess *script_process);
160+
CScriptProcess *script_process(const ScriptProcessor &process_id) const;
161+
void add_script_process(const ScriptProcessor &process_id, CScriptProcess *script_process);
162162
void remove_script_process(const ScriptProcessor &process_id);
163163
static int auto_load(lua_State *L);
164164
void setup_auto_load();
165165
bool process_file_if_exists(LPCSTR file_name, bool warn_if_not_exist);
166166
bool process_file(LPCSTR file_name);
167167
bool process_file(LPCSTR file_name, bool reload_modules);
168168
bool function_object(LPCSTR function_to_call, luabind::object &object, int type = LUA_TFUNCTION);
169-
IC void parse_script_namespace(const char *name, char *ns, u32 nsSize, char *func, u32 funcSize);
169+
void parse_script_namespace(const char *name, char *ns, u32 nsSize, char *func, u32 funcSize);
170170
template<typename TResult>
171171
IC bool functor(LPCSTR function_to_call, luabind::functor<TResult> &lua_function);
172172
#ifdef USE_DEBUGGER
@@ -193,4 +193,12 @@ class XRSCRIPTENGINE_API CScriptEngine
193193
void DestroyScriptThread(const CScriptThread *thread);
194194
};
195195

196-
#include "script_engine_inline.hpp"
196+
template<typename TResult>
197+
IC bool CScriptEngine::functor(LPCSTR function_to_call, luabind::functor<TResult> &lua_function)
198+
{
199+
luabind::object object;
200+
if (!function_object(function_to_call, object))
201+
return false;
202+
lua_function = object;
203+
return true;
204+
}

src/xrScriptEngine/script_engine_inline.hpp

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/xrScriptEngine/xrScriptEngine.vcxproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@
240240
<ClInclude Include="script_debugger_messages.hpp" />
241241
<ClInclude Include="script_debugger_threads.hpp" />
242242
<ClInclude Include="script_engine.hpp" />
243-
<ClInclude Include="script_engine_inline.hpp" />
244243
<ClInclude Include="script_lua_helper.hpp" />
245244
<ClInclude Include="script_process.hpp" />
246245
<ClInclude Include="script_space_forward.hpp" />

src/xrScriptEngine/xrScriptEngine.vcxproj.filters

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@
5757
<ClInclude Include="script_engine.hpp">
5858
<Filter>Engine</Filter>
5959
</ClInclude>
60-
<ClInclude Include="script_engine_inline.hpp">
61-
<Filter>Engine</Filter>
62-
</ClInclude>
6360
<ClInclude Include="script_space_forward.hpp">
6461
<Filter>Engine</Filter>
6562
</ClInclude>

0 commit comments

Comments
 (0)