Changeset 883fedc in mainline for uspace/app/sbi/src/builtin/bi_fun.c

Timestamp:

2010-04-23T23:09:56Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

37c9fc8

Parents:

80badbe (diff), 6c39a907 (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. New: generic classes, autoboxing, delegates.

File:

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

uspace/app/sbi/src/builtin/bi_fun.c

@@ -44 +44 @@
 #include "bi_fun.h"
 
+static void bi_fun_builtin_write(run_t *run);
 static void bi_fun_builtin_writeline(run_t *run);
 static void bi_fun_task_exec(run_t *run);
 
-/** Declare builtin functions. */
+/** Declare builtin functions.
+ *
+ * @param bi    Builtin object
+ */
 void bi_fun_declare(builtin_t *bi)
 {
@@ -63 +67 @@
         csi = stree_csi_new(csi_class);
         csi->name = ident;
+        list_init(&csi->targ);
         list_init(&csi->members);
 
@@ -75 +80 @@
         list_append(&bi->program->module->members, modm);
 
+        /* Declare Builtin.Write(). */
+
+        fun_sym = builtin_declare_fun(csi, "Write");
+        builtin_fun_add_arg(fun_sym, "arg");
+
         /* Declare Builtin.WriteLine(). */
 
@@ -88 +98 @@
 }
 
-/** Bind builtin functions. */
+/** Bind builtin functions.
+ *
+ * @param bi    Builtin object
+ */
 void bi_fun_bind(builtin_t *bi)
 {
+        builtin_fun_bind(bi, "Builtin", "Write", bi_fun_builtin_write);
         builtin_fun_bind(bi, "Builtin", "WriteLine", bi_fun_builtin_writeline);
         builtin_fun_bind(bi, "Task", "Exec", bi_fun_task_exec);
 }
 
-/** Write a line of output. */
-static void bi_fun_builtin_writeline(run_t *run)
+/** Write to the console.
+ *
+ * @param run   Runner object
+ */
+static void bi_fun_builtin_write(run_t *run)
 {
         rdata_var_t *var;
@@ -103 +120 @@
 
 #ifdef DEBUG_RUN_TRACE
-        printf("Called Builtin.WriteLine()\n");
+        printf("Called Builtin.Write()\n");
 #endif
         var = run_local_vars_lookup(run, strtab_get_sid("arg"));
@@ -109 +126 @@
 
         switch (var->vc) {
+        case vc_bool:
+                printf("%s", var->u.bool_v->value ? "true" : "false");
+                break;
         case vc_char:
                 rc = bigint_get_value_int(&var->u.char_v->value, &char_val);
                 if (rc == EOK)
-                        printf("%lc\n", char_val);
+                        printf("%lc", char_val);
                 else
-                        printf("???\n");
+                        printf("???");
                 break;
         case vc_int:
                 bigint_print(&var->u.int_v->value);
-                putchar('\n');
                 break;
         case vc_string:
-                printf("%s\n", var->u.string_v->value);
+                printf("%s", var->u.string_v->value);
                 break;
         default:
-                printf("Unimplemented: writeLine() with unsupported type.\n");
-                exit(1);
-        }
-}
-
-/** Start an executable and wait for it to finish. */
+                printf("Unimplemented: Write() with unsupported type.\n");
+                exit(1);
+        }
+}
+
+/** Write a line of output.
+ *
+ * @param run   Runner object
+ */
+static void bi_fun_builtin_writeline(run_t *run)
+{
+#ifdef DEBUG_RUN_TRACE
+        printf("Called Builtin.WriteLine()\n");
+#endif
+        bi_fun_builtin_write(run);
+        putchar('\n');
+}
+
+/** Start an executable and wait for it to finish.
+ *
+ * @param run   Runner object
+ */
 static void bi_fun_task_exec(run_t *run)
 {
@@ -137 +172 @@
         rdata_var_t *arg;
         int idx, dim;
-        char **cmd;
+        const char **cmd;
 
 #ifdef DEBUG_RUN_TRACE
@@ -178 +213 @@
         cmd[dim] = '\0';
 
-        if (os_exec(cmd) != EOK) {
+        if (os_exec((char * const *)cmd) != EOK) {
                 printf("Error: Exec failed.\n");
                 exit(1);