new command line options

This commit is contained in:
Roberto Ierusalimschy
1997-12-19 16:34:23 -02:00
parent 4e91384e14
commit 7ecc3ce827

81
lua.c
View File

@@ -1,5 +1,5 @@
/* /*
** $Id: lua.c,v 1.8 1997/12/11 14:48:46 roberto Exp roberto $ ** $Id: lua.c,v 1.9 1997/12/11 17:00:21 roberto Exp roberto $
** Lua stand-alone interpreter ** Lua stand-alone interpreter
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@@ -25,6 +25,17 @@
#define isatty(x) (x==0) /* assume stdin is a tty */ #define isatty(x) (x==0) /* assume stdin is a tty */
#endif #endif
/* command line options:
** -v print version information (banner).
** -d debug on
** -e dostring on next arg
** a=b sets global 'a' with string 'b'
** -q interactive mode without prompt
** -i interactive mode with prompt
** - executes stdin as a file
** name dofile "name"
*/
static void assign (char *arg) static void assign (char *arg)
{ {
@@ -44,39 +55,35 @@ static void assign (char *arg)
static void manual_input (int prompt) static void manual_input (int prompt)
{ {
if (isatty(0)) { int cont = 1;
int cont = 1; while (cont) {
while (cont) { char buffer[BUF_SIZE];
char buffer[BUF_SIZE]; int i = 0;
int i = 0; lua_beginblock();
lua_beginblock(); if (prompt)
if (prompt) printf("%s", lua_getstring(lua_getglobal("_PROMPT")));
printf("%s", lua_getstring(lua_getglobal("_PROMPT"))); for(;;) {
for(;;) { int c = getchar();
int c = getchar(); if (c == EOF) {
if (c == EOF) { cont = 0;
cont = 0; break;
break;
}
else if (c == '\n') {
if (i>0 && buffer[i-1] == '\\')
buffer[i-1] = '\n';
else break;
}
else if (i >= BUF_SIZE-1) {
fprintf(stderr, "lua: argument line too long\n");
break;
}
else buffer[i++] = c;
} }
buffer[i] = 0; else if (c == '\n') {
lua_dostring(buffer); if (i>0 && buffer[i-1] == '\\')
lua_endblock(); buffer[i-1] = '\n';
else break;
}
else if (i >= BUF_SIZE-1) {
fprintf(stderr, "lua: argument line too long\n");
break;
}
else buffer[i++] = c;
} }
printf("\n"); buffer[i] = 0;
lua_dostring(buffer);
lua_endblock();
} }
else printf("\n");
lua_dofile(NULL); /* executes stdin as a file */
} }
@@ -88,12 +95,18 @@ int main (int argc, char *argv[])
lua_strlibopen(); lua_strlibopen();
lua_mathlibopen(); lua_mathlibopen();
lua_pushstring("> "); lua_setglobal("_PROMPT"); lua_pushstring("> "); lua_setglobal("_PROMPT");
if (argc < 2) { if (argc < 2) { /* no arguments? */
printf("%s %s\n", LUA_VERSION, LUA_COPYRIGHT); if (isatty(0)) {
manual_input(1); printf("%s %s\n", LUA_VERSION, LUA_COPYRIGHT);
manual_input(1);
}
else
lua_dofile(NULL); /* executes stdin as a file */
} }
else for (i=1; i<argc; i++) { else for (i=1; i<argc; i++) {
if (strcmp(argv[i], "-") == 0) if (strcmp(argv[i], "-") == 0)
lua_dofile(NULL); /* executes stdin as a file */
else if (strcmp(argv[i], "-i") == 0)
manual_input(1); manual_input(1);
else if (strcmp(argv[i], "-q") == 0) else if (strcmp(argv[i], "-q") == 0)
manual_input(0); manual_input(0);