nik/lush
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

print_stack now gets a parameter (file to print);

Browse Source 
small changes.
This commit is contained in:
Roberto Ierusalimschy
1995-11-03 13:43:50 -02:00
parent 63b8a6fd20
commit f9a9bd77e4
1 changed files with 64 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
iolib.c
View File

@@ -3,7 +3,7 @@
** Input/output library to LUA ** Input/output library to LUA
*/ */
char *rcs_iolib="$Id: iolib.c,v 1.25 1995/10/23 13:53:48 roberto Exp roberto $"; char *rcs_iolib="$Id: iolib.c,v 1.26 1995/10/26 14:21:56 roberto Exp roberto $";
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
@@ -25,6 +25,22 @@ static FILE *in=stdin, *out=stdout;
#define pclose(x) (-1) #define pclose(x) (-1)
#endif #endif
static void str_error(char *funcname)
{
char buff[250];
sprintf(buff, "incorrect arguments to function `%s'", funcname);
lua_error(buff);
}
static char *check_and_get_string (int numArg, char *funcname)
{
lua_Object o = lua_getparam(numArg);
if (!(lua_isstring(o) || lua_isnumber(o)))
str_error(funcname);
return lua_getstring(o);
}
static void closeread (void) static void closeread (void)
{ {
if (in != stdin) if (in != stdin)
@@ -55,34 +71,23 @@ static void closewrite (void)
*/ */
static void io_readfrom (void) static void io_readfrom (void)
{ {
lua_Object o = lua_getparam (1); if (lua_getparam (1) == LUA_NOOBJECT)
if (o == LUA_NOOBJECT) /* restore standart input */ { /* restore standart input */
{
closeread(); closeread();
lua_pushnumber (1); lua_pushnumber (1);
} }
else else
{ {
if (!lua_isstring (o)) char *s = check_and_get_string(1, "readfrom");
{
lua_error ("incorrect argument to function 'readfrom`");
lua_pushnumber (0);
}
else
{
char *s = lua_getstring(o);
FILE *fp = (*s == '|') ? popen(s+1, "r") : fopen(s, "r"); FILE *fp = (*s == '|') ? popen(s+1, "r") : fopen(s, "r");
if (fp == NULL) if (fp == NULL)
{
lua_pushnumber (0); lua_pushnumber (0);
}
else else
{ {
closeread(); closeread();
in = fp; in = fp;
lua_pushnumber (1); lua_pushnumber (1);
} }
}
} }
} }
@@ -97,34 +102,23 @@ static void io_readfrom (void)
*/ */
static void io_writeto (void) static void io_writeto (void)
{ {
lua_Object o = lua_getparam (1); if (lua_getparam (1) == LUA_NOOBJECT) /* restore standart output */
if (o == LUA_NOOBJECT) /* restore standart output */
{ {
closewrite(); closewrite();
lua_pushnumber (1); lua_pushnumber (1);
} }
else else
{ {
if (!lua_isstring (o)) char *s = check_and_get_string(1, "writeto");
{
lua_error ("incorrect argument to function 'writeto`");
lua_pushnumber (0);
}
else
{
char *s = lua_getstring(o);
FILE *fp = (*s == '|') ? popen(s+1,"w") : fopen(s,"w"); FILE *fp = (*s == '|') ? popen(s+1,"w") : fopen(s,"w");
if (fp == NULL) if (fp == NULL)
{
lua_pushnumber (0); lua_pushnumber (0);
}
else else
{ {
closewrite(); closewrite();
out = fp; out = fp;
lua_pushnumber (1); lua_pushnumber (1);
} }
}
} }
} }
@@ -140,30 +134,17 @@ static void io_writeto (void)
*/ */
static void io_appendto (void) static void io_appendto (void)
{ {
lua_Object o = lua_getparam (1); char *s = check_and_get_string(1, "appendto");
if (!lua_isstring (o)) struct stat st;
{ int r = (stat(s, &st) == -1) ? 1 : 2;
lua_error ("incorrect argument to function 'appendto`"); FILE *fp = fopen (s, "a");
lua_pushnumber (0); if (fp == NULL)
} lua_pushnumber (0);
else else
{ {
int r; if (out != stdout) fclose (out);
FILE *fp; out = fp;
struct stat st; lua_pushnumber (r);
if (stat(lua_getstring(o), &st) == -1) r = 1;
else r = 2;
fp = fopen (lua_getstring(o),"a");
if (fp == NULL)
{
lua_pushnumber (0);
}
else
{
if (out != stdout) fclose (out);
out = fp;
lua_pushnumber (r);
}
} }
} }
@@ -185,30 +166,17 @@ static void io_appendto (void)
static void io_read (void) static void io_read (void)
{ {
lua_Object o = lua_getparam (1); lua_Object o = lua_getparam (1);
if (o == LUA_NOOBJECT || !lua_isstring(o)) /* free format */ if (o == LUA_NOOBJECT) /* free format */
{ {
int c; int c;
char s[256]; char s[256];
while (isspace(c=fgetc(in))) while (isspace(c=fgetc(in)))
; ;
if (c == '\"') if (c == '\"' || c == '\'')
{ {
int del = c;
int n=0; int n=0;
while((c = fgetc(in)) != '\"') while((c = fgetc(in)) != del)
{
if (c == EOF)
{
lua_pushnil ();
return;
}
s[n++] = c;
}
s[n] = 0;
}
else if (c == '\'')
{
int n=0;
while((c = fgetc(in)) != '\'')
{ {
if (c == EOF) if (c == EOF)
{ {
@@ -239,7 +207,7 @@ static void io_read (void)
} }
else /* formatted */ else /* formatted */
{ {
char *e = lua_getstring(o); char *e = check_and_get_string(1, "read");
char t; char t;
int m=0; int m=0;
while (isspace(*e)) e++; while (isspace(*e)) e++;
@@ -483,18 +451,7 @@ static void io_write (void)
*/ */
static void io_execute (void) static void io_execute (void)
{ {
lua_Object o = lua_getparam (1); lua_pushnumber(system(check_and_get_string(1, "execute")));
if (o == LUA_NOOBJECT || !lua_isstring (o))
{
lua_error ("incorrect argument to function 'execute`");
lua_pushnumber (0);
}
else
{
int res = system(lua_getstring(o));
lua_pushnumber (res);
}
return;
} }
/* /*
@@ -503,20 +460,10 @@ static void io_execute (void)
*/ */
static void io_remove (void) static void io_remove (void)
{ {
lua_Object o = lua_getparam (1); if (remove(check_and_get_string(1, "remove")) == 0)
if (o == LUA_NOOBJECT || !lua_isstring (o))
{
lua_error ("incorrect argument to function 'execute`");
lua_pushnumber (0);
}
else
{
if (remove(lua_getstring(o)) == 0)
lua_pushnumber (1); lua_pushnumber (1);
else else
lua_pushnumber (0); lua_pushnumber (0);
}
return;
} }
@@ -525,15 +472,9 @@ static void io_remove (void)
*/ */
static void io_getenv (void) static void io_getenv (void)
{ {
lua_Object s = lua_getparam(1); char *env = getenv(check_and_get_string(1, "getenv"));
if (!lua_isstring(s)) if (env == NULL) lua_pushnil();
lua_pushnil(); else lua_pushstring(env);
else
{
char *env = getenv(lua_getstring(s));
if (env == NULL) lua_pushnil();
else lua_pushstring(env);
}
} }
/* /*
@@ -602,26 +543,23 @@ static void io_debug (void)
} }
static void print_message (void) void lua_printstack (FILE *f)
{ {
lua_Object o = lua_getparam(1);
char *s = lua_isstring(o) ? lua_getstring(o) : "(no messsage)";
int level = 0; int level = 0;
lua_Object func; lua_Object func;
fprintf(stderr, "lua: %s\n", s); fprintf(f, "Active Stack:\n");
fprintf(stderr, "Active Stack:\n");
while ((func = lua_stackedfunction(level++)) != LUA_NOOBJECT) while ((func = lua_stackedfunction(level++)) != LUA_NOOBJECT)
{ {
char *name; char *name;
int currentline; int currentline;
fprintf(stderr, "\t"); fprintf(f, "\t");
switch (*getobjname(func, &name)) switch (*getobjname(func, &name))
{ {
case 'g': case 'g':
fprintf(stderr, "function %s", name); fprintf(f, "function %s", name);
break; break;
case 'f': case 'f':
fprintf(stderr, "fallback %s", name); fprintf(f, "fallback %s", name);
break; break;
default: default:
{ {
@@ -629,19 +567,29 @@ static void print_message (void)
int linedefined; int linedefined;
lua_funcinfo(func, &filename, &linedefined); lua_funcinfo(func, &filename, &linedefined);
if (linedefined == 0) if (linedefined == 0)
fprintf(stderr, "main of %s", filename); fprintf(f, "main of %s", filename);
else if (linedefined < 0) else if (linedefined < 0)
fprintf(stderr, "%s", filename); fprintf(f, "%s", filename);
else else
fprintf(stderr, "function (%s:%d)", filename, linedefined); fprintf(f, "function (%s:%d)", filename, linedefined);
} }
} }
if ((currentline = lua_currentline(func)) > 0) if ((currentline = lua_currentline(func)) > 0)
fprintf(stderr, " at line %d", currentline); fprintf(f, " at line %d", currentline);
fprintf(stderr, "\n"); fprintf(f, "\n");
} }
} }
static void errorfb (void)
{
lua_Object o = lua_getparam(1);
char *s = lua_isstring(o) ? lua_getstring(o) : "(no messsage)";
fprintf(stderr, "lua: %s\n", s);
lua_printstack(stderr);
}
/* /*
** Open io library ** Open io library
*/ */
@@ -661,5 +609,6 @@ void iolib_open (void)
lua_register ("beep", io_beep); lua_register ("beep", io_beep);
lua_register ("exit", io_exit); lua_register ("exit", io_exit);
lua_register ("debug", io_debug); lua_register ("debug", io_debug);
lua_setfallback("error", print_message); lua_register ("print_stack", errorfb);
lua_setfallback("error", errorfb);
} }