From f3a0b4ddc516de5524862b51af548e277a43a28a Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Mon, 13 Mar 2017 07:19:40 -0700
Subject: Fix missing nao terminator in formatted printing.

* arith.c (trunc1, trunc, floorf, ceili):
Add missing nao terminator to uw_throwf calls.

* debug.c (debug): Missing nao terminator in format call.

* eval.c (expand_opt_params_rec, me_equot): Missing nao
terminator in eval_error call.

* lib.c (use_sym): Missing nao in uw_throw call.

* regex.c (reg_derivative): Missing nao in uw_throwf.
---
 arith.c | 8 ++++----
 debug.c | 2 +-
 eval.c  | 4 ++--
 lib.c   | 2 +-
 regex.c | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arith.c b/arith.c
index 1dff8eb6..6d6dd9f9 100644
--- a/arith.c
+++ b/arith.c
@@ -819,7 +819,7 @@ static val trunc1(val num)
   default:
     break;
   }
-  uw_throwf(error_s, lit("trunc: invalid operand ~s"), num);
+  uw_throwf(error_s, lit("trunc: invalid operand ~s"), num, nao);
 }
 
 val trunc(val anum, val bnum)
@@ -1267,7 +1267,7 @@ static val round1(val num)
   default:
     break;
   }
-  uw_throwf(error_s, lit("round: invalid operand ~s"), num);
+  uw_throwf(error_s, lit("round: invalid operand ~s"), num, nao);
 }
 
 
@@ -1956,7 +1956,7 @@ val floorf(val num)
   default:
     break;
   }
-  uw_throwf(error_s, lit("floor: invalid operand ~s"), num);
+  uw_throwf(error_s, lit("floor: invalid operand ~s"), num, nao);
 }
 
 val ceili(val num)
@@ -1972,7 +1972,7 @@ val ceili(val num)
   default:
     break;
   }
-  uw_throwf(error_s, lit("ceil: invalid operand ~s"), num);
+  uw_throwf(error_s, lit("ceil: invalid operand ~s"), num, nao);
 }
 
 val sine(val num)
diff --git a/debug.c b/debug.c
index d207034b..fdf21423 100644
--- a/debug.c
+++ b/debug.c
@@ -209,7 +209,7 @@ val debug(val ctx, val bindings, val data, val line, val pos, val base)
             val breakpoints_old = breakpoints;
             breakpoints = remqual(l, breakpoints, nil);
             if (breakpoints == breakpoints_old)
-              format(std_debug, lit("no such breakpoint\n"));
+              format(std_debug, lit("no such breakpoint\n"), nao);
           } else {
             opt_loglevel = c_num(n);
           }
diff --git a/eval.c b/eval.c
index b4beaa9a..873c810c 100644
--- a/eval.c
+++ b/eval.c
@@ -923,7 +923,7 @@ static val expand_opt_params_rec(val params, val menv,
 
       if (cdddr(pair))
         eval_error(form, lit("~s: extra forms ~s in ~s"),
-                   car(form), pair, cdddr(pair));
+                   car(form), pair, cdddr(pair), nao);
 
       if (opt_sym) {
         if (!bindable(opt_sym))
@@ -3181,7 +3181,7 @@ static val me_qquote(val form, val menv)
 static val me_equot(val form, val menv)
 {
   if (!cdr(form) || cddr(form))
-    eval_error(form, lit("~s: one argument required"), car(form));
+    eval_error(form, lit("~s: one argument required"), car(form), nao);
 
   return rlcp(cons(quote_s, cons(expand(cadr(form), menv), nil)), form);
 }
diff --git a/lib.c b/lib.c
index cd470b8e..7b208cd8 100644
--- a/lib.c
+++ b/lib.c
@@ -4918,7 +4918,7 @@ val use_sym(val symbol, val package_in)
 
     if (found && symbol_package(existing) == package) {
       if (existing == nil)
-        uw_throwf(error_s, lit("~a: cannot hide ~s"), self, existing);
+        uw_throwf(error_s, lit("~a: cannot hide ~s"), self, existing, nao);
       sethash(package->pk.hidhash, name, existing);
       existing->s.package = nil;
     }
diff --git a/regex.c b/regex.c
index 33f0431a..3bbd3492 100644
--- a/regex.c
+++ b/regex.c
@@ -1741,7 +1741,7 @@ static val reg_derivative(val exp, val ch)
     val args = rest(exp);
 
     if (sym == set_s || sym == cset_s) {
-      uw_throwf(error_s, lit("uncompiled regex passed to reg_derivative"));
+      uw_throwf(error_s, lit("uncompiled regex passed to reg_derivative"), nao);
     } else if (sym == compound_s) {
       return reg_derivative_list(args, ch);
     } else if (sym == optional_s) {
-- 
cgit v1.2.3