mirror of
https://github.com/lua/lua.git
synced 2025-01-14 05:43:00 +08:00
setparsedfile is extern; luaz_... changed to luaZ_...
This commit is contained in:
parent
88f020b626
commit
6bb2cac3db
21
inout.c
21
inout.c
@ -5,7 +5,7 @@
|
||||
** Also provides some predefined lua functions.
|
||||
*/
|
||||
|
||||
char *rcs_inout="$Id: inout.c,v 2.62 1997/06/17 18:44:31 roberto Exp roberto $";
|
||||
char *rcs_inout="$Id: inout.c,v 2.63 1997/06/18 20:35:49 roberto Exp roberto $";
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
@ -38,7 +38,7 @@ char *luaI_typenames[] = { /* ORDER LUA_T */
|
||||
|
||||
|
||||
|
||||
static void setparsedfile (char *name)
|
||||
void luaI_setparsedfile (char *name)
|
||||
{
|
||||
lua_parsedfile = luaI_createfixedstring(name)->str;
|
||||
}
|
||||
@ -47,7 +47,7 @@ static void setparsedfile (char *name)
|
||||
int lua_doFILE (FILE *f, int bin)
|
||||
{
|
||||
ZIO z;
|
||||
luaz_Fopen(&z, f);
|
||||
luaZ_Fopen(&z, f);
|
||||
if (bin)
|
||||
return luaI_undump(&z);
|
||||
else {
|
||||
@ -64,7 +64,7 @@ int lua_dofile (char *filename)
|
||||
FILE *f = (filename == NULL) ? stdin : fopen(filename, "r");
|
||||
if (f == NULL)
|
||||
return 2;
|
||||
setparsedfile(filename?filename:"(stdin)");
|
||||
luaI_setparsedfile(filename?filename:"(stdin)");
|
||||
c = fgetc(f);
|
||||
ungetc(c, f);
|
||||
if (c == ID_CHUNK) {
|
||||
@ -76,7 +76,8 @@ int lua_dofile (char *filename)
|
||||
while ((c=fgetc(f)) != '\n') /* skip first line */;
|
||||
status = lua_doFILE(f, 0);
|
||||
}
|
||||
fclose(f);
|
||||
if (f != stdin)
|
||||
fclose(f);
|
||||
return status;
|
||||
}
|
||||
|
||||
@ -89,10 +90,9 @@ int lua_dobuffer (char *buff, int size)
|
||||
{
|
||||
int status;
|
||||
ZIO z;
|
||||
setparsedfile("(buffer)");
|
||||
luaz_mopen(&z, buff, size);
|
||||
luaI_setparsedfile("(buffer)");
|
||||
luaZ_mopen(&z, buff, size);
|
||||
status = luaI_undump(&z);
|
||||
zclose(&z);
|
||||
return status;
|
||||
}
|
||||
|
||||
@ -107,11 +107,10 @@ int lua_dostring (char *str)
|
||||
sprintf(buff, "(dostring) >> %.20s", str);
|
||||
temp = strchr(buff, '\n');
|
||||
if (temp) *temp = 0; /* end string after first line */
|
||||
setparsedfile(buff);
|
||||
luaz_sopen(&z, str);
|
||||
luaI_setparsedfile(buff);
|
||||
luaZ_sopen(&z, str);
|
||||
lua_setinput(&z);
|
||||
status = lua_domain();
|
||||
zclose(&z);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
7
inout.h
7
inout.h
@ -1,5 +1,5 @@
|
||||
/*
|
||||
** $Id: inout.h,v 1.18 1997/06/16 16:50:22 roberto Exp roberto $
|
||||
** $Id: inout.h,v 1.19 1997/06/18 20:35:49 roberto Exp roberto $
|
||||
*/
|
||||
|
||||
|
||||
@ -14,10 +14,7 @@ extern Word lua_linenumber;
|
||||
extern Word lua_debugline;
|
||||
extern char *lua_parsedfile;
|
||||
|
||||
FILE *lua_openfile (char *fn);
|
||||
void lua_closefile (void);
|
||||
void lua_openstring (char *s);
|
||||
void lua_closestring (void);
|
||||
void luaI_setparsedfile (char *name);
|
||||
|
||||
void luaI_predefine (void);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user