From ea8bf1c897290d2283033d8e3546a970cdd096f3 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Fri, 13 Nov 2015 20:54:48 -0800 Subject: Implementing *print-base* and ~d format directive. * debug.c (show_bindings): Use ~d for level, so as not to be influenced by *print-base*. (debug): Use ~d for line numbers. * lib.c (gensym): Use ~d conversion specifier for formatting gensym counter into symbol name. * match.c (LOG_MISMATCH, LOG_MATCH): Use ~d for line number references. (h_skip, h_coll, h_fun, h_chr, match_line_completely, v_skip, v_fuzz, v_gather, v_collect, v_output, v_filter, v_fun, v_assert, v_load, v_line, h_assert, open_data_source): Use ~d for line refs, number of iterations, errno values. * parser.c (repl): Use ~d for prompt line numbers, numbered variables and the expr- string in error messages. * parser.l (yyerrorf, source_loc_str): Use ~d for line numbers. * stream.c (print_base_s): New symbol variable. (formatv): Implement *print-base*. (stdio_maybe_read_error, stdio_maybe_error, stdio_close, pipe_close, open_directory, open_file, open_fileno, open_tail, open_process, run, remove_path): Use ~d for errno values. (stream_init): Initialize print_base_s and register *print-base* special variable. sysif.c (mkdir_wrap, ensure_dir, getcwd_wrap, mknod_wrap, chmod_wrap, symlink_wrap, link_wrap, readlink_wrap, excec_wrap, stat_impl, pipe_wrap, poll_wrap, getgroups_wrap, setuid_wrap, seteuid_wrap, setgid_wrap): Use ~d for errno values and system function results. * txr.1: Documented *print-base* and ~d conversion specifier. --- parser.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'parser.c') diff --git a/parser.c b/parser.c index 1924cad0..258c77b8 100644 --- a/parser.c +++ b/parser.c @@ -673,10 +673,10 @@ val repl(val bindings, val in_stream, val out_stream) lino_hist_load(ls, histfile_u8); while (!done) { - val prompt = format(nil, lit("~a> "), counter, nao); + val prompt = format(nil, lit("~d> "), counter, nao); val prev_counter = counter; val var_counter = mod(counter, num_fast(100)); - val var_name = format(nil, lit("*~a"), var_counter, nao); + val var_name = format(nil, lit("*~d"), var_counter, nao); val var_sym = intern(var_name, user_package); char *prompt_u8 = utf8_dup_to(c_str(prompt)); @@ -726,7 +726,7 @@ val repl(val bindings, val in_stream, val out_stream) uw_catch_begin (catch_all, exsym, exvals); { - val name = format(nil, lit("expr-~a"), prev_counter, nao); + val name = format(nil, lit("expr-~d"), prev_counter, nao); val line = string_utf8(line_u8); val form = lisp_parse(line, out_stream, colon_k, name, colon_k); if (form == quit_k) { -- cgit v1.2.3