nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all boxed types start with their tags

Browse Source
This commit is contained in:
Roberto Ierusalimschy
2001-01-29 17:34:02 -02:00
parent 09def5da44
commit 63a822c8e1
7 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ldo.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: ldo.c,v 1.117 2001/01/26 11:45:51 roberto Exp roberto $ ** $Id: ldo.c,v 1.118 2001/01/29 15:35:17 roberto Exp roberto $
** Stack and Call structure of Lua ** Stack and Call structure of Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -172,6 +172,7 @@ void luaD_call (lua_State *L, StkId func, int nResults) {
setclvalue(func, tm); /* tag method is the new function to be called */ setclvalue(func, tm); /* tag method is the new function to be called */
} }
cl = clvalue(func); cl = clvalue(func);
ci.v.ttype = LUA_TMARK;
ci.func = cl; ci.func = cl;
setivalue(func, &ci); setivalue(func, &ci);
callhook = L->callhook; callhook = L->callhook;

3
lfunc.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lfunc.c,v 1.36 2000/12/28 12:55:41 roberto Exp roberto $ ** $Id: lfunc.c,v 1.37 2001/01/19 13:20:30 roberto Exp roberto $
** Auxiliary functions to manipulate prototypes and closures ** Auxiliary functions to manipulate prototypes and closures
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -19,6 +19,7 @@
Closure *luaF_newclosure (lua_State *L, int nelems) { Closure *luaF_newclosure (lua_State *L, int nelems) {
Closure *c = (Closure *)luaM_malloc(L, sizeclosure(nelems)); Closure *c = (Closure *)luaM_malloc(L, sizeclosure(nelems));
c->v.ttype = LUA_TFUNCTION;
c->next = G(L)->rootcl; c->next = G(L)->rootcl;
G(L)->rootcl = c; G(L)->rootcl = c;
c->mark = c; c->mark = c;

4
lgc.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lgc.c,v 1.81 2001/01/26 14:16:24 roberto Exp roberto $ ** $Id: lgc.c,v 1.82 2001/01/29 17:16:58 roberto Exp roberto $
** Garbage Collector ** Garbage Collector
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -66,6 +66,8 @@ static void marktable (GCState *st, Hash *h) {
static void markobject (GCState *st, TObject *o) { static void markobject (GCState *st, TObject *o) {
lua_assert(ttype(o) == LUA_TNUMBER ||
ttype(o) == ((TValue *)(o->value.v))->ttype);
switch (ttype(o)) { switch (ttype(o)) {
case LUA_TUSERDATA: case LUA_TSTRING: case LUA_TUSERDATA: case LUA_TSTRING:
strmark(tsvalue(o)); strmark(tsvalue(o));

5
lobject.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lobject.c,v 1.61 2001/01/25 16:45:36 roberto Exp roberto $ ** $Id: lobject.c,v 1.62 2001/01/26 14:16:35 roberto Exp roberto $
** Some generic functions over Lua objects ** Some generic functions over Lua objects
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -19,7 +19,8 @@
const TObject luaO_nilobject = {LUA_TNIL, {NULL}}; const char luaO_ttnil = LUA_TNIL;
const TObject luaO_nilobject = {LUA_TNIL, {(void *)&luaO_ttnil}};
/* /*

27
lobject.h
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lobject.h,v 1.89 2001/01/26 15:58:50 roberto Exp roberto $ ** $Id: lobject.h,v 1.90 2001/01/29 17:16:58 roberto Exp roberto $
** Type definitions for Lua objects ** Type definitions for Lua objects
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -29,7 +29,7 @@
#endif #endif
/* mark for closures active in the stack */ /* ttype for closures active in the stack */
#define LUA_TMARK 6 #define LUA_TMARK 6
@@ -41,6 +41,14 @@
#define is_T_MARK(t) (ttype(t) == LUA_TMARK) #define is_T_MARK(t) (ttype(t) == LUA_TMARK)
/*
** tag at the start of all "boxed" Lua values
*/
typedef struct TValue {
char ttype;
} TValue;
typedef union { typedef union {
void *v; void *v;
lua_Number n; /* LUA_TNUMBER */ lua_Number n; /* LUA_TNUMBER */
@@ -87,7 +95,8 @@ typedef struct lua_TObject {
{ TObject *_o=(obj); struct CallInfo *_v=(x); \ { TObject *_o=(obj); struct CallInfo *_v=(x); \
_o->tt=LUA_TMARK; _o->value.v=_v; } _o->tt=LUA_TMARK; _o->value.v=_v; }
#define setnilvalue(obj) { (obj)->tt=LUA_TNIL; } #define setnilvalue(obj) \
{ TObject *_o=(obj); _o->tt=LUA_TNIL; _o->value.v = (void *)&luaO_ttnil; }
#define setobj(obj1,obj2) \ #define setobj(obj1,obj2) \
{ TObject *o1=(obj1); const TObject *o2=(obj2); \ { TObject *o1=(obj1); const TObject *o2=(obj2); \
@@ -107,6 +116,8 @@ typedef struct lua_TObject {
#define TSPACK ((int)sizeof(int)) #define TSPACK ((int)sizeof(int))
typedef struct TString { typedef struct TString {
TValue v;
unsigned char marked;
union { union {
struct { /* for strings */ struct { /* for strings */
luint32 hash; luint32 hash;
@@ -119,7 +130,6 @@ typedef struct TString {
} u; } u;
size_t len; size_t len;
struct TString *nexthash; /* chain for hash table */ struct TString *nexthash; /* chain for hash table */
int marked;
char str[TSPACK]; /* variable length string!! must be the last field! */ char str[TSPACK]; /* variable length string!! must be the last field! */
} TString; } TString;
@@ -128,6 +138,7 @@ typedef struct TString {
** Function Prototypes ** Function Prototypes
*/ */
typedef struct Proto { typedef struct Proto {
TValue v;
lua_Number *knum; /* numbers used by the function */ lua_Number *knum; /* numbers used by the function */
int sizeknum; /* size of `knum' */ int sizeknum; /* size of `knum' */
struct TString **kstr; /* strings used by the function */ struct TString **kstr; /* strings used by the function */
@@ -162,14 +173,15 @@ typedef struct LocVar {
** Closures ** Closures
*/ */
typedef struct Closure { typedef struct Closure {
TValue v;
char isC; /* 0 for Lua functions, 1 for C functions */
short nupvalues;
union { union {
lua_CFunction c; /* C functions */ lua_CFunction c; /* C functions */
struct Proto *l; /* Lua functions */ struct Proto *l; /* Lua functions */
} f; } f;
struct Closure *next; struct Closure *next;
struct Closure *mark; /* marked closures (point to itself when not marked) */ struct Closure *mark; /* marked closures (point to itself when not marked) */
short isC; /* 0 for Lua functions, 1 for C functions */
short nupvalues;
TObject upvalue[1]; TObject upvalue[1];
} Closure; } Closure;
@@ -186,6 +198,7 @@ typedef struct Node {
typedef struct Hash { typedef struct Hash {
TValue v;
Node *node; Node *node;
int htag; int htag;
int size; int size;
@@ -210,6 +223,7 @@ typedef struct Hash {
** informations about a call (for debugging) ** informations about a call (for debugging)
*/ */
typedef struct CallInfo { typedef struct CallInfo {
TValue v;
struct Closure *func; /* function being called */ struct Closure *func; /* function being called */
const Instruction **pc; /* current pc of called function */ const Instruction **pc; /* current pc of called function */
int lastpc; /* last pc traced */ int lastpc; /* last pc traced */
@@ -218,6 +232,7 @@ typedef struct CallInfo {
} CallInfo; } CallInfo;
extern const char luaO_ttnil; /* "address" of the nil value */
extern const TObject luaO_nilobject; extern const TObject luaO_nilobject;

4
lstring.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lstring.c,v 1.51 2001/01/19 13:20:30 roberto Exp roberto $ ** $Id: lstring.c,v 1.52 2001/01/26 15:58:50 roberto Exp roberto $
** String table (keeps all strings handled by Lua) ** String table (keeps all strings handled by Lua)
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -76,6 +76,7 @@ TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
} }
/* not found */ /* not found */
ts = (TString *)luaM_malloc(L, sizestring(l)); ts = (TString *)luaM_malloc(L, sizestring(l));
ts->v.ttype = LUA_TSTRING;
ts->marked = 0; ts->marked = 0;
ts->nexthash = NULL; ts->nexthash = NULL;
ts->len = l; ts->len = l;
@@ -91,6 +92,7 @@ TString *luaS_newlstr (lua_State *L, const char *str, size_t l) {
TString *luaS_newudata (lua_State *L, size_t s, void *udata) { TString *luaS_newudata (lua_State *L, size_t s, void *udata) {
union L_UTString *uts = (union L_UTString *)luaM_malloc(L, sizeudata(s)); union L_UTString *uts = (union L_UTString *)luaM_malloc(L, sizeudata(s));
TString *ts = &uts->ts; TString *ts = &uts->ts;
ts->v.ttype = LUA_TUSERDATA;
ts->marked = 0; ts->marked = 0;
ts->nexthash = NULL; ts->nexthash = NULL;
ts->len = s; ts->len = s;

3
ltable.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: ltable.c,v 1.71 2001/01/29 13:02:20 roberto Exp roberto $ ** $Id: ltable.c,v 1.72 2001/01/29 17:16:58 roberto Exp roberto $
** Lua tables (hash) ** Lua tables (hash)
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -98,6 +98,7 @@ static void setnodevector (lua_State *L, Hash *t, luint32 size) {
Hash *luaH_new (lua_State *L, int size) { Hash *luaH_new (lua_State *L, int size) {
Hash *t = luaM_new(L, Hash); Hash *t = luaM_new(L, Hash);
t->v.ttype = LUA_TTABLE;
t->htag = TagDefault; t->htag = TagDefault;
t->next = G(L)->roottable; t->next = G(L)->roottable;
G(L)->roottable = t; G(L)->roottable = t;