From 3e1f0315763d9d288c4f9ce5b7cdd9cbdad38e8f Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Wed, 7 Feb 2018 00:44:51 -0500 Subject: [PATCH] Self host the repl, remove linenoise, and selfhost the main client. --- CMakeLists.txt | 18 +- LICENSE | 25 - src/compiler/boot.dst | 88 +++ src/compiler/compile.c | 19 +- src/compiler/context.c | 236 ------- src/compiler/run.c | 75 +++ src/compiler/stl.c | 13 +- src/core/corelib.c | 21 +- src/core/fiber.c | 1 + src/core/io.c | 2 +- src/include/dst/dstcompile.h | 40 +- src/include/dst/dstcorelib.h | 5 +- src/mainclient/init.dst | 7 + src/mainclient/linenoise.c | 1206 ---------------------------------- src/mainclient/linenoise.h | 73 -- src/mainclient/main.c | 155 +---- src/parser/parse.c | 21 +- test/suite0.dst | 4 +- 18 files changed, 255 insertions(+), 1754 deletions(-) delete mode 100644 src/compiler/context.c create mode 100644 src/compiler/run.c create mode 100644 src/mainclient/init.dst delete mode 100644 src/mainclient/linenoise.c delete mode 100644 src/mainclient/linenoise.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e3a5788..692f812b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,18 +40,26 @@ add_custom_command( COMMENT "Generating stl bootstrap C header for embedding" ) +# Generate header containing main client script +add_custom_command( + OUTPUT clientinit.h + COMMAND xxd ${CMAKE_CURRENT_SOURCE_DIR}/src/mainclient/init.dst clientinit.h dst_mainclient_init + DEPENDS xxd src/mainclient/init.dst + COMMENT "Generating mainclient init C header for embedding" +) + set(ASSEMBLER_SOURCES src/assembler/asm.c ) set(COMPILER_SOURCES src/compiler/compile.c -src/compiler/specials.c src/compiler/cfuns.c -src/compiler/context.c +src/compiler/run.c +src/compiler/specials.c src/compiler/stl.c -dststlbootstrap.h +dststlbootstrap.h src/compiler/compile.h ) @@ -83,9 +91,7 @@ src/core/util.h set(MAINCLIENT_SOURCES src/mainclient/main.c -src/mainclient/linenoise.c - -src/mainclient/linenoise.h +clientinit.h ) set(PARSER_SOURCES diff --git a/LICENSE b/LICENSE index ef1cfd1e..4e5a480d 100644 --- a/LICENSE +++ b/LICENSE @@ -17,28 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Copyright (c) 2010-2014, Salvatore Sanfilippo -Copyright (c) 2010-2013, Pieter Noordhuis - -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. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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 diff --git a/src/compiler/boot.dst b/src/compiler/boot.dst index bc25bf03..320f7640 100644 --- a/src/compiler/boot.dst +++ b/src/compiler/boot.dst @@ -9,6 +9,8 @@ [cond & body] (tuple 'if cond (tuple-prepend body 'do))) +(def identity (fn [x] x)) + (def seq (do (defn array-seq [x] (def len (length x)) @@ -160,3 +162,89 @@ (varset! lastkey (next x lastkey)) ret) }) + +# Handle errors +(defn onerr [t e] + (print (string t " error: " e))) + +(var *read* nil) +(var *onvalue* identity) + +# Cache for require +(def require-loading @{}) + +# Create a char stream from a function that gets input +(defn char-stream [getchunk ondone] + (fiber (fn [parent] + (def buf @"") + (var len 1) + (while (< 0 len) + (buffer-clear buf) + (getchunk buf) + (varset! len (length buf)) + (for [i 0 len] + (transfer parent (get buf i)))) + (ondone)))) + +# Convert a charstream into a value +(defn val-stream [chars] + (fiber (fn [parent] + (var up parent) + (def me (fiber-current)) + (def p (parser)) + (while true + (def s (parser-status p)) + (if (= s :full) + (varset! up (transfer up (parser-produce p))) + (if (= s :error) + # Parse error + (onerr "parse" (parser-error p)) + # Normal state, get next char + (parser-byte p (transfer chars me)))))))) + +(defn require [path] + (when (get require-loading path) + (error (string "circular dependency: module " path "is already loading"))) + (def oldread *read*) + (def oldonvalue *onvalue*) + (def f (file-open path)) + (def getter (fn [buf] (file-read f 1024 buf))) + (def cs (char-stream getter (fn [] + (put require-loading path nil) + (file-close f) + (varset! *read* oldread) + (varset! *onvalue* oldonvalue) + nil))) + (def vs (val-stream cs)) + (varset! *onvalue* identity) + (varset! *read* (fn [] (transfer vs (fiber-current)))) + nil) + +(defn dorepl [] + (def oldread *read*) + (def cs (char-stream (fn [buf] + (file-write stdout ">> ") + (file-read stdin :line buf)) + (fn [] + (varset! *read* oldread) + nil))) + (def vs (val-stream cs)) + (varset! *onvalue* (fn [ret] + (put _env '_ @{'value ret}) + (describe ret))) + (varset! *read* (fn [] (transfer vs (fiber-current))))) + +# Main loop +(defn init-loop [] + (while *read* + (def wrapper (fiber (fn [] + (while *read* + (def source (*read*)) + (def res (compile source _env)) + (if (= (type res) :function) + (*onvalue* (res)) + (onerr "compile" (get res :error))))))) + (def eb (transfer wrapper)) + (if (= (fiber-status wrapper) :error) (onerr "runtime" eb)))) + +(defn init-repl [] (dorepl) (init-loop)) diff --git a/src/compiler/compile.c b/src/compiler/compile.c index bfac314d..11fdb371 100644 --- a/src/compiler/compile.c +++ b/src/compiler/compile.c @@ -995,23 +995,19 @@ int dst_compile_cfun(DstArgs args) { DstCompileResult res; DstTable *t; DstTable *env; - if (args.n < 1) - return dst_throw(args, "expected at least one argument"); - if (args.n >= 2) { - if (!dst_checktype(args.v[1], DST_TABLE)) return dst_throw(args, "expected table as environment"); - env = dst_unwrap_table(args.v[1]); - } else { - env = dst_stl_env(); - } + if (args.n < 2) + return dst_throw(args, "expected at least 2 arguments"); + if (!dst_checktype(args.v[1], DST_TABLE)) return dst_throw(args, "expected table as environment"); + env = dst_unwrap_table(args.v[1]); res = dst_compile(args.v[0], env, 0); if (res.status == DST_COMPILE_OK) { DstFunction *fun = dst_function(res.funcdef, NULL); return dst_return(args, dst_wrap_function(fun)); } else { t = dst_table(2); - dst_table_put(t, dst_cstringv("error"), dst_wrap_string(res.error)); - dst_table_put(t, dst_cstringv("error-start"), dst_wrap_integer(res.error_start)); - dst_table_put(t, dst_cstringv("error-end"), dst_wrap_integer(res.error_end)); + dst_table_put(t, dst_csymbolv(":error"), dst_wrap_string(res.error)); + dst_table_put(t, dst_csymbolv(":error-start"), dst_wrap_integer(res.error_start)); + dst_table_put(t, dst_csymbolv(":error-end"), dst_wrap_integer(res.error_end)); return dst_return(args, dst_wrap_table(t)); } } @@ -1021,4 +1017,3 @@ int dst_lib_compile(DstArgs args) { dst_env_def(env, "compile", dst_wrap_cfunction(dst_compile_cfun)); return 0; } - diff --git a/src/compiler/context.c b/src/compiler/context.c deleted file mode 100644 index b6065ffd..00000000 --- a/src/compiler/context.c +++ /dev/null @@ -1,236 +0,0 @@ -/* -* Copyright (c) 2017 Calvin Rose -* -* Permission is hereby granted, free of charge, to any person obtaining a copy -* of this software and associated documentation files (the "Software"), to -* deal in the Software without restriction, including without limitation the -* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -* sell copies of the Software, and to permit persons to whom the Software is -* furnished to do so, subject to the following conditions: -* -* The above copyright notice and this permission notice shall be included in -* all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -* IN THE SOFTWARE. -*/ - -#include -#include -#include - -#define CHUNKSIZE 1024 - -/* read input for a repl */ -static int replread(DstContext *c, enum DstParserStatus status) { - if (status == DST_PARSE_PENDING) - printf(">> "); - else - printf("> "); - for (;;) { - int x = fgetc(stdin); - if (x == EOF) { - dst_buffer_push_u8(&c->buffer, '\n'); - printf("\n"); - break; - } - dst_buffer_push_u8(&c->buffer, x); - if (x == '\n') break; - } - return 0; -} - -static int bytesread(DstContext *c, enum DstParserStatus status) { - const uint8_t *src = (const uint8_t *)(c->user); - (void) status; - int32_t n = CHUNKSIZE; - DstBuffer *b = &c->buffer; - b->count = 0; - if (!c->bufsize) { - dst_buffer_push_u8(b, '\n'); - return 1; - } - if (c->bufsize < n) n = c->bufsize; - dst_buffer_push_bytes(b, src, n); - c->bufsize -= n; - c->user = (void *)(src + n); - return 0; -} - -/* Chunk readers */ -static void filedeinit(DstContext *c) { - fclose((FILE *) (c->user)); -} - -/* Read chunk from file */ -static int32_t fileread(DstContext *c, enum DstParserStatus status) { - size_t nread; - FILE *f = (FILE *) c->user; - (void) status; - c->buffer.count = 0; - dst_buffer_ensure(&c->buffer, CHUNKSIZE); - nread = fread(c->buffer.data, 1, CHUNKSIZE, f); - if (nread != CHUNKSIZE && ferror(f)) { - return -1; - } - c->buffer.count = (int32_t) nread; - return 0; -} - -/* Output for a repl */ -static void replonvalue(DstContext *c, Dst value) { - (void) c; - dst_puts(dst_formatc("%v\n", value)); - dst_env_def(c->env, "_", value); -} - -/* Handle errors on repl */ -static void simpleerror(DstContext *c, enum DstContextErrorType type, Dst err, size_t start, size_t end) { - const char *errtype = ""; - (void) c; - (void) start; - (void) end; - switch (type) { - case DST_CONTEXT_ERROR_PARSE: - errtype = "parse"; - break; - case DST_CONTEXT_ERROR_RUNTIME: - errtype = "runtime"; - break; - case DST_CONTEXT_ERROR_COMPILE: - errtype = "compile"; - break; - } - dst_puts(dst_formatc("%s error: %s\n", errtype, dst_to_string(err))); -} - -void dst_context_init(DstContext *c, DstTable *env) { - dst_buffer_init(&c->buffer, CHUNKSIZE); - c->env = env; - dst_gcroot(dst_wrap_table(env)); - c->index = 0; - c->read_chunk = NULL; - c->on_error = NULL; - c->on_value = NULL; - c->deinit = NULL; -} - -void dst_context_deinit(DstContext *c) { - dst_buffer_deinit(&c->buffer); - if (c->deinit) c->deinit(c); - dst_gcunroot(dst_wrap_table(c->env)); -} - -int dst_context_repl(DstContext *c, DstTable *env) { - dst_context_init(c, env); - c->user = NULL; - dst_env_def(c->env, "_", dst_wrap_nil()); - c->read_chunk = replread; - c->on_error = simpleerror; - c->on_value = replonvalue; - return 0; -} - -int dst_context_file(DstContext *c, DstTable *env, const char *path) { - FILE *f = fopen(path, "r"); - if (!f) { - return -1; - } - dst_context_init(c, env); - c->user = f; - c->read_chunk = fileread; - c->on_error = simpleerror; - c->deinit = filedeinit; - return 0; -} - -int dst_context_bytes(DstContext *c, DstTable *env, const uint8_t *bytes, int32_t len) { - dst_context_init(c, env); - c->user = (void *) bytes; - c->bufsize = len; - c->read_chunk = bytesread; - return 0; -} - -/* Do something on an error. Return flags to or with current flags. */ -static int doerror( - DstContext *c, - enum DstContextErrorType type, - Dst err, - int32_t bstart, - int32_t bend) { - if (c->on_error) { - c->on_error(c, type, - err, - bstart, - bend); - } - return 1 << type; -} - -/* Start a context */ -int dst_context_run(DstContext *c, int flags) { - int done = 0; - int errflags = 0; - DstParser parser; - enum DstParserStatus status; - dst_parser_init(&parser, flags); - while (!done) { - int bufferdone = 0; - while (!bufferdone) { - status = dst_parser_status(&parser); - switch (status) { - case DST_PARSE_FULL: - { - DstCompileResult cres = dst_compile(dst_parser_produce(&parser), c->env, flags); - if (cres.status == DST_COMPILE_OK) { - DstFunction *f = dst_function(cres.funcdef, NULL); - Dst ret; - if (dst_run(dst_wrap_function(f), &ret)) { - /* Get location from stacktrace? */ - errflags |= doerror(c, DST_CONTEXT_ERROR_RUNTIME, ret, -1, -1); - } else { - if (c->on_value) { - c->on_value(c, ret); - } - } - } else { - errflags |= doerror(c, DST_CONTEXT_ERROR_COMPILE, - dst_wrap_string(cres.error), - cres.error_start, - cres.error_end); - } - } - break; - case DST_PARSE_ERROR: - doerror(c, DST_CONTEXT_ERROR_PARSE, - dst_cstringv(dst_parser_error(&parser)), - parser.index, - parser.index); - break; - case DST_PARSE_PENDING: - case DST_PARSE_ROOT: - if (c->index >= c->buffer.count) { - bufferdone = 1; - break; - } - dst_parser_consume(&parser, c->buffer.data[c->index++]); - break; - } - } - /* Refill the buffer */ - c->buffer.count = 0; - c->index = 0; - if (c->read_chunk(c, status) || c->buffer.count == 0) { - done = 1; - } - } - - dst_parser_deinit(&parser); - return errflags; -} diff --git a/src/compiler/run.c b/src/compiler/run.c new file mode 100644 index 00000000..c21564e9 --- /dev/null +++ b/src/compiler/run.c @@ -0,0 +1,75 @@ +/* +* Copyright (c) 2017 Calvin Rose +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to +* deal in the Software without restriction, including without limitation the +* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +* sell copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +*/ + +#include +#include +#include +#include + +/* Run a string */ +int dst_dobytes(DstTable *env, const uint8_t *bytes, int32_t len) { + DstParser parser; + int errflags = 0; + int32_t index = 0; + + dst_parser_init(&parser, DST_PARSEFLAG_SOURCEMAP); + for (;;) { + switch (dst_parser_status(&parser)) { + case DST_PARSE_FULL: + { + Dst form = dst_parser_produce(&parser); + DstCompileResult cres = dst_compile(form, env, 0); + if (cres.status == DST_COMPILE_OK) { + DstFunction *f = dst_function(cres.funcdef, NULL); + Dst ret; + if (dst_run(dst_wrap_function(f), &ret)) { + printf("internal runtime error: %s\n", (const char *) dst_to_string(ret)); + errflags |= 0x01; + } + } else { + printf("internal compile error: %s\n", (const char *) cres.error); + errflags |= 0x02; + } + } + break; + case DST_PARSE_ERROR: + errflags |= 0x04; + printf("internal parse error: %s\n", dst_parser_error(&parser)); + break; + case DST_PARSE_PENDING: + if (index >= len) + printf("internal parse error: unexpected end of source\n"); + /* fallthrough */ + case DST_PARSE_ROOT: + if (index >= len) return errflags; + dst_parser_consume(&parser, bytes[index++]); + break; + } + } +} + +int dst_dostring(DstTable *env, const char *str) { + int32_t len = 0; + while (str[len]) ++len; + return dst_dobytes(env, (const uint8_t *)str, len); +} + diff --git a/src/compiler/stl.c b/src/compiler/stl.c index a2fd0f9d..b1b1c32a 100644 --- a/src/compiler/stl.c +++ b/src/compiler/stl.c @@ -42,13 +42,16 @@ static const DstReg cfuns[] = { {"tuple", dst_core_tuple}, {"struct", dst_core_struct}, {"fiber", dst_core_fiber}, - {"status", dst_core_status}, + {"fiber-status", dst_core_fiber_status}, + {"fiber-current", dst_core_fiber_current}, {"buffer", dst_core_buffer}, {"gensym", dst_core_gensym}, {"get", dst_core_get}, {"put", dst_core_put}, {"length", dst_core_length}, {"gccollect", dst_core_gccollect}, + {"gcsetinterval", dst_core_gcsetinterval}, + {"gcinterval", dst_core_gcinterval}, {"type", dst_core_type}, {"next", dst_core_next}, {"hash", dst_core_hash}, @@ -88,6 +91,8 @@ DstTable *dst_stl_env() { dst_env_def(env, "yield", dst_wrap_function(dst_quick_asm(1, 0, 2, yield_asm, sizeof(yield_asm)))); dst_env_def(env, "transfer", dst_wrap_function(dst_quick_asm(2, 0, 2, transfer_asm, sizeof(transfer_asm)))); + dst_env_def(env, "VERSION", dst_cstringv(DST_VERSION)); + /* Allow references to the environment */ dst_env_def(env, "_env", ret); @@ -111,11 +116,7 @@ DstTable *dst_stl_env() { } /* Run bootstrap source */ - { - DstContext ctxt; - dst_context_bytes(&ctxt, env, dst_stl_bootstrap_gen, sizeof(dst_stl_bootstrap_gen)); - dst_context_run(&ctxt, 0); - } + dst_dobytes(env, dst_stl_bootstrap_gen, sizeof(dst_stl_bootstrap_gen)); dst_gcunroot(dst_wrap_table(env)); diff --git a/src/core/corelib.c b/src/core/corelib.c index b0e02c23..76d72f3b 100644 --- a/src/core/corelib.c +++ b/src/core/corelib.c @@ -139,8 +139,8 @@ int dst_core_fiber(DstArgs args) { if (args.n < 1) return dst_throw(args, "expected at least one argument"); if (!dst_checktype(args.v[0], DST_FUNCTION)) return dst_throw(args, "expected a function"); fiber = dst_fiber(64); - dst_fiber_funcframe(fiber, dst_unwrap_function(args.v[0])); fiber->parent = dst_vm_fiber; + dst_fiber_funcframe(fiber, dst_unwrap_function(args.v[0])); return dst_return(args, dst_wrap_fiber(fiber)); } @@ -172,7 +172,7 @@ int dst_core_get(DstArgs args) { return dst_return(args, ds); } -int dst_core_status(DstArgs args) { +int dst_core_fiber_status(DstArgs args) { const char *status = ""; if (args.n != 1) return dst_throw(args, "expected 1 argument"); if (!dst_checktype(args.v[0], DST_FIBER)) return dst_throw(args, "expected fiber"); @@ -196,6 +196,10 @@ int dst_core_status(DstArgs args) { return dst_return(args, dst_csymbolv(status)); } +int dst_core_fiber_current(DstArgs args) { + return dst_return(args, dst_wrap_fiber(dst_vm_fiber)); +} + int dst_core_put(DstArgs args) { Dst ds, key, value; DstArgs subargs = args; @@ -215,6 +219,19 @@ int dst_core_gccollect(DstArgs args) { return 0; } +int dst_core_gcsetinterval(DstArgs args) { + if (args.n < 1 || + !dst_checktype(args.v[0], DST_INTEGER) || + dst_unwrap_integer(args.v[0]) < 0) + return dst_throw(args, "expected non-negative integer"); + dst_vm_gc_interval = dst_unwrap_integer(args.v[0]); + return dst_return(args, dst_wrap_integer(dst_vm_gc_interval)); +} + +int dst_core_gcinterval(DstArgs args) { + return dst_return(args, dst_wrap_integer(dst_vm_gc_interval)); +} + int dst_core_type(DstArgs args) { if (args.n != 1) return dst_throw(args, "expected 1 argument"); if (dst_checktype(args.v[0], DST_ABSTRACT)) { diff --git a/src/core/fiber.c b/src/core/fiber.c index 1f501881..9ade2dfa 100644 --- a/src/core/fiber.c +++ b/src/core/fiber.c @@ -253,6 +253,7 @@ void dst_fiber_cframe(DstFiber *fiber) { * NULL if there are no more frames */ void dst_fiber_popframe(DstFiber *fiber) { DstStackFrame *frame = dst_fiber_frame(fiber); + if (fiber->frame == 0) return; /* Clean up the frame (detach environments) */ if (NULL != frame->func) diff --git a/src/core/io.c b/src/core/io.c index a47cbb0d..838c4a69 100644 --- a/src/core/io.c +++ b/src/core/io.c @@ -206,7 +206,7 @@ static int dst_io_fread(DstArgs args) { ntoread = len; nread = fread((char *)(b->data + b->count), 1, ntoread, iof->file); if (nread != ntoread && ferror(iof->file)) return dst_throw(args, "could not read file"); - b->count += len; + b->count += nread; return dst_return(args, dst_wrap_buffer(b)); } diff --git a/src/include/dst/dstcompile.h b/src/include/dst/dstcompile.h index a0e38cfa..1eb39448 100644 --- a/src/include/dst/dstcompile.h +++ b/src/include/dst/dstcompile.h @@ -28,7 +28,6 @@ extern "C" { #endif #include "dsttypes.h" -#include "dstparse.h" typedef struct DstCompileOptions DstCompileOptions; typedef struct DstCompileResult DstCompileResult; @@ -47,47 +46,14 @@ DstCompileResult dst_compile(Dst source, DstTable *env, int flags); int dst_compile_cfun(DstArgs args); int dst_lib_compile(DstArgs args); -/* Context - for executing dst in the interpretted form. */ -typedef struct DstContext DstContext; - /* Get the default environment for dst */ DstTable *dst_stl_env(); -/* Different levels of reporting and configuration */ -void dst_context_init(DstContext *c, DstTable *env); -int dst_context_file(DstContext *c, DstTable *env, const char *path); -int dst_context_repl(DstContext *c, DstTable *env); -int dst_context_bytes(DstContext *c, DstTable *env, const uint8_t *bytes, int32_t len); - -/* Evaluate a form in the context */ -int dst_context_run(DstContext *c, int flags); - -void dst_context_deinit(DstContext *c); - -/* Parse structs */ -enum DstContextErrorType { - DST_CONTEXT_ERROR_PARSE, - DST_CONTEXT_ERROR_COMPILE, - DST_CONTEXT_ERROR_RUNTIME -}; - -/* Evaluation context. Encapsulates parsing and compiling for easier integration - * with client programs. */ -struct DstContext { - DstTable *env; - DstBuffer buffer; - void *user; - int32_t bufsize; - int32_t index; - - int (*read_chunk)(DstContext *self, enum DstParserStatus status); - void (*on_error)(DstContext *self, enum DstContextErrorType type, Dst err, size_t start, size_t end); - void (*on_value)(DstContext *self, Dst value); - void (*deinit)(DstContext *self); -}; +int dst_dobytes(DstTable *env, const uint8_t *bytes, int32_t len); +int dst_dostring(DstTable *env, const char *str); #ifdef __cplusplus } #endif -#endif /* DST_COMPILE_H_defined */ +#endif diff --git a/src/include/dst/dstcorelib.h b/src/include/dst/dstcorelib.h index 63fe4067..e97feaf5 100644 --- a/src/include/dst/dstcorelib.h +++ b/src/include/dst/dstcorelib.h @@ -84,9 +84,12 @@ int dst_core_buffer(DstArgs args); int dst_core_gensym(DstArgs args); int dst_core_length(DstArgs args); int dst_core_get(DstArgs args); -int dst_core_status(DstArgs args); +int dst_core_fiber_status(DstArgs args); +int dst_core_fiber_current(DstArgs args); int dst_core_put(DstArgs args); int dst_core_gccollect(DstArgs args); +int dst_core_gcsetinterval(DstArgs args); +int dst_core_gcinterval(DstArgs args); int dst_core_type(DstArgs args); int dst_core_next(DstArgs args); int dst_core_hash(DstArgs args); diff --git a/src/mainclient/init.dst b/src/mainclient/init.dst new file mode 100644 index 00000000..8acf0e5b --- /dev/null +++ b/src/mainclient/init.dst @@ -0,0 +1,7 @@ +(print (string "Dst " VERSION " Copyright (C) 2017-2018 Calvin Rose")) + +# Process arguments +(for [i 0 (length args)] + (print (get args i))) + +(init-repl) diff --git a/src/mainclient/linenoise.c b/src/mainclient/linenoise.c deleted file mode 100644 index 800eeb4d..00000000 --- a/src/mainclient/linenoise.c +++ /dev/null @@ -1,1206 +0,0 @@ -/* linenoise.c -- guerrilla line editing library against the idea that a - * line editing lib needs to be 20,000 lines of C code. - * - * You can find the latest source code at: - * - * http://github.com/antirez/linenoise - * - * Does a number of crazy assumptions that happen to be true in 99.9999% of - * the 2010 UNIX computers around. - * - * ------------------------------------------------------------------------ - * - * Copyright (c) 2010-2016, Salvatore Sanfilippo - * Copyright (c) 2010-2013, Pieter Noordhuis - * - * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "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 COPYRIGHT - * HOLDER OR CONTRIBUTORS 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. - * - * ------------------------------------------------------------------------ - * - * References: - * - http://invisible-island.net/xterm/ctlseqs/ctlseqs.html - * - http://www.3waylabs.com/nw/WWW/products/wizcon/vt220.html - * - * Todo list: - * - Filter bogus Ctrl+ combinations. - * - Win32 support - * - * Bloat: - * - History search like Ctrl+r in readline? - * - * List of escape sequences used by this program, we do everything just - * with three sequences. In order to be so cheap we may have some - * flickering effect with some slow terminal, but the lesser sequences - * the more compatible. - * - * EL (Erase Line) - * Sequence: ESC [ n K - * Effect: if n is 0 or missing, clear from cursor to end of line - * Effect: if n is 1, clear from beginning of line to cursor - * Effect: if n is 2, clear entire line - * - * CUF (CUrsor Forward) - * Sequence: ESC [ n C - * Effect: moves cursor forward n chars - * - * CUB (CUrsor Backward) - * Sequence: ESC [ n D - * Effect: moves cursor backward n chars - * - * The following is used to get the terminal width if getting - * the width with the TIOCGWINSZ ioctl fails - * - * DSR (Device Status Report) - * Sequence: ESC [ 6 n - * Effect: reports the current cusor position as ESC [ n ; m R - * where n is the row and m is the column - * - * When multi line mode is enabled, we also use an additional escape - * sequence. However multi line editing is disabled by default. - * - * CUU (Cursor Up) - * Sequence: ESC [ n A - * Effect: moves cursor up of n chars. - * - * CUD (Cursor Down) - * Sequence: ESC [ n B - * Effect: moves cursor down of n chars. - * - * When linenoiseClearScreen() is called, two additional escape sequences - * are used in order to clear the screen and position the cursor at home - * position. - * - * CUP (Cursor position) - * Sequence: ESC [ H - * Effect: moves the cursor to upper left corner - * - * ED (Erase display) - * Sequence: ESC [ 2 J - * Effect: clear the whole screen - * - */ - -/* On Windows, have a minimal implementation */ -#ifdef WIN32 - -#else - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "linenoise.h" - -#define LINENOISE_DEFAULT_HISTORY_MAX_LEN 100 -#define LINENOISE_MAX_LINE 4096 -static char *unsupported_term[] = {"dumb","cons25","emacs",NULL}; -static linenoiseCompletionCallback *completionCallback = NULL; -static linenoiseHintsCallback *hintsCallback = NULL; -static linenoiseFreeHintsCallback *freeHintsCallback = NULL; - -static struct termios orig_termios; /* In order to restore at exit.*/ -static int rawmode = 0; /* For atexit() function to check if restore is needed*/ -static int mlmode = 0; /* Multi line mode. Default is single line. */ -static int atexit_registered = 0; /* Register atexit just 1 time. */ -static int history_max_len = LINENOISE_DEFAULT_HISTORY_MAX_LEN; -static int history_len = 0; -static char **history = NULL; - -/* The linenoiseState structure represents the state during line editing. - * We pass this state to functions implementing specific editing - * functionalities. */ -struct linenoiseState { - int ifd; /* Terminal stdin file descriptor. */ - int ofd; /* Terminal stdout file descriptor. */ - char *buf; /* Edited line buffer. */ - size_t buflen; /* Edited line buffer size. */ - const char *prompt; /* Prompt to display. */ - size_t plen; /* Prompt length. */ - size_t pos; /* Current cursor position. */ - size_t oldpos; /* Previous refresh cursor position. */ - size_t len; /* Current edited line length. */ - size_t cols; /* Number of columns in terminal. */ - size_t maxrows; /* Maximum num of rows used so far (multiline mode) */ - int history_index; /* The history index we are currently editing. */ -}; - -enum KEY_ACTION{ - KEY_NULL = 0, /* NULL */ - CTRL_A = 1, /* Ctrl+a */ - CTRL_B = 2, /* Ctrl-b */ - CTRL_C = 3, /* Ctrl-c */ - CTRL_D = 4, /* Ctrl-d */ - CTRL_E = 5, /* Ctrl-e */ - CTRL_F = 6, /* Ctrl-f */ - CTRL_H = 8, /* Ctrl-h */ - TAB = 9, /* Tab */ - CTRL_K = 11, /* Ctrl+k */ - CTRL_L = 12, /* Ctrl+l */ - ENTER = 13, /* Enter */ - CTRL_N = 14, /* Ctrl-n */ - CTRL_P = 16, /* Ctrl-p */ - CTRL_T = 20, /* Ctrl-t */ - CTRL_U = 21, /* Ctrl+u */ - CTRL_W = 23, /* Ctrl+w */ - ESC = 27, /* Escape */ - BACKSPACE = 127 /* Backspace */ -}; - -static void linenoiseAtExit(void); -int linenoiseHistoryAdd(const char *line); -static void refreshLine(struct linenoiseState *l); - -/* Debugging macro. */ -#if 0 -FILE *lndebug_fp = NULL; -#define lndebug(...) \ - do { \ - if (lndebug_fp == NULL) { \ - lndebug_fp = fopen("/tmp/lndebug.txt","a"); \ - fprintf(lndebug_fp, \ - "[%d %d %d] p: %d, rows: %d, rpos: %d, max: %d, oldmax: %d\n", \ - (int)l->len,(int)l->pos,(int)l->oldpos,plen,rows,rpos, \ - (int)l->maxrows,old_rows); \ - } \ - fprintf(lndebug_fp, ", " __VA_ARGS__); \ - fflush(lndebug_fp); \ - } while (0) -#else -#define lndebug(fmt, ...) -#endif - -/* ======================= Low level terminal handling ====================== */ - -/* Set if to use or not the multi line mode. */ -void linenoiseSetMultiLine(int ml) { - mlmode = ml; -} - -/* Return true if the terminal name is in the list of terminals we know are - * not able to understand basic escape sequences. */ -static int isUnsupportedTerm(void) { - char *term = getenv("TERM"); - int j; - - if (term == NULL) return 0; - for (j = 0; unsupported_term[j]; j++) - if (!strcasecmp(term,unsupported_term[j])) return 1; - return 0; -} - -/* Raw mode: 1960 magic shit. */ -static int enableRawMode(int fd) { - struct termios raw; - - if (!isatty(STDIN_FILENO)) goto fatal; - if (!atexit_registered) { - atexit(linenoiseAtExit); - atexit_registered = 1; - } - if (tcgetattr(fd,&orig_termios) == -1) goto fatal; - - raw = orig_termios; /* modify the original mode */ - /* input modes: no break, no CR to NL, no parity check, no strip char, - * no start/stop output control. */ - raw.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); - /* output modes - disable post processing */ - raw.c_oflag &= ~(OPOST); - /* control modes - set 8 bit chars */ - raw.c_cflag |= (CS8); - /* local modes - choing off, canonical off, no extended functions, - * no signal chars (^Z,^C) */ - raw.c_lflag &= ~(ECHO | ICANON | IEXTEN | ISIG); - /* control chars - set return condition: min number of bytes and timer. - * We want read to return every single byte, without timeout. */ - raw.c_cc[VMIN] = 1; raw.c_cc[VTIME] = 0; /* 1 byte, no timer */ - - /* put terminal in raw mode after flushing */ - if (tcsetattr(fd,TCSAFLUSH,&raw) < 0) goto fatal; - rawmode = 1; - return 0; - -fatal: - errno = ENOTTY; - return -1; -} - -static void disableRawMode(int fd) { - /* Don't even check the return value as it's too late. */ - if (rawmode && tcsetattr(fd,TCSAFLUSH,&orig_termios) != -1) - rawmode = 0; -} - -/* Use the ESC [6n escape sequence to query the horizontal cursor position - * and return it. On error -1 is returned, on success the position of the - * cursor. */ -static int getCursorPosition(int ifd, int ofd) { - char buf[32]; - int cols, rows; - unsigned int i = 0; - - /* Report cursor location */ - if (write(ofd, "\x1b[6n", 4) != 4) return -1; - - /* Read the response: ESC [ rows ; cols R */ - while (i < sizeof(buf)-1) { - if (read(ifd,buf+i,1) != 1) break; - if (buf[i] == 'R') break; - i++; - } - buf[i] = '\0'; - - /* Parse it. */ - if (buf[0] != ESC || buf[1] != '[') return -1; - if (sscanf(buf+2,"%d;%d",&rows,&cols) != 2) return -1; - return cols; -} - -/* Try to get the number of columns in the current terminal, or assume 80 - * if it fails. */ -static int getColumns(int ifd, int ofd) { - struct winsize ws; - - if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) { - /* ioctl() failed. Try to query the terminal itself. */ - int start, cols; - - /* Get the initial position so we can restore it later. */ - start = getCursorPosition(ifd,ofd); - if (start == -1) goto failed; - - /* Go to right margin and get position. */ - if (write(ofd,"\x1b[999C",6) != 6) goto failed; - cols = getCursorPosition(ifd,ofd); - if (cols == -1) goto failed; - - /* Restore position. */ - if (cols > start) { - char seq[32]; - snprintf(seq,32,"\x1b[%dD",cols-start); - if (write(ofd,seq,strlen(seq)) == -1) { - /* Can't recover... */ - } - } - return cols; - } else { - return ws.ws_col; - } - -failed: - return 80; -} - -/* Clear the screen. Used to handle ctrl+l */ -void linenoiseClearScreen(void) { - if (write(STDOUT_FILENO,"\x1b[H\x1b[2J",7) <= 0) { - /* nothing to do, just to avoid warning. */ - } -} - -/* Beep, used for completion when there is nothing to complete or when all - * the choices were already shown. */ -static void linenoiseBeep(void) { - fprintf(stderr, "\x7"); - fflush(stderr); -} - -/* ============================== Completion ================================ */ - -/* Free a list of completion option populated by linenoiseAddCompletion(). */ -static void freeCompletions(linenoiseCompletions *lc) { - size_t i; - for (i = 0; i < lc->len; i++) - free(lc->cvec[i]); - if (lc->cvec != NULL) - free(lc->cvec); -} - -/* This is an helper function for linenoiseEdit() and is called when the - * user types the key in order to complete the string currently in the - * input. - * - * The state of the editing is encapsulated into the pointed linenoiseState - * structure as described in the structure definition. */ -static int completeLine(struct linenoiseState *ls) { - linenoiseCompletions lc = { 0, NULL }; - int nread, nwritten; - char c = 0; - - completionCallback(ls->buf,&lc); - if (lc.len == 0) { - linenoiseBeep(); - } else { - size_t stop = 0, i = 0; - - while(!stop) { - /* Show completion or original buffer */ - if (i < lc.len) { - struct linenoiseState saved = *ls; - - ls->len = ls->pos = strlen(lc.cvec[i]); - ls->buf = lc.cvec[i]; - refreshLine(ls); - ls->len = saved.len; - ls->pos = saved.pos; - ls->buf = saved.buf; - } else { - refreshLine(ls); - } - - nread = read(ls->ifd,&c,1); - if (nread <= 0) { - freeCompletions(&lc); - return -1; - } - - switch(c) { - case 9: /* tab */ - i = (i+1) % (lc.len+1); - if (i == lc.len) linenoiseBeep(); - break; - case 27: /* escape */ - /* Re-show original buffer */ - if (i < lc.len) refreshLine(ls); - stop = 1; - break; - default: - /* Update buffer and return */ - if (i < lc.len) { - nwritten = snprintf(ls->buf,ls->buflen,"%s",lc.cvec[i]); - ls->len = ls->pos = nwritten; - } - stop = 1; - break; - } - } - } - - freeCompletions(&lc); - return c; /* Return last read character */ -} - -/* Register a callback function to be called for tab-completion. */ -void linenoiseSetCompletionCallback(linenoiseCompletionCallback *fn) { - completionCallback = fn; -} - -/* Register a hits function to be called to show hits to the user at the - * right of the prompt. */ -void linenoiseSetHintsCallback(linenoiseHintsCallback *fn) { - hintsCallback = fn; -} - -/* Register a function to free the hints returned by the hints callback - * registered with linenoiseSetHintsCallback(). */ -void linenoiseSetFreeHintsCallback(linenoiseFreeHintsCallback *fn) { - freeHintsCallback = fn; -} - -/* This function is used by the callback function registered by the user - * in order to add completion options given the input string when the - * user typed . See the example.c source code for a very easy to - * understand example. */ -void linenoiseAddCompletion(linenoiseCompletions *lc, const char *str) { - size_t len = strlen(str); - char *copy, **cvec; - - copy = malloc(len+1); - if (copy == NULL) return; - memcpy(copy,str,len+1); - cvec = realloc(lc->cvec,sizeof(char*)*(lc->len+1)); - if (cvec == NULL) { - free(copy); - return; - } - lc->cvec = cvec; - lc->cvec[lc->len++] = copy; -} - -/* =========================== Line editing ================================= */ - -/* We define a very simple "append buffer" structure, that is an heap - * allocated string where we can append to. This is useful in order to - * write all the escape sequences in a buffer and flush them to the standard - * output in a single call, to avoid flickering effects. */ -struct abuf { - char *b; - int len; -}; - -static void abInit(struct abuf *ab) { - ab->b = NULL; - ab->len = 0; -} - -static void abAppend(struct abuf *ab, const char *s, int len) { - char *new = realloc(ab->b,ab->len+len); - - if (new == NULL) return; - memcpy(new+ab->len,s,len); - ab->b = new; - ab->len += len; -} - -static void abFree(struct abuf *ab) { - free(ab->b); -} - -/* Helper of refreshSingleLine() and refreshMultiLine() to show hints - * to the right of the prompt. */ -void refreshShowHints(struct abuf *ab, struct linenoiseState *l, int plen) { - char seq[64]; - if (hintsCallback && plen+l->len < l->cols) { - int color = -1, bold = 0; - char *hint = hintsCallback(l->buf,&color,&bold); - if (hint) { - int hintlen = strlen(hint); - int hintmaxlen = l->cols-(plen+l->len); - if (hintlen > hintmaxlen) hintlen = hintmaxlen; - if (bold == 1 && color == -1) color = 37; - if (color != -1 || bold != 0) - snprintf(seq,64,"\033[%d;%d;49m",bold,color); - abAppend(ab,seq,strlen(seq)); - abAppend(ab,hint,hintlen); - if (color != -1 || bold != 0) - abAppend(ab,"\033[0m",4); - /* Call the function to free the hint returned. */ - if (freeHintsCallback) freeHintsCallback(hint); - } - } -} - -/* Single line low level line refresh. - * - * Rewrite the currently edited line accordingly to the buffer content, - * cursor position, and number of columns of the terminal. */ -static void refreshSingleLine(struct linenoiseState *l) { - char seq[64]; - size_t plen = strlen(l->prompt); - int fd = l->ofd; - char *buf = l->buf; - size_t len = l->len; - size_t pos = l->pos; - struct abuf ab; - - while((plen+pos) >= l->cols) { - buf++; - len--; - pos--; - } - while (plen+len > l->cols) { - len--; - } - - abInit(&ab); - /* Cursor to left edge */ - snprintf(seq,64,"\r"); - abAppend(&ab,seq,strlen(seq)); - /* Write the prompt and the current buffer content */ - abAppend(&ab,l->prompt,strlen(l->prompt)); - abAppend(&ab,buf,len); - /* Show hits if any. */ - refreshShowHints(&ab,l,plen); - /* Erase to right */ - snprintf(seq,64,"\x1b[0K"); - abAppend(&ab,seq,strlen(seq)); - /* Move cursor to original position. */ - snprintf(seq,64,"\r\x1b[%dC", (int)(pos+plen)); - abAppend(&ab,seq,strlen(seq)); - if (write(fd,ab.b,ab.len) == -1) {} /* Can't recover from write error. */ - abFree(&ab); -} - -/* Multi line low level line refresh. - * - * Rewrite the currently edited line accordingly to the buffer content, - * cursor position, and number of columns of the terminal. */ -static void refreshMultiLine(struct linenoiseState *l) { - char seq[64]; - int plen = strlen(l->prompt); - int rows = (plen+l->len+l->cols-1)/l->cols; /* rows used by current buf. */ - int rpos = (plen+l->oldpos+l->cols)/l->cols; /* cursor relative row. */ - int rpos2; /* rpos after refresh. */ - int col; /* colum position, zero-based. */ - int old_rows = l->maxrows; - int fd = l->ofd, j; - struct abuf ab; - - /* Update maxrows if needed. */ - if (rows > (int)l->maxrows) l->maxrows = rows; - - /* First step: clear all the lines used before. To do so start by - * going to the last row. */ - abInit(&ab); - if (old_rows-rpos > 0) { - lndebug("go down %d", old_rows-rpos); - snprintf(seq,64,"\x1b[%dB", old_rows-rpos); - abAppend(&ab,seq,strlen(seq)); - } - - /* Now for every row clear it, go up. */ - for (j = 0; j < old_rows-1; j++) { - lndebug("clear+up"); - snprintf(seq,64,"\r\x1b[0K\x1b[1A"); - abAppend(&ab,seq,strlen(seq)); - } - - /* Clean the top line. */ - lndebug("clear"); - snprintf(seq,64,"\r\x1b[0K"); - abAppend(&ab,seq,strlen(seq)); - - /* Write the prompt and the current buffer content */ - abAppend(&ab,l->prompt,strlen(l->prompt)); - abAppend(&ab,l->buf,l->len); - - /* Show hits if any. */ - refreshShowHints(&ab,l,plen); - - /* If we are at the very end of the screen with our prompt, we need to - * emit a newline and move the prompt to the first column. */ - if (l->pos && - l->pos == l->len && - (l->pos+plen) % l->cols == 0) - { - lndebug(""); - abAppend(&ab,"\n",1); - snprintf(seq,64,"\r"); - abAppend(&ab,seq,strlen(seq)); - rows++; - if (rows > (int)l->maxrows) l->maxrows = rows; - } - - /* Move cursor to right position. */ - rpos2 = (plen+l->pos+l->cols)/l->cols; /* current cursor relative row. */ - lndebug("rpos2 %d", rpos2); - - /* Go up till we reach the expected positon. */ - if (rows-rpos2 > 0) { - lndebug("go-up %d", rows-rpos2); - snprintf(seq,64,"\x1b[%dA", rows-rpos2); - abAppend(&ab,seq,strlen(seq)); - } - - /* Set column. */ - col = (plen+(int)l->pos) % (int)l->cols; - lndebug("set col %d", 1+col); - if (col) - snprintf(seq,64,"\r\x1b[%dC", col); - else - snprintf(seq,64,"\r"); - abAppend(&ab,seq,strlen(seq)); - - lndebug("\n"); - l->oldpos = l->pos; - - if (write(fd,ab.b,ab.len) == -1) {} /* Can't recover from write error. */ - abFree(&ab); -} - -/* Calls the two low level functions refreshSingleLine() or - * refreshMultiLine() according to the selected mode. */ -static void refreshLine(struct linenoiseState *l) { - if (mlmode) - refreshMultiLine(l); - else - refreshSingleLine(l); -} - -/* Insert the character 'c' at cursor current position. - * - * On error writing to the terminal -1 is returned, otherwise 0. */ -int linenoiseEditInsert(struct linenoiseState *l, char c) { - if (l->len < l->buflen) { - if (l->len == l->pos) { - l->buf[l->pos] = c; - l->pos++; - l->len++; - l->buf[l->len] = '\0'; - if ((!mlmode && l->plen+l->len < l->cols && !hintsCallback)) { - /* Avoid a full update of the line in the - * trivial case. */ - if (write(l->ofd,&c,1) == -1) return -1; - } else { - refreshLine(l); - } - } else { - memmove(l->buf+l->pos+1,l->buf+l->pos,l->len-l->pos); - l->buf[l->pos] = c; - l->len++; - l->pos++; - l->buf[l->len] = '\0'; - refreshLine(l); - } - } - return 0; -} - -/* Move cursor on the left. */ -void linenoiseEditMoveLeft(struct linenoiseState *l) { - if (l->pos > 0) { - l->pos--; - refreshLine(l); - } -} - -/* Move cursor on the right. */ -void linenoiseEditMoveRight(struct linenoiseState *l) { - if (l->pos != l->len) { - l->pos++; - refreshLine(l); - } -} - -/* Move cursor to the start of the line. */ -void linenoiseEditMoveHome(struct linenoiseState *l) { - if (l->pos != 0) { - l->pos = 0; - refreshLine(l); - } -} - -/* Move cursor to the end of the line. */ -void linenoiseEditMoveEnd(struct linenoiseState *l) { - if (l->pos != l->len) { - l->pos = l->len; - refreshLine(l); - } -} - -/* Substitute the currently edited line with the next or previous history - * entry as specified by 'dir'. */ -#define LINENOISE_HISTORY_NEXT 0 -#define LINENOISE_HISTORY_PREV 1 -void linenoiseEditHistoryNext(struct linenoiseState *l, int dir) { - if (history_len > 1) { - /* Update the current history entry before to - * overwrite it with the next one. */ - free(history[history_len - 1 - l->history_index]); - history[history_len - 1 - l->history_index] = strdup(l->buf); - /* Show the new entry */ - l->history_index += (dir == LINENOISE_HISTORY_PREV) ? 1 : -1; - if (l->history_index < 0) { - l->history_index = 0; - return; - } else if (l->history_index >= history_len) { - l->history_index = history_len-1; - return; - } - strncpy(l->buf,history[history_len - 1 - l->history_index],l->buflen); - l->buf[l->buflen-1] = '\0'; - l->len = l->pos = strlen(l->buf); - refreshLine(l); - } -} - -/* Delete the character at the right of the cursor without altering the cursor - * position. Basically this is what happens with the "Delete" keyboard key. */ -void linenoiseEditDelete(struct linenoiseState *l) { - if (l->len > 0 && l->pos < l->len) { - memmove(l->buf+l->pos,l->buf+l->pos+1,l->len-l->pos-1); - l->len--; - l->buf[l->len] = '\0'; - refreshLine(l); - } -} - -/* Backspace implementation. */ -void linenoiseEditBackspace(struct linenoiseState *l) { - if (l->pos > 0 && l->len > 0) { - memmove(l->buf+l->pos-1,l->buf+l->pos,l->len-l->pos); - l->pos--; - l->len--; - l->buf[l->len] = '\0'; - refreshLine(l); - } -} - -/* Delete the previosu word, maintaining the cursor at the start of the - * current word. */ -void linenoiseEditDeletePrevWord(struct linenoiseState *l) { - size_t old_pos = l->pos; - size_t diff; - - while (l->pos > 0 && l->buf[l->pos-1] == ' ') - l->pos--; - while (l->pos > 0 && l->buf[l->pos-1] != ' ') - l->pos--; - diff = old_pos - l->pos; - memmove(l->buf+l->pos,l->buf+old_pos,l->len-old_pos+1); - l->len -= diff; - refreshLine(l); -} - -/* This function is the core of the line editing capability of linenoise. - * It expects 'fd' to be already in "raw mode" so that every key pressed - * will be returned ASAP to read(). - * - * The resulting string is put into 'buf' when the user type enter, or - * when ctrl+d is typed. - * - * The function returns the length of the current buffer. */ -static int linenoiseEdit(int stdin_fd, int stdout_fd, char *buf, size_t buflen, const char *prompt) -{ - struct linenoiseState l; - - /* Populate the linenoise state that we pass to functions implementing - * specific editing functionalities. */ - l.ifd = stdin_fd; - l.ofd = stdout_fd; - l.buf = buf; - l.buflen = buflen; - l.prompt = prompt; - l.plen = strlen(prompt); - l.oldpos = l.pos = 0; - l.len = 0; - l.cols = getColumns(stdin_fd, stdout_fd); - l.maxrows = 0; - l.history_index = 0; - - /* Buffer starts empty. */ - l.buf[0] = '\0'; - l.buflen--; /* Make sure there is always space for the nulterm */ - - /* The latest history entry is always our current buffer, that - * initially is just an empty string. */ - linenoiseHistoryAdd(""); - - if (write(l.ofd,prompt,l.plen) == -1) return -1; - while(1) { - char c; - int nread; - char seq[3]; - - nread = read(l.ifd,&c,1); - if (nread <= 0) return l.len; - - /* Only autocomplete when the callback is set. It returns < 0 when - * there was an error reading from fd. Otherwise it will return the - * character that should be handled next. */ - if (c == 9 && completionCallback != NULL) { - c = completeLine(&l); - /* Return on errors */ - if (c < 0) return l.len; - /* Read next character when 0 */ - if (c == 0) continue; - } - - switch(c) { - case ENTER: /* enter */ - history_len--; - free(history[history_len]); - if (mlmode) linenoiseEditMoveEnd(&l); - if (hintsCallback) { - /* Force a refresh without hints to leave the previous - * line as the user typed it after a newline. */ - linenoiseHintsCallback *hc = hintsCallback; - hintsCallback = NULL; - refreshLine(&l); - hintsCallback = hc; - } - return (int)l.len; - case CTRL_C: /* ctrl-c */ - errno = EAGAIN; - return -1; - case BACKSPACE: /* backspace */ - case 8: /* ctrl-h */ - linenoiseEditBackspace(&l); - break; - case CTRL_D: /* ctrl-d, remove char at right of cursor, or if the - line is empty, act as end-of-file. */ - if (l.len > 0) { - linenoiseEditDelete(&l); - } else { - history_len--; - free(history[history_len]); - return -1; - } - break; - case CTRL_T: /* ctrl-t, swaps current character with previous. */ - if (l.pos > 0 && l.pos < l.len) { - int aux = buf[l.pos-1]; - buf[l.pos-1] = buf[l.pos]; - buf[l.pos] = aux; - if (l.pos != l.len-1) l.pos++; - refreshLine(&l); - } - break; - case CTRL_B: /* ctrl-b */ - linenoiseEditMoveLeft(&l); - break; - case CTRL_F: /* ctrl-f */ - linenoiseEditMoveRight(&l); - break; - case CTRL_P: /* ctrl-p */ - linenoiseEditHistoryNext(&l, LINENOISE_HISTORY_PREV); - break; - case CTRL_N: /* ctrl-n */ - linenoiseEditHistoryNext(&l, LINENOISE_HISTORY_NEXT); - break; - case ESC: /* escape sequence */ - /* Read the next two bytes representing the escape sequence. - * Use two calls to handle slow terminals returning the two - * chars at different times. */ - if (read(l.ifd,seq,1) == -1) break; - if (read(l.ifd,seq+1,1) == -1) break; - - /* ESC [ sequences. */ - if (seq[0] == '[') { - if (seq[1] >= '0' && seq[1] <= '9') { - /* Extended escape, read additional byte. */ - if (read(l.ifd,seq+2,1) == -1) break; - if (seq[2] == '~') { - switch(seq[1]) { - case '3': /* Delete key. */ - linenoiseEditDelete(&l); - break; - } - } - } else { - switch(seq[1]) { - case 'A': /* Up */ - linenoiseEditHistoryNext(&l, LINENOISE_HISTORY_PREV); - break; - case 'B': /* Down */ - linenoiseEditHistoryNext(&l, LINENOISE_HISTORY_NEXT); - break; - case 'C': /* Right */ - linenoiseEditMoveRight(&l); - break; - case 'D': /* Left */ - linenoiseEditMoveLeft(&l); - break; - case 'H': /* Home */ - linenoiseEditMoveHome(&l); - break; - case 'F': /* End*/ - linenoiseEditMoveEnd(&l); - break; - } - } - } - - /* ESC O sequences. */ - else if (seq[0] == 'O') { - switch(seq[1]) { - case 'H': /* Home */ - linenoiseEditMoveHome(&l); - break; - case 'F': /* End*/ - linenoiseEditMoveEnd(&l); - break; - } - } - break; - default: - if (linenoiseEditInsert(&l,c)) return -1; - break; - case CTRL_U: /* Ctrl+u, delete the whole line. */ - buf[0] = '\0'; - l.pos = l.len = 0; - refreshLine(&l); - break; - case CTRL_K: /* Ctrl+k, delete from current to end of line. */ - buf[l.pos] = '\0'; - l.len = l.pos; - refreshLine(&l); - break; - case CTRL_A: /* Ctrl+a, go to the start of the line */ - linenoiseEditMoveHome(&l); - break; - case CTRL_E: /* ctrl+e, go to the end of the line */ - linenoiseEditMoveEnd(&l); - break; - case CTRL_L: /* ctrl+l, clear screen */ - linenoiseClearScreen(); - refreshLine(&l); - break; - case CTRL_W: /* ctrl+w, delete previous word */ - linenoiseEditDeletePrevWord(&l); - break; - } - } - return l.len; -} - -/* This special mode is used by linenoise in order to print scan codes - * on screen for debugging / development purposes. It is implemented - * by the linenoise_example program using the --keycodes option. */ -void linenoisePrintKeyCodes(void) { - char quit[4]; - - printf("Linenoise key codes debugging mode.\n" - "Press keys to see scan codes. Type 'quit' at any time to exit.\n"); - if (enableRawMode(STDIN_FILENO) == -1) return; - memset(quit,' ',4); - while(1) { - char c; - int nread; - - nread = read(STDIN_FILENO,&c,1); - if (nread <= 0) continue; - memmove(quit,quit+1,sizeof(quit)-1); /* shift string to left. */ - quit[sizeof(quit)-1] = c; /* Insert current char on the right. */ - if (memcmp(quit,"quit",sizeof(quit)) == 0) break; - - printf("'%c' %02x (%d) (type quit to exit)\n", - isprint(c) ? c : '?', (int)c, (int)c); - printf("\r"); /* Go left edge manually, we are in raw mode. */ - fflush(stdout); - } - disableRawMode(STDIN_FILENO); -} - -/* This function calls the line editing function linenoiseEdit() using - * the STDIN file descriptor set in raw mode. */ -static int linenoiseRaw(char *buf, size_t buflen, const char *prompt) { - int count; - - if (buflen == 0) { - errno = EINVAL; - return -1; - } - - if (enableRawMode(STDIN_FILENO) == -1) return -1; - count = linenoiseEdit(STDIN_FILENO, STDOUT_FILENO, buf, buflen, prompt); - disableRawMode(STDIN_FILENO); - printf("\n"); - return count; -} - -/* This function is called when linenoise() is called with the standard - * input file descriptor not attached to a TTY. So for example when the - * program using linenoise is called in pipe or with a file redirected - * to its standard input. In this case, we want to be able to return the - * line regardless of its length (by default we are limited to 4k). */ -static char *linenoiseNoTTY(void) { - char *line = NULL; - size_t len = 0, maxlen = 0; - - while(1) { - if (len == maxlen) { - if (maxlen == 0) maxlen = 16; - maxlen *= 2; - char *oldval = line; - line = realloc(line,maxlen); - if (line == NULL) { - if (oldval) free(oldval); - return NULL; - } - } - int c = fgetc(stdin); - if (c == EOF || c == '\n') { - if (c == EOF && len == 0) { - free(line); - return NULL; - } else { - line[len] = '\0'; - return line; - } - } else { - line[len] = c; - len++; - } - } -} - -/* The high level function that is the main API of the linenoise library. - * This function checks if the terminal has basic capabilities, just checking - * for a blacklist of stupid terminals, and later either calls the line - * editing function or uses dummy fgets() so that you will be able to type - * something even in the most desperate of the conditions. */ -char *linenoise(const char *prompt) { - char buf[LINENOISE_MAX_LINE]; - int count; - - if (!isatty(STDIN_FILENO)) { - /* Not a tty: read from file / pipe. In this mode we don't want any - * limit to the line size, so we call a function to handle that. */ - return linenoiseNoTTY(); - } else if (isUnsupportedTerm()) { - size_t len; - - printf("%s",prompt); - fflush(stdout); - if (fgets(buf,LINENOISE_MAX_LINE,stdin) == NULL) return NULL; - len = strlen(buf); - while(len && (buf[len-1] == '\n' || buf[len-1] == '\r')) { - len--; - buf[len] = '\0'; - } - return strdup(buf); - } else { - count = linenoiseRaw(buf,LINENOISE_MAX_LINE,prompt); - if (count == -1) return NULL; - return strdup(buf); - } -} - -/* This is just a wrapper the user may want to call in order to make sure - * the linenoise returned buffer is freed with the same allocator it was - * created with. Useful when the main program is using an alternative - * allocator. */ -void linenoiseFree(void *ptr) { - free(ptr); -} - -/* ================================ History ================================= */ - -/* Free the history, but does not reset it. Only used when we have to - * exit() to avoid memory leaks are reported by valgrind & co. */ -static void freeHistory(void) { - if (history) { - int j; - - for (j = 0; j < history_len; j++) - free(history[j]); - free(history); - } -} - -/* At exit we'll try to fix the terminal to the initial conditions. */ -static void linenoiseAtExit(void) { - disableRawMode(STDIN_FILENO); - freeHistory(); -} - -/* This is the API call to add a new entry in the linenoise history. - * It uses a fixed array of char pointers that are shifted (memmoved) - * when the history max length is reached in order to remove the older - * entry and make room for the new one, so it is not exactly suitable for huge - * histories, but will work well for a few hundred of entries. - * - * Using a circular buffer is smarter, but a bit more complex to handle. */ -int linenoiseHistoryAdd(const char *line) { - char *linecopy; - - if (history_max_len == 0) return 0; - - /* Initialization on first call. */ - if (history == NULL) { - history = malloc(sizeof(char*)*history_max_len); - if (history == NULL) return 0; - memset(history,0,(sizeof(char*)*history_max_len)); - } - - /* Don't add duplicated lines. */ - if (history_len && !strcmp(history[history_len-1], line)) return 0; - - /* Add an heap allocated copy of the line in the history. - * If we reached the max length, remove the older line. */ - linecopy = strdup(line); - if (!linecopy) return 0; - if (history_len == history_max_len) { - free(history[0]); - memmove(history,history+1,sizeof(char*)*(history_max_len-1)); - history_len--; - } - history[history_len] = linecopy; - history_len++; - return 1; -} - -/* Set the maximum length for the history. This function can be called even - * if there is already some history, the function will make sure to retain - * just the latest 'len' elements if the new history length value is smaller - * than the amount of items already inside the history. */ -int linenoiseHistorySetMaxLen(int len) { - char **new; - - if (len < 1) return 0; - if (history) { - int tocopy = history_len; - - new = malloc(sizeof(char*)*len); - if (new == NULL) return 0; - - /* If we can't copy everything, free the elements we'll not use. */ - if (len < tocopy) { - int j; - - for (j = 0; j < tocopy-len; j++) free(history[j]); - tocopy = len; - } - memset(new,0,sizeof(char*)*len); - memcpy(new,history+(history_len-tocopy), sizeof(char*)*tocopy); - free(history); - history = new; - } - history_max_len = len; - if (history_len > history_max_len) - history_len = history_max_len; - return 1; -} - -/* Save the history in the specified file. On success 0 is returned - * otherwise -1 is returned. */ -int linenoiseHistorySave(const char *filename) { - mode_t old_umask = umask(S_IXUSR|S_IRWXG|S_IRWXO); - FILE *fp; - int j; - - fp = fopen(filename,"w"); - umask(old_umask); - if (fp == NULL) return -1; - chmod(filename,S_IRUSR|S_IWUSR); - for (j = 0; j < history_len; j++) - fprintf(fp,"%s\n",history[j]); - fclose(fp); - return 0; -} - -/* Load the history from the specified file. If the file does not exist - * zero is returned and no operation is performed. - * - * If the file exists and the operation succeeded 0 is returned, otherwise - * on error -1 is returned. */ -int linenoiseHistoryLoad(const char *filename) { - FILE *fp = fopen(filename,"r"); - char buf[LINENOISE_MAX_LINE]; - - if (fp == NULL) return -1; - - while (fgets(buf,LINENOISE_MAX_LINE,fp) != NULL) { - char *p; - - p = strchr(buf,'\r'); - if (!p) p = strchr(buf,'\n'); - if (p) *p = '\0'; - linenoiseHistoryAdd(buf); - } - fclose(fp); - return 0; -} - -#endif \ No newline at end of file diff --git a/src/mainclient/linenoise.h b/src/mainclient/linenoise.h deleted file mode 100644 index ed20232c..00000000 --- a/src/mainclient/linenoise.h +++ /dev/null @@ -1,73 +0,0 @@ -/* linenoise.h -- VERSION 1.0 - * - * Guerrilla line editing library against the idea that a line editing lib - * needs to be 20,000 lines of C code. - * - * See linenoise.c for more information. - * - * ------------------------------------------------------------------------ - * - * Copyright (c) 2010-2014, Salvatore Sanfilippo - * Copyright (c) 2010-2013, Pieter Noordhuis - * - * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "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 COPYRIGHT - * HOLDER OR CONTRIBUTORS 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 __LINENOISE_H -#define __LINENOISE_H - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct linenoiseCompletions { - size_t len; - char **cvec; -} linenoiseCompletions; - -typedef void(linenoiseCompletionCallback)(const char *, linenoiseCompletions *); -typedef char*(linenoiseHintsCallback)(const char *, int *color, int *bold); -typedef void(linenoiseFreeHintsCallback)(void *); -void linenoiseSetCompletionCallback(linenoiseCompletionCallback *); -void linenoiseSetHintsCallback(linenoiseHintsCallback *); -void linenoiseSetFreeHintsCallback(linenoiseFreeHintsCallback *); -void linenoiseAddCompletion(linenoiseCompletions *, const char *); - -char *linenoise(const char *prompt); -void linenoiseFree(void *ptr); -int linenoiseHistoryAdd(const char *line); -int linenoiseHistorySetMaxLen(int len); -int linenoiseHistorySave(const char *filename); -int linenoiseHistoryLoad(const char *filename); -void linenoiseClearScreen(void); -void linenoiseSetMultiLine(int ml); -void linenoisePrintKeyCodes(void); - -#ifdef __cplusplus -} -#endif - -#endif /* __LINENOISE_H */ diff --git a/src/mainclient/main.c b/src/mainclient/main.c index 97f626fa..0fd6af12 100644 --- a/src/mainclient/main.c +++ b/src/mainclient/main.c @@ -20,163 +20,34 @@ * IN THE SOFTWARE. */ -#include -#include #include #include -#include "linenoise.h" -#include - -#define DST_CLIENT_HELP 1 -#define DST_CLIENT_VERBOSE 2 -#define DST_CLIENT_VERSION 4 -#define DST_CLIENT_REPL 8 -#define DST_CLIENT_UNKNOWN 16 - -static const char *replsplash = -"Dst " DST_VERSION " Copyright (C) 2017-2018 Calvin Rose"; - -static int client_strequal(const char *a, const char *b) { - while (*a) if (*a++ != *b++) return 0; - return *a == *b; -} - -static int client_strequal_witharg(const char *a, const char *b) { - while (*b) if (*a++ != *b++) return 0; - return *a == '='; -} - -static int linenoiseread(DstContext *c, enum DstParserStatus status) { - const char *prompt = (status == DST_PARSE_PENDING) - ? ">> " - : "> "; - char *line = linenoise(prompt); - if (line) { - linenoiseHistoryAdd(line); - dst_buffer_push_cstring(&c->buffer, line); - free(line); - } else if (errno) { - return 1; - } - dst_buffer_push_u8(&c->buffer, '\n'); - return 0; -} +#include "clientinit.h" int main(int argc, char **argv) { - int status = 0; - int i; - int fileRead = 0; - uint32_t gcinterval = 0x10000; - uint64_t flags = 0; + int i, status; + DstArray *args; DstTable *env; - /* Read the arguments. Ignore files. */ - for (i = 1; i < argc; ++i) { - const char *arg = argv[i]; - if (*arg == '-') { - /* Flag or option */ - if (arg[1] == '-') { - /* Option */ - if (client_strequal(arg + 2, "help")) { - flags |= DST_CLIENT_HELP; - } else if (client_strequal(arg + 2, "version")) { - flags |= DST_CLIENT_VERSION; - } else if (client_strequal(arg + 2, "verbose")) { - flags |= DST_CLIENT_VERBOSE; - } else if (client_strequal(arg + 2, "repl")) { - flags |= DST_CLIENT_REPL; - } else if (client_strequal_witharg(arg + 2, "gcinterval")) { - int status = 0; - int32_t m; - const uint8_t *start = (const uint8_t *)(arg + 13); - const uint8_t *end = start; - while (*end) ++end; - m = dst_scan_integer(start, end - start, &status); - if (!status) - gcinterval = m; - } else { - flags |= DST_CLIENT_UNKNOWN; - } - } else if (*arg) { - /* Flag */ - const char *c = arg; - while (*(++c)) { - switch (*c) { - case 'h': - flags |= DST_CLIENT_HELP; - break; - case 'v': - flags |= DST_CLIENT_VERSION; - break; - case 'V': - flags |= DST_CLIENT_VERBOSE; - break; - case 'r': - flags |= DST_CLIENT_REPL; - break; - default: - flags |= DST_CLIENT_UNKNOWN; - break; - } - } - } - } - } - - /* Handle flags and options */ - if ((flags & DST_CLIENT_HELP) || (flags & DST_CLIENT_UNKNOWN)) { - printf( "Usage:\n" - "%s -opts --fullopt1 --fullopt2 file1 file2...\n" - "\n" - " -h --help Shows this information.\n" - " -V --verbose Show more output.\n" - " -r --repl Launch a repl after all files are processed.\n" - " -v --version Print the version number and exit.\n" - " --gcinterval=[int] Set the amount of memory to allocate before\n" - " forcing a collection in bytes. Max is 2^31-1,\n" - " min is 0.\n\n", - argv[0]); - return 0; - } - if (flags & DST_CLIENT_VERSION) { - printf("%s\n", DST_VERSION); - return 0; - } - /* Set up VM */ dst_init(); - dst_vm_gc_interval = gcinterval; env = dst_stl_env(); dst_gcroot(dst_wrap_table(env)); - /* Read the arguments. Only process files. */ - for (i = 1; i < argc; ++i) { - const char *arg = argv[i]; - if (*arg != '-') { - DstContext ctxt; - fileRead = 1; - if (dst_context_file(&ctxt, env, arg)) { - printf("file %s not found\n", arg); - status |= 2; - continue; - } - status |= dst_context_run(&ctxt, DST_PARSEFLAG_SOURCEMAP); - } + /* Create process tuple */ + args = dst_array(argc); + for (i = 0; i < argc; i++) { + dst_array_push(args, dst_cstringv(argv[i])); } - /* Run a repl if nothing else happened, or the flag is set */ - if (!fileRead || (flags & DST_CLIENT_REPL)) { - DstContext ctxt; - dst_context_repl(&ctxt, env); -#ifndef DST_WINDOWS - ctxt.read_chunk = linenoiseread; - linenoiseSetMultiLine(1); -#endif - puts(replsplash); - status = dst_context_run(&ctxt, DST_PARSEFLAG_SOURCEMAP); - } + /* Allow access to runtime argument */ + dst_env_def(env, "args", dst_wrap_array(args)); + /* Run startup script */ + status = dst_dobytes(env, dst_mainclient_init, sizeof(dst_mainclient_init)); + + /* Deinitialize vm */ dst_deinit(); return status; diff --git a/src/parser/parse.c b/src/parser/parse.c index 11372d10..8e4f02f7 100644 --- a/src/parser/parse.c +++ b/src/parser/parse.c @@ -598,25 +598,35 @@ static int cfun_consume(DstArgs args) { return dst_return(args, dst_wrap_nil()); } +static int cfun_byte(DstArgs args) { + DstParser *p; + if (args.n != 2) return dst_throw(args, "expected 2 arguments"); + p = checkparser(args); + if (!p) return 1; + if (!dst_checktype(args.v[1], DST_INTEGER)) return dst_throw(args, "expected integer"); + dst_parser_consume(p, 0xFF & dst_unwrap_integer(args.v[1])); + return dst_return(args, args.v[0]); +} + static int cfun_status(DstArgs args) { const char *stat = NULL; DstParser *p = checkparser(args); if (!p) return 1; switch (dst_parser_status(p)) { case DST_PARSE_FULL: - stat = "full"; + stat = ":full"; break; case DST_PARSE_PENDING: - stat = "pending"; + stat = ":pending"; break; case DST_PARSE_ERROR: - stat = "error"; + stat = ":error"; break; case DST_PARSE_ROOT: - stat = "root"; + stat = ":root"; break; } - return dst_return(args, dst_cstringv(stat)); + return dst_return(args, dst_csymbolv(stat)); } static int cfun_error(DstArgs args) { @@ -678,6 +688,7 @@ static const DstReg cfuns[] = { {"parser", cfun_parser}, {"parser-produce", cfun_produce}, {"parser-consume", cfun_consume}, + {"parser-byte", cfun_byte}, {"parser-error", cfun_error}, {"parser-status", cfun_status}, {"ast-unwrap", cfun_unwrap}, diff --git a/test/suite0.dst b/test/suite0.dst index dbf7782f..72db4bf2 100644 --- a/test/suite0.dst +++ b/test/suite0.dst @@ -163,7 +163,7 @@ (def afiber-result (transfer afiber "world!")) (assert (= afiber-result "hello, world!") "fiber error result") -(assert (= (status afiber) :error) "fiber error status") +(assert (= (fiber-status afiber) :error) "fiber error status") # yield tests @@ -172,7 +172,7 @@ (assert (= 1 (transfer t)) "initial transfer to new fiber") (assert (= 2 (transfer t)) "second transfer to fiber") (assert (= 3 (transfer t)) "return from fiber") -(assert (= (status t) :dead) "finished fiber is dead") +(assert (= (fiber-status t) :dead) "finished fiber is dead") # Var arg tests