1 files changed, 13 insertions, 4 deletions

diff --git a/src/tools.h b/src/tools.h
index e4fbd94..f79d2ad 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -38,6 +38,9 @@
 #define USE_DEBUG_SPEW 0
 #if USE_DEBUG_SPEW
 extern char const* debugspew_indent;
+extern int debugspew_indent_depth;
+#define INDENT_BEGIN "%.*s "
+#define INDENT_END , debugspew_indent_depth, debugspew_indent
 #define DEBUGSPEW_CODE(_code) _code
 #else // USE_DEBUG_SPEW
 #define DEBUGSPEW_CODE(_code)
@@ -53,10 +56,16 @@ extern char const* debugspew_indent;
 #else
   #define _ASSERT_L(lua,c)  do { if (!(c)) luaL_error( lua, "ASSERT failed: %s:%d '%s'", __FILE__, __LINE__, #c ); } while( 0)
   //
-  #define STACK_CHECK(L)     { int _oldtop_##L = lua_gettop(L);
-  #define STACK_MID(L,change)  { int a= lua_gettop(L)-_oldtop_##L; int b= (change); \
-                               if (a != b) luaL_error( L, "STACK ASSERT failed (%d not %d): %s:%d", a, b, __FILE__, __LINE__ ); }
-  #define STACK_END(L,change)  STACK_MID(L,change) }
+  #define STACK_CHECK(L)     { int const _oldtop_##L = lua_gettop( L)
+  #define STACK_MID(L,change) \
+        do \
+        { \
+                int a = lua_gettop( L) - _oldtop_##L; \
+                int b = (change); \
+                if( a != b) \
+                        luaL_error( L, "STACK ASSERT failed (%d not %d): %s:%d", a, b, __FILE__, __LINE__ ); \
+        } while( 0)
+  #define STACK_END(L,change)  STACK_MID(L,change); }
 
   #define STACK_DUMP(L)    luaG_dump(L);
 #endif