Lua 3.03.0

9 files changed, 314 insertions, 1452 deletions

diff --git a/clients/lib/iolib.c b/clients/lib/iolib.c
index c2faf1c5..e518df1b 100644
--- a/clients/lib/iolib.c
+++ b/clients/lib/iolib.c
@@ -1,16 +1,16 @@
 #include <stdio.h>
-#include <ctype.h>
 #include <string.h>
 #include <time.h>
 #include <stdlib.h>
 #include <errno.h>
 
 #include "lua.h"
+#include "auxlib.h"
 #include "luadebug.h"
 #include "lualib.h"
 
 
-FILE *lua_infile, *lua_outfile;
+int lua_tagio;
 
 
 #ifdef POPEN
@@ -31,76 +31,95 @@ static void pushresult (int i)
 #ifndef NOSTRERROR
     lua_pushstring(strerror(errno));
 #else
-    lua_pushstring("system unable to define the error");
+    lua_pushstring("O.S. unable to define the error");
 #endif
   }
 }
 
 
-static void closefile (FILE *f)
+
+static FILE *getfile (char *name)
+{
+  lua_Object f = lua_getglobal(name);
+  if (!lua_isuserdata(f) || lua_tag(f) != lua_tagio)
+    luaL_verror("global variable %s is not a file handle", name);
+  return lua_getuserdata(f);
+}
+
+
+static void closefile (char *name)
 {
-  if (f == stdin || f == stdout)
-    return;
-  if (f == lua_infile)
-    lua_infile = stdin;
-  if (f == lua_outfile)
-    lua_outfile = stdout;
+  FILE *f = getfile(name);
+  if (f == stdin || f == stdout) return;
   if (pclose(f) == -1)
     fclose(f);
 }
 
 
+static void setfile (FILE *f, char *name)
+{
+  lua_pushusertag(f, lua_tagio);
+  lua_setglobal(name);
+}
+
+
+static void setreturn (FILE *f, char *name)
+{
+  setfile(f, name);
+  lua_pushusertag(f, lua_tagio);
+}
+
 
 static void io_readfrom (void)
 {
+  FILE *current;
   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);
+  if (f == LUA_NOOBJECT) {
+    closefile("_INPUT");
+    current = stdin;
+  }
+  else if (lua_tag(f) == lua_tagio)
+    current = 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 {
+    char *s = luaL_check_string(1);
+    current = (*s == '|') ? popen(s+1, "r") : fopen(s, "r");
+    if (current == NULL) {
       pushresult(0);
       return;
     }
   }
-  lua_pushuserdata(lua_infile);
+  setreturn(current, "_INPUT");
 }
 
 
 static void io_writeto (void)
 {
+  FILE *current;
   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);
+  if (f == LUA_NOOBJECT) {
+    closefile("_OUTPUT");
+    current = stdout;
+  }
+  else if (lua_tag(f) == lua_tagio)
+    current = 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 {
+    char *s = luaL_check_string(1);
+    current = (*s == '|') ? popen(s+1,"w") : fopen(s,"w");
+    if (current == NULL) {
       pushresult(0);
       return;
     }
   }
-  lua_pushuserdata(lua_outfile);
+  setreturn(current, "_OUTPUT");
 }
 
 
 static void io_appendto (void)
 {
-  char *s = lua_check_string(1, "appendto");
+  char *s = luaL_check_string(1);
   FILE *fp = fopen (s, "a");
-  if (fp != NULL) {
-    lua_outfile = fp;
-    lua_pushuserdata(lua_outfile);
-  }
+  if (fp != NULL)
+    setreturn(fp, "_OUTPUT");
   else
     pushresult(0);
 }
@@ -110,23 +129,30 @@ static void io_appendto (void)
 
 static void io_read (void)
 {
+  FILE *f = getfile("_INPUT");
   char *buff;
-  char *p = lua_opt_string(1, "[^\n]*{\n}", "read");
+  char *p = luaL_opt_string(1, "[^\n]*{\n}");
   int inskip = 0;  /* to control {skips} */
   int c = NEED_OTHER;
-  luaI_addchar(0);
+  luaI_emptybuff();
   while (*p) {
-    if (*p == '{' || *p == '}') {
-      inskip = (*p == '{');
+    if (*p == '{') {
+      inskip++;
+      p++;
+    }
+    else if (*p == '}') {
+      if (inskip == 0)
+        lua_error("unbalanced braces in read pattern");
+      inskip--;
       p++;
     }
     else {
-      char *ep = item_end(p);  /* get what is next */
+      char *ep = luaL_item_end(p);  /* get what is next */
       int m;  /* match result */
-      if (c == NEED_OTHER) c = getc(lua_infile);
-      m = (c == EOF) ? 0 : singlematch((char)c, p);
+      if (c == NEED_OTHER) c = getc(f);
+      m = (c == EOF) ? 0 : luaL_singlematch((char)c, p);
       if (m) {
-        if (!inskip) luaI_addchar(c);
+        if (inskip == 0) luaI_addchar(c);
         c = NEED_OTHER;
       }
       switch (*ep) {
@@ -144,7 +170,7 @@ static void io_read (void)
     }
   } break_while:
   if (c >= 0)  /* not EOF nor NEED_OTHER? */
-     ungetc(c, lua_infile);
+     ungetc(c, f);
   buff = luaI_addchar(0);
   if (*buff != 0 || *p == 0)  /* read something or did not fail? */
     lua_pushstring(buff);
@@ -153,31 +179,32 @@ static void io_read (void)
 
 static void io_write (void)
 {
+  FILE *f = getfile("_OUTPUT");
   int arg = 1;
   int status = 1;
   char *s;
-  while ((s = lua_opt_string(arg++, NULL, "write")) != NULL)
-    status = status && (fputs(s, lua_outfile) != EOF);
+  while ((s = luaL_opt_string(arg++, NULL)) != NULL)
+    status = status && (fputs(s, f) != EOF);
   pushresult(status);
 }
 
 
 static void io_execute (void)
 {
-  lua_pushnumber(system(lua_check_string(1, "execute")));
+  lua_pushnumber(system(luaL_check_string(1)));
 }
 
 
 static void io_remove  (void)
 {
-  pushresult(remove(lua_check_string(1, "remove")) == 0);
+  pushresult(remove(luaL_check_string(1)) == 0);
 }
 
 
 static void io_rename (void)
 {
-  pushresult(rename(lua_check_string(1, "rename"),
-                    lua_check_string(2, "rename")) == 0);
+  pushresult(rename(luaL_check_string(1),
+                    luaL_check_string(2)) == 0);
 }
 
 
@@ -190,7 +217,7 @@ static void io_tmpname (void)
 
 static void io_getenv (void)
 {
-  lua_pushstring(getenv(lua_check_string(1, "getenv"))); /* if NULL push nil */
+  lua_pushstring(getenv(luaL_check_string(1))); /* if NULL push nil */
 }
 
 
@@ -198,7 +225,7 @@ static void io_date (void)
 {
   time_t t;
   struct tm *tm;
-  char *s = lua_opt_string(1, "%c", "date");
+  char *s = luaL_opt_string(1, "%c");
   char b[BUFSIZ];
   time(&t); tm = localtime(&t);
   if (strftime(b,sizeof(b),s,tm))
@@ -229,34 +256,36 @@ static void io_debug (void)
 
 static void lua_printstack (FILE *f)
 {
-  int level = 0;
+  int level = 1;  /* skip level 0 (it's this function) */
   lua_Object func;
-  fprintf(f, "Active Stack:\n");
   while ((func = lua_stackedfunction(level++)) != LUA_NOOBJECT) {
     char *name;
     int currentline;
-    fprintf(f, "\t");
+    char *filename;
+    int linedefined;
+    lua_funcinfo(func, &filename, &linedefined);
+    fprintf(f, (level==2) ? "Active Stack:\n\t" : "\t");
     switch (*lua_getobjname(func, &name)) {
       case 'g':
         fprintf(f, "function %s", name);
         break;
-      case 'f':
-        fprintf(f, "`%s' fallback", name);
+      case 't':
+        fprintf(f, "`%s' tag method", name);
         break;
       default: {
-        char *filename;
-        int linedefined;
-        lua_funcinfo(func, &filename, &linedefined);
         if (linedefined == 0)
           fprintf(f, "main of %s", filename);
         else if (linedefined < 0)
           fprintf(f, "%s", filename);
         else
           fprintf(f, "function (%s:%d)", filename, linedefined);
+        filename = NULL;
       }
     }
     if ((currentline = lua_currentline(func)) > 0)
       fprintf(f, " at line %d", currentline);
+    if (filename)
+      fprintf(f, " [in file %s]", filename);
     fprintf(f, "\n");
   }
 }
@@ -264,13 +293,13 @@ static void lua_printstack (FILE *f)
 
 static void errorfb (void)
 {
-  char *s = lua_opt_string(1, "(no messsage)", NULL);
-  fprintf(stderr, "lua: %s\n", s);
+  fprintf(stderr, "lua: %s\n", lua_getstring(lua_getparam(1)));
   lua_printstack(stderr);
 }
 
 
-static struct lua_reg iolib[] = {
+
+static struct luaL_reg iolib[] = {
 {"readfrom", io_readfrom},
 {"writeto",  io_writeto},
 {"appendto", io_appendto},
@@ -289,7 +318,13 @@ static struct lua_reg iolib[] = {
 
 void iolib_open (void)
 {
-  lua_infile=stdin; lua_outfile=stdout;
-  luaI_openlib(iolib, (sizeof(iolib)/sizeof(iolib[0])));
-  lua_setfallback("error", errorfb);
+  lua_tagio = lua_newtag();
+  setfile(stdin, "_INPUT");
+  setfile(stdout, "_OUTPUT");
+  setfile(stdin, "_STDIN");
+  setfile(stdout, "_STDOUT");
+  setfile(stderr, "_STDERR");
+  luaL_openlib(iolib, (sizeof(iolib)/sizeof(iolib[0])));
+  lua_pushcfunction(errorfb);
+  lua_seterrormethod();
 }
diff --git a/clients/lib/mathlib.c b/clients/lib/mathlib.c
index d8f8dc13..e929d6aa 100644
--- a/clients/lib/mathlib.c
+++ b/clients/lib/mathlib.c
@@ -3,12 +3,13 @@
 ** Mathematics library to LUA
 */
 
-char *rcs_mathlib="$Id: mathlib.c,v 1.18 1996/08/01 14:55:33 roberto Exp $";
+char *rcs_mathlib="$Id: mathlib.c,v 1.25 1997/06/19 18:03:04 roberto Exp $";
 
 #include <stdlib.h>
 #include <math.h>
 
 #include "lualib.h"
+#include "auxlib.h"
 #include "lua.h"
 
 #ifndef PI
@@ -19,7 +20,7 @@ char *rcs_mathlib="$Id: mathlib.c,v 1.18 1996/08/01 14:55:33 roberto Exp $";
 
 static void math_abs (void)
 {
- double d = lua_check_number(1, "abs"); 
+ double d = luaL_check_number(1); 
  if (d < 0) d = -d;
  lua_pushnumber (d);
 }
@@ -27,7 +28,7 @@ static void math_abs (void)
 
 static void math_sin (void)
 {
- double d = lua_check_number(1, "sin");
+ double d = luaL_check_number(1);
  lua_pushnumber (sin(TORAD(d)));
 }
 
@@ -35,7 +36,7 @@ static void math_sin (void)
 
 static void math_cos (void)
 {
- double d = lua_check_number(1, "cos");
+ double d = luaL_check_number(1);
  lua_pushnumber (cos(TORAD(d)));
 }
 
@@ -43,98 +44,82 @@ static void math_cos (void)
 
 static void math_tan (void)
 {
- double d = lua_check_number(1, "tan");
+ double d = luaL_check_number(1);
  lua_pushnumber (tan(TORAD(d)));
 }
 
 
 static void math_asin (void)
 {
- double d = lua_check_number(1, "asin");
+ double d = luaL_check_number(1);
  lua_pushnumber (TODEGREE(asin(d)));
 }
 
 
 static void math_acos (void)
 {
- double d = lua_check_number(1, "acos");
+ double d = luaL_check_number(1);
  lua_pushnumber (TODEGREE(acos(d)));
 }
 
 
 static void math_atan (void)
 {
- double d = lua_check_number(1, "atan");
+ double d = luaL_check_number(1);
  lua_pushnumber (TODEGREE(atan(d)));
 }
 
 
 static void math_atan2 (void)
 {
- double d1 = lua_check_number(1, "atan2");
- double d2 = lua_check_number(2, "atan2");
+ double d1 = luaL_check_number(1);
+ double d2 = luaL_check_number(2);
  lua_pushnumber (TODEGREE(atan2(d1, d2)));
 }
 
 
 static void math_ceil (void)
 {
- double d = lua_check_number(1, "ceil");
+ double d = luaL_check_number(1);
  lua_pushnumber (ceil(d));
 }
 
 
 static void math_floor (void)
 {
- double d = lua_check_number(1, "floor");
+ double d = luaL_check_number(1);
  lua_pushnumber (floor(d));
 }
 
 static void math_mod (void)
 {
-  float x = lua_check_number(1, "mod");
-  float y = lua_check_number(2, "mod");
+  float x = luaL_check_number(1);
+  float y = luaL_check_number(2);
   lua_pushnumber(fmod(x, y));
 }
 
 
 static void math_sqrt (void)
 {
- double d = lua_check_number(1, "sqrt");
+ double d = luaL_check_number(1);
  lua_pushnumber (sqrt(d));
 }
 
-static int old_pow;
 
 static void math_pow (void)
 {
- lua_Object o1 = lua_getparam (1);
- lua_Object o2 = lua_getparam (2);
- lua_Object op = lua_getparam(3);
- if (!lua_isnumber(o1) || !lua_isnumber(o2) || *(lua_getstring(op)) != 'p')
- {
-   lua_Object old = lua_getref(old_pow);
-   lua_pushobject(o1);
-   lua_pushobject(o2);
-   lua_pushobject(op);
-   if (lua_callfunction(old) != 0)
-     lua_error(NULL);
- }
- else
- {
-   double d1 = lua_getnumber(o1);
-   double d2 = lua_getnumber(o2);
-   lua_pushnumber (pow(d1,d2));
- }
+  double d1 = luaL_check_number(1);
+  double d2 = luaL_check_number(2);
+  lua_pushnumber(pow(d1,d2));
 }
 
 static void math_min (void)
 {
  int i=1;
- double dmin = lua_check_number(i, "min");
+ double dmin = luaL_check_number(i);
  while (lua_getparam(++i) != LUA_NOOBJECT)
  {
-  double d = lua_check_number(i, "min");
+  double d = luaL_check_number(i);
   if (d < dmin) dmin = d;
  }
  lua_pushnumber (dmin);
@@ -143,10 +128,10 @@ static void math_min (void)
 static void math_max (void)
 {
  int i=1;
- double dmax = lua_check_number(i, "max");
+ double dmax = luaL_check_number(i);
  while (lua_getparam(++i) != LUA_NOOBJECT)
  {
-  double d = lua_check_number(i, "max");
+  double d = luaL_check_number(i);
   if (d > dmax) dmax = d;
  }
  lua_pushnumber (dmax);
@@ -154,33 +139,33 @@ static void math_max (void)
 
 static void math_log (void)
 {
- double d = lua_check_number(1, "log");
+ double d = luaL_check_number(1);
  lua_pushnumber (log(d));
 }
 
 
 static void math_log10 (void)
 {
- double d = lua_check_number(1, "log10");
+ double d = luaL_check_number(1);
  lua_pushnumber (log10(d));
 }
 
 
 static void math_exp (void)
 {
- double d = lua_check_number(1, "exp");
+ double d = luaL_check_number(1);
  lua_pushnumber (exp(d));
 }
 
 static void math_deg (void)
 {
- float d = lua_check_number(1, "deg");
+ float d = luaL_check_number(1);
  lua_pushnumber (d*180./PI);
 }
 
 static void math_rad (void)
 {
- float d = lua_check_number(1, "rad");
+ float d = luaL_check_number(1);
  lua_pushnumber (d/180.*PI);
 }
 
@@ -191,11 +176,11 @@ static void math_random (void)
 
 static void math_randomseed (void)
 {
-  srand(lua_check_number(1, "randomseed"));
+  srand(luaL_check_number(1));
 }
 
 
-static struct lua_reg mathlib[] = {
+static struct luaL_reg mathlib[] = {
 {"abs",   math_abs},
 {"sin",   math_sin},
 {"cos",   math_cos},
@@ -224,7 +209,9 @@ static struct lua_reg mathlib[] = {
 */
 void mathlib_open (void)
 {
-  luaI_openlib(mathlib, (sizeof(mathlib)/sizeof(mathlib[0])));
-  old_pow = lua_refobject(lua_setfallback("arith", math_pow), 1);
+  luaL_openlib(mathlib, (sizeof(mathlib)/sizeof(mathlib[0])));
+  lua_pushcfunction(math_pow);
+  lua_pushnumber(0);  /* to get its tag */
+  lua_settagmethod(lua_tag(lua_pop()), "pow");
 }
 
diff --git a/clients/lib/old/Makefile b/clients/lib/old/Makefile
deleted file mode 100644
index b9668617..00000000
--- a/clients/lib/old/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# makefile for lualib
-
-LUA= ../../..
-
-include $(LUA)/config
-
-EXTRA_DEFS= $(POPEN) $(NOSTRERROR)
-
-OBJS= iolib.o mathlib.o strlib.o
-SRCS= iolib.c mathlib.c strlib.c
-
-SLIB= $(LIB)/liboldlualib.a
-
-# dynamic libraries only work for SunOs
-DLIB= $(LIB)/liboldlualib.so.$(VERSION)
-
-all: $(SLIB)
-
-dynamic: $(DLIB)
-
-$(SLIB): $(OBJS)
-	ar rcu $@ $(OBJS)
-	$(RANLIB) $(SLIB)
-
-$(DLIB): $(OBJS)
-	ld -o $@ $(OBJS)
-
-clean:
-	rm -f $(OBJS) $(SLIB) $(DLIB)
-
-co:
-	co -f -M -rv2_4 $(SRCS)
-
-klean:	clean
-	rm -f $(SRCS)
diff --git a/clients/lib/old/iolib.c b/clients/lib/old/iolib.c
deleted file mode 100644
index 9ed7e479..00000000
--- a/clients/lib/old/iolib.c
+++ /dev/null
@@ -1,618 +0,0 @@
-/*
-** iolib.c
-** Input/output library to LUA
-*/
-
-char *rcs_iolib="$Id: iolib.c,v 1.44 1996/05/03 20:10:59 roberto Exp $";
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include "lua.h"
-#include "luadebug.h"
-#include "lualib.h"
-
-static FILE *in=stdin, *out=stdout;
-
-
-#ifdef POPEN
-FILE *popen();
-int pclose();
-#else
-#define popen(x,y) NULL  /* that is, popen always fails */
-#define pclose(x)  (-1)
-#endif
-
-
-static void pushresult (int i)
-{
-  if (i)
-    lua_pushnumber (1);
-  else
-   lua_pushnil();
-}
-
-static void closeread (void)
-{
-  if (in != stdin)
-  {
-    if (pclose(in) == -1)
-      fclose(in);
-    in = stdin;
-  }
-}
-
-static void closewrite (void)
-{
-  if (out != stdout)
-  {
-    if (pclose(out) == -1)
-      fclose(out);
-    out = stdout;
-  }
-}
-
-/*
-** 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);
-   }
- }
-}
-
-
-/*
-** 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 == NULL)
-    lua_pushnil();
-   else
-   {
-    closewrite();
-    out = fp;
-    lua_pushnumber (1);
-   }
- }
-}
-
-
-/*
-** 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 == NULL)
-  lua_pushnil();
- else
- {
-  if (out != stdout) fclose (out);
-  out = fp;
-  lua_pushnumber(1);
- }
-}
-
-
-static char getformat (char *f, int *just, int *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_error("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');
-  }
-  else
-    *n = -1;
-  return t;
-}
-
-
-/*
-** 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 (int 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)
-  {
-    lua_pushnil();
-    return;
-  }
-  if (c == '\"' || c == '\'')
-  { /* string */
-    c = read_until_char(c);
-    if (c == EOF)
-      lua_pushnil();
-    else
-      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);
-  }
-}
-
-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 */
-  {
-    int m, 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);
-        else
-          lua_pushnil();
-        break;
-      }
-
-      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);
-        else
-          lua_pushnil();
-        break;
-      }
-      default:
-        lua_arg_error("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 (int n, int c)
-{
-  while (n--)
-    if (fputc(c, out) == EOF)
-      return 0;
-  return 1;
-}
-
-static int write_string (char *s, int just, int m)
-{
-  int status;
-  int l = strlen(s);
-  int 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, int 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, int 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, int 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);
-}
-
-
-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 */
-  {
-    int just, m, 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);
-  else
-    lua_pushnil();
-}
-
-/*
-** 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);
-}
-
-static void io_tmpname (void)
-{
-  lua_pushstring(tmpnam(NULL));
-}
-
-static void io_errorno (void)
-{
-/*  lua_pushstring(strerror(errno));*/
-}
-
-
-/*
-** To get a environment variable
-*/
-static void io_getenv (void)
-{
- char *env = getenv(lua_check_string(1, "getenv"));
- lua_pushstring(env);  /* 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");
-}
- 
-/*
-** 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);
-}
-
-/*
-** To debug a lua program. Start a dialog with the user, interpreting
-   lua commands until an 'cont'.
-*/
-static void io_debug (void)
-{
-  while (1)
-  {
-    char buffer[250];
-    fprintf(stderr, "lua_debug> ");
-    if (fgets(buffer, sizeof(buffer), stdin) == 0) return;
-    if (strcmp(buffer, "cont") == 0) return;
-    lua_dostring(buffer);
-  }
-}
-
-
-static void lua_printstack (FILE *f)
-{
-  int level = 0;
-  lua_Object func;
-  fprintf(f, "Active Stack:\n");
-  while ((func = lua_stackedfunction(level++)) != LUA_NOOBJECT)
-  {
-    char *name;
-    int currentline;
-    fprintf(f, "\t");
-    switch (*lua_getobjname(func, &name))
-    {
-      case 'g':
-        fprintf(f, "function %s", name);
-        break;
-      case 'f':
-        fprintf(f, "`%s' fallback", name);
-        break;
-      default:
-      {
-        char *filename;
-        int linedefined;
-        lua_funcinfo(func, &filename, &linedefined);
-        if (linedefined == 0)
-          fprintf(f, "main of %s", filename);
-        else if (linedefined < 0)
-          fprintf(f, "%s", filename);
-        else
-          fprintf(f, "function (%s:%d)", filename, linedefined);
-      }
-    }
-    if ((currentline = lua_currentline(func)) > 0)
-      fprintf(f, " at line %d", currentline);
-    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);
-}
-
-
-static struct lua_reg iolib[] = {
-{"readfrom", io_readfrom},
-{"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},
-{"debug",    io_debug},
-{"print_stack", errorfb}
-};
-
-void iolib_open (void)
-{
-  luaI_openlib(iolib, (sizeof(iolib)/sizeof(iolib[0])));
-  lua_setfallback("error", errorfb);
-}
diff --git a/clients/lib/old/lualib.h b/clients/lib/old/lualib.h
deleted file mode 100644
index 6005d7c2..00000000
--- a/clients/lib/old/lualib.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-** Libraries to be used in LUA programs
-** Grupo de Tecnologia em Computacao Grafica
-** TeCGraf - PUC-Rio
-** $Id: lualib.h,v 1.8 1996/04/30 21:13:55 roberto Exp $
-*/
-
-#ifndef lualib_h
-#define lualib_h
-
-#include "lua.h"
-
-void iolib_open   (void);
-void strlib_open  (void);
-void mathlib_open (void);
-
-
-/* auxiliar functions (private) */
-
-struct lua_reg {
-  char *name;
-  lua_CFunction func;
-};
-
-void luaI_openlib (struct lua_reg *l, int n);
-void lua_arg_error(char *funcname);
-char *lua_check_string (int numArg, char *funcname);
-double lua_check_number (int numArg, char *funcname);
-char *luaI_addchar (int c);
-void luaI_addquoted (char *s);
-
-#endif
-
diff --git a/clients/lib/old/mathlib.c b/clients/lib/old/mathlib.c
deleted file mode 100644
index 07081e48..00000000
--- a/clients/lib/old/mathlib.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
-** mathlib.c
-** Mathematics library to LUA
-*/
-
-char *rcs_mathlib="$Id: mathlib.c,v 1.17 1996/04/30 21:13:55 roberto Exp $";
-
-#include <stdlib.h>
-#include <math.h>
-
-#include "lualib.h"
-#include "lua.h"
-
-#ifndef PI
-#define PI          3.14159265358979323846
-#endif
-#define TODEGREE(a) ((a)*180.0/PI)
-#define TORAD(a)    ((a)*PI/180.0)
-
-static void math_abs (void)
-{
- double d = lua_check_number(1, "abs"); 
- if (d < 0) d = -d;
- lua_pushnumber (d);
-}
-
-
-static void math_sin (void)
-{
- double d = lua_check_number(1, "sin");
- lua_pushnumber (sin(TORAD(d)));
-}
-
-
-
-static void math_cos (void)
-{
- double d = lua_check_number(1, "cos");
- lua_pushnumber (cos(TORAD(d)));
-}
-
-
-
-static void math_tan (void)
-{
- double d = lua_check_number(1, "tan");
- lua_pushnumber (tan(TORAD(d)));
-}
-
-
-static void math_asin (void)
-{
- double d = lua_check_number(1, "asin");
- lua_pushnumber (TODEGREE(asin(d)));
-}
-
-
-static void math_acos (void)
-{
- double d = lua_check_number(1, "acos");
- lua_pushnumber (TODEGREE(acos(d)));
-}
-
-
-static void math_atan (void)
-{
- double d = lua_check_number(1, "atan");
- lua_pushnumber (TODEGREE(atan(d)));
-}
-
-
-static void math_atan2 (void)
-{
- double d1 = lua_check_number(1, "atan2");
- double d2 = lua_check_number(2, "atan2");
- lua_pushnumber (TODEGREE(atan2(d1, d2)));
-}
-
-
-static void math_ceil (void)
-{
- double d = lua_check_number(1, "ceil");
- lua_pushnumber (ceil(d));
-}
-
-
-static void math_floor (void)
-{
- double d = lua_check_number(1, "floor");
- lua_pushnumber (floor(d));
-}
-
-static void math_mod (void)
-{
- int d1 = (int)lua_check_number(1, "mod");
- int d2 = (int)lua_check_number(2, "mod");
- lua_pushnumber (d1%d2);
-}
-
-
-static void math_sqrt (void)
-{
- double d = lua_check_number(1, "sqrt");
- lua_pushnumber (sqrt(d));
-}
-
-static int old_pow;
-
-static void math_pow (void)
-{
- lua_Object o1 = lua_getparam (1);
- lua_Object o2 = lua_getparam (2);
- lua_Object op = lua_getparam(3);
- if (!lua_isnumber(o1) || !lua_isnumber(o2) || *(lua_getstring(op)) != 'p')
- {
-   lua_Object old = lua_getref(old_pow);
-   lua_pushobject(o1);
-   lua_pushobject(o2);
-   lua_pushobject(op);
-   if (lua_callfunction(old) != 0)
-     lua_error(NULL);
- }
- else
- {
-   double d1 = lua_getnumber(o1);
-   double d2 = lua_getnumber(o2);
-   lua_pushnumber (pow(d1,d2));
- }
-}
-
-static void math_min (void)
-{
- int i=1;
- double dmin = lua_check_number(i, "min");
- while (lua_getparam(++i) != LUA_NOOBJECT)
- {
-  double d = lua_check_number(i, "min");
-  if (d < dmin) dmin = d;
- }
- lua_pushnumber (dmin);
-}
-
-static void math_max (void)
-{
- int i=1;
- double dmax = lua_check_number(i, "max");
- while (lua_getparam(++i) != LUA_NOOBJECT)
- {
-  double d = lua_check_number(i, "max");
-  if (d > dmax) dmax = d;
- }
- lua_pushnumber (dmax);
-}
-
-static void math_log (void)
-{
- double d = lua_check_number(1, "log");
- lua_pushnumber (log(d));
-}
-
-
-static void math_log10 (void)
-{
- double d = lua_check_number(1, "log10");
- lua_pushnumber (log10(d));
-}
-
-
-static void math_exp (void)
-{
- double d = lua_check_number(1, "exp");
- lua_pushnumber (exp(d));
-}
-
-static void math_deg (void)
-{
- float d = lua_check_number(1, "deg");
- lua_pushnumber (d*180./PI);
-}
-
-static void math_rad (void)
-{
- float d = lua_check_number(1, "rad");
- lua_pushnumber (d/180.*PI);
-}
-
-static void math_random (void)
-{
-  lua_pushnumber((double)(rand()%RAND_MAX) / (double)RAND_MAX);
-}
-
-static void math_randomseed (void)
-{
-  srand(lua_check_number(1, "randomseed"));
-}
-
-
-static struct lua_reg mathlib[] = {
-{"abs",   math_abs},
-{"sin",   math_sin},
-{"cos",   math_cos},
-{"tan",   math_tan},
-{"asin",  math_asin},
-{"acos",  math_acos},
-{"atan",  math_atan},
-{"atan2",  math_atan2},
-{"ceil",  math_ceil},
-{"floor", math_floor},
-{"mod",   math_mod},
-{"sqrt",  math_sqrt},
-{"min",   math_min},
-{"max",   math_max},
-{"log",   math_log},
-{"log10", math_log10},
-{"exp",   math_exp},
-{"deg",   math_deg},
-{"rad",   math_rad},
-{"random",     math_random},
-{"randomseed", math_randomseed}
-};
-
-/*
-** Open math library
-*/
-void mathlib_open (void)
-{
-  luaI_openlib(mathlib, (sizeof(mathlib)/sizeof(mathlib[0])));
-  old_pow = lua_refobject(lua_setfallback("arith", math_pow), 1);
-}
-
diff --git a/clients/lib/old/strlib.c b/clients/lib/old/strlib.c
deleted file mode 100644
index 6a99871c..00000000
--- a/clients/lib/old/strlib.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
-** strlib.c
-** String library to LUA
-*/
-
-char *rcs_strlib="$Id: strlib.c,v 1.23 1996/04/30 21:13:55 roberto Exp $";
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <limits.h>
-
-#include "lua.h"
-#include "lualib.h"
-
-
-void lua_arg_error(char *funcname)
-{
-  char buff[100];
-  sprintf(buff, "incorrect arguments to function `%s'", funcname);
-  lua_error(buff);
-}
-
-char *lua_check_string (int numArg, char *funcname)
-{
-  lua_Object o = lua_getparam(numArg);
-  if (!lua_isstring(o))
-    lua_arg_error(funcname);
-  return lua_getstring(o);
-}
-
-double lua_check_number (int numArg, char *funcname)
-{
-  lua_Object o = lua_getparam(numArg);
-  if (!lua_isnumber(o))
-    lua_arg_error(funcname);
-  return lua_getnumber(o);
-}
-
-static int lua_opt_number (int numArg, int def, char *funcname)
-{
-  return (lua_getparam(numArg) == LUA_NOOBJECT) ? def :
-                              (int)lua_check_number(numArg, funcname);
-}
-
-char *luaI_addchar (int c)
-{
-  static char *buff = NULL;
-  static int max = 0;
-  static int n = 0;
-  if (n >= max)
-  {
-    if (max == 0)
-    {
-      max = 100;
-      buff = (char *)malloc(max);
-    }
-    else
-    {
-      max *= 2;
-      buff = (char *)realloc(buff, max);
-    }
-    if (buff == NULL)
-      lua_error("memory overflow");
-  }
-  buff[n++] = c;
-  if (c == 0)
-    n = 0;  /* prepare for next string */
-  return buff;
-}
-
-
-/*
-** Return the position of the first caracter of a substring into a string
-** LUA interface:
-**			n = strfind (string, substring, init, end)
-*/
-static void str_find (void)
-{
- char *s1 = lua_check_string(1, "strfind");
- char *s2 = lua_check_string(2, "strfind");
- int init = lua_opt_number(3, 1, "strfind") - 1;
- char *f = (init>=0 && init<=strlen(s1)) ? strstr(s1+init,s2) : NULL;
- if (f != NULL)
- {
-  int pos = f-s1+1;
-  if (lua_opt_number(4, INT_MAX, "strfind") >= pos+strlen(s2)-1)
-   lua_pushnumber (pos);
-  else
-   lua_pushnil();
- }
- else
-  lua_pushnil();
-}
-
-/*
-** Return the string length
-** LUA interface:
-**			n = strlen (string)
-*/
-static void str_len (void)
-{
- char *s = lua_check_string(1, "strlen");
- lua_pushnumber(strlen(s));
-}
-
-
-/*
-** Return the substring of a string, from start to end
-** LUA interface:
-**			substring = strsub (string, start, end)
-*/
-static void str_sub (void)
-{
- char *s = lua_check_string(1, "strsub");
- int start = (int)lua_check_number(2, "strsub");
- int end = lua_opt_number(3, strlen(s), "strsub");
- if (end < start || start < 1 || end > strlen(s))
-  lua_pushliteral("");
- else
- {
-   luaI_addchar(0);
-   while (start <= end) 
-     luaI_addchar(s[start++ - 1]);
-   lua_pushstring (luaI_addchar(0));
- }
-}
-
-/*
-** Convert a string to lower case.
-** LUA interface:
-**			lowercase = strlower (string)
-*/
-static void str_lower (void)
-{
-  char *s = lua_check_string(1, "strlower");
-  luaI_addchar(0);
-  while (*s)
-    luaI_addchar(tolower(*s++));
-  lua_pushstring(luaI_addchar(0));
-}
-
-
-/*
-** Convert a string to upper case.
-** LUA interface:
-**			uppercase = strupper (string)
-*/
-static void str_upper (void)
-{
-  char *s = lua_check_string(1, "strupper");
-  luaI_addchar(0);
-  while (*s)
-    luaI_addchar(toupper(*s++));
-  lua_pushstring(luaI_addchar(0));
-}
-
-/*
-** get ascii value of a character in a string
-*/
-static void str_ascii (void)
-{
-  char *s = lua_check_string(1, "ascii");
-  int pos = lua_opt_number(2, 1, "ascii") - 1;
-  if (pos<0 || pos>=strlen(s))
-    lua_arg_error("ascii");
-  lua_pushnumber(s[pos]);
-}
-
-void luaI_addquoted (char *s)
-{
-  luaI_addchar('"');
-  for (; *s; s++)
-  {
-    if (*s == '"' || *s == '\\' || *s == '\n')
-      luaI_addchar('\\');
-    luaI_addchar(*s);
-  }
-  luaI_addchar('"');
-}
-
-#define MAX_CONVERTION 2000
-#define MAX_FORMAT 50
-
-static void str_format (void)
-{
-  int arg = 1;
-  char *strfrmt = lua_check_string(arg++, "format");
-  luaI_addchar(0);  /* initialize */
-  while (*strfrmt)
-  {
-    if (*strfrmt != '%')
-      luaI_addchar(*strfrmt++);
-    else if (*++strfrmt == '%')
-      luaI_addchar(*strfrmt++);  /* %% */
-    else
-    { /* format item */
-      char form[MAX_FORMAT];      /* store the format ('%...') */
-      char buff[MAX_CONVERTION];  /* store the formated value */
-      int size = 0;
-      int i = 0;
-      form[i++] = '%';
-      form[i] = *strfrmt++;
-      while (!isalpha(form[i]))
-      {
-        if (isdigit(form[i]))
-        {
-          size = size*10 + form[i]-'0';
-          if (size >= MAX_CONVERTION)
-            lua_error("format size/precision too long in function `format'");
-        }
-        else if (form[i] == '.')
-          size = 0;  /* re-start */
-        if (++i >= MAX_FORMAT)
-            lua_error("bad format in function `format'");
-        form[i] = *strfrmt++;
-      }
-      form[i+1] = 0;  /* ends string */
-      switch (form[i])
-      {
-        case 'q':
-          luaI_addquoted(lua_check_string(arg++, "format"));
-          buff[0] = '\0';  /* addchar already done */
-          break;
-        case 's':
-        {
-          char *s = lua_check_string(arg++, "format");
-          if (strlen(s) >= MAX_CONVERTION)
-            lua_error("string argument too long in function `format'");
-          sprintf(buff, form, s);
-          break;
-        }
-        case 'c':  case 'd':  case 'i': case 'o':
-        case 'u':  case 'x':  case 'X':
-          sprintf(buff, form, (int)lua_check_number(arg++, "format"));
-          break;
-        case 'e':  case 'E': case 'f': case 'g':
-          sprintf(buff, form, lua_check_number(arg++, "format"));
-          break;
-        default:  /* also treat cases 'pnLlh' */
-          lua_error("invalid format option in function `format'");
-      }
-      for (i=0; buff[i]; i++)  /* move formated value to result */
-        luaI_addchar(buff[i]);
-    }
-  }
-  lua_pushstring(luaI_addchar(0));  /* push the result */
-}
-
-
-void luaI_openlib (struct lua_reg *l, int n)
-{
-  int i;
-  for (i=0; i<n; i++)
-    lua_register(l[i].name, l[i].func);
-}
-
-static struct lua_reg strlib[] = {
-{"strfind", str_find},
-{"strlen", str_len},
-{"strsub", str_sub},
-{"strlower", str_lower},
-{"strupper", str_upper},
-{"ascii", str_ascii},
-{"format",    str_format}
-};
-
-
-/*
-** Open string library
-*/
-void strlib_open (void)
-{
-  luaI_openlib(strlib, (sizeof(strlib)/sizeof(strlib[0])));
-}
diff --git a/clients/lib/strlib.c b/clients/lib/strlib.c
index 47e91f4f..bd41693b 100644
--- a/clients/lib/strlib.c
+++ b/clients/lib/strlib.c
@@ -3,7 +3,7 @@
 ** String library to LUA
 */
 
-char *rcs_strlib="$Id: strlib.c,v 1.33 1996/11/20 13:47:59 roberto Exp $";
+char *rcs_strlib="$Id: strlib.c,v 1.46 1997/06/19 18:49:40 roberto Exp $";
 
 #include <string.h>
 #include <stdio.h>
@@ -11,6 +11,7 @@ char *rcs_strlib="$Id: strlib.c,v 1.33 1996/11/20 13:47:59 roberto Exp $";
 #include <ctype.h>
 
 #include "lua.h"
+#include "auxlib.h"
 #include "lualib.h"
 
 
@@ -23,7 +24,7 @@ struct lbuff {
 static struct lbuff lbuffer = {NULL, 0, 0};
 
 
-static char *lua_strbuffer (unsigned long size)
+static char *strbuffer (unsigned long size)
 {
   if (size > lbuffer.max) {
     /* ANSI "realloc" doesn't need this test, but some machines (Sun!)
@@ -38,55 +39,24 @@ static char *lua_strbuffer (unsigned long size)
 
 static char *openspace (unsigned long size)
 {
-  char *buff = lua_strbuffer(lbuffer.size+size);
+  char *buff = strbuffer(lbuffer.size+size);
   return buff+lbuffer.size;
 }
 
-void lua_arg_check(int cond, char *funcname)
-{
-  if (!cond) {
-    char buff[100];
-    sprintf(buff, "incorrect argument to function `%s'", funcname);
-    lua_error(buff);
-  }
-}
-
-char *lua_check_string (int numArg, char *funcname)
-{
-  lua_Object o = lua_getparam(numArg);
-  lua_arg_check(lua_isstring(o), funcname);
-  return lua_getstring(o);
-}
-
-char *lua_opt_string (int numArg, char *def, char *funcname)
-{
-  return (lua_getparam(numArg) == LUA_NOOBJECT) ? def :
-                              lua_check_string(numArg, funcname);
-}
-
-double lua_check_number (int numArg, char *funcname)
-{
-  lua_Object o = lua_getparam(numArg);
-  lua_arg_check(lua_isnumber(o), funcname);
-  return lua_getnumber(o);
-}
-
-long lua_opt_number (int numArg, long def, char *funcname)
-{
-  return (lua_getparam(numArg) == LUA_NOOBJECT) ? def :
-                              (long)lua_check_number(numArg, funcname);
-}
-
 char *luaI_addchar (int c)
 {
   if (lbuffer.size >= lbuffer.max)
-    lua_strbuffer(lbuffer.max == 0 ? 100 : lbuffer.max*2);
+    strbuffer(lbuffer.max == 0 ? 100 : lbuffer.max*2);
   lbuffer.b[lbuffer.size++] = c;
-  if (c == 0)
-    lbuffer.size = 0;  /* prepare for next string */
   return lbuffer.b;
 }
 
+void luaI_emptybuff (void)
+{
+  lbuffer.size = 0;  /* prepare for next string */
+}
+
+
 static void addnchar (char *s, int n)
 {
   char *b = openspace(n);
@@ -99,35 +69,13 @@ static void addstr (char *s)
   addnchar(s, strlen(s));
 }
 
-/*
-** Interface to strtok
-*/
-static void str_tok (void)
-{
-  char *s1 = lua_check_string(1, "strtok");
-  char *del = lua_check_string(2, "strtok");
-  lua_Object t = lua_createtable();
-  int i = 1;
-  /* As strtok changes s1, and s1 is "constant",  make a copy of it */
-  s1 = strcpy(lua_strbuffer(strlen(s1+1)), s1);
-  while ((s1 = strtok(s1, del)) != NULL) {
-    lua_pushobject(t);
-    lua_pushnumber(i++);
-    lua_pushstring(s1);
-    lua_storesubscript();
-    s1 = NULL;  /* prepare for next strtok */
-  }
-  lua_pushobject(t);
-  lua_pushnumber(i-1);  /* total number of tokens */
-}
-
 
 /*
 ** Return the string length
 */
 static void str_len (void)
 {
- lua_pushnumber(strlen(lua_check_string(1, "strlen")));
+ lua_pushnumber(strlen(luaL_check_string(1)));
 }
 
 /*
@@ -135,15 +83,18 @@ static void str_len (void)
 */
 static void str_sub (void)
 {
-  char *s = lua_check_string(1, "strsub");
-  long start = (long)lua_check_number(2, "strsub");
-  long end = lua_opt_number(3, strlen(s), "strsub");
-  if (1 <= start && start <= end && end <= strlen(s)) {
-    luaI_addchar(0);
+  char *s = luaL_check_string(1);
+  long l = strlen(s);
+  long start = (long)luaL_check_number(2);
+  long end = (long)luaL_opt_number(3, -1);
+  if (start < 0) start = l+start+1;
+  if (end < 0) end = l+end+1;
+  if (1 <= start && start <= end && end <= l) {
+    luaI_emptybuff();
     addnchar(s+start-1, end-start+1);
     lua_pushstring(luaI_addchar(0));
   }
-  else lua_pushliteral("");
+  else lua_pushstring("");
 }
 
 /*
@@ -151,10 +102,10 @@ static void str_sub (void)
 */
 static void str_lower (void)
 {
-  char *s = lua_check_string(1, "strlower");
-  luaI_addchar(0);
-  while (*s)
-    luaI_addchar(tolower(*s++));
+  char *s;
+  luaI_emptybuff();
+  for (s = luaL_check_string(1); *s; s++)
+    luaI_addchar(tolower((unsigned char)*s));
   lua_pushstring(luaI_addchar(0));
 }
 
@@ -163,18 +114,18 @@ static void str_lower (void)
 */
 static void str_upper (void)
 {
-  char *s = lua_check_string(1, "strupper");
-  luaI_addchar(0);
-  while (*s)
-    luaI_addchar(toupper(*s++));
+  char *s;
+  luaI_emptybuff();
+  for (s = luaL_check_string(1); *s; s++)
+    luaI_addchar(toupper((unsigned char)*s));
   lua_pushstring(luaI_addchar(0));
 }
 
 static void str_rep (void)
 {
-  char *s = lua_check_string(1, "strrep");
-  int n = (int)lua_check_number(2, "strrep");
-  luaI_addchar(0);
+  char *s = luaL_check_string(1);
+  int n = (int)luaL_check_number(2);
+  luaI_emptybuff();
   while (n-- > 0)
     addstr(s);
   lua_pushstring(luaI_addchar(0));
@@ -185,9 +136,9 @@ static void str_rep (void)
 */
 static void str_ascii (void)
 {
-  char *s = lua_check_string(1, "ascii");
-  long pos = lua_opt_number(2, 1, "ascii") - 1;
-  lua_arg_check(0<=pos && pos<strlen(s), "ascii");
+  char *s = luaL_check_string(1);
+  long pos = (long)luaL_opt_number(2, 1) - 1;
+  luaL_arg_check(0<=pos && pos<strlen(s), 2,  "out of range");
   lua_pushnumber((unsigned char)s[pos]);
 }
 
@@ -195,23 +146,23 @@ static void str_ascii (void)
 /* pattern matching */
 
 #define ESC	'%'
-#define SPECIALS  "^$*?.([%"
+#define SPECIALS  "^$*?.([%-"
 
 static char *bracket_end (char *p)
 {
   return (*p == 0) ? NULL : strchr((*p=='^') ? p+2 : p+1, ']');
 }
 
-char *item_end (char *p)
+char *luaL_item_end (char *p)
 {
   switch (*p++) {
     case '\0': return p-1;
     case ESC:
-      if (*p == 0) lua_error("incorrect pattern");
+      if (*p == 0) luaL_verror("incorrect pattern (ends with `%c')", ESC);
       return p+1;
     case '[': {
       char *end = bracket_end(p);
-      if (end == NULL) lua_error("incorrect pattern");
+      if (end == NULL) lua_error("incorrect pattern (missing `]')");
       return end+1;
     }
     default:
@@ -222,21 +173,21 @@ char *item_end (char *p)
 static int matchclass (int c, int cl)
 {
   int res;
-  switch (tolower(cl)) {
-    case 'a' : res = isalpha(c); break;
-    case 'c' : res = iscntrl(c); break;
-    case 'd' : res = isdigit(c); break;
-    case 'l' : res = islower(c); break;
-    case 'p' : res = ispunct(c); break;
-    case 's' : res = isspace(c); break;
-    case 'u' : res = isupper(c); break;
-    case 'w' : res = isalnum(c); break;
+  switch (tolower((unsigned char)cl)) {
+    case 'a' : res = isalpha((unsigned char)c); break;
+    case 'c' : res = iscntrl((unsigned char)c); break;
+    case 'd' : res = isdigit((unsigned char)c); break;
+    case 'l' : res = islower((unsigned char)c); break;
+    case 'p' : res = ispunct((unsigned char)c); break;
+    case 's' : res = isspace((unsigned char)c); break;
+    case 'u' : res = isupper((unsigned char)c); break;
+    case 'w' : res = isalnum((unsigned char)c); break;
     default: return (cl == c);
   }
-  return (islower(cl) ? res : !res);
+  return (islower((unsigned char)cl) ? res : !res);
 }
 
-int singlematch (int c, char *p)
+int luaL_singlematch (int c, char *p)
 {
   if (c == 0) return 0;
   switch (*p) {
@@ -333,7 +284,7 @@ static char *match (char *s, char *p, int level)
       return res;
     }
     case ESC:
-      if (isdigit(*(p+1))) {  /* capture */
+      if (isdigit((unsigned char)(*(p+1)))) {  /* capture */
         int l = check_cap(*(p+1), level);
         if (strncmp(capture[l].init, s, capture[l].len) == 0) {
           /* return match(p+2, s+capture[l].len, level); */
@@ -358,8 +309,8 @@ static char *match (char *s, char *p, int level)
       }
       else goto dflt;
     default: dflt: {  /* it is a pattern item */
-      int m = singlematch(*s, p);
-      char *ep = item_end(p);  /* get what is next */
+      int m = luaL_singlematch(*s, p);
+      char *ep = luaL_item_end(p);  /* get what is next */
       switch (*ep) {
         case '*': {  /* repetition */
           char *res;
@@ -367,6 +318,17 @@ static char *match (char *s, char *p, int level)
             return res;
           p=ep+1; goto init;  /* else return match(s, ep+1, level); */
         }
+        case '-': {  /* repetition */
+          char *res;
+          if ((res = match(s, ep+1, level)) != 0)
+            return res;
+          else if (m) {
+            s++;
+            goto init;  /* return match(s+1, p, level); */
+          }
+          else
+            return NULL;
+        }
         case '?': {  /* optional */
           char *res;
           if (m && (res = match(s+1, ep+1, level)))
@@ -383,10 +345,10 @@ static char *match (char *s, char *p, int level)
 
 static void str_find (void)
 {
-  char *s = lua_check_string(1, "strfind");
-  char *p = lua_check_string(2, "strfind");
-  long init = lua_opt_number(3, 1, "strfind") - 1;
-  lua_arg_check(0 <= init && init <= strlen(s), "strfind");
+  char *s = luaL_check_string(1);
+  char *p = luaL_check_string(2);
+  long init = (long)luaL_opt_number(3, 1) - 1;
+  luaL_arg_check(0 <= init && init <= strlen(s), 3, "out of range");
   if (lua_getparam(4) != LUA_NOOBJECT || 
       strpbrk(p, SPECIALS) == NULL) {  /* no special caracters? */
     char *s2 = strstr(s+init, p);
@@ -410,12 +372,12 @@ static void str_find (void)
   }
 }
 
-static void add_s (lua_Object newp)
+static void add_s (lua_Object newp, lua_Object table, int n)
 {
   if (lua_isstring(newp)) {
     char *news = lua_getstring(newp);
     while (*news) {
-      if (*news != ESC || !isdigit(*++news))
+      if (*news != ESC || !isdigit((unsigned char)*++news))
         luaI_addchar(*news++);
       else {
         int l = check_cap(*news++, num_captures);
@@ -426,41 +388,50 @@ static void add_s (lua_Object newp)
   else if (lua_isfunction(newp)) {
     lua_Object res;
     struct lbuff oldbuff;
+    int status;
     lua_beginblock();
+    if (lua_istable(table)) {
+      lua_pushobject(table);
+      lua_pushnumber(n);
+    }
     push_captures();
     /* function may use lbuffer, so save it and create a new one */
     oldbuff = lbuffer;
     lbuffer.b = NULL; lbuffer.max = lbuffer.size = 0;
-    lua_callfunction(newp);
+    status = lua_callfunction(newp);
     /* restore old buffer */
     free(lbuffer.b);
     lbuffer = oldbuff;
+    if (status != 0)
+      lua_error(NULL);
     res = lua_getresult(1);
     addstr(lua_isstring(res) ? lua_getstring(res) : "");
     lua_endblock();
   }
-  else lua_arg_check(0, "gsub");
+  else luaL_arg_check(0, 3, NULL);
 }
 
 static void str_gsub (void)
 {
-  char *src = lua_check_string(1, "gsub");
-  char *p = lua_check_string(2, "gsub");
+  char *src = luaL_check_string(1);
+  char *p = luaL_check_string(2);
   lua_Object newp = lua_getparam(3);
-  int max_s = lua_opt_number(4, strlen(src), "gsub");
+  lua_Object table = lua_getparam(4);
+  int max_s = (int)luaL_opt_number(lua_istable(table)?5:4, strlen(src)+1);
   int anchor = (*p == '^') ? (p++, 1) : 0;
   int n = 0;
-  luaI_addchar(0);
-  while (*src && n < max_s) {
-    char *e;
-    if ((e=match(src, p, 0)) == NULL)
-      luaI_addchar(*src++);
-    else {
-      if (e == src) lua_error("empty pattern in substitution");
-      add_s(newp);
-      src = e;
+  luaI_emptybuff();
+  while (n < max_s) {
+    char *e = match(src, p, 0);
+    if (e) {
       n++;
+      add_s(newp, table, n);
     }
+    if (e && e>src) /* non empty match? */
+      src = e;  /* skip it */
+    else if (*src)
+      luaI_addchar(*src++);
+    else break;
     if (anchor) break;
   }
   addstr(src);
@@ -470,12 +441,12 @@ static void str_gsub (void)
 
 static void str_set (void)
 {
-  char *item = lua_check_string(1, "strset");
+  char *item = luaL_check_string(1);
   int i;
-  lua_arg_check(*item_end(item) == 0, "strset");
-  luaI_addchar(0);
+  luaL_arg_check(*luaL_item_end(item) == 0, 1, "wrong format");
+  luaI_emptybuff();
   for (i=1; i<256; i++)  /* 0 cannot be part of a set */
-    if (singlematch(i, item))
+    if (luaL_singlematch(i, item))
       luaI_addchar(i);
   lua_pushstring(luaI_addchar(0));
 }
@@ -497,8 +468,8 @@ void luaI_addquoted (char *s)
 static void str_format (void)
 {
   int arg = 1;
-  char *strfrmt = lua_check_string(arg++, "format");
-  luaI_addchar(0);  /* initialize */
+  char *strfrmt = luaL_check_string(arg++);
+  luaI_emptybuff();  /* initialize */
   while (*strfrmt) {
     if (*strfrmt != '%')
       luaI_addchar(*strfrmt++);
@@ -510,26 +481,26 @@ static void str_format (void)
       char *initf = strfrmt-1;  /* -1 to include % */
       strfrmt = match(strfrmt, "[-+ #]*(%d*)%.?(%d*)", 0);
       if (capture[0].len > 3 || capture[1].len > 3)  /* < 1000? */
-        lua_error("invalid format (width/precision too long)");
+        lua_error("invalid format (width or precision too long)");
       strncpy(form, initf, strfrmt-initf+1); /* +1 to include convertion */
       form[strfrmt-initf+1] = 0;
       buff = openspace(1000);  /* to store the formated value */
       switch (*strfrmt++) {
         case 'q':
-          luaI_addquoted(lua_check_string(arg++, "format"));
+          luaI_addquoted(luaL_check_string(arg++));
           continue;
         case 's': {
-          char *s = lua_check_string(arg++, "format");
+          char *s = luaL_check_string(arg++);
           buff = openspace(strlen(s));
           sprintf(buff, form, s);
           break;
         }
         case 'c':  case 'd':  case 'i': case 'o':
         case 'u':  case 'x':  case 'X':
-          sprintf(buff, form, (int)lua_check_number(arg++, "format"));
+          sprintf(buff, form, (int)luaL_check_number(arg++));
           break;
         case 'e':  case 'E': case 'f': case 'g':
-          sprintf(buff, form, lua_check_number(arg++, "format"));
+          sprintf(buff, form, luaL_check_number(arg++));
           break;
         default:  /* also treat cases 'pnLlh' */
           lua_error("invalid format option in function `format'");
@@ -541,16 +512,7 @@ static void str_format (void)
 }
 
 
-void luaI_openlib (struct lua_reg *l, int n)
-{
-  int i;
-  for (i=0; i<n; i++)
-    lua_register(l[i].name, l[i].func);
-}
-
-
-static struct lua_reg strlib[] = {
-{"strtok", str_tok},
+static struct luaL_reg strlib[] = {
 {"strlen", str_len},
 {"strsub", str_sub},
 {"strset", str_set},
@@ -569,5 +531,5 @@ static struct lua_reg strlib[] = {
 */
 void strlib_open (void)
 {
-  luaI_openlib(strlib, (sizeof(strlib)/sizeof(strlib[0])));
+  luaL_openlib(strlib, (sizeof(strlib)/sizeof(strlib[0])));
 }
diff --git a/clients/lua/lua.c b/clients/lua/lua.c
index a6d558a2..afa2b560 100644
--- a/clients/lua/lua.c
+++ b/clients/lua/lua.c
@@ -3,12 +3,13 @@
 ** Linguagem para Usuarios de Aplicacao
 */
 
-char *rcs_lua="$Id: lua.c,v 1.14 1996/09/24 17:30:28 roberto Exp $";
+char *rcs_lua="$Id: lua.c,v 1.18 1997/06/19 18:55:40 roberto Exp $";
 
 #include <stdio.h>
 #include <string.h>
 
 #include "lua.h"
+#include "auxlib.h"
 #include "lualib.h"
 
 
@@ -19,6 +20,74 @@ char *rcs_lua="$Id: lua.c,v 1.14 1996/09/24 17:30:28 roberto Exp $";
 #endif
 
 
+#define DEBUG	0
+
+static void testC (void)
+{
+#if DEBUG
+#define getnum(s)	((*s++) - '0')
+#define getname(s)	(nome[0] = *s++, nome)
+
+  static int locks[10];
+  lua_Object reg[10];
+  char nome[2];
+  char *s = luaL_check_string(1);
+  nome[1] = 0;
+  while (1) {
+    switch (*s++) {
+      case '0': case '1': case '2': case '3': case '4':
+      case '5': case '6': case '7': case '8': case '9':
+        lua_pushnumber(*(s-1) - '0');
+        break;
+
+      case 'c': reg[getnum(s)] = lua_createtable(); break;
+
+      case 'P': reg[getnum(s)] = lua_pop(); break;
+
+      case 'g': { int n = getnum(s); reg[n] = lua_getglobal(getname(s)); break; }
+
+      case 'G': { int n = getnum(s);
+                  reg[n] = lua_rawgetglobal(getname(s));
+                  break;
+                }
+
+      case 'l': locks[getnum(s)] = lua_ref(1); break;
+      case 'L': locks[getnum(s)] = lua_ref(0); break;
+
+      case 'r': { int n = getnum(s); reg[n] = lua_getref(locks[getnum(s)]); break; }
+
+      case 'u': lua_unref(locks[getnum(s)]); break;
+
+      case 'p': { int n = getnum(s); reg[n] = lua_getparam(getnum(s)); break; }
+
+      case '=': lua_setglobal(getname(s)); break;
+
+      case 's': lua_pushstring(getname(s)); break;
+
+      case 'o': lua_pushobject(reg[getnum(s)]); break;
+
+      case 'f': lua_call(getname(s)); break;
+
+      case 'i': reg[getnum(s)] = lua_gettable(); break;
+
+      case 'I': reg[getnum(s)] = lua_rawgettable(); break;
+
+      case 't': lua_settable(); break;
+
+      case 'T': lua_rawsettable(); break;
+
+      default: luaL_verror("unknown command in `testC': %c", *(s-1));
+
+    }
+  if (*s == 0) return;
+  if (*s++ != ' ') lua_error("missing ` ' between commands in `testC'");
+  }
+#else
+  lua_error("`testC' not active");
+#endif
+}
+
+
 static void manual_input (void)
 {
   if (isatty(0)) {
@@ -41,6 +110,7 @@ int main (int argc, char *argv[])
   iolib_open ();
   strlib_open ();
   mathlib_open ();
+  lua_register("testC", testC);
   if (argc < 2)
     manual_input();
   else for (i=1; i<argc; i++) {
@@ -59,8 +129,8 @@ int main (int argc, char *argv[])
       result = lua_dofile (argv[i]);
       if (result) {
         if (result == 2) {
-          fprintf(stderr, "lua: cannot execute file `%s' - ", argv[i]);
-          perror(NULL);
+          fprintf(stderr, "lua: cannot execute file ");
+          perror(argv[i]);
         }
         return 1;
       }