Internal code tweaks

* Registry access code utility macros
* CONFIG_REGKEY and LOOKUP_REGKEY are now lightuserdata instead of strings
* Stack checking debug macros improvements

1 files changed, 54 insertions, 14 deletions

diff --git a/src/macros_and_utils.h b/src/macros_and_utils.h
index 550fc0a..acbe690 100644
--- a/src/macros_and_utils.h
+++ b/src/macros_and_utils.h
@@ -46,26 +46,52 @@ extern char const* debugspew_indent;
 
 #ifdef NDEBUG
 
-#define _ASSERT_L(lua,c)  /*nothing*/
-#define STACK_CHECK(L)    /*nothing*/
-#define STACK_MID(L,c)    /*nothing*/
-#define STACK_END(L,c)    /*nothing*/
-#define STACK_DUMP(L)    /*nothing*/
+#define _ASSERT_L(lua,c)     //nothing
+#define STACK_CHECK(L,o)     //nothing
+#define STACK_CHECK_ABS(L,o) //nothing
+#define STACK_MID(L,c)       //nothing
+#define STACK_END(L,c)       //nothing
+#define STACK_DUMP(L)        //nothing
 
 #else // NDEBUG
 
 #define _ASSERT_L( L, cond_) if( (cond_) == 0) { (void) luaL_error( L, "ASSERT failed: %s:%d '%s'", __FILE__, __LINE__, #cond_);}
 
-#define STACK_CHECK(L)     { int const _oldtop_##L = lua_gettop( L)
-#define STACK_MID(L,change) \
-        do \
+#define STACK_CHECK( L, offset_) \
         { \
-                int stack_check_a = lua_gettop( L) - _oldtop_##L; \
-                int stack_check_b = (change); \
-                if( stack_check_a != stack_check_b) \
-                        luaL_error( L, "STACK ASSERT failed (%d not %d): %s:%d", stack_check_a, stack_check_b, __FILE__, __LINE__ ); \
-        } while( 0)
-#define STACK_END(L,change)  STACK_MID(L,change); }
+                int const L##_delta = offset_; \
+                if( (L##_delta < 0) || (lua_gettop( L) < L##_delta)) \
+                { \
+                        assert( FALSE); \
+                        (void) luaL_error( L, "STACK INIT ASSERT failed (%d not %d): %s:%d", lua_gettop( L), L##_delta, __FILE__, __LINE__); \
+                } \
+                int const L##_oldtop = lua_gettop( L) - L##_delta
+
+#define STACK_CHECK_ABS( L, offset_) \
+        { \
+                int const L##_pos = offset_; \
+                if( lua_gettop( L) < L##_pos) \
+                { \
+                        assert( FALSE); \
+                        (void) luaL_error( L, "STACK INIT ASSERT failed (%d not %d): %s:%d", lua_gettop( L), L##_pos, __FILE__, __LINE__); \
+                } \
+                int const L##_oldtop = 0
+
+#define STACK_MID( L, change) \
+                do \
+                { \
+                        int stack_check_a = lua_gettop( L) - L##_oldtop; \
+                        int stack_check_b = (change); \
+                        if( stack_check_a != stack_check_b) \
+                        { \
+                                assert( FALSE); \
+                                luaL_error( L, "STACK ASSERT failed (%d not %d): %s:%d", stack_check_a, stack_check_b, __FILE__, __LINE__); \
+                        } \
+                } while( 0)
+
+#define STACK_END( L, change) \
+                STACK_MID( L, change); \
+        }
 
 #define STACK_DUMP( L)    luaG_dump( L)
 
@@ -75,4 +101,18 @@ extern char const* debugspew_indent;
 
 #define STACK_GROW( L, n) do { if (!lua_checkstack(L,(int)(n))) luaL_error( L, "Cannot grow stack!" ); } while( 0)
 
+// non-string keyed registry access
+#define REGISTRY_SET( L, key_, value_) \
+{ \
+        push_unique_key( L, key_); \
+        value_; \
+        lua_rawset( L, LUA_REGISTRYINDEX); \
+}
+
+#define REGISTRY_GET( L, key_) \
+{ \
+        push_unique_key( L, key_); \
+        lua_rawget( L, LUA_REGISTRYINDEX); \
+}
+
 #endif // MACROS_AND_UTILS_H