diff options
-rw-r--r-- | lapi.c | 6 | ||||
-rw-r--r-- | lbuiltin.c | 6 | ||||
-rw-r--r-- | llex.h | 5 | ||||
-rw-r--r-- | lmem.h | 6 | ||||
-rw-r--r-- | lstring.h | 3 | ||||
-rw-r--r-- | lstrlib.c | 4 | ||||
-rw-r--r-- | ltable.h | 3 | ||||
-rw-r--r-- | ltm.h | 3 | ||||
-rw-r--r-- | lua.h | 6 | ||||
-rw-r--r-- | lualib.h | 3 |
10 files changed, 20 insertions, 25 deletions
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lapi.c,v 1.6 1997/11/19 18:16:33 roberto Exp roberto $ | 2 | ** $Id: lapi.c,v 1.7 1997/11/21 19:00:46 roberto Exp roberto $ |
3 | ** Lua API | 3 | ** Lua API |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -267,7 +267,7 @@ int lua_isfunction (lua_Object o) | |||
267 | } | 267 | } |
268 | 268 | ||
269 | 269 | ||
270 | real lua_getnumber (lua_Object object) | 270 | double lua_getnumber (lua_Object object) |
271 | { | 271 | { |
272 | if (object == LUA_NOOBJECT) return 0.0; | 272 | if (object == LUA_NOOBJECT) return 0.0; |
273 | if (tonumber(Address(object))) return 0.0; | 273 | if (tonumber(Address(object))) return 0.0; |
@@ -302,7 +302,7 @@ void lua_pushnil (void) | |||
302 | incr_top; | 302 | incr_top; |
303 | } | 303 | } |
304 | 304 | ||
305 | void lua_pushnumber (real n) | 305 | void lua_pushnumber (double n) |
306 | { | 306 | { |
307 | ttype(L->stack.top) = LUA_T_NUMBER; | 307 | ttype(L->stack.top) = LUA_T_NUMBER; |
308 | nvalue(L->stack.top) = n; | 308 | nvalue(L->stack.top) = n; |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lbuiltin.c,v 1.7 1997/11/07 18:19:13 roberto Exp roberto $ | 2 | ** $Id: lbuiltin.c,v 1.8 1997/11/19 17:29:23 roberto Exp roberto $ |
3 | ** Built-in functions | 3 | ** Built-in functions |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -152,11 +152,11 @@ static char *to_string (lua_Object obj) | |||
152 | case LUA_T_NUMBER: case LUA_T_STRING: | 152 | case LUA_T_NUMBER: case LUA_T_STRING: |
153 | return lua_getstring(obj); | 153 | return lua_getstring(obj); |
154 | case LUA_T_ARRAY: { | 154 | case LUA_T_ARRAY: { |
155 | sprintf(buff, "table: %p", o->value.a); | 155 | sprintf(buff, "table: %p", (void *)o->value.a); |
156 | return buff; | 156 | return buff; |
157 | } | 157 | } |
158 | case LUA_T_FUNCTION: { | 158 | case LUA_T_FUNCTION: { |
159 | sprintf(buff, "function: %p", o->value.cl); | 159 | sprintf(buff, "function: %p", (void *)o->value.cl); |
160 | return buff; | 160 | return buff; |
161 | } | 161 | } |
162 | case LUA_T_USERDATA: { | 162 | case LUA_T_USERDATA: { |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: llex.h,v 1.2 1997/11/04 15:27:53 roberto Exp roberto $ | 2 | ** $Id: llex.h,v 1.3 1997/11/19 17:29:23 roberto Exp roberto $ |
3 | ** Lexical Analizer | 3 | ** Lexical Analizer |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -40,9 +40,6 @@ typedef struct LexState { | |||
40 | } LexState; | 40 | } LexState; |
41 | 41 | ||
42 | 42 | ||
43 | extern int luaX_linenumber; | ||
44 | |||
45 | |||
46 | void luaX_init (void); | 43 | void luaX_init (void); |
47 | void luaX_setinput (ZIO *z); | 44 | void luaX_setinput (ZIO *z); |
48 | char *luaX_lasttoken (void); | 45 | char *luaX_lasttoken (void); |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: $ | 2 | ** $Id: lmem.h,v 1.1 1997/09/16 19:25:59 roberto Exp roberto $ |
3 | ** Interface to Memory Manager | 3 | ** Interface to Memory Manager |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -38,7 +38,9 @@ int luaM_growaux (void **block, unsigned long nelems, int size, | |||
38 | #define luaM_reallocvector(v,n,t) ((t *)luaM_realloc(v,(n)*sizeof(t))) | 38 | #define luaM_reallocvector(v,n,t) ((t *)luaM_realloc(v,(n)*sizeof(t))) |
39 | 39 | ||
40 | 40 | ||
41 | void luaM_query (void); /* only ifdef DEBUG */ | 41 | #ifdef DEBUG |
42 | void luaM_query (void); | ||
43 | #endif | ||
42 | 44 | ||
43 | 45 | ||
44 | #endif | 46 | #endif |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lstring.h,v 1.3 1997/11/04 15:27:53 roberto Exp roberto $ | 2 | ** $Id: lstring.h,v 1.4 1997/11/19 17:29:23 roberto Exp roberto $ |
3 | ** String table (keep all strings handled by Lua) | 3 | ** String table (keep all strings handled by Lua) |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -15,7 +15,6 @@ void luaS_init (void); | |||
15 | TaggedString *luaS_createudata (void *udata, int tag); | 15 | TaggedString *luaS_createudata (void *udata, int tag); |
16 | TaggedString *luaS_collector (void); | 16 | TaggedString *luaS_collector (void); |
17 | void luaS_free (TaggedString *l); | 17 | void luaS_free (TaggedString *l); |
18 | void luaS_callIM (TaggedString *l); | ||
19 | TaggedString *luaS_new (char *str); | 18 | TaggedString *luaS_new (char *str); |
20 | TaggedString *luaS_newfixedstring (char *str); | 19 | TaggedString *luaS_newfixedstring (char *str); |
21 | void luaS_rawsetglobal (TaggedString *ts, TObject *newval); | 20 | void luaS_rawsetglobal (TaggedString *ts, TObject *newval); |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lstrlib.c,v 1.1 1997/08/14 19:47:57 roberto Exp roberto $ | 2 | ** $Id: lstrlib.c,v 1.1 1997/09/16 19:25:59 roberto Exp roberto $ |
3 | ** Standard library for strings and pattern-matching | 3 | ** Standard library for strings and pattern-matching |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -446,7 +446,7 @@ static void str_gsub (void) | |||
446 | } | 446 | } |
447 | 447 | ||
448 | 448 | ||
449 | void luaI_addquoted (char *s) | 449 | static void luaI_addquoted (char *s) |
450 | { | 450 | { |
451 | luaI_addchar('"'); | 451 | luaI_addchar('"'); |
452 | for (; *s; s++) { | 452 | for (; *s; s++) { |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: ltable.h,v 1.3 1997/10/18 16:29:15 roberto Exp roberto $ | 2 | ** $Id: ltable.h,v 1.4 1997/11/19 17:29:23 roberto Exp roberto $ |
3 | ** Lua tables (hash) | 3 | ** Lua tables (hash) |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -16,7 +16,6 @@ | |||
16 | #define nhash(t) ((t)->nhash) | 16 | #define nhash(t) ((t)->nhash) |
17 | 17 | ||
18 | Hash *luaH_new (int nhash); | 18 | Hash *luaH_new (int nhash); |
19 | void luaH_callIM (Hash *l); | ||
20 | void luaH_free (Hash *frees); | 19 | void luaH_free (Hash *frees); |
21 | TObject *luaH_get (Hash *t, TObject *ref); | 20 | TObject *luaH_get (Hash *t, TObject *ref); |
22 | TObject *luaH_set (Hash *t, TObject *ref); | 21 | TObject *luaH_set (Hash *t, TObject *ref); |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: ltm.h,v 1.2 1997/11/04 15:27:53 roberto Exp roberto $ | 2 | ** $Id: ltm.h,v 1.3 1997/11/19 17:29:23 roberto Exp roberto $ |
3 | ** Tag methods | 3 | ** Tag methods |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -51,7 +51,6 @@ extern char *luaT_eventname[]; | |||
51 | 51 | ||
52 | 52 | ||
53 | void luaT_init (void); | 53 | void luaT_init (void); |
54 | void luaT_settag (int tag, TObject *o); | ||
55 | void luaT_realtag (int tag); | 54 | void luaT_realtag (int tag); |
56 | int luaT_efectivetag (TObject *o); | 55 | int luaT_efectivetag (TObject *o); |
57 | void luaT_settagmethod (int t, char *event, TObject *func); | 56 | void luaT_settagmethod (int t, char *event, TObject *func); |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: lua.h,v 1.3 1997/11/04 15:27:53 roberto Exp roberto $ | 2 | ** $Id: lua.h,v 1.4 1997/11/19 17:29:23 roberto Exp roberto $ |
3 | ** LUA - An Extensible Extension Language | 3 | ** LUA - An Extensible Extension Language |
4 | ** TeCGraf: Grupo de Tecnologia em Computacao Grafica, PUC-Rio, Brazil | 4 | ** TeCGraf: Grupo de Tecnologia em Computacao Grafica, PUC-Rio, Brazil |
5 | ** e-mail: lua@tecgraf.puc-rio.br | 5 | ** e-mail: lua@tecgraf.puc-rio.br |
@@ -85,14 +85,14 @@ int lua_isnumber (lua_Object object); | |||
85 | int lua_isstring (lua_Object object); | 85 | int lua_isstring (lua_Object object); |
86 | int lua_isfunction (lua_Object object); | 86 | int lua_isfunction (lua_Object object); |
87 | 87 | ||
88 | float lua_getnumber (lua_Object object); | 88 | double lua_getnumber (lua_Object object); |
89 | char *lua_getstring (lua_Object object); | 89 | char *lua_getstring (lua_Object object); |
90 | lua_CFunction lua_getcfunction (lua_Object object); | 90 | lua_CFunction lua_getcfunction (lua_Object object); |
91 | void *lua_getuserdata (lua_Object object); | 91 | void *lua_getuserdata (lua_Object object); |
92 | 92 | ||
93 | 93 | ||
94 | void lua_pushnil (void); | 94 | void lua_pushnil (void); |
95 | void lua_pushnumber (float n); | 95 | void lua_pushnumber (double n); |
96 | void lua_pushstring (char *s); | 96 | void lua_pushstring (char *s); |
97 | void lua_pushCclosure (lua_CFunction fn, int n); | 97 | void lua_pushCclosure (lua_CFunction fn, int n); |
98 | void lua_pushusertag (void *u, int tag); | 98 | void lua_pushusertag (void *u, int tag); |
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | ** $Id: $ | 2 | ** $Id: lualib.h,v 1.1 1997/09/16 19:25:59 roberto Exp roberto $ |
3 | ** Lua standard libraries | 3 | ** Lua standard libraries |
4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
5 | */ | 5 | */ |
@@ -30,7 +30,6 @@ void lua_mathlibopen (void); | |||
30 | 30 | ||
31 | char *luaI_addchar (int c); | 31 | char *luaI_addchar (int c); |
32 | void luaI_emptybuff (void); | 32 | void luaI_emptybuff (void); |
33 | void luaI_addquoted (char *s); | ||
34 | 33 | ||
35 | int luaI_singlematch (int c, char *p, char **ep); | 34 | int luaI_singlematch (int c, char *p, char **ep); |
36 | 35 | ||