Changeset 074444f in mainline for uspace/app/sbi/src/main.c

Timestamp:

2010-04-10T11:15:33Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1ef0fc3, 38aaacc2

Parents:

23de644

Message:

Update SBI to rev. 184.

File:

• uspace/app/sbi/src/main.c (modified) (7 diffs)

uspace/app/sbi/src/main.c

@@ -37 +37 @@
 #include <stdlib.h>
 #include "ancr.h"
+#include "os/os.h"
 #include "builtin.h"
 #include "imode.h"
 #include "mytypes.h"
+#include "program.h"
 #include "strtab.h"
 #include "stree.h"
@@ -48 +50 @@
 #include "run.h"
 
-void syntax_print(void);
+static void syntax_print(void);
 
 /** Main entry point.
@@ -56 +58 @@
 int main(int argc, char *argv[])
 {
-        input_t *input;
-        lex_t lex;
-        parse_t parse;
         stree_program_t *program;
         stype_t stype;
@@ -64 +63 @@
         int rc;
 
-        if (argc == 1) {
+        /* Store executable file path under which we have been invoked. */
+        os_store_ef_path(*argv);
+
+        argv += 1;
+        argc -= 1;
+
+        if (argc == 0) {
                 /* Enter interactive mode */
                 strtab_init();
@@ -71 +76 @@
         }
 
-        if (argc != 2) {
+        if (os_str_cmp(*argv, "-h") == 0) {
                 syntax_print();
-                exit(1);
-        }
-
-        rc = input_new_file(&input, argv[1]);
-        if (rc != EOK) {
-                printf("Failed opening source file '%s'.\n", argv[1]);
-                exit(1);
+                return 0;
         }
 
@@ -89 +88 @@
         builtin_declare(program);
 
-        /* Parse input file. */
-        lex_init(&lex, input);
-        parse_init(&parse, program, &lex);
-        parse_module(&parse);
-
-        /* Check for parse errors. */
-        if (parse.error)
+        /* Process source files in the library. */
+        if (program_lib_process(program) != EOK)
                 return 1;
 
+        /* Process all source files specified in command-line arguments. */
+        while (argc > 0) {
+                rc = program_file_process(program, *argv);
+                if (rc != EOK)
+                        return 1;
+
+                argv += 1;
+                argc -= 1;
+        }
+
         /* Resolve ancestry. */
-        ancr_module_process(program, parse.cur_mod);
+        ancr_module_process(program, program->module);
 
         /* Type program. */
@@ -122 +126 @@
 
 /** Print command-line syntax help. */
-void syntax_print(void)
+static void syntax_print(void)
 {
-        printf("Missing or invalid arguments.\n");
         printf("Syntax: sbi <source_file.sy>\n");
 }