parser

git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@82 d4a5a174-5a4a-5b4b-b672-37683c10d7d5

diff --git a/Client/main.c b/Client/main.c
index c2514e2bce0a5886a0bd5f8cfbf1ddd500199cc2..bc82cde5013b828743052cd7a96023e91272825e 100644 (file)
--- a/Client/main.c
+++ b/Client/main.c
@@ -59,6 +59,7 @@ int main(int argc, char** argv) {
        bool banner = true;
        bool log = true;
        const char* fname = NULL;
+       const char* fprog = NULL;
        for(i = 1; i < argc; i++) {
                if(argv[i][0] == '-') {
                        if(strcmp(argv[i], "--version") == 0 || strcmp(argv[i], "-V") == 0) {
@@ -75,6 +76,9 @@ int main(int argc, char** argv) {
                                banner = false;
                        } else if(strcmp(argv[i], "--nolog") == 0 || strcmp(argv[i], "-NL") == 0) {
                                log = false;
+                       } else if(strcmp(argv[i], "-f") == 0){
+                               fprog = argv[i + 1];
+                               i++;
                        } else {
                                fprintf(stderr, "%s: %s: invalid option\n", argv[0], argv[i]);
                                return 1;
@@ -152,10 +156,22 @@ int main(int argc, char** argv) {
        buf[0] = 0;
        char ch;
        char prompt = '.';
-       printf("%c ", prompt);
-       fflush(stdout);
+       FILE* fp = stdin;
+       if(fprog != NULL){
+               fp = fopen(fprog, "r");
+               if(fp == NULL){
+                       printf("Could not open the program file.\n");
+                       return 1;
+               }
+       }
+       if(fprog == NULL){
+               printf("%c ", prompt);
+               fflush(stdout);
+       }
+       char* linebuf = malloc(1);
+       linebuf[0] = 0;
        while(1) {
-               if(fread(&ch, 1, 1, stdin) <= 0) break;
+               if(fread(&ch, 1, 1, fp) <= 0) break;
                if(ch == '\n') {
                        if(buf[0] == '.') {
                                if(__dw_strcaseequ(buf, ".bye") || __dw_strcaseequ(buf, ".quit")) {
@@ -196,18 +212,42 @@ int main(int argc, char** argv) {
                                        printf("Unknown dot-command.\n");
                                }
                        } else if(strlen(buf) > 0) {
-                               struct __dw_token* token = __dw_parser_parse(NULL, buf);
-                               if(token != NULL) {
-                                       if(token->error) {
-                                               printf("%s\n", dataworks_database_strerror(token->errnum));
-                                       } else {
+                               char* tmp = linebuf;
+                               linebuf = __dw_strcat(tmp, buf);
+                               free(tmp);
+                               int i;
+rep:;
+                               for(i = 0; linebuf[i] != 0; i++){
+                                       if(linebuf[i] == ';'){
+                                               char* line = malloc(i + 1);
+                                               line[i] = 0;
+                                               memcpy(line, linebuf, i);
+                                               struct __dw_token* token = __dw_parser_parse(NULL, line);
+                                               if(token != NULL) {
+                                                       if(token->error) {
+                                                               printf("%s\n", dataworks_database_strerror(token->errnum));
+                                                       } else {
+                                                       }
+                                               } else {
+                                                       printf("Parser returned NULL. Help!\n");
+                                               }
+                                               if(fprog != NULL){
+                                                       printf("%s\n", line);
+                                               }
+                                               free(line);
+                                               char* newbuf = malloc(strlen(linebuf) - i);
+                                               newbuf[strlen(linebuf) - i - 1] = 0;
+                                               memcpy(newbuf, linebuf + i + 1, strlen(linebuf) - i - 1);
+                                               free(linebuf);
+                                               linebuf = newbuf;
+                                               goto rep;
                                        }
-                               } else {
-                                       printf("Parser returned NULL. Help!\n");
                                }
                        }
-                       printf("%c ", prompt);
-                       fflush(stdout);
+                       if(fprog == NULL){
+                               printf("%c ", prompt);
+                               fflush(stdout);
+                       }
                        free(buf);
                        buf = malloc(1);
                        buf[0] = 0;
@@ -224,6 +264,7 @@ int main(int argc, char** argv) {
                        len++;
                }
        }
+       free(linebuf);
        free(buf);
        printf("\n");
 }

diff --git a/Library/dw_parser.h b/Library/dw_parser.h
index cab2316892306738ffe210d6442db24779f6b143..a7521ff7cbe0bf1993aedbb7756c9320261fad61 100644 (file)
--- a/Library/dw_parser.h
+++ b/Library/dw_parser.h
@@ -49,7 +49,7 @@ struct __dw_token {
        int type;
        bool error;
        int errnum;
-       struct __dw_token* token;
+       struct __dw_token** token;
 };
 
 struct __dw_token* __dw_parser_parse(const char* name, const char* str);