Changes in uspace/app/sbi/src/builtin.c [23de644:38aaacc2] in mainline

File:

• uspace/app/sbi/src/builtin.c (modified) (5 diffs)

uspace/app/sbi/src/builtin.c

@@ -40 +40 @@
 #include <stdlib.h>
 #include <assert.h>
-#include "ancr.h"
+#include "builtin/bi_boxed.h"
 #include "builtin/bi_error.h"
 #include "builtin/bi_fun.h"
@@ -90 +90 @@
         bi_fun_declare(bi);
         bi_textfile_declare(bi);
-
-        /* Need to process ancestry so that symbol lookups work. */
-        ancr_module_process(program, program->module);
-
+}
+
+/** Bind internal interpreter references to symbols in the program.
+ *
+ * This is performed in separate phase for several reasons. First,
+ * symbol lookups do not work until ancestry is processed. Second,
+ * this gives a chance to process the library first and thus bind
+ * to symbols defined there.
+ */
+void builtin_bind(builtin_t *bi)
+{
+        bi_boxed_bind(bi);
         bi_error_bind(bi);
         bi_fun_bind(bi);
@@ -300 +308 @@
         stree_ident_t *ident;
         stree_fun_t *fun;
+        stree_fun_sig_t *sig;
         stree_csimbr_t *csimbr;
         stree_symbol_t *fun_sym;
@@ -310 +319 @@
         fun->proc = stree_proc_new();
         fun->proc->body = NULL;
-        list_init(&fun->args);
+        sig = stree_fun_sig_new();
+        fun->sig = sig;
+
+        list_init(&fun->sig->args);
 
         csimbr = stree_csimbr_new(csimbr_fun);
@@ -348 +360 @@
         proc_arg->type = NULL; /* XXX */
 
-        list_append(&fun->args, proc_arg);
-}
+        list_append(&fun->sig->args, proc_arg);
+}