Cleanup

src/lua/lua_assert.h

@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2012-2015 Daniele Bartolini and individual contributors.
- * License: https://github.com/taylor001/crown/blob/master/LICENSE
- */
-
-#pragma once
-
-#include "config.h"
-#include "lua.hpp"
-
-#if CROWN_DEBUG
-	#define LUA_ASSERT(condition, stack, msg, ...) do { if (!(condition)) {\
-		stack.push_fstring("\nLua assertion failed: %s\n\t" msg "\n", #condition, ##__VA_ARGS__); lua_error(stack.state()); }} while (0);
-#else
-	#define LUA_ASSERT(...) ((void)0)
-#endif // CROWN_DEBUG

src/lua/lua_environment.cpp

@@ -10,7 +10,6 @@
 #include "lua_stack.h"
 #include "lua_resource.h"
 #include "device.h"
-#include "lua_assert.h"
 #include "resource_manager.h"
 #include "log.h"
 #include <stdarg.h>

src/lua/lua_settings.cpp

@@ -15,251 +15,133 @@ namespace crown
 static int int_setting_query_value(lua_State* L)
 {
 	LuaStack stack(L);
-
 	const char* setting_name = stack.get_string(1);
-
 	IntSetting* setting = IntSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_int32(setting->value());
-	}
-	else
-	{
-		stack.push_int32(0);
-	}
-
+	LUA_ASSERT(setting != NULL, stack, "Setting not found");
+	stack.push_int32(setting->value());
 	return 1;
 }
 
 static int int_setting_query_synopsis(lua_State* L)
 {
 	LuaStack stack(L);
-
 	const char* setting_name = stack.get_string(1);
-
 	IntSetting* setting = IntSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_string(setting->synopsis());
-	}
-	else
-	{
-		stack.push_string("");
-	}
-
+	LUA_ASSERT(setting != NULL, stack, "Setting not found");
+	stack.push_string(setting->synopsis());
 	return 1;
 }
 
 static int int_setting_query_min(lua_State* L)
 {
 	LuaStack stack(L);
-
 	const char* setting_name = stack.get_string(1);
-
 	IntSetting* setting = IntSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_int32(setting->min());
-	}
-	else
-	{
-		stack.push_int32(0);
-	}
-
+	LUA_ASSERT(setting != NULL, stack, "Setting not found");
+	stack.push_int32(setting->min());
 	return 1;
 }
 
 static int int_setting_query_max(lua_State* L)
 {
 	LuaStack stack(L);
-
 	const char* setting_name = stack.get_string(1);
-
 	IntSetting* setting = IntSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_int32(setting->max());
-	}
-	else
-	{
-		stack.push_int32(0);
-	}
-
+	LUA_ASSERT(setting != NULL, stack, "Setting not found");
+	stack.push_int32(setting->max());
 	return 1;
 }
 
 static int int_setting_update(lua_State* L)
 {
 	LuaStack stack(L);
-
 	const char* setting_name = stack.get_string(1);
 	const int32_t setting_value = stack.get_int(2);
-
 	IntSetting* setting = IntSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		(*setting) = setting_value;
-	}
-
+	LUA_ASSERT(setting != NULL, stack, "Setting not found");
+	*setting = setting_value;
 	return 0;
 }
 
 static int float_setting_value(lua_State* L)
 {
 	LuaStack stack(L);
-
 	const char* setting_name = stack.get_string(1);
-
 	FloatSetting* setting = FloatSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_float(setting->value());
-	}
-	else
-	{
-		stack.push_float(0.0f);
-	}
-
+	LUA_ASSERT(setting != NULL, stack, "Setting not found");
+	stack.push_float(setting->value());
 	return 1;
 }
 
 static int float_setting_synopsis(lua_State* L)
 {
 	LuaStack stack(L);
-
 	const char* setting_name = stack.get_string(1);
-
 	FloatSetting* setting = FloatSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_string(setting->synopsis());
-	}
-	else
-	{
-		stack.push_string("");
-	}
-
+	LUA_ASSERT(setting != NULL, stack, "Setting not found");
+	stack.push_string(setting->synopsis());
 	return 1;
 }
 
 static int float_setting_min(lua_State* L)
 {
 	LuaStack stack(L);
-
 	const char* setting_name = stack.get_string(1);
-
 	FloatSetting* setting = FloatSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_float(setting->min());
-	}
-	else
-	{
-		stack.push_float(0);
-	}
-
+	LUA_ASSERT(setting != NULL, stack, "Setting not found");
+	stack.push_float(setting->min());
 	return 1;
 }
 
 static int float_setting_max(lua_State* L)
 {
 	LuaStack stack(L);
-
 	const char* setting_name = stack.get_string(1);
-
 	FloatSetting* setting = FloatSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_float(setting->max());
-	}
-	else
-	{
-		stack.push_float(0);
-	}
-
+	LUA_ASSERT(setting != NULL, stack, "Setting not found");
+	stack.push_float(setting->max());
 	return 1;
 }
 
 static int float_setting_update(lua_State* L)
 {
 	LuaStack stack(L);
-
 	const char* setting_name = stack.get_string(1);
 	const float setting_value = stack.get_float(2);
-
 	FloatSetting* setting = FloatSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		(*setting) = setting_value;
-	}
-
+	LUA_ASSERT(setting != NULL, stack, "Setting not found");
+	*setting = setting_value;
 	return 0;
 }
 
 static int string_setting_value(lua_State* L)
 {
 	LuaStack stack(L);
-
 	const char* setting_name = stack.get_string(1);
-
 	StringSetting* setting = StringSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_string(setting->value());
-	}
-	else
-	{
-		stack.push_string("");
-	}
-
+	LUA_ASSERT(setting != NULL, stack, "Setting not found");
+	stack.push_string(setting->value());
 	return 1;
 }
 
 static int string_setting_synopsis(lua_State* L)
 {
 	LuaStack stack(L);
-
 	const char* setting_name = stack.get_string(1);
-
 	StringSetting* setting = StringSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_string(setting->synopsis());
-	}
-	else
-	{
-		stack.push_string("");
-	}
-
+	LUA_ASSERT(setting != NULL, stack, "Setting not found");
+	stack.push_string(setting->synopsis());
 	return 1;
 }
 
 static int string_setting_update(lua_State* L)
 {
 	LuaStack stack(L);
-
 	const char* setting_name = stack.get_string(1);
 	const char* setting_value = stack.get_string(2);
-
 	StringSetting* setting = StringSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		(*setting) = setting_value;
-	}
-
+	LUA_ASSERT(setting != NULL, stack, "Setting not found");
+	*setting = setting_value;
 	return 0;
 }
 

src/lua/lua_stack.h

@@ -40,6 +40,9 @@
 	#define CHECKINTEGER(stack, i) luaL_checkinteger(stack, i)
 	#define CHECKNUMBER(stack, i) luaL_checknumber(stack, i)
 	#define CHECKSTRING(stack, i) luaL_checkstring(stack, i)
+
+	#define LUA_ASSERT(condition, stack, msg, ...) do { if (!(condition)) {\
+		stack.push_fstring("\nLua assertion failed: %s\n\t" msg "\n", #condition, ##__VA_ARGS__); lua_error(stack.state()); }} while (0);
 #else
 	#define CHECKUDATA(stack, i, expected) lua_touserdata(stack, i)
 	#define CHECKLIGHTDATA(stack, i, cf, expected) lua_touserdata(stack, i)
@@ -47,6 +50,8 @@
 	#define CHECKINTEGER(stack, i) lua_tointeger(stack, i)
 	#define CHECKNUMBER(stack, i) lua_tonumber(stack, i)
 	#define CHECKSTRING(stack, i) lua_tostring(stack, i)
+
+	#define LUA_ASSERT(...) ((void)0)
 #endif // CROWN_DEBUG
 
 namespace crown

src/lua/lua_vector3.cpp

@@ -6,7 +6,6 @@
 #include "vector3.h"
 #include "lua_stack.h"
 #include "lua_environment.h"
-#include "lua_assert.h"
 
 namespace crown
 {

src/lua/lua_world.cpp

@@ -7,7 +7,6 @@
 #include "lua_environment.h"
 #include "array.h"
 #include "gui.h"
-#include "lua_assert.h"
 #include "temp_allocator.h"
 #include "world.h"
 #include "device.h"