aboutsummaryrefslogtreecommitdiff
path: root/lobject.h
diff options
context:
space:
mode:
authorRoberto Ierusalimschy <roberto@inf.puc-rio.br>2001-02-20 15:15:33 -0300
committerRoberto Ierusalimschy <roberto@inf.puc-rio.br>2001-02-20 15:15:33 -0300
commit099442c41f2cec6122690e6c8f2e11327613e6f6 (patch)
tree73599b274ea4a9b96906ff8160eeb4a524702a8e /lobject.h
parent27600fe87a6fafdfd4ddddeb390591fe749b480f (diff)
downloadlua-099442c41f2cec6122690e6c8f2e11327613e6f6.tar.gz
lua-099442c41f2cec6122690e6c8f2e11327613e6f6.tar.bz2
lua-099442c41f2cec6122690e6c8f2e11327613e6f6.zip
better separation between basic types
Diffstat (limited to 'lobject.h')
-rw-r--r--lobject.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/lobject.h b/lobject.h
index c46e0cb1..5fb142a2 100644
--- a/lobject.h
+++ b/lobject.h
@@ -1,5 +1,5 @@
1/* 1/*
2** $Id: lobject.h,v 1.94 2001/02/02 16:32:00 roberto Exp roberto $ 2** $Id: lobject.h,v 1.95 2001/02/09 20:22:29 roberto Exp roberto $
3** Type definitions for Lua objects 3** Type definitions for Lua objects
4** See Copyright Notice in lua.h 4** See Copyright Notice in lua.h
5*/ 5*/
@@ -93,7 +93,7 @@ typedef struct lua_TObject {
93typedef struct TString { 93typedef struct TString {
94 union { 94 union {
95 struct { /* for strings */ 95 struct { /* for strings */
96 luint32 hash; 96 lu_hash hash;
97 int constindex; /* hint to reuse constants */ 97 int constindex; /* hint to reuse constants */
98 } s; 98 } s;
99 struct { /* for userdata */ 99 struct { /* for userdata */
@@ -160,13 +160,13 @@ typedef struct LocVar {
160*/ 160*/
161typedef struct Closure { 161typedef struct Closure {
162 int isC; /* 0 for Lua functions, 1 for C functions */ 162 int isC; /* 0 for Lua functions, 1 for C functions */
163 int nupvalues;
163 union { 164 union {
164 lua_CFunction c; /* C functions */ 165 lua_CFunction c; /* C functions */
165 struct Proto *l; /* Lua functions */ 166 struct Proto *l; /* Lua functions */
166 } f; 167 } f;
167 struct Closure *next; 168 struct Closure *next;
168 struct Closure *mark; /* marked closures (point to itself when not marked) */ 169 struct Closure *mark; /* marked closures (point to itself when not marked) */
169 int nupvalues;
170 TObject upvalue[1]; 170 TObject upvalue[1];
171} Closure; 171} Closure;
172 172
@@ -199,7 +199,8 @@ typedef struct Hash {
199 199
200 200
201/* 201/*
202** "module" operation (size is always a power of 2) */ 202** "module" operation for hashing (size is always a power of 2)
203*/
203#define lmod(s,size) ((int)((s) & ((size)-1))) 204#define lmod(s,size) ((int)((s) & ((size)-1)))
204 205
205 206
@@ -218,7 +219,6 @@ typedef struct CallInfo {
218extern const TObject luaO_nilobject; 219extern const TObject luaO_nilobject;
219 220
220 221
221luint32 luaO_power2 (luint32 n);
222char *luaO_openspace (lua_State *L, size_t n); 222char *luaO_openspace (lua_State *L, size_t n);
223 223
224int luaO_equalObj (const TObject *t1, const TObject *t2); 224int luaO_equalObj (const TObject *t1, const TObject *t2);