Index: uspace/app/sbi/src/builtin/bi_console.c =================================================================== --- uspace/app/sbi/src/builtin/bi_console.c (revision cfbcd86527baadf8d06a61c7d65f4bbe8facaf82) +++ uspace/app/sbi/src/builtin/bi_console.c (revision cfbcd86527baadf8d06a61c7d65f4bbe8facaf82) @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @file Console builtin binding. */ + +#include +#include +#include +#include "../bigint.h" +#include "../builtin.h" +#include "../list.h" +#include "../mytypes.h" +#include "../run.h" +#include "../stree.h" +#include "../strtab.h" +#include "../symbol.h" + +#include "bi_console.h" + +static void bi_console_write(run_t *run); +static void bi_console_writeline(run_t *run); + +/** Declare Console builtin. + * + * @param bi Builtin object + */ +void bi_console_declare(builtin_t *bi) +{ + stree_modm_t *modm; + stree_csi_t *csi; + stree_ident_t *ident; + stree_symbol_t *symbol; + stree_symbol_t *fun_sym; + + /* Declare class Builtin */ + + ident = stree_ident_new(); + ident->sid = strtab_get_sid("Console"); + + csi = stree_csi_new(csi_class); + csi->name = ident; + list_init(&csi->targ); + list_init(&csi->members); + + modm = stree_modm_new(mc_csi); + modm->u.csi = csi; + + symbol = stree_symbol_new(sc_csi); + symbol->u.csi = csi; + symbol->outer_csi = NULL; + csi->symbol = symbol; + + 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(). */ + + fun_sym = builtin_declare_fun(csi, "WriteLine"); + builtin_fun_add_arg(fun_sym, "arg"); +} + +/** Bind builtin functions. + * + * @param bi Builtin object + */ +void bi_console_bind(builtin_t *bi) +{ + builtin_fun_bind(bi, "Console", "Write", bi_console_write); + builtin_fun_bind(bi, "Console", "WriteLine", bi_console_writeline); +} + +/** Write to the console. + * + * @param run Runner object + */ +static void bi_console_write(run_t *run) +{ + rdata_var_t *var; + int char_val; + int rc; + +#ifdef DEBUG_RUN_TRACE + printf("Called Console.Write()\n"); +#endif + var = run_local_vars_lookup(run, strtab_get_sid("arg")); + assert(var); + + 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", char_val); + else + printf("???"); + break; + case vc_int: + bigint_print(&var->u.int_v->value); + break; + case vc_string: + printf("%s", var->u.string_v->value); + break; + default: + printf("Unimplemented: Write() with unsupported type.\n"); + exit(1); + } +} + +/** Write a line of output. + * + * @param run Runner object + */ +static void bi_console_writeline(run_t *run) +{ +#ifdef DEBUG_RUN_TRACE + printf("Called Console.WriteLine()\n"); +#endif + bi_console_write(run); + putchar('\n'); +} Index: uspace/app/sbi/src/builtin/bi_console.h =================================================================== --- uspace/app/sbi/src/builtin/bi_console.h (revision cfbcd86527baadf8d06a61c7d65f4bbe8facaf82) +++ uspace/app/sbi/src/builtin/bi_console.h (revision cfbcd86527baadf8d06a61c7d65f4bbe8facaf82) @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef BI_CONSOLE_H_ +#define BI_CONSOLE_H_ + +#include "../mytypes.h" + +void bi_console_declare(builtin_t *bi); +void bi_console_bind(builtin_t *bi); + +#endif Index: uspace/app/sbi/src/builtin/bi_fun.c =================================================================== --- uspace/app/sbi/src/builtin/bi_fun.c (revision c5cb943d5d19ad0d75578f54188f2491dfd64937) +++ (revision ) @@ -1,219 +1,0 @@ -/* - * Copyright (c) 2010 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @file Builtin functions. */ - -#include -#include -#include -#include "../bigint.h" -#include "../builtin.h" -#include "../list.h" -#include "../mytypes.h" -#include "../os/os.h" -#include "../run.h" -#include "../stree.h" -#include "../strtab.h" -#include "../symbol.h" - -#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. - * - * @param bi Builtin object - */ -void bi_fun_declare(builtin_t *bi) -{ - stree_modm_t *modm; - stree_csi_t *csi; - stree_ident_t *ident; - stree_symbol_t *symbol; - stree_symbol_t *fun_sym; - - /* Declare class Builtin */ - - ident = stree_ident_new(); - ident->sid = strtab_get_sid("Builtin"); - - csi = stree_csi_new(csi_class); - csi->name = ident; - list_init(&csi->targ); - list_init(&csi->members); - - modm = stree_modm_new(mc_csi); - modm->u.csi = csi; - - symbol = stree_symbol_new(sc_csi); - symbol->u.csi = csi; - symbol->outer_csi = NULL; - csi->symbol = symbol; - - 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(). */ - - 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"); -} - -/** 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 to the console. - * - * @param run Runner object - */ -static void bi_fun_builtin_write(run_t *run) -{ - rdata_var_t *var; - int char_val; - int rc; - -#ifdef DEBUG_RUN_TRACE - printf("Called Builtin.Write()\n"); -#endif - var = run_local_vars_lookup(run, strtab_get_sid("arg")); - assert(var); - - 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", char_val); - else - printf("???"); - break; - case vc_int: - bigint_print(&var->u.int_v->value); - break; - case vc_string: - printf("%s", var->u.string_v->value); - break; - default: - 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) -{ - 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); - } -} Index: uspace/app/sbi/src/builtin/bi_fun.h =================================================================== --- uspace/app/sbi/src/builtin/bi_fun.h (revision c5cb943d5d19ad0d75578f54188f2491dfd64937) +++ (revision ) @@ -1,37 +1,0 @@ -/* - * Copyright (c) 2010 Jiri Svoboda - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef BI_FUN_H_ -#define BI_FUN_H_ - -#include "../mytypes.h" - -void bi_fun_declare(builtin_t *bi); -void bi_fun_bind(builtin_t *bi); - -#endif Index: uspace/app/sbi/src/builtin/bi_task.c =================================================================== --- uspace/app/sbi/src/builtin/bi_task.c (revision cfbcd86527baadf8d06a61c7d65f4bbe8facaf82) +++ uspace/app/sbi/src/builtin/bi_task.c (revision cfbcd86527baadf8d06a61c7d65f4bbe8facaf82) @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @file Task builtin binding. */ + +#include +#include +#include +#include "../builtin.h" +#include "../list.h" +#include "../mytypes.h" +#include "../os/os.h" +#include "../run.h" +#include "../strtab.h" + +#include "bi_task.h" + +static void bi_task_exec(run_t *run); + +/** Declare task builtin. + * + * @param bi Builtin object + */ +void bi_task_declare(builtin_t *bi) +{ + builtin_code_snippet(bi, + "class Task is\n" + "fun Exec(args : string[], packed), static, builtin;\n" + "end\n"); +} + +/** Bind builtin functions. + * + * @param bi Builtin object + */ +void bi_task_bind(builtin_t *bi) +{ + builtin_fun_bind(bi, "Task", "Exec", bi_task_exec); +} + +/** Start an executable and wait for it to finish. + * + * @param run Runner object + */ +static void bi_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); + } +} Index: uspace/app/sbi/src/builtin/bi_task.h =================================================================== --- uspace/app/sbi/src/builtin/bi_task.h (revision cfbcd86527baadf8d06a61c7d65f4bbe8facaf82) +++ uspace/app/sbi/src/builtin/bi_task.h (revision cfbcd86527baadf8d06a61c7d65f4bbe8facaf82) @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef BI_TASK_H_ +#define BI_TASK_H_ + +#include "../mytypes.h" + +void bi_task_declare(builtin_t *bi); +void bi_task_bind(builtin_t *bi); + +#endif