Changeset 1113c9e in mainline for uspace/app/sbi/src/builtin.c

Timestamp:

2010-06-09T19:03:24Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8eec3c8

Parents:

8f80c77 (diff), c5cb943d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jsvoboda/helenos/sysel.

File:

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

uspace/app/sbi/src/builtin.c

@@ -42 +42 @@
 #include "builtin/bi_boxed.h"
 #include "builtin/bi_error.h"
+#include "builtin/bi_char.h"
 #include "builtin/bi_fun.h"
+#include "builtin/bi_int.h"
 #include "builtin/bi_textfile.h"
 #include "builtin/bi_string.h"
@@ -52 +54 @@
 #include "os/os.h"
 #include "parse.h"
+#include "rdata.h"
 #include "run.h"
 #include "stree.h"
@@ -89 +92 @@
 
         bi_error_declare(bi);
+        bi_char_declare(bi);
         bi_fun_declare(bi);
+        bi_int_declare(bi);
         bi_textfile_declare(bi);
         bi_string_declare(bi);
@@ -105 +110 @@
         bi_boxed_bind(bi);
         bi_error_bind(bi);
+        bi_char_bind(bi);
         bi_fun_bind(bi);
+        bi_int_bind(bi);
         bi_textfile_bind(bi);
         bi_string_bind(bi);
@@ -250 +257 @@
 {
         stree_symbol_t *fun_sym;
-        builtin_t *bi;
         builtin_proc_t bproc;
 
@@ -257 +263 @@
 #endif
         fun_sym = proc->outer_symbol;
-        bi = run->program->builtin;
 
         bproc = proc->bi_handler;
@@ -298 +303 @@
 }
 
-/** Declare a builtin function in @a csi.
+/** Return string value from builtin procedure.
+ *
+ * Makes it easy for a builtin procedure to return value of type @c string.
+ *
+ * @param run           Runner object
+ * @param str           String value. Must be allocated from heap and its
+ *                      ownership is hereby given up.
+ */
+void builtin_return_string(run_t *run, const char *astr)
+{
+        rdata_string_t *rstring;
+        rdata_var_t *rvar;
+        rdata_value_t *rval;
+        rdata_item_t *ritem;
+
+        run_proc_ar_t *proc_ar;
+
+#ifdef DEBUG_RUN_TRACE
+        printf("Return string '%s' from builtin function.\n", astr);
+#endif
+        rstring = rdata_string_new();
+        rstring->value = astr;
+
+        rvar = rdata_var_new(vc_string);
+        rvar->u.string_v = rstring;
+        rval = rdata_value_new();
+        rval->var = rvar;
+
+        ritem = rdata_item_new(ic_value);
+        ritem->u.value = rval;
+
+        proc_ar = run_get_current_proc_ar(run);
+        proc_ar->retval = ritem;
+}
+
+/** Declare a static builtin function in @a csi.
  *
  * Declare a builtin function member of CSI @a csi. Deprecated in favor
@@ -314 +354 @@
         stree_csimbr_t *csimbr;
         stree_symbol_t *fun_sym;
+        stree_symbol_attr_t *sym_attr;
 
         ident = stree_ident_new();
@@ -333 +374 @@
         fun_sym->u.fun = fun;
         fun_sym->outer_csi = csi;
+
+        sym_attr = stree_symbol_attr_new(sac_static);
+        list_append(&fun_sym->attr, sym_attr);
+
         fun->symbol = fun_sym;
         fun->proc->outer_symbol = fun_sym;