From a40faa2be6e6c9b5108ef19402334c66541e06be Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Sun, 8 Apr 2018 09:44:28 -0700
Subject: expander: consolidate dotted argument error.

* eval.c (dotted_form_error): New static function.
(expand_forms, expand_forms_ss, expand_forms_lisp1): Call
dotted_form_error instead of repeated open coded uw_throwf
calls.
---
 eval.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/eval.c b/eval.c
index 72a5f973..e893aea6 100644
--- a/eval.c
+++ b/eval.c
@@ -3096,13 +3096,18 @@ static val dot_to_apply(val form, val lisp1_p)
   return form;
 }
 
+noreturn static void dotted_form_error(val form)
+{
+  uw_throwf(error_s, lit("dotted argument ~!~s not supported by form"),
+            form, nao);
+}
+
 val expand_forms(val form, val menv)
 {
   if (atom(form)) {
     if (!form || (opt_compat && opt_compat <= 137))
       return form;
-    uw_throwf(error_s, lit("dotted argument ~!~s "
-                           "was not converted to apply form"), form, nao);
+    dotted_form_error(form);
   } else {
     val f = car(form);
     val r = cdr(form);
@@ -3123,8 +3128,7 @@ static val expand_forms_ss(val form, val menv, val ss_hash)
   if (atom(form)) {
     if (!form)
       return form;
-    uw_throwf(error_s, lit("dotted argument ~!~s "
-                           "was not converted to apply form"), form, nao);
+    dotted_form_error(form);
   } else {
     val f = car(form);
     val r = cdr(form);
@@ -3209,8 +3213,7 @@ static val expand_forms_lisp1(val form, val menv)
   if (atom(form)) {
     if (!form || (opt_compat && opt_compat <= 137))
       return form;
-    uw_throwf(error_s, lit("dotted function call ~!~s "
-                           "was not converted to apply form"), form, nao);
+    dotted_form_error(form);
   } else {
     val f = car(form);
     val r = cdr(form);
-- 
cgit v1.2.3