diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 21 | ||||
| -rw-r--r-- | parser.c | 82 | ||||
| -rw-r--r-- | parser.h | 3 | ||||
| -rw-r--r-- | txr.c | 12 |
5 files changed, 119 insertions, 1 deletions
@@ -47,11 +47,11 @@ EXTRA_OBJS-y := OBJS := txr.o lex.yy.o y.tab.o match.o lib.o regex.o gc.o unwind.o stream.o OBJS += arith.o hash.o utf8.o filter.o eval.o parser.o rand.o combi.o sysif.o OBJS += args.o lisplib.o cadr.o struct.o -OBJS += linenoise/linenoise.o OBJS-$(debug_support) += debug.o OBJS-$(have_syslog) += syslog.o OBJS-$(have_glob) += glob.o OBJS-$(have_posix_sigs) += signal.o +OBJS-$(have_termios) += linenoise/linenoise.o EXTRA_OBJS-$(add_win_res) += win/txr.res ifneq ($(have_git),) @@ -123,6 +123,7 @@ need_darwin_c_source= have_git= have_pwuid= have_alloca= +have_termios= conf_dir=config config_h=$conf_dir/config.h config_make=$conf_dir/config.make @@ -649,6 +650,8 @@ have_glob := $have_glob # do we modern posix signal handling? have_posix_sigs := $have_posix_sigs +have_termios := $have_termios + # do we compile in debug support? debug_support := $debug_support @@ -2128,6 +2131,24 @@ if [ -z "$have_alloca" ] ; then printf "no\n" fi +printf "Checking for termios ... " + +cat > conftest.c <<! +#include <termios.h> + +int main(int argc, char **argv) +{ + struct termios t; + return 0; +} +! + +if conftest ; then + printf "yes\n" + printf "#define HAVE_TERMIOS 1\n" >> $config_h + have_termios=y +fi + # # Dependent variables # @@ -29,6 +29,7 @@ #include <limits.h> #include <dirent.h> #include <stdlib.h> +#include <string.h> #include <stdarg.h> #include <setjmp.h> #include <wchar.h> @@ -47,6 +48,9 @@ #include "stream.h" #include "y.tab.h" #include "parser.h" +#if HAVE_TERMIOS +#include "linenoise/linenoise.h" +#endif val parser_s, unique_s; @@ -332,6 +336,84 @@ val read_eval_stream(val stream, val error_stream, val hash_bang_support) return t; } +#if HAVE_TERMIOS + +val repl(val bindings, val in_stream, val out_stream) +{ + val ifd = stream_get_prop(in_stream, fd_k); + val ofd = stream_get_prop(out_stream, fd_k); + lino_t *ls = lino_make(c_num(ifd), c_num(ofd)); + char *line_u8 = 0; + char *prompt_u8 = 0; + val repl_env = make_env(bindings, nil, nil); + val quit_k = intern(lit("quit"), keyword_package); + val catch_all = list(t, nao); + val done = nil; + val counter = one; + + while (!done) { + val prompt = format(nil, lit("~a> "), counter, nao); + char *prompt_u8 = utf8_dup_to(c_str(prompt)); + + line_u8 = linenoise(ls, prompt_u8); + free (prompt_u8); + prompt_u8 = 0; + + if (line_u8 == 0) + break; + + if (strspn(line_u8, " \t") == strlen(line_u8)) + continue; + + counter = succ(counter); + + uw_catch_begin (catch_all, exsym, exvals); + + { + val line = string_utf8(line_u8); + val form = lisp_parse(line, out_stream, colon_k, colon_k); + val value = eval_intrinsic(form, repl_env); + if (value == quit_k) { + done = t; + } else { + prinl(value, out_stream); + lino_hist_add(ls, line_u8); /* Add to the history. */ + } + } + + uw_catch (exsym, exvals) { + if (uw_exception_subtype_p(exsym, error_s)) { + obj_pprint(car(exvals), out_stream); + if (cdr(exvals)) { + put_string(lit(" "), out_stream); + pprinl(cdr(exvals), out_stream); + } else { + put_line(nil, nil); + } + } else { + format(out_stream, lit("caught exception: ~s ~s\n"), + exsym, exvals, nao); + } + } + + uw_unwind { + free(line_u8); + line_u8 = 0; + } + + uw_catch_end; + + gc_hint(prompt); + } + + free(prompt_u8); + free(line_u8); + lino_free(ls); + return nil; +} + +#endif + val get_parser(val stream) { return gethash(stream_parser_hash, stream); @@ -94,6 +94,9 @@ val rlcp_tree(val to, val from); val regex_parse(val string, val error_stream); val lisp_parse(val source, val error_stream, val error_return_val, val name); val read_eval_stream(val stream, val error_stream, val hash_bang_support); +#if HAVE_TERMIOS +val repl(val bindings, val in_stream, val out_stream); +#endif void parser_common_init(parser_t *); void parser_cleanup(parser_t *); val parser(val stream, val lineno); @@ -113,6 +113,8 @@ static void help(void) "-B Force list of bindings to be dumped, or false\n" " if termination is unsuccessful.\n" "-l If dumping bindings, use TXR Lisp format.\n" +"-i Interactive TXR Lisp listener mode.\n" +" (Requires compiled-in support.)\n" "-d Debugger mode.\n" "-n Noninteractive input mode for standard input stream,\n" " even if its connected to a terminal device.\n" @@ -624,6 +626,16 @@ int txr_main(int argc, char **argv) opt_lisp_bindings = 1; opt_print_bindings = 1; break; + case 'i': +#if HAVE_TERMIOS + repl(bindings, std_input, std_output); + return 0; +#else + format(std_error, + lit("~a: option ~a requires a platform with termios\n"), + prog_string, arg, nao); + return EXIT_FAILURE; +#endif case 'd': #if CONFIG_DEBUG_SUPPORT opt_debugger = 1; |