commit 450465c4d4c765ef83e6b27d5e8d8591db55ef00
parent 2f44cc9f4d62cbdc6e752d5328408fc5123bedcc
Author: Roberto Ierusalimschy <roberto@inf.puc-rio.br>
Date: Fri, 1 Nov 1996 15:03:16 -0200
new parameters for "read" and "write". BIG CHANGE.
Diffstat:
| M | iolib.c | | | 562 | ++++++++++++++++++------------------------------------------------------------- |
1 file changed, 124 insertions(+), 438 deletions(-)
diff --git a/iolib.c b/iolib.c
@@ -1,10 +1,3 @@
-/*
-** iolib.c
-** Input/output library to LUA
-*/
-
-char *rcs_iolib="$Id: iolib.c,v 1.47 1996/08/01 14:55:33 roberto Exp roberto $";
-
#include <stdio.h>
#include <ctype.h>
#include <string.h>
@@ -16,7 +9,8 @@ char *rcs_iolib="$Id: iolib.c,v 1.47 1996/08/01 14:55:33 roberto Exp roberto $";
#include "luadebug.h"
#include "lualib.h"
-static FILE *in, *out;
+
+FILE *lua_infile, *lua_outfile;
#ifdef POPEN
@@ -31,496 +25,194 @@ int pclose();
static void pushresult (int i)
{
if (i)
- lua_pushnumber (1);
-}
-
-static void closeread (void)
-{
- if (in != stdin)
- {
- if (pclose(in) == -1)
- fclose(in);
- in = stdin;
+ lua_pushuserdata(NULL);
+ else {
+ lua_pushnil();
+ lua_pushstring(strerror(errno));
}
}
-static void closewrite (void)
+
+static void closefile (FILE *f)
{
- if (out != stdout)
- {
- if (pclose(out) == -1)
- fclose(out);
- out = stdout;
- }
+ if (f == stdin || f == stdout)
+ return;
+ if (f == lua_infile)
+ lua_infile = stdin;
+ if (f == lua_outfile)
+ lua_outfile = stdout;
+ if (pclose(f) == -1)
+ fclose(f);
}
-/*
-** Open a file to read.
-** LUA interface:
-** status = readfrom (filename)
-** where:
-** status = 1 -> success
-** status = nil -> error
-*/
+
+
static void io_readfrom (void)
{
- if (lua_getparam (1) == LUA_NOOBJECT)
- { /* restore standart input */
- closeread();
- lua_pushnumber (1);
- }
- else
- {
- char *s = lua_check_string(1, "readfrom");
- FILE *fp = (*s == '|') ? popen(s+1, "r") : fopen(s, "r");
- if (fp == NULL)
- lua_pushnil();
- else
- {
- closeread();
- in = fp;
- lua_pushnumber (1);
- }
- }
+ lua_Object f = lua_getparam(1);
+ if (f == LUA_NOOBJECT)
+ closefile(lua_infile); /* restore standart input */
+ else if (lua_isuserdata(f))
+ lua_infile = lua_getuserdata(f);
+ else {
+ char *s = lua_check_string(1, "readfrom");
+ FILE *fp = (*s == '|') ? popen(s+1, "r") : fopen(s, "r");
+ if (fp)
+ lua_infile = fp;
+ else {
+ pushresult(0);
+ return;
+ }
+ }
+ lua_pushuserdata(lua_infile);
}
-/*
-** Open a file to write.
-** LUA interface:
-** status = writeto (filename)
-** where:
-** status = 1 -> success
-** status = nil -> error
-*/
static void io_writeto (void)
{
- if (lua_getparam (1) == LUA_NOOBJECT) /* restore standart output */
- {
- closewrite();
- lua_pushnumber (1);
- }
- else
- {
- char *s = lua_check_string(1, "writeto");
- FILE *fp = (*s == '|') ? popen(s+1,"w") : fopen(s,"w");
- if (fp)
- {
- closewrite();
- out = fp;
- lua_pushnumber (1);
- }
- }
+ lua_Object f = lua_getparam(1);
+ if (f == LUA_NOOBJECT)
+ closefile(lua_outfile); /* restore standart output */
+ else if (lua_isuserdata(f))
+ lua_outfile = lua_getuserdata(f);
+ else {
+ char *s = lua_check_string(1, "writeto");
+ FILE *fp = (*s == '|') ? popen(s+1,"w") : fopen(s,"w");
+ if (fp)
+ lua_outfile = fp;
+ else {
+ pushresult(0);
+ return;
+ }
+ }
+ lua_pushuserdata(lua_outfile);
}
-/*
-** Open a file to write appended.
-** LUA interface:
-** status = appendto (filename)
-** where:
-** status = 1 -> success
-** status = nil -> error
-*/
static void io_appendto (void)
{
- char *s = lua_check_string(1, "appendto");
- FILE *fp = fopen (s, "a");
- if (fp)
- {
- if (out != stdout) fclose (out);
- out = fp;
- lua_pushnumber(1);
- }
-}
-
-
-static char getformat (char *f, int *just, long *m, int *n)
-{
- int t;
- switch (*f++)
- {
- case 'q': case 'Q':
- case 's': case 'S':
- case 'i': case 'I':
- t = tolower(*(f-1));
- break;
- case 'f': case 'F': case 'g': case 'G': case 'e': case 'E':
- t = 'f';
- break;
- default:
- t = 0; /* to avoid compiler warnings */
- lua_arg_check(0, "read/write (format)");
- }
- *just = (*f == '<' || *f == '>' || *f == '|') ? *f++ : '>';
- if (isdigit(*f))
- {
- *m = 0;
- while (isdigit(*f))
- *m = *m*10 + (*f++ - '0');
- }
- else
- *m = -1;
- if (*f == '.')
- {
- f++; /* skip point */
- *n = 0;
- while (isdigit(*f))
- *n = *n*10 + (*f++ - '0');
+ char *s = lua_check_string(1, "appendto");
+ FILE *fp = fopen (s, "a");
+ if (fp != NULL) {
+ lua_outfile = fp;
+ lua_pushuserdata(lua_outfile);
}
else
- *n = -1;
- return t;
+ pushresult(0);
}
-/*
-** Read a variable. On error put nil on stack.
-** LUA interface:
-** variable = read ([format])
-**
-** O formato pode ter um dos seguintes especificadores:
-**
-** s ou S -> para string
-** f ou F, g ou G, e ou E -> para reais
-** i ou I -> para inteiros
-**
-** Estes especificadores podem vir seguidos de numero que representa
-** o numero de campos a serem lidos.
-*/
-
-static int read_until_char (int del)
-{
- int c;
- while((c = fgetc(in)) != EOF && c != del)
- luaI_addchar(c);
- return c;
-}
-
-static void read_until_blank (void)
-{
- int c;
- while((c = fgetc(in)) != EOF && !isspace(c))
- luaI_addchar(c);
- if (c != EOF) ungetc(c,in);
-}
-
-static void read_m (size_t m)
-{
- int c;
- while (m-- && (c = fgetc(in)) != EOF)
- luaI_addchar(c);
-}
-
-
-static void read_free (void)
-{
- int c;
- while (isspace(c=fgetc(in)))
- ;
- if (c == EOF)
- return;
- if (c == '\"' || c == '\'')
- { /* string */
- c = read_until_char(c);
- if (c != EOF)
- lua_pushstring(luaI_addchar(0));
- }
- else
- {
- double d;
- char dummy;
- char *s;
- luaI_addchar(c);
- read_until_blank();
- s = luaI_addchar(0);
- if (sscanf(s, "%lf %c", &d, &dummy) == 1)
- lua_pushnumber(d);
- else
- lua_pushstring(s);
- }
-}
+#define NEED_OTHER (EOF-1) /* just some flag different from EOF */
static void io_read (void)
{
- lua_Object o = lua_getparam (1);
- luaI_addchar(0); /* initialize buffer */
- if (o == LUA_NOOBJECT) /* free format */
- read_free();
- else /* formatted */
- {
- long m;
- int dummy1, dummy2;
- switch (getformat(lua_check_string(1, "read"), &dummy1, &m, &dummy2))
- {
- case 's':
- {
- char *s;
- if (m < 0)
- read_until_blank();
- else
- read_m(m);
- s = luaI_addchar(0);
- if ((m >= 0 && strlen(s) == m) || (m < 0 && strlen(s) > 0))
- lua_pushstring(s);
- break;
+ char *buff;
+ char *p = lua_opt_string(1, "[^\n]*{\n}", "read");
+ int inskip = 0; /* to control {skips} */
+ int c = NEED_OTHER;
+ luaI_addchar(0);
+ while (*p) {
+ if (*p == '{' || *p == '}') {
+ inskip = (*p == '{');
+ p++;
+ }
+ else {
+ char *ep = item_end(p); /* get what is next */
+ int m;
+ if (c == NEED_OTHER) c = getc(lua_infile);
+ if ((m = singlematch(c, p)) != 0) {
+ if (!inskip) luaI_addchar(c);
+ c = NEED_OTHER;
}
-
- case 'i': /* can read as float, since it makes no difference to Lua */
- case 'f':
- {
- double d;
- int result;
- if (m < 0)
- result = fscanf(in, "%lf", &d);
- else
- {
- read_m(m);
- result = sscanf(luaI_addchar(0), "%lf", &d);
- }
- if (result == 1)
- lua_pushnumber(d);
- break;
+ switch (*ep) {
+ case '*': /* repetition */
+ if (!m) p = ep+1; /* else stay in (repeat) the same item */
+ break;
+ case '?': /* optional */
+ p = ep+1; /* continues reading the pattern */
+ break;
+ default:
+ if (m) p = ep; /* continues reading the pattern */
+ else
+ goto break_while; /* pattern fails */
}
- default:
- lua_arg_check(0, "read (format)");
}
- }
-}
-
-
-/*
-** Read characters until a given one. The delimiter is not read.
-*/
-static void io_readuntil (void)
-{
- int del, c;
- lua_Object p = lua_getparam(1);
- luaI_addchar(0); /* initialize buffer */
- if (p == LUA_NOOBJECT || lua_isnil(p))
- del = EOF;
- else
- del = *lua_check_string(1, "readuntil");
- c = read_until_char(del);
- if (c != EOF) ungetc(c,in);
- lua_pushstring(luaI_addchar(0));
-}
-
-
-/*
-** Write a variable. On error put 0 on stack, otherwise put 1.
-** LUA interface:
-** status = write (variable [,format])
-**
-** O formato pode ter um dos seguintes especificadores:
-**
-** s ou S -> para string
-** f ou F, g ou G, e ou E -> para reais
-** i ou I -> para inteiros
-**
-** Estes especificadores podem vir seguidos de:
-**
-** [?][m][.n]
-**
-** onde:
-** ? -> indica justificacao
-** < = esquerda
-** | = centro
-** > = direita (default)
-** m -> numero maximo de campos (se exceder estoura)
-** n -> indica precisao para
-** reais -> numero de casas decimais
-** inteiros -> numero minimo de digitos
-** string -> nao se aplica
-*/
-
-static int write_fill (size_t n, int c)
-{
- while (n--)
- if (fputc(c, out) == EOF)
- return 0;
- return 1;
-}
-
-static int write_string (char *s, int just, long m)
-{
- int status;
- size_t l = strlen(s);
- size_t pre; /* number of blanks before string */
- if (m < 0) m = l;
- else if (l > m)
- {
- write_fill(m, '*');
- return 0;
- }
- pre = (just == '<') ? 0 : (just == '>') ? m-l : (m-l)/2;
- status = write_fill(pre, ' ');
- status = status && fprintf(out, "%s", s) >= 0;
- status = status && write_fill(m-(l+pre), ' ');
- return status;
-}
-
-static int write_quoted (int just, long m)
-{
- luaI_addchar(0);
- luaI_addquoted(lua_check_string(1, "write"));
- return write_string(luaI_addchar(0), just, m);
-}
-
-static int write_float (int just, long m, int n)
-{
- char buffer[100];
- lua_Object p = lua_getparam(1);
- float number;
- if (!lua_isnumber(p)) return 0;
- number = lua_getnumber(p);
- if (n >= 0)
- sprintf(buffer, "%.*f", n, number);
- else
- sprintf(buffer, "%g", number);
- return write_string(buffer, just, m);
-}
-
-
-static int write_int (int just, long m, int n)
-{
- char buffer[100];
- lua_Object p = lua_getparam(1);
- int number;
- if (!lua_isnumber(p)) return 0;
- number = (int)lua_getnumber(p);
- if (n >= 0)
- sprintf(buffer, "%.*d", n, number);
- else
- sprintf(buffer, "%d", number);
- return write_string(buffer, just, m);
+ } break_while:
+ if (c >= 0) /* not EOF nor NEED_OTHER? */
+ ungetc(c, lua_infile);
+ buff = luaI_addchar(0);
+ if (*buff != 0 || *p == 0) /* read something or did not fail? */
+ lua_pushstring(buff);
}
static void io_write (void)
{
- int status = 0;
- if (lua_getparam (2) == LUA_NOOBJECT) /* free format */
- {
- lua_Object o1 = lua_getparam(1);
- int t = lua_type(o1);
- if (t == LUA_T_NUMBER)
- status = fprintf (out, "%g", lua_getnumber(o1)) >= 0;
- else if (t == LUA_T_STRING)
- status = fprintf (out, "%s", lua_getstring(o1)) >= 0;
- }
- else /* formated */
- {
- long m;
- int just, n;
- switch (getformat(lua_check_string(2, "write"), &just, &m, &n))
- {
- case 's':
- {
- lua_Object p = lua_getparam(1);
- if (lua_isstring(p))
- status = write_string(lua_getstring(p), just, m);
- else
- status = 0;
- break;
- }
- case 'q':
- status = write_quoted(just, m);
- break;
- case 'f':
- status = write_float(just, m, n);
- break;
- case 'i':
- status = write_int(just, m, n);
- break;
- }
- }
- if (status)
- lua_pushnumber(status);
+ int arg = 1;
+ int status = 1;
+ char *s;
+ while ((s = lua_opt_string(arg++, NULL, "write")) != NULL)
+ status = status && (fputs(s, lua_outfile) != EOF);
+ pushresult(status);
}
-/*
-** Execute a executable program using "system".
-** Return the result of execution.
-*/
+
static void io_execute (void)
{
lua_pushnumber(system(lua_check_string(1, "execute")));
}
-/*
-** Remove a file. On error return nil.
-*/
+
static void io_remove (void)
{
pushresult(remove(lua_check_string(1, "remove")) == 0);
}
+
static void io_rename (void)
{
- char *f1 = lua_check_string(1, "rename");
- char *f2 = lua_check_string(2, "rename");
- pushresult(rename(f1, f2) == 0);
+ pushresult(rename(lua_check_string(1, "rename"),
+ lua_check_string(2, "rename")) == 0);
}
+
static void io_tmpname (void)
{
lua_pushstring(tmpnam(NULL));
}
-static void io_errorno (void)
-{
-/* lua_pushstring(strerror(errno));*/
-}
-/*
-** To get an environment variable
-*/
static void io_getenv (void)
{
- char *env = getenv(lua_check_string(1, "getenv"));
- lua_pushstring(env); /* if NULL push nil */
+ lua_pushstring(getenv(lua_check_string(1, "getenv"))); /* if NULL push nil */
}
-/*
-** Return user formatted time stamp
-*/
+
static void io_date (void)
{
- time_t t;
- struct tm *tm;
- char *s;
- char b[BUFSIZ];
- if (lua_getparam(1) == LUA_NOOBJECT)
- s = "%c";
- else
- s = lua_check_string(1, "date");
- time(&t); tm = localtime(&t);
- if (strftime(b,sizeof(b),s,tm))
- lua_pushstring(b);
- else
- lua_error("invalid `date' format");
+ time_t t;
+ struct tm *tm;
+ char *s = lua_opt_string(1, "%c", "date");
+ char b[BUFSIZ];
+ time(&t); tm = localtime(&t);
+ if (strftime(b,sizeof(b),s,tm))
+ lua_pushstring(b);
+ else
+ lua_error("invalid `date' format");
}
-/*
-** To exit
-*/
+
static void io_exit (void)
{
- lua_Object o = lua_getparam(1);
- int code = lua_isnumber(o) ? (int)lua_getnumber(o) : 1;
- exit(code);
+ lua_Object o = lua_getparam(1);
+ exit(lua_isnumber(o) ? (int)lua_getnumber(o) : 1);
}
-/*
-** To debug a lua program. Start a dialog with the user, interpreting
- lua commands until an 'cont'.
-*/
+
static void io_debug (void)
{
- while (1)
- {
+ while (1) {
char buffer[250];
fprintf(stderr, "lua_debug> ");
if (fgets(buffer, sizeof(buffer), stdin) == 0) return;
@@ -535,21 +227,18 @@ static void lua_printstack (FILE *f)
int level = 0;
lua_Object func;
fprintf(f, "Active Stack:\n");
- while ((func = lua_stackedfunction(level++)) != LUA_NOOBJECT)
- {
+ while ((func = lua_stackedfunction(level++)) != LUA_NOOBJECT) {
char *name;
int currentline;
fprintf(f, "\t");
- switch (*lua_getobjname(func, &name))
- {
+ switch (*lua_getobjname(func, &name)) {
case 'g':
fprintf(f, "function %s", name);
break;
case 'f':
fprintf(f, "`%s' fallback", name);
break;
- default:
- {
+ default: {
char *filename;
int linedefined;
lua_funcinfo(func, &filename, &linedefined);
@@ -570,8 +259,7 @@ static void lua_printstack (FILE *f)
static void errorfb (void)
{
- lua_Object o = lua_getparam(1);
- char *s = lua_isstring(o) ? lua_getstring(o) : "(no messsage)";
+ char *s = lua_opt_string(1, "(no messsage)", NULL);
fprintf(stderr, "lua: %s\n", s);
lua_printstack(stderr);
}
@@ -582,13 +270,11 @@ static struct lua_reg iolib[] = {
{"writeto", io_writeto},
{"appendto", io_appendto},
{"read", io_read},
-{"readuntil",io_readuntil},
{"write", io_write},
{"execute", io_execute},
{"remove", io_remove},
{"rename", io_rename},
{"tmpname", io_tmpname},
-{"ioerror", io_errorno},
{"getenv", io_getenv},
{"date", io_date},
{"exit", io_exit},
@@ -598,7 +284,7 @@ static struct lua_reg iolib[] = {
void iolib_open (void)
{
- in=stdin; out=stdout;
+ lua_infile=stdin; lua_outfile=stdout;
luaI_openlib(iolib, (sizeof(iolib)/sizeof(iolib[0])));
lua_setfallback("error", errorfb);
}
