Changeset 406 for trunk/src/lua/lua_function.cc

Timestamp:

06/20/15 00:05:17 (10 years ago)

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

File:

• trunk/src/lua/lua_function.cc (modified) (4 diffs)

trunk/src/lua/lua_function.cc

@@ -5 +5 @@
 // For conditions of distribution and use, see copying.txt file in root folder.
 
-#include <nv/lua/lua_function.hh>
+#include "nv/lua/lua_function.hh"
 
-#include <nv/lua/lua_raw.hh>
+#include "nv/core/logging.hh"
+#include "nv/lua/lua_raw.hh"
 
 using namespace nv;
+
+#define NV_LUA_ABORT( func, ... ) \
+        NV_LOG_CRITICAL( "lua::" func " : ", __VA_ARGS__ ) \
+        NV_ABORT( "lua::" func " : critical error!" )
 
 lua::function_base::function_base( lua_State* a_L, const path& a_path, bool a_global /*= true*/ ) : L(a_L)
@@ -16 +21 @@
         {
                 lua_pop( L, 1 );
-                throw std::runtime_error("not a valid path - " + a_path.to_string() );
+                NV_LUA_ABORT( "function_base::function_base", "not a valid path - ", a_path.to_string() );
         }
 
@@ -22 +27 @@
         {
                 lua_pop( L, 1 );
-                throw std::runtime_error("not a valid function - " + a_path.to_string() );
+                NV_LUA_ABORT( "function_base::function_base", "not a valid function - ", a_path.to_string() );
         }
         m_ref = luaL_ref( L, LUA_REGISTRYINDEX );
@@ -61 +66 @@
                 std::string error = lua_tostring( L, -1 );
                 lua_pop( L, 1 );
-                throw std::runtime_error(error.c_str());
+                NV_LUA_ABORT( "function_base::call", "call failed - ", error.c_str() );
         }
 }