Replace trivial format(nil, ...) with simpler ops.

* gencadr.txr (cadr_register): Use scat2 to glue two strings.

* cadr.c: Regenerated.

* lib.c (scat2, scat3): New functions.

* lib.h (scat2, scat3): Declared.

* liblib.c (place_instantiate, ver_instantiate,
ifa_instantiate, txr_case_instantiate,
with_resources_instantiate, path_test_instantiate,
struct_instantiate, with_stream_instantiate, hash_instantiate,
except_instantiate, type_instantiate, yield_instantiate,
sock_instantiate, termios_instantiate, awk_instantiate,
build_instantiate, trace_instantiate, getopts_instantiate,
package_instantiate, getput_instantiate, tagbody_instantiate,
pmac_instantiate, error_instantiate, keyparams_instantiate,
ffi_instantiate, doloop_instantiate, stream_wrap_instantiate,
asm_instantiate, compiler_instantiate, debugger_instantiate,
op_instantiate, save_exe_instantiate, defset_instantiate,
copy_file_instantiate): Use scat2 to glue two strings instead
of format.

* parser.c (find_matching_syms, hist_save, repl): Replace
trivial uses of format with scat2 or scat3.

* sysif.c (ensure_dir): Likewise.

* txr.c (get_self_path, substitute_basename, sysroot,
sysroot_init, parse_once_noerr, read_compiled_file_noerr,
read_eval_stream_noerr): Likewise.

* unwind.c (uw_unwind_to_exit_point): Likewise.

1 files changed, 7 insertions, 9 deletions

diff --git a/txr.c b/txr.c
index ae639782..a5dacc3d 100644
--- a/txr.c
+++ b/txr.c
@@ -254,7 +254,7 @@ static val get_self_path(void)
   val execname = string_utf8(getexecname());
   if (car(execname) == chr('/'))
     return execname;
-  return format(nil, lit("~a/~a"), getcwd_wrap(), execname, nao);
+  return scat3(getcwd_wrap(), chr('/'), execname);
 }
 #else
 static val get_self_path(void)
@@ -278,15 +278,13 @@ static val substitute_basename(val edited_path, val source_path)
                      source_path);
 
   return if3(lslash,
-             format(nil, lit("~a~a"),
-                    sub_str(edited_path, 0, succ(lslash)),
-                    basename, nao),
+             scat2(sub_str(edited_path, 0, succ(lslash)), basename),
              basename);
 }
 
 static val sysroot(val target)
 {
-  return format(nil, lit("~a~a"), sysroot_path, target, nao);
+  return scat2(sysroot_path, target);
 }
 
 static void sysroot_init(void)
@@ -305,7 +303,7 @@ static void sysroot_init(void)
   prog_dir = dir_name(prog_path);
 
   if (ref(prog_dir, negone) != chr(psc[0]))
-    prog_dir = format(nil, lit("~a~a"), prog_dir, chr(psc[0]), nao);
+    prog_dir = scat3(prog_dir, chr(psc[0]), lit(""));
 
   if (!(maybe_sysroot(lit(TXR_REL_PATH)) ||
         maybe_sysroot(lit(TXR_REL_PATH EXE_SUFF)) ||
@@ -473,21 +471,21 @@ static void no_dbg_support(val arg)
 
 static int parse_once_noerr(val stream, val name)
 {
-  val pfx = format(nil, lit("~a:"), name, nao);
+  val pfx = scat2(name, lit(":"));
   ignerr_func_body(int, 0, parse_once(prog_string, stream, name),
                    std_error, pfx);
 }
 
 static val read_compiled_file_noerr(val self, val stream, val name, val error_stream)
 {
-  val pfx = format(nil, lit("~a:"), name, nao);
+  val pfx = scat2(name, lit(":"));
   ignerr_func_body(val, nil, read_compiled_file(self, stream, error_stream),
                    std_error, pfx);
 }
 
 static val read_eval_stream_noerr(val self, val stream, val name, val error_stream)
 {
-  val pfx = format(nil, lit("~a:"), name, nao);
+  val pfx = scat2(name, lit(":"));
   ignerr_func_body(val, nil, read_eval_stream(self, stream, error_stream),
                    std_error, pfx);
 }