1 files changed, 53 insertions, 53 deletions

diff --git a/lua.c b/lua.c
index 6d76d03c..43310326 100644
--- a/lua.c
+++ b/lua.c
@@ -1,5 +1,5 @@
 /*
-** $Id: lua.c,v 1.60 2001/02/14 17:19:01 roberto Exp roberto $
+** $Id: lua.c,v 1.61 2001/02/20 18:15:33 roberto Exp roberto $
 ** Lua stand-alone interpreter
 ** See Copyright Notice in lua.h
 */
@@ -25,7 +25,7 @@ static int isatty (int x) { return x==0; }  /* assume stdin is a tty */
 
 
 #ifndef PROMPT
-#define PROMPT          "> "
+#define PROMPT          l_s("> ")
 #endif
 
 
@@ -70,7 +70,7 @@ static void lstop (void) {
   lua_setlinehook(L, old_linehook);
   lua_setcallhook(L, old_callhook);
   lreset();
-  lua_error(L, "interrupted!");
+  lua_error(L, l_s("interrupted!"));
 }
 
 
@@ -83,7 +83,7 @@ static void laction (int i) {
 }
 
 
-static int ldo (int (*f)(lua_State *l, const char *), const char *name) {
+static int ldo (int (*f)(lua_State *l, const l_char *), const l_char *name) {
   int res;
   handler h = lreset();
   int top = lua_gettop(L);
@@ -92,45 +92,45 @@ static int ldo (int (*f)(lua_State *l, const char *), const char *name) {
   signal(SIGINT, h);  /* restore old action */
   /* Lua gives no message in such cases, so lua.c provides one */
   if (res == LUA_ERRMEM) {
-    fprintf(stderr, "lua: memory allocation error\n");
+    fprintf(stderr, l_s("lua: memory allocation error\n"));
   }
   else if (res == LUA_ERRERR)
-    fprintf(stderr, "lua: error in error message\n");
+    fprintf(stderr, l_s("lua: error in error message\n"));
   return res;
 }
 
 
 static void print_message (void) {
   fprintf(stderr,
-  "usage: lua [options].  Available options are:\n"
-  "  -        execute stdin as a file\n"
-  "  -c       close Lua when exiting\n"
-  "  -e stat  execute string `stat'\n"
-  "  -f name  execute file `name' with remaining arguments in table `arg'\n"
-  "  -i       enter interactive mode with prompt\n"
-  "  -q       enter interactive mode without prompt\n"
-  "  -sNUM    set stack size to NUM (must be the first option)\n"
-  "  -v       print version information\n"
-  "  a=b      set global `a' to string `b'\n"
-  "  name     execute file `name'\n"
+  l_s("usage: lua [options].  Available options are:\n")
+  l_s("  -        execute stdin as a file\n")
+  l_s("  -c       close Lua when exiting\n")
+  l_s("  -e stat  execute string `stat'\n")
+  l_s("  -f name  execute file `name' with remaining arguments in table `arg'\n")
+  l_s("  -i       enter interactive mode with prompt\n")
+  l_s("  -q       enter interactive mode without prompt\n")
+  l_s("  -sNUM    set stack size to NUM (must be the first option)\n")
+  l_s("  -v       print version information\n")
+  l_s("  a=b      set global `a' to string `b'\n")
+  l_s("  name     execute file `name'\n")
 );
 }
 
 
 static void print_version (void) {
-  printf("%.80s  %.80s\n", LUA_VERSION, LUA_COPYRIGHT);
+  printf(l_s("%.80s  %.80s\n"), l_s(LUA_VERSION), l_s(LUA_COPYRIGHT));
 }
 
 
-static void assign (char *arg) {
-  char *eq = strchr(arg, '=');
-  *eq = '\0';  /* spilt `arg' in two strings (name & value) */
+static void assign (l_char *arg) {
+  l_char *eq = strchr(arg, l_c('='));
+  *eq = l_c('\0');  /* spilt `arg' in two strings (name & value) */
   lua_pushstring(L, eq+1);
   lua_setglobal(L, arg);
 }
 
 
-static void getargs (char *argv[]) {
+static void getargs (l_char *argv[]) {
   int i;
   lua_newtable(L);
   for (i=0; argv[i]; i++) {
@@ -140,24 +140,24 @@ static void getargs (char *argv[]) {
     lua_settable(L, -3);
   }
   /* arg.n = maximum index in table `arg' */
-  lua_pushliteral(L, "n");
+  lua_pushliteral(L, l_s("n"));
   lua_pushnumber(L, i-1);
   lua_settable(L, -3);
 }
 
 
 static int l_getargs (lua_State *l) {
-  char **argv = (char **)lua_touserdata(l, -1);
+  l_char **argv = (l_char **)lua_touserdata(l, -1);
   getargs(argv);
   return 1;
 }
 
 
-static int file_input (const char *argv) {
+static int file_input (const l_char *argv) {
   int result = ldo(lua_dofile, argv);
   if (result) {
     if (result == LUA_ERRFILE) {
-      fprintf(stderr, "lua: cannot execute file ");
+      fprintf(stderr, l_s("lua: cannot execute file "));
       perror(argv);
     }
     return EXIT_FAILURE;
@@ -173,12 +173,12 @@ static int file_input (const char *argv) {
 #endif
 
 
-static const char *get_prompt (int prompt) {
+static const l_char *get_prompt (int prompt) {
   if (!prompt)
-    return "";
+    return l_s("");
   else {
-    const char *s;
-    lua_getglobal(L, "_PROMPT");
+    const l_char *s;
+    lua_getglobal(L, l_s("_PROMPT"));
     s = lua_tostring(L, -1);
     if (!s) s = PROMPT;
     lua_pop(L, 1);  /* remove global */
@@ -192,15 +192,15 @@ static void manual_input (int version, int prompt) {
   for (;;) {
     fputs(get_prompt(prompt), stdout);  /* show prompt */
     for(;;) {
-      char buffer[MAXINPUT];
+      l_char buffer[MAXINPUT];
       size_t l;
       if (fgets(buffer, sizeof(buffer), stdin) == NULL) {
-        printf("\n");
+        printf(l_s("\n"));
         return;
       }
       l = strlen(buffer);
-      if (buffer[l-1] == '\n' && buffer[l-2] == '\\') {
-        buffer[l-2] = '\n';
+      if (buffer[l-1] == l_c('\n') && buffer[l-2] == l_c('\\')) {
+        buffer[l-2] = l_c('\n');
         lua_pushlstring(L, buffer, l-1);
       }
       else {
@@ -215,7 +215,7 @@ static void manual_input (int version, int prompt) {
 }
 
 
-static int handle_argv (char *argv[], struct Options *opt) {
+static int handle_argv (l_char *argv[], struct Options *opt) {
   if (opt->stacksize > 0) argv++;  /* skip option `-s' (if present) */
   if (*argv == NULL) {  /* no more arguments? */
     if (isatty(0)) {
@@ -227,8 +227,8 @@ static int handle_argv (char *argv[], struct Options *opt) {
   else {  /* other arguments; loop over them */
     int i;
     for (i = 0; argv[i] != NULL; i++) {
-      if (argv[i][0] != '-') {  /* not an option? */
-        if (strchr(argv[i], '='))
+      if (argv[i][0] != l_c('-')) {  /* not an option? */
+        if (strchr(argv[i], l_c('=')))
           assign(argv[i]);
         else
           if (file_input(argv[i]) != EXIT_SUCCESS)
@@ -239,46 +239,46 @@ static int handle_argv (char *argv[], struct Options *opt) {
             ldo(lua_dofile, NULL);  /* executes stdin as a file */
             break;
           }
-          case 'i': {
+          case l_c('i'): {
             manual_input(0, 1);
             break;
           }
-          case 'q': {
+          case l_c('q'): {
             manual_input(0, 0);
             break;
           }
-          case 'c': {
+          case l_c('c'): {
             opt->toclose = 1;
             break;
           }
-          case 'v': {
+          case l_c('v'): {
             print_version();
             break;
           }
-          case 'e': {
+          case l_c('e'): {
             i++;
             if (argv[i] == NULL) {
               print_message();
               return EXIT_FAILURE;
             }
             if (ldo(lua_dostring, argv[i]) != 0) {
-              fprintf(stderr, "lua: error running argument `%.99s'\n", argv[i]);
+              fprintf(stderr, l_s("lua: error running argument `%.99s'\n"), argv[i]);
               return EXIT_FAILURE;
             }
             break;
           }
-          case 'f': {
+          case l_c('f'): {
             i++;
             if (argv[i] == NULL) {
               print_message();
               return EXIT_FAILURE;
             }
             getargs(argv+i);  /* collect remaining arguments */
-            lua_setglobal(L, "arg");
+            lua_setglobal(L, l_s("arg"));
             return file_input(argv[i]);  /* stop scanning arguments */
           }
-          case 's': {
-            fprintf(stderr, "lua: stack size (`-s') must be the first option\n");
+          case l_c('s'): {
+            fprintf(stderr, l_s("lua: stack size (`-s') must be the first option\n"));
             return EXIT_FAILURE;
           }
           default: {
@@ -292,11 +292,11 @@ static int handle_argv (char *argv[], struct Options *opt) {
 }
 
 
-static void getstacksize (int argc, char *argv[], struct Options *opt) {
-  if (argc >= 2 && argv[1][0] == '-' && argv[1][1] == 's') {
+static void getstacksize (int argc, l_char *argv[], struct Options *opt) {
+  if (argc >= 2 && argv[1][0] == l_c('-') && argv[1][1] == l_c('s')) {
     int stacksize = atoi(&argv[1][2]);
     if (stacksize <= 0) {
-      fprintf(stderr, "lua: invalid stack size ('%.20s')\n", &argv[1][2]);
+      fprintf(stderr, l_s("lua: invalid stack size ('%.20s')\n"), &argv[1][2]);
       exit(EXIT_FAILURE);
     }
     opt->stacksize = stacksize;
@@ -306,10 +306,10 @@ static void getstacksize (int argc, char *argv[], struct Options *opt) {
 }
 
 
-static void register_getargs (char *argv[]) {
+static void register_getargs (l_char *argv[]) {
   lua_pushuserdata(L, argv);
   lua_pushcclosure(L, l_getargs, 1);
-  lua_setglobal(L, "getargs");
+  lua_setglobal(L, l_s("getargs"));
 }
 
 
@@ -322,7 +322,7 @@ static void openstdlibs (lua_State *l) {
 }
 
 
-int main (int argc, char *argv[]) {
+int main (int argc, l_char *argv[]) {
   struct Options opt;
   int status;
   opt.toclose = 0;