summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lapi.c6
-rw-r--r--lbuiltin.c6
-rw-r--r--llex.h5
-rw-r--r--lmem.h6
-rw-r--r--lstring.h3
-rw-r--r--lstrlib.c4
-rw-r--r--ltable.h3
-rw-r--r--ltm.h3
-rw-r--r--lua.h6
-rw-r--r--lualib.h3
10 files changed, 20 insertions, 25 deletions
diff --git a/lapi.c b/lapi.c
index 8a570674..aa6bd324 100644
--- a/lapi.c
+++ b/lapi.c
@@ -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
270real lua_getnumber (lua_Object object) 270double 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
305void lua_pushnumber (real n) 305void 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;
diff --git a/lbuiltin.c b/lbuiltin.c
index 36432add..50183fff 100644
--- a/lbuiltin.c
+++ b/lbuiltin.c
@@ -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: {
diff --git a/llex.h b/llex.h
index 4f28cc24..a24fdec1 100644
--- a/llex.h
+++ b/llex.h
@@ -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
43extern int luaX_linenumber;
44
45
46void luaX_init (void); 43void luaX_init (void);
47void luaX_setinput (ZIO *z); 44void luaX_setinput (ZIO *z);
48char *luaX_lasttoken (void); 45char *luaX_lasttoken (void);
diff --git a/lmem.h b/lmem.h
index dcc1c1a4..90111336 100644
--- a/lmem.h
+++ b/lmem.h
@@ -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
41void luaM_query (void); /* only ifdef DEBUG */ 41#ifdef DEBUG
42void luaM_query (void);
43#endif
42 44
43 45
44#endif 46#endif
diff --git a/lstring.h b/lstring.h
index c842afe8..b2c421e2 100644
--- a/lstring.h
+++ b/lstring.h
@@ -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);
15TaggedString *luaS_createudata (void *udata, int tag); 15TaggedString *luaS_createudata (void *udata, int tag);
16TaggedString *luaS_collector (void); 16TaggedString *luaS_collector (void);
17void luaS_free (TaggedString *l); 17void luaS_free (TaggedString *l);
18void luaS_callIM (TaggedString *l);
19TaggedString *luaS_new (char *str); 18TaggedString *luaS_new (char *str);
20TaggedString *luaS_newfixedstring (char *str); 19TaggedString *luaS_newfixedstring (char *str);
21void luaS_rawsetglobal (TaggedString *ts, TObject *newval); 20void luaS_rawsetglobal (TaggedString *ts, TObject *newval);
diff --git a/lstrlib.c b/lstrlib.c
index eba282de..cdd2ffe5 100644
--- a/lstrlib.c
+++ b/lstrlib.c
@@ -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
449void luaI_addquoted (char *s) 449static void luaI_addquoted (char *s)
450{ 450{
451 luaI_addchar('"'); 451 luaI_addchar('"');
452 for (; *s; s++) { 452 for (; *s; s++) {
diff --git a/ltable.h b/ltable.h
index 4fb66a91..06cf17c3 100644
--- a/ltable.h
+++ b/ltable.h
@@ -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
18Hash *luaH_new (int nhash); 18Hash *luaH_new (int nhash);
19void luaH_callIM (Hash *l);
20void luaH_free (Hash *frees); 19void luaH_free (Hash *frees);
21TObject *luaH_get (Hash *t, TObject *ref); 20TObject *luaH_get (Hash *t, TObject *ref);
22TObject *luaH_set (Hash *t, TObject *ref); 21TObject *luaH_set (Hash *t, TObject *ref);
diff --git a/ltm.h b/ltm.h
index 4b52fe94..9c3ec111 100644
--- a/ltm.h
+++ b/ltm.h
@@ -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
53void luaT_init (void); 53void luaT_init (void);
54void luaT_settag (int tag, TObject *o);
55void luaT_realtag (int tag); 54void luaT_realtag (int tag);
56int luaT_efectivetag (TObject *o); 55int luaT_efectivetag (TObject *o);
57void luaT_settagmethod (int t, char *event, TObject *func); 56void luaT_settagmethod (int t, char *event, TObject *func);
diff --git a/lua.h b/lua.h
index 48fd80cf..23a30cbe 100644
--- a/lua.h
+++ b/lua.h
@@ -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);
85int lua_isstring (lua_Object object); 85int lua_isstring (lua_Object object);
86int lua_isfunction (lua_Object object); 86int lua_isfunction (lua_Object object);
87 87
88float lua_getnumber (lua_Object object); 88double lua_getnumber (lua_Object object);
89char *lua_getstring (lua_Object object); 89char *lua_getstring (lua_Object object);
90lua_CFunction lua_getcfunction (lua_Object object); 90lua_CFunction lua_getcfunction (lua_Object object);
91void *lua_getuserdata (lua_Object object); 91void *lua_getuserdata (lua_Object object);
92 92
93 93
94void lua_pushnil (void); 94void lua_pushnil (void);
95void lua_pushnumber (float n); 95void lua_pushnumber (double n);
96void lua_pushstring (char *s); 96void lua_pushstring (char *s);
97void lua_pushCclosure (lua_CFunction fn, int n); 97void lua_pushCclosure (lua_CFunction fn, int n);
98void lua_pushusertag (void *u, int tag); 98void lua_pushusertag (void *u, int tag);
diff --git a/lualib.h b/lualib.h
index 0031de9f..9e9b0193 100644
--- a/lualib.h
+++ b/lualib.h
@@ -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
31char *luaI_addchar (int c); 31char *luaI_addchar (int c);
32void luaI_emptybuff (void); 32void luaI_emptybuff (void);
33void luaI_addquoted (char *s);
34 33
35int luaI_singlematch (int c, char *p, char **ep); 34int luaI_singlematch (int c, char *p, char **ep);
36 35