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-<n> 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.

1 files changed, 3 insertions, 3 deletions

diff --git a/parser.l b/parser.l
index 68767f7e..fe16330d 100644
--- a/parser.l
+++ b/parser.l
@@ -109,10 +109,10 @@ void yyerrorf(scanner_t *scanner, val fmt, ...)
     va_list vl;
     va_start (vl, fmt);
     if (opt_compat && opt_compat <= 114)
-      format(std_error, lit("~a: (~a:~a): "), prog_string,
+      format(std_error, lit("~a: (~a:~d): "), prog_string,
              parser->name, num(parser->lineno), nao);
     else
-      format(std_error, lit("~a:~a: "),
+      format(std_error, lit("~a:~d: "),
              parser->name, num(parser->lineno), nao);
 
     vformat(std_error, fmt, vl);
@@ -1037,7 +1037,7 @@ val source_loc_str(val form, val alt)
   cons_bind (line, file, gethash(form_to_ln_hash, form));
   if (missingp(alt))
     alt = lit("source location n/a");
-  return if3(line, format(nil, lit("~a:~a"), file, line, nao), alt);
+  return if3(line, format(nil, lit("~a:~d"), file, line, nao), alt);
 }
 
 int yylex(YYSTYPE *yylval_param, yyscan_t yyscanner)