GitHub/lua
1
0
Fork 0
mirror of https://github.com/lua/lua.git synced 2025-01-14 05:43:00 +08:00
Code Issues Projects Releases Wiki Activity

C upvalues are the last arguments to a function

Browse Source
This commit is contained in:
Roberto Ierusalimschy 2000-08-29 11:33:31 -03:00
parent b691d4344b
commit ac12f4db4b
6 changed files with 74 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lauxlib.c
View File

@ -1,5 +1,5 @@
/*
** $Id: lauxlib.c,v 1.30 2000/08/09 19:16:57 roberto Exp roberto $
** $Id: lauxlib.c,v 1.31 2000/08/28 17:57:04 roberto Exp roberto $
** Auxiliary functions for building Lua libraries
** See Copyright Notice in lua.h
*/
@ -32,8 +32,7 @@ int luaL_findstring (const char *name, const char *const list[]) {
void luaL_argerror (lua_State *L, int narg, const char *extramsg) {
lua_Debug ar;
lua_getstack(L, 0, &ar);
lua_getinfo(L, "nu", &ar);
narg -= ar.nups;
lua_getinfo(L, "n", &ar);
if (ar.name == NULL)
ar.name = "?";
luaL_verror(L, "bad argument #%d to `%.50s' (%.100s)",

6
lbuiltin.c
View File

@ -1,5 +1,5 @@
/*
** $Id: lbuiltin.c,v 1.121 2000/08/15 18:28:48 roberto Exp roberto $
** $Id: lbuiltin.c,v 1.122 2000/08/28 17:57:04 roberto Exp roberto $
** Built-in functions
** See Copyright Notice in lua.h
*/
@ -640,7 +640,7 @@ static void deprecated_funcs (lua_State *L) {
hvalue(&gt) = L->gt;
for (i=0; i<num_deprecated; i++) {
lua_pushobject(L, &gt);
lua_pushcclosure(L, deprecated_global_funcs[i].func, 1);
lua_pushcclosure(L, deprecated_global_funcs[i].func, 1); ??
lua_setglobal(L, deprecated_global_funcs[i].name);
}
luaL_openl(L, other_deprecated_global_funcs);
@ -652,7 +652,7 @@ static void deprecated_funcs (lua_State *L) {
** gives an explicit error in any attempt to call a deprecated function
*/
static int deprecated_func (lua_State *L) {
luaL_verror(L, "function `%.20s' is deprecated", luaL_check_string(L, 1));
luaL_verror(L, "function `%.20s' is deprecated", luaL_check_string(L, -1));
return 0; /* to avoid warnings */
}

20
ldo.c
View File

@ -1,5 +1,5 @@
/*
** $Id: ldo.c,v 1.85 2000/08/10 19:50:47 roberto Exp roberto $
** $Id: ldo.c,v 1.86 2000/08/28 17:57:04 roberto Exp roberto $
** Stack and Call structure of Lua
** See Copyright Notice in lua.h
*/
@ -136,20 +136,14 @@ static void luaD_callHook (lua_State *L, StkId func, lua_Hook callhook,
static StkId callCclosure (lua_State *L, const struct Closure *cl, StkId base) {
int nup = cl->nupvalues; /* number of upvalues */
StkId old_Cbase = L->Cbase;
int nres; /* number of results */
if (nup > 0) {
int n = L->top - base; /* number of arguments */
luaD_checkstack(L, nup);
/* open space for upvalues as extra arguments */
while (n--) *(base+nup+n) = *(base+n);
L->top += nup;
/* copy upvalues into stack */
while (nup--) *(base+nup) = cl->upvalue[nup];
}
int n;
L->Cbase = base; /* new base for C function */
nres = (*cl->f.c)(L); /* do the actual call */
luaD_checkstack(L, nup);
for (n=0; n<nup; n++) /* copy upvalues as extra arguments */
*(L->top++) = cl->upvalue[n];
n = (*cl->f.c)(L); /* do the actual call */
L->Cbase = old_Cbase; /* restore old C base */
return L->top - nres; /* return index of first result */
return L->top - n; /* return index of first result */
}

100
liolib.c
View File

@ -1,5 +1,5 @@
/*
** $Id: liolib.c,v 1.71 2000/08/22 17:47:17 roberto Exp roberto $
** $Id: liolib.c,v 1.72 2000/08/28 17:57:04 roberto Exp roberto $
** Standard I/O (and system) library
** See Copyright Notice in lua.h
*/
@ -109,7 +109,6 @@ static FILE *getfilebyref (lua_State *L, IOCtrl *ctrl, int inout) {
lua_getref(L, ctrl->ref[inout]);
lua_rawget(L);
f = gethandle(L, ctrl, -1);
lua_settop(L, -1); /* remove global */
if (f == NULL)
luaL_verror(L, "global variable `%.10s' is not a file handle",
filenames[inout]);
@ -150,21 +149,23 @@ static int closefile (lua_State *L, IOCtrl *ctrl, FILE *f) {
static int io_close (lua_State *L) {
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, 1);
return pushresult(L, closefile(L, ctrl, getnonullfile(L, ctrl, 2)));
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, -1);
lua_settop(L, -1); /* remove upvalue */
return pushresult(L, closefile(L, ctrl, getnonullfile(L, ctrl, 1)));
}
static int file_collect (lua_State *L) {
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, 1);
if (ctrl == (IOCtrl *)lua_touserdata(L, 2)) {
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, -1);
lua_settop(L, -1); /* remove upvalue */
if (ctrl == (IOCtrl *)lua_touserdata(L, 1)) {
/* collectig `ctrl' itself */
lua_unref(L, ctrl->ref[INFILE]);
lua_unref(L, ctrl->ref[OUTFILE]);
free(ctrl);
}
else { /* collecting a file: Close it */
FILE *f = getnonullfile(L, ctrl, 2);
FILE *f = getnonullfile(L, ctrl, 1);
if (f != stdin && f != stdout && f != stderr)
CLOSEFILE(L, f);
}
@ -173,8 +174,10 @@ static int file_collect (lua_State *L) {
static int io_open (lua_State *L) {
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, 1);
FILE *f = fopen(luaL_check_string(L, 2), luaL_check_string(L, 3));
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, -1);
FILE *f;
lua_settop(L, -1); /* remove upvalue */
f = fopen(luaL_check_string(L, 1), luaL_check_string(L, 2));
if (f) {
lua_pushusertag(L, f, ctrl->iotag);
return 1;
@ -186,16 +189,17 @@ static int io_open (lua_State *L) {
static int io_fromto (lua_State *L, int inout, const char *mode) {
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, 1);
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, -1);
FILE *current;
if (lua_isnull(L, 2)) {
lua_settop(L, -1); /* remove upvalue */
if (lua_isnull(L, 1)) {
closefile(L, ctrl, getfilebyref(L, ctrl, inout));
current = (inout == 0) ? stdin : stdout;
}
else if (lua_tag(L, 2) == ctrl->iotag) /* deprecated option */
current = (FILE *)lua_touserdata(L, 2);
else if (lua_tag(L, 1) == ctrl->iotag) /* deprecated option */
current = (FILE *)lua_touserdata(L, 1);
else {
const char *s = luaL_check_string(L, 2);
const char *s = luaL_check_string(L, 1);
current = (*s == '|') ? popen(s+1, mode) : fopen(s, mode);
}
return setreturn(L, ctrl, current, inout);
@ -213,8 +217,10 @@ static int io_writeto (lua_State *L) {
static int io_appendto (lua_State *L) {
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, 1);
FILE *current = fopen(luaL_check_string(L, 2), "a");
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, -1);
FILE *current;
lua_settop(L, -1); /* remove upvalue */
current = fopen(luaL_check_string(L, 1), "a");
return setreturn(L, ctrl, current, OUTFILE);
}
@ -353,28 +359,33 @@ static int read_chars (lua_State *L, FILE *f, size_t n) {
static int io_read (lua_State *L) {
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, 1);
int lastarg = lua_gettop(L);
int firstarg = 2;
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, -1);
int lastarg = lua_gettop(L) - 1;
int firstarg = 1;
FILE *f = gethandle(L, ctrl, firstarg);
int n = 0;
int n;
if (f) firstarg++;
else f = getfilebyref(L, ctrl, INFILE); /* get _INPUT */
do { /* repeat for each part */
lua_settop(L, -1);
if (firstarg > lastarg) { /* no arguments? */
lua_settop(L, 0); /* erase upvalue and other eventual garbage */
firstarg = lastarg = 1; /* correct indices */
lua_pushstring(L, "*l"); /* push default argument */
}
for (n = firstarg; n<=lastarg; n++) {
size_t l;
int success;
luaL_resetbuffer(L);
if (lua_isnumber(L, firstarg+n))
success = read_chars(L, f, (size_t)lua_tonumber(L, firstarg+n));
if (lua_isnumber(L, n))
success = read_chars(L, f, (size_t)lua_tonumber(L, n));
else {
const char *p = luaL_opt_string(L, firstarg+n, "*l");
const char *p = luaL_check_string(L, n);
if (p[0] != '*')
success = read_pattern(L, f, p); /* deprecated! */
else {
switch (p[1]) {
case 'n': /* number */
if (!read_number(L, f)) return n; /* read fails */
n++;
if (!read_number(L, f)) goto endloop; /* read fails */
continue; /* number is already pushed; avoid the "pushstring" */
case 'l': /* line */
success = read_line(L, f);
@ -388,26 +399,25 @@ static int io_read (lua_State *L) {
success = 0; /* must read something to succeed */
break;
default:
luaL_argerror(L, firstarg+n, "invalid format");
luaL_argerror(L, n, "invalid format");
success = 0; /* to avoid warnings */
}
}
}
l = luaL_getsize(L);
if (!success && l==0) return n; /* read fails */
if (!success && l==0) break; /* read fails */
lua_pushlstring(L, luaL_buffer(L), l);
n++;
} while (firstarg+n <= lastarg);
return n;
} endloop:
return n - firstarg;
}
/* }====================================================== */
static int io_write (lua_State *L) {
int lastarg = lua_gettop(L);
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, 1);
int arg = 2;
int lastarg = lua_gettop(L) - 1;
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, -1);
int arg = 1;
int status = 1;
FILE *f = gethandle(L, ctrl, arg);
if (f) arg++;
@ -431,11 +441,15 @@ static int io_write (lua_State *L) {
static int io_seek (lua_State *L) {
static const int mode[] = {SEEK_SET, SEEK_CUR, SEEK_END};
static const char *const modenames[] = {"set", "cur", "end", NULL};
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, 1);
FILE *f = getnonullfile(L, ctrl, 2);
int op = luaL_findstring(luaL_opt_string(L, 3, "cur"), modenames);
long offset = luaL_opt_long(L, 4, 0);
luaL_arg_check(L, op != -1, 3, "invalid mode");
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, -1);
FILE *f;
int op;
long offset;
lua_settop(L, -1); /* remove upvalue */
f = getnonullfile(L, ctrl, 1);
op = luaL_findstring(luaL_opt_string(L, 2, "cur"), modenames);
offset = luaL_opt_long(L, 3, 0);
luaL_arg_check(L, op != -1, 2, "invalid mode");
op = fseek(f, offset, mode[op]);
if (op)
return pushresult(L, 0); /* error */
@ -447,9 +461,11 @@ static int io_seek (lua_State *L) {
static int io_flush (lua_State *L) {
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, 1);
FILE *f = gethandle(L, ctrl, 2);
luaL_arg_check(L, f || lua_isnull(L, 2), 2, "invalid file handle");
IOCtrl *ctrl = (IOCtrl *)lua_touserdata(L, -1);
FILE *f;
lua_settop(L, -1); /* remove upvalue */
f = gethandle(L, ctrl, 1);
luaL_arg_check(L, f || lua_isnull(L, 1), 1, "invalid file handle");
return pushresult(L, fflush(f) == 0);
}

4
lua.c
View File

@ -1,5 +1,5 @@
/*
** $Id: lua.c,v 1.45 2000/08/14 17:45:59 roberto Exp roberto $
** $Id: lua.c,v 1.46 2000/08/28 17:57:04 roberto Exp roberto $
** Lua stand-alone interpreter
** See Copyright Notice in lua.h
*/
@ -142,7 +142,7 @@ static void getargs (char *argv[]) {
static int l_getargs (lua_State *l) {
char **argv = (char **)lua_touserdata(l, 1);
char **argv = (char **)lua_touserdata(l, -1);
getargs(argv);
return 1;
}

4
lua.h
View File

@ -1,5 +1,5 @@
/*
** $Id: lua.h,v 1.59 2000/08/17 13:18:01 roberto Exp roberto $
** $Id: lua.h,v 1.60 2000/08/28 17:57:04 roberto Exp roberto $
** Lua - An Extensible Extension Language
** TeCGraf: Grupo de Tecnologia em Computacao Grafica, PUC-Rio, Brazil
** e-mail: lua@tecgraf.puc-rio.br
@ -153,7 +153,7 @@ int lua_next (lua_State *L, int index, int i);
#define lua_clonetag(L,t) lua_copytagmethods(L, lua_newtag(L), (t))
#define lua_isfunction(L,n) (*lua_type(L,n) == 'f')
#define lua_isstring(L,n) (lua_tostring(L,n))
#define lua_isstring(L,n) (lua_tostring(L,n) != 0)
#define lua_istable(L,n) (*lua_type(L,n) == 't')
#define lua_isuserdata(L,n) (*lua_type(L,n) == 'u')
#define lua_isnil(L,n) (lua_type(L,n)[2] == 'l')