Changes in uspace/app/sbi/src/main.c [074444f:23de644] in mainline

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