Changeset d011038 in mainline for uspace/app/sbi/src/builtin/bi_console.c

Timestamp:

2011-03-29T20:12:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8f17503

Parents:

c4fb95d3 (diff), 93ebe4e (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 mainline changes.

File:

• uspace/app/sbi/src/builtin/bi_console.c (moved) (moved from uspace/app/sbi/src/builtin/bi_fun.c ) (9 diffs)

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

@@ -27 +27 @@
  */
 
-/** @file Builtin functions. */
+/** @file Console builtin binding. */
 
 #include <stdio.h>
@@ -36 +36 @@
 #include "../list.h"
 #include "../mytypes.h"
-#include "../os/os.h"
 #include "../run.h"
 #include "../stree.h"
@@ -42 +41 @@
 #include "../symbol.h"
 
-#include "bi_fun.h"
+#include "bi_console.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);
+static void bi_console_write(run_t *run);
+static void bi_console_writeline(run_t *run);
 
-/** Declare builtin functions.
+/** Declare Console builtin.
  *
  * @param bi    Builtin object
  */
-void bi_fun_declare(builtin_t *bi)
+void bi_console_declare(builtin_t *bi)
 {
         stree_modm_t *modm;
@@ -63 +61 @@
 
         ident = stree_ident_new();
-        ident->sid = strtab_get_sid("Builtin");
+        ident->sid = strtab_get_sid("Console");
 
         csi = stree_csi_new(csi_class);
@@ -89 +87 @@
         fun_sym = builtin_declare_fun(csi, "WriteLine");
         builtin_fun_add_arg(fun_sym, "arg");
-
-        /* Declare class Task. */
-
-        builtin_code_snippet(bi,
-                "class Task is\n"
-                        "fun Exec(args : string[], packed), static, builtin;\n"
-                "end\n");
 }
 
@@ -102 +93 @@
  * @param bi    Builtin object
  */
-void bi_fun_bind(builtin_t *bi)
+void bi_console_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);
+        builtin_fun_bind(bi, "Console", "Write", bi_console_write);
+        builtin_fun_bind(bi, "Console", "WriteLine", bi_console_writeline);
 }
 
@@ -113 +103 @@
  * @param run   Runner object
  */
-static void bi_fun_builtin_write(run_t *run)
+static void bi_console_write(run_t *run)
 {
         rdata_var_t *var;
@@ -120 +110 @@
 
 #ifdef DEBUG_RUN_TRACE
-        printf("Called Builtin.Write()\n");
+        printf("Called Console.Write()\n");
 #endif
         var = run_local_vars_lookup(run, strtab_get_sid("arg"));
@@ -152 +142 @@
  * @param run   Runner object
  */
-static void bi_fun_builtin_writeline(run_t *run)
+static void bi_console_writeline(run_t *run)
 {
 #ifdef DEBUG_RUN_TRACE
-        printf("Called Builtin.WriteLine()\n");
+        printf("Called Console.WriteLine()\n");
 #endif
-        bi_fun_builtin_write(run);
+        bi_console_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)
-{
-        rdata_var_t *args;
-        rdata_var_t *var;
-        rdata_array_t *array;
-        rdata_var_t *arg;
-        int idx, dim;
-        const char **cmd;
-
-#ifdef DEBUG_RUN_TRACE
-        printf("Called Task.Exec()\n");
-#endif
-        args = run_local_vars_lookup(run, strtab_get_sid("args"));
-
-        assert(args);
-        assert(args->vc == vc_ref);
-
-        var = args->u.ref_v->vref;
-        assert(var->vc == vc_array);
-
-        array = var->u.array_v;
-        assert(array->rank == 1);
-        dim = array->extent[0];
-
-        if (dim == 0) {
-                printf("Error: Builtin.Exec() expects at least one argument.\n");
-                exit(1);
-        }
-
-        cmd = calloc(dim + 1, sizeof(char *));
-        if (cmd == NULL) {
-                printf("Memory allocation failed.\n");
-                exit(1);
-        }
-
-        for (idx = 0; idx < dim; ++idx) {
-                arg = array->element[idx];
-                if (arg->vc != vc_string) {
-                        printf("Error: Argument to Builtin.Exec() must be "
-                            "string (found %d).\n", arg->vc);
-                        exit(1);
-                }
-
-                cmd[idx] = arg->u.string_v->value;
-        }
-
-        cmd[dim] = '\0';
-
-        if (os_exec((char * const *)cmd) != EOK) {
-                printf("Error: Exec failed.\n");
-                exit(1);
-        }
-}