1 files changed, 23 insertions, 24 deletions

diff --git a/lobject.h b/lobject.h
index dbfe0506..72820220 100644
--- a/lobject.h
+++ b/lobject.h
@@ -1,5 +1,5 @@
 /*
-** $Id: lobject.h,v 2.92 2014/05/15 20:41:27 roberto Exp roberto $
+** $Id: lobject.h,v 2.93 2014/05/29 19:30:07 roberto Exp roberto $
 ** Type definitions for Lua objects
 ** See Copyright Notice in lua.h
 */
@@ -156,17 +156,17 @@ typedef struct lua_TValue TValue;
 #define fltvalue(o)     check_exp(ttisfloat(o), val_(o).n)
 #define gcvalue(o)      check_exp(iscollectable(o), val_(o).gc)
 #define pvalue(o)       check_exp(ttislightuserdata(o), val_(o).p)
-#define rawtsvalue(o)   check_exp(ttisstring(o), &val_(o).gc->ts)
+#define rawtsvalue(o)   check_exp(ttisstring(o), rawgco2ts(val_(o).gc))
 #define tsvalue(o)      (&rawtsvalue(o)->tsv)
-#define rawuvalue(o)    check_exp(ttisfulluserdata(o), &val_(o).gc->u)
+#define rawuvalue(o)    check_exp(ttisfulluserdata(o), rawgco2u(val_(o).gc))
 #define uvalue(o)       (&rawuvalue(o)->uv)
-#define clvalue(o)      check_exp(ttisclosure(o), &val_(o).gc->cl)
-#define clLvalue(o)     check_exp(ttisLclosure(o), &val_(o).gc->cl.l)
-#define clCvalue(o)     check_exp(ttisCclosure(o), &val_(o).gc->cl.c)
+#define clvalue(o)      check_exp(ttisclosure(o), gco2cl(val_(o).gc))
+#define clLvalue(o)     check_exp(ttisLclosure(o), gco2lcl(val_(o).gc))
+#define clCvalue(o)     check_exp(ttisCclosure(o), gco2ccl(val_(o).gc))
 #define fvalue(o)       check_exp(ttislcf(o), val_(o).f)
-#define hvalue(o)       check_exp(ttistable(o), &val_(o).gc->h)
+#define hvalue(o)       check_exp(ttistable(o), gco2t(val_(o).gc))
 #define bvalue(o)       check_exp(ttisboolean(o), val_(o).b)
-#define thvalue(o)      check_exp(ttisthread(o), &val_(o).gc->th)
+#define thvalue(o)      check_exp(ttisthread(o), gco2th(val_(o).gc))
 /* a dead value may get the 'gc' field, but cannot access its contents */
 #define deadvalue(o)    check_exp(ttisdeadkey(o), cast(void *, val_(o).gc))
 
@@ -205,38 +205,37 @@ typedef struct lua_TValue TValue;
   { TValue *io=(obj); val_(io).b=(x); settt_(io, LUA_TBOOLEAN); }
 
 #define setgcovalue(L,obj,x) \
-  { TValue *io=(obj); GCObject *i_g=(x); \
-    val_(io).gc=i_g; settt_(io, ctb(gch(i_g)->tt)); }
+  { TValue *io = (obj); GCObject *i_g=(x); \
+    val_(io).gc = i_g; settt_(io, ctb(gch(i_g)->tt)); }
 
 #define setsvalue(L,obj,x) \
-  { TValue *io=(obj); \
-    TString *x_ = (x); \
-    val_(io).gc=cast(GCObject *, x_); settt_(io, ctb(x_->tsv.tt)); \
+  { TValue *io = (obj); TString *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(x_->tsv.tt)); \
     checkliveness(G(L),io); }
 
 #define setuvalue(L,obj,x) \
-  { TValue *io=(obj); \
-    val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TUSERDATA)); \
+  { TValue *io = (obj); Udata *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_TUSERDATA)); \
     checkliveness(G(L),io); }
 
 #define setthvalue(L,obj,x) \
-  { TValue *io=(obj); \
-    val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TTHREAD)); \
+  { TValue *io = (obj); lua_State *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_TTHREAD)); \
     checkliveness(G(L),io); }
 
 #define setclLvalue(L,obj,x) \
-  { TValue *io=(obj); \
-    val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TLCL)); \
+  { TValue *io = (obj); LClosure *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_TLCL)); \
     checkliveness(G(L),io); }
 
 #define setclCvalue(L,obj,x) \
-  { TValue *io=(obj); \
-    val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TCCL)); \
+  { TValue *io = (obj); CClosure *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_TCCL)); \
     checkliveness(G(L),io); }
 
 #define sethvalue(L,obj,x) \
-  { TValue *io=(obj); \
-    val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TTABLE)); \
+  { TValue *io = (obj); Table *x_ = (x); \
+    val_(io).gc = obj2gco(x_); settt_(io, ctb(LUA_TTABLE)); \
     checkliveness(G(L),io); }
 
 #define setdeadvalue(obj)       settt_(obj, LUA_TDEADKEY)
@@ -390,7 +389,7 @@ typedef struct Proto {
   int *lineinfo;  /* map from opcodes to source lines (debug information) */
   LocVar *locvars;  /* information about local variables (debug information) */
   Upvaldesc *upvalues;  /* upvalue information */
-  union Closure *cache;  /* last created closure with this prototype */
+  struct LClosure *cache;  /* last created closure with this prototype */
   TString  *source;  /* used for debug information */
   GCObject *gclist;
 } Proto;