1 files changed, 126 insertions, 126 deletions

diff --git a/liolib.c b/liolib.c
index f9aa2716..379a8ca7 100644
--- a/liolib.c
+++ b/liolib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: liolib.c,v 1.106 2001/02/09 19:52:54 roberto Exp roberto $
+** $Id: liolib.c,v 1.107 2001/02/22 17:15:18 roberto Exp roberto $
 ** Standard I/O (and system) library
 ** See Copyright Notice in lua.h
 */
@@ -47,10 +47,10 @@ int pclose(); */
 #define OUTFILE 1
 #define NOFILE  2
 
-#define FILEHANDLE      "FileHandle"
+#define FILEHANDLE      l_s("FileHandle")
 
 
-static const char *const filenames[] = {"_INPUT", "_OUTPUT"};
+static const l_char *const filenames[] = {l_s("_INPUT"), l_s("_OUTPUT")};
 
 
 static int pushresult (lua_State *L, int i) {
@@ -81,10 +81,10 @@ static FILE *getopthandle (lua_State *L, int inout) {
   FILE *p = (FILE *)lua_touserdata(L, 1);
   if (p != NULL) {  /* is it a userdata ? */
     if (!checkfile(L, 1)) {
-      if (strcmp(lua_xtype(L, 1), "ClosedFileHandle") == 0)
-        luaL_argerror(L, 1, "file is closed");
+      if (strcmp(lua_xtype(L, 1), l_s("ClosedFileHandle")) == 0)
+        luaL_argerror(L, 1, l_s("file is closed"));
       else
-        luaL_argerror(L, 1, "(invalid value)");
+        luaL_argerror(L, 1, l_s("(invalid value)"));
     }
     /* move it to stack top */
     lua_pushvalue(L, 1); lua_remove(L, 1);
@@ -92,7 +92,7 @@ static FILE *getopthandle (lua_State *L, int inout) {
   else if (inout != NOFILE) {  /* try global value */
     lua_getglobal(L, filenames[inout]);
     if (!checkfile(L,-1))
-      luaL_verror(L, "global variable `%.10s' is not a valid file handle",
+      luaL_verror(L, l_s("global variable `%.10s' is not a valid file handle"),
                   filenames[inout]);
     p = (FILE *)lua_touserdata(L, -1);
   }
@@ -105,7 +105,7 @@ static void pushfile (lua_State *L, FILE *f) {
 }
 
 
-static void setfilebyname (lua_State *L, FILE *f, const char *name) {
+static void setfilebyname (lua_State *L, FILE *f, const l_char *name) {
   pushfile(L, f);
   lua_setglobal(L, name);
 }
@@ -131,7 +131,7 @@ static int closefile (lua_State *L, FILE *f) {
     return 1;
   else {
     lua_pushuserdata(L, f);
-    lua_settag(L, lua_type2tag(L, "ClosedFileHandle"));
+    lua_settag(L, lua_type2tag(L, l_s("ClosedFileHandle")));
     return (CLOSEFILE(L, f) == 0);
   }
 }
@@ -163,7 +163,7 @@ static int io_tmpfile (lua_State *L) {
 
 
 
-static int io_fromto (lua_State *L, int inout, const char *mode) {
+static int io_fromto (lua_State *L, int inout, const l_char *mode) {
   FILE *current;
   if (lua_isnull(L, 1)) {
     closefile(L, getopthandle(L, inout));
@@ -172,25 +172,25 @@ static int io_fromto (lua_State *L, int inout, const char *mode) {
   else if (checkfile(L, 1))  /* deprecated option */
     current = (FILE *)lua_touserdata(L, 1);
   else {
-    const char *s = luaL_check_string(L, 1);
-    current = (*s == '|') ? popen(s+1, mode) : fopen(s, mode);
+    const l_char *s = luaL_check_string(L, 1);
+    current = (*s == l_c('|')) ? popen(s+1, mode) : fopen(s, mode);
   }
   return setreturn(L, current, inout);
 }
 
 
 static int io_readfrom (lua_State *L) {
-  return io_fromto(L, INFILE, "r");
+  return io_fromto(L, INFILE, l_s("r"));
 }
 
 
 static int io_writeto (lua_State *L) {
-  return io_fromto(L, OUTFILE, "w");
+  return io_fromto(L, OUTFILE, l_s("w"));
 }
 
 
 static int io_appendto (lua_State *L) {
-  FILE *current = fopen(luaL_check_string(L, 1), "a");
+  FILE *current = fopen(luaL_check_string(L, 1), l_s("a"));
   return setreturn(L, current, OUTFILE);
 }
 
@@ -205,7 +205,7 @@ static int io_appendto (lua_State *L) {
 
 static int read_number (lua_State *L, FILE *f) {
   double d;
-  if (fscanf(f, "%lf", &d) == 1) {
+  if (fscanf(f, l_s("%lf"), &d) == 1) {
     lua_pushnumber(L, d);
     return 1;
   }
@@ -233,11 +233,11 @@ static int read_line (lua_State *L, FILE *f) {
   luaL_Buffer b;
   luaL_buffinit(L, &b);
   for (;;) {
-    char *p = luaL_prepbuffer(&b);
+    l_char *p = luaL_prepbuffer(&b);
     if (!fgets(p, LUAL_BUFFERSIZE, f))  /* read fails? */
       break;
     n = strlen(p);
-    if (p[n-1] != '\n')
+    if (p[n-1] != l_c('\n'))
       luaL_addsize(&b, n); 
     else {
       luaL_addsize(&b, n-1);  /* do not add the `\n' */
@@ -253,15 +253,15 @@ static void read_file (lua_State *L, FILE *f) {
   size_t len = 0;
   size_t size = LUAL_BUFFERSIZE;
   size_t oldsize = 0;
-  char *buffer = NULL;
+  l_char *buffer = NULL;
   for (;;) {
-    char *newbuffer = (char *)l_realloc(buffer, oldsize, size);
+    l_char *newbuffer = (l_char *)l_realloc(buffer, oldsize, size);
     if (newbuffer == NULL) {
       l_free(buffer, oldsize);
-      lua_error(L, "not enough memory to read a file");
+      lua_error(L, l_s("not enough memory to read a file"));
     }
     buffer = newbuffer;
-    len += fread(buffer+len, sizeof(char), size-len, f);
+    len += fread(buffer+len, sizeof(l_char), size-len, f);
     if (len < size) break;  /* did not read all it could */
     oldsize = size;
     size *= 2;
@@ -279,17 +279,17 @@ static int read_chars (lua_State *L, FILE *f, size_t n) {
     return (c != EOF);
   }
   else {
-    char *buffer;
+    l_char *buffer;
     size_t n1;
-    char statbuff[LUAL_BUFFERSIZE];
+    l_char statbuff[LUAL_BUFFERSIZE];
     if (n <= LUAL_BUFFERSIZE)
       buffer = statbuff;
     else {
-      buffer = (char  *)l_malloc(n);
+      buffer = (l_char  *)l_malloc(n);
       if (buffer == NULL)
-        lua_error(L, "not enough memory to read a file");
+        lua_error(L, l_s("not enough memory to read a file"));
     }
-    n1 = fread(buffer, sizeof(char), n, f);
+    n1 = fread(buffer, sizeof(l_char), n, f);
     lua_pushlstring(L, buffer, n1);
     if (buffer != statbuff) l_free(buffer, n);
     return (n1 > 0 || n == 0);
@@ -307,31 +307,31 @@ static int io_read (lua_State *L) {
     n = 2;  /* will return n-1 results */
   }
   else {  /* ensure stack space for all results and for auxlib's buffer */
-    luaL_checkstack(L, nargs+LUA_MINSTACK, "too many arguments");
+    luaL_checkstack(L, nargs+LUA_MINSTACK, l_s("too many arguments"));
     success = 1;
     for (n = 1; n<=nargs && success; n++) {
       if (lua_type(L, n) == LUA_TNUMBER)
         success = read_chars(L, f, (size_t)lua_tonumber(L, n));
       else {
-        const char *p = lua_tostring(L, n);
-        if (!p || p[0] != '*')
-          lua_error(L, "invalid `read' option");
+        const l_char *p = lua_tostring(L, n);
+        if (!p || p[0] != l_c('*'))
+          lua_error(L, l_s("invalid `read' option"));
         switch (p[1]) {
-          case 'n':  /* number */
+          case l_c('n'):  /* number */
             success = read_number(L, f);
             break;
-          case 'l':  /* line */
+          case l_c('l'):  /* line */
             success = read_line(L, f);
             break;
-          case 'a':  /* file */
+          case l_c('a'):  /* file */
             read_file(L, f);
             success = 1; /* always success */
             break;
-          case 'w':  /* word */
+          case l_c('w'):  /* word */
             success = read_word(L, f);
             break;
           default:
-            luaL_argerror(L, n, "invalid format");
+            luaL_argerror(L, n, l_s("invalid format"));
             success = 0;  /* to avoid warnings */
         }
       }
@@ -355,12 +355,12 @@ static int io_write (lua_State *L) {
   for (arg=1; arg<=nargs; arg++) {
     if (lua_type(L, arg) == LUA_TNUMBER) {  /* LUA_NUMBER */
       /* optimization: could be done exactly as for strings */
-      status = status && fprintf(f, "%.16g", lua_tonumber(L, arg)) > 0;
+      status = status && fprintf(f, l_s("%.16g"), lua_tonumber(L, arg)) > 0;
     }
     else {
       size_t l;
-      const char *s = luaL_check_lstr(L, arg, &l);
-      status = status && (fwrite(s, sizeof(char), l, f) == l);
+      const l_char *s = luaL_check_lstr(L, arg, &l);
+      status = status && (fwrite(s, sizeof(l_char), l, f) == l);
     }
   }
   pushresult(L, status);
@@ -370,11 +370,11 @@ 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};
+  static const l_char *const modenames[] = {l_s("set"), l_s("cur"), l_s("end"), NULL};
   FILE *f = (FILE *)luaL_check_userdata(L, 1, FILEHANDLE);
-  int op = luaL_findstring(luaL_opt_string(L, 2, "cur"), modenames);
+  int op = luaL_findstring(luaL_opt_string(L, 2, l_s("cur")), modenames);
   long offset = luaL_opt_long(L, 3, 0);
-  luaL_arg_check(L, op != -1, 2, "invalid mode");
+  luaL_arg_check(L, op != -1, 2, l_s("invalid mode"));
   op = fseek(f, offset, mode[op]);
   if (op)
     return pushresult(L, 0);  /* error */
@@ -387,7 +387,7 @@ static int io_seek (lua_State *L) {
 
 static int io_flush (lua_State *L) {
   FILE *f = getopthandle(L, NOFILE);
-  luaL_arg_check(L, f || lua_isnull(L, 1), 1, "invalid file handle");
+  luaL_arg_check(L, f || lua_isnull(L, 1), 1, l_s("invalid file handle"));
   return pushresult(L, fflush(f) == 0);
 }
 
@@ -418,9 +418,9 @@ static int io_rename (lua_State *L) {
 
 
 static int io_tmpname (lua_State *L) {
-  char buff[L_tmpnam];
+  l_char buff[L_tmpnam];
   if (tmpnam(buff) != buff)
-    lua_error(L, "unable to generate a unique filename");
+    lua_error(L, l_s("unable to generate a unique filename"));
   lua_pushstring(L, buff);
   return 1;
 }
@@ -447,14 +447,14 @@ static int io_clock (lua_State *L) {
 ** =======================================================
 */
 
-static void setfield (lua_State *L, const char *key, int value) {
+static void setfield (lua_State *L, const l_char *key, int value) {
   lua_pushstring(L, key);
   lua_pushnumber(L, value);
   lua_rawset(L, -3);
 }
 
 
-static int getfield (lua_State *L, const char *key, int d) {
+static int getfield (lua_State *L, const l_char *key, int d) {
   int res;
   lua_pushstring(L, key);
   lua_rawget(L, -2);
@@ -462,7 +462,7 @@ static int getfield (lua_State *L, const char *key, int d) {
     res = (int)lua_tonumber(L, -1);
   else {
     if (d == -2)
-      luaL_verror(L, "field `%.20s' missing in date table", key);
+      luaL_verror(L, l_s("field `%.20s' missing in date table"), key);
     res = d;
   }
   lua_pop(L, 1);
@@ -471,12 +471,12 @@ static int getfield (lua_State *L, const char *key, int d) {
 
 
 static int io_date (lua_State *L) {
-  const char *s = luaL_opt_string(L, 1, "%c");
+  const l_char *s = luaL_opt_string(L, 1, l_s("%c"));
   time_t t = (time_t)luaL_opt_number(L, 2, -1);
   struct tm *stm;
   if (t == (time_t)-1)  /* no time given? */
     t = time(NULL);  /* use current time */
-  if (*s == '!') {  /* UTC? */
+  if (*s == l_c('!')) {  /* UTC? */
     stm = gmtime(&t);
     s++;  /* skip `!' */
   }
@@ -484,24 +484,24 @@ static int io_date (lua_State *L) {
     stm = localtime(&t);
   if (stm == NULL)  /* invalid date? */
     lua_pushnil(L);
-  else if (strcmp(s, "*t") == 0) {
+  else if (strcmp(s, l_s("*t")) == 0) {
     lua_newtable(L);
-    setfield(L, "sec", stm->tm_sec);
-    setfield(L, "min", stm->tm_min);
-    setfield(L, "hour", stm->tm_hour);
-    setfield(L, "day", stm->tm_mday);
-    setfield(L, "month", stm->tm_mon+1);
-    setfield(L, "year", stm->tm_year+1900);
-    setfield(L, "wday", stm->tm_wday+1);
-    setfield(L, "yday", stm->tm_yday+1);
-    setfield(L, "isdst", stm->tm_isdst);
+    setfield(L, l_s("sec"), stm->tm_sec);
+    setfield(L, l_s("min"), stm->tm_min);
+    setfield(L, l_s("hour"), stm->tm_hour);
+    setfield(L, l_s("day"), stm->tm_mday);
+    setfield(L, l_s("month"), stm->tm_mon+1);
+    setfield(L, l_s("year"), stm->tm_year+1900);
+    setfield(L, l_s("wday"), stm->tm_wday+1);
+    setfield(L, l_s("yday"), stm->tm_yday+1);
+    setfield(L, l_s("isdst"), stm->tm_isdst);
   }
   else {
-    char b[256];
+    l_char b[256];
     if (strftime(b, sizeof(b), s, stm))
       lua_pushstring(L, b);
     else
-      lua_error(L, "invalid `date' format");
+      lua_error(L, l_s("invalid `date' format"));
   }
   return 1;
 }
@@ -515,13 +515,13 @@ static int io_time (lua_State *L) {
     struct tm ts;
     luaL_checktype(L, 1, LUA_TTABLE);
     lua_settop(L, 1);  /* make sure table is at the top */
-    ts.tm_sec = getfield(L, "sec", 0);
-    ts.tm_min = getfield(L, "min", 0);
-    ts.tm_hour = getfield(L, "hour", 12);
-    ts.tm_mday = getfield(L, "day", -2);
-    ts.tm_mon = getfield(L, "month", -2)-1;
-    ts.tm_year = getfield(L, "year", -2)-1900;
-    ts.tm_isdst = getfield(L, "isdst", -1);
+    ts.tm_sec = getfield(L, l_s("sec"), 0);
+    ts.tm_min = getfield(L, l_s("min"), 0);
+    ts.tm_hour = getfield(L, l_s("hour"), 12);
+    ts.tm_mday = getfield(L, l_s("day"), -2);
+    ts.tm_mon = getfield(L, l_s("month"), -2)-1;
+    ts.tm_year = getfield(L, l_s("year"), -2)-1900;
+    ts.tm_isdst = getfield(L, l_s("isdst"), -1);
     t = mktime(&ts);
     if (t == (time_t)-1)
       lua_pushnil(L);
@@ -544,10 +544,10 @@ static int io_difftime (lua_State *L) {
 static int io_setloc (lua_State *L) {
   static const int cat[] = {LC_ALL, LC_COLLATE, LC_CTYPE, LC_MONETARY,
                       LC_NUMERIC, LC_TIME};
-  static const char *const catnames[] = {"all", "collate", "ctype", "monetary",
-     "numeric", "time", NULL};
-  int op = luaL_findstring(luaL_opt_string(L, 2, "all"), catnames);
-  luaL_arg_check(L, op != -1, 2, "invalid option");
+  static const l_char *const catnames[] = {l_s("all"), l_s("collate"), l_s("ctype"), l_s("monetary"),
+     l_s("numeric"), l_s("time"), NULL};
+  int op = luaL_findstring(luaL_opt_string(L, 2, l_s("all")), catnames);
+  luaL_arg_check(L, op != -1, 2, l_s("invalid option"));
   lua_pushstring(L, setlocale(cat[op], luaL_check_string(L, 1)));
   return 1;
 }
@@ -564,10 +564,10 @@ static int io_exit (lua_State *L) {
 
 static int io_debug (lua_State *L) {
   for (;;) {
-    char buffer[250];
-    fprintf(stderr, "lua_debug> ");
+    l_char buffer[250];
+    fprintf(stderr, l_s("lua_debug> "));
     if (fgets(buffer, sizeof(buffer), stdin) == 0 ||
-        strcmp(buffer, "cont\n") == 0)
+        strcmp(buffer, l_s("cont\n")) == 0)
       return 0;
     lua_dostring(L, buffer);
     lua_settop(L, 0);  /* remove eventual returns */
@@ -584,61 +584,61 @@ static int errorfb (lua_State *L) {
   lua_Debug ar;
   luaL_Buffer b;
   luaL_buffinit(L, &b);
-  luaL_addstring(&b, "error: ");
+  luaL_addstring(&b, l_s("error: "));
   luaL_addstring(&b, luaL_check_string(L, 1));
-  luaL_addstring(&b, "\n");
+  luaL_addstring(&b, l_s("\n"));
   while (lua_getstack(L, level++, &ar)) {
-    char buff[120];  /* enough to fit following `sprintf's */
+    l_char buff[120];  /* enough to fit following `sprintf's */
     if (level == 2)
-      luaL_addstring(&b, "stack traceback:\n");
+      luaL_addstring(&b, l_s("stack traceback:\n"));
     else if (level > LEVELS1 && firstpart) {
       /* no more than `LEVELS2' more levels? */
       if (!lua_getstack(L, level+LEVELS2, &ar))
         level--;  /* keep going */
       else {
-        luaL_addstring(&b, "       ...\n");  /* too many levels */
+        luaL_addstring(&b, l_s("       ...\n"));  /* too many levels */
         while (lua_getstack(L, level+LEVELS2, &ar))  /* find last levels */
           level++;
       }
       firstpart = 0;
       continue;
     }
-    sprintf(buff, "%4d:  ", level-1);
+    sprintf(buff, l_s("%4d:  "), level-1);
     luaL_addstring(&b, buff);
-    lua_getinfo(L, "Snl", &ar);
+    lua_getinfo(L, l_s("Snl"), &ar);
     switch (*ar.namewhat) {
-      case 'g':  case 'l':  /* global, local */
-        sprintf(buff, "function `%.50s'", ar.name);
+      case l_c('g'):  case l_c('l'):  /* global, local */
+        sprintf(buff, l_s("function `%.50s'"), ar.name);
         break;
-      case 'f':  /* field */
-        sprintf(buff, "method `%.50s'", ar.name);
+      case l_c('f'):  /* field */
+        sprintf(buff, l_s("method `%.50s'"), ar.name);
         break;
-      case 't':  /* tag method */
-        sprintf(buff, "`%.50s' tag method", ar.name);
+      case l_c('t'):  /* tag method */
+        sprintf(buff, l_s("`%.50s' tag method"), ar.name);
         break;
       default: {
-        if (*ar.what == 'm')  /* main? */
-          sprintf(buff, "main of %.70s", ar.short_src);
-        else if (*ar.what == 'C')  /* C function? */
-          sprintf(buff, "%.70s", ar.short_src);
+        if (*ar.what == l_c('m'))  /* main? */
+          sprintf(buff, l_s("main of %.70s"), ar.short_src);
+        else if (*ar.what == l_c('C'))  /* C function? */
+          sprintf(buff, l_s("%.70s"), ar.short_src);
         else
-          sprintf(buff, "function <%d:%.70s>", ar.linedefined, ar.short_src);
+          sprintf(buff, l_s("function <%d:%.70s>"), ar.linedefined, ar.short_src);
         ar.source = NULL;  /* do not print source again */
       }
     }
     luaL_addstring(&b, buff);
     if (ar.currentline > 0) {
-      sprintf(buff, " at line %d", ar.currentline);
+      sprintf(buff, l_s(" at line %d"), ar.currentline);
       luaL_addstring(&b, buff);
     }
     if (ar.source) {
-      sprintf(buff, " [%.70s]", ar.short_src);
+      sprintf(buff, l_s(" [%.70s]"), ar.short_src);
       luaL_addstring(&b, buff);
     }
-    luaL_addstring(&b, "\n");
+    luaL_addstring(&b, l_s("\n"));
   }
   luaL_pushresult(&b);
-  lua_getglobal(L, LUA_ALERT);
+  lua_getglobal(L, l_s(LUA_ALERT));
   if (lua_isfunction(L, -1)) {  /* avoid loop if _ALERT is not defined */
     lua_pushvalue(L, -2);  /* error message */
     lua_rawcall(L, 1, 0);
@@ -649,44 +649,44 @@ static int errorfb (lua_State *L) {
 
 
 static const luaL_reg iolib[] = {
-  {"appendto",  io_appendto},
-  {"clock",     io_clock},
-  {"closefile", io_close},
-  {"date",      io_date},
-  {"debug",     io_debug},
-  {"difftime",  io_difftime},
-  {"execute",   io_execute},
-  {"exit",      io_exit},
-  {"flush",     io_flush},
-  {"getenv",    io_getenv},
-  {"openfile",  io_open},
-  {"read",      io_read},
-  {"readfrom",  io_readfrom},
-  {"remove",    io_remove},
-  {"rename",    io_rename},
-  {"seek",      io_seek},
-  {"setlocale", io_setloc},
-  {"time",      io_time},
-  {"tmpfile",   io_tmpfile},
-  {"tmpname",   io_tmpname},
-  {"write",     io_write},
-  {"writeto",   io_writeto},
-  {LUA_ERRORMESSAGE, errorfb}
+  {l_s("appendto"),  io_appendto},
+  {l_s("clock"),     io_clock},
+  {l_s("closefile"), io_close},
+  {l_s("date"),      io_date},
+  {l_s("debug"),     io_debug},
+  {l_s("difftime"),  io_difftime},
+  {l_s("execute"),   io_execute},
+  {l_s("exit"),      io_exit},
+  {l_s("flush"),     io_flush},
+  {l_s("getenv"),    io_getenv},
+  {l_s("openfile"),  io_open},
+  {l_s("read"),      io_read},
+  {l_s("readfrom"),  io_readfrom},
+  {l_s("remove"),    io_remove},
+  {l_s("rename"),    io_rename},
+  {l_s("seek"),      io_seek},
+  {l_s("setlocale"), io_setloc},
+  {l_s("time"),      io_time},
+  {l_s("tmpfile"),   io_tmpfile},
+  {l_s("tmpname"),   io_tmpname},
+  {l_s("write"),     io_write},
+  {l_s("writeto"),   io_writeto},
+  {l_s(LUA_ERRORMESSAGE), errorfb}
 };
 
 
 LUALIB_API void lua_iolibopen (lua_State *L) {
   int iotag = lua_newtype(L, FILEHANDLE, LUA_TUSERDATA);
-  lua_newtype(L, "ClosedFileHandle", LUA_TUSERDATA);
+  lua_newtype(L, l_s("ClosedFileHandle"), LUA_TUSERDATA);
   luaL_openl(L, iolib);
   /* predefined file handles */
   setfile(L, stdin, INFILE);
   setfile(L, stdout, OUTFILE);
-  setfilebyname(L, stdin, "_STDIN");
-  setfilebyname(L, stdout, "_STDOUT");
-  setfilebyname(L, stderr, "_STDERR");
+  setfilebyname(L, stdin, l_s("_STDIN"));
+  setfilebyname(L, stdout, l_s("_STDOUT"));
+  setfilebyname(L, stderr, l_s("_STDERR"));
   /* close files when collected */
   lua_pushcfunction(L, file_collect);
-  lua_settagmethod(L, iotag, "gc");
+  lua_settagmethod(L, iotag, l_s("gc"));
 }