From 2c2c329b09a2721fbcca5344152cc4ddc8234fbc Mon Sep 17 00:00:00 2001
From: Juan Jose Garcia Ripoll <jjgarcia@jjgr-2.local>
Date: Thu, 25 Feb 2010 16:46:40 +0100
Subject: [PATCH] Replaced FEtype_error_symbol with FEwrong_type_*_arg

---
 src/c/error.d     | 6 ------
 src/c/reference.d | 4 ++--
 src/h/eval.h      | 2 --
 src/h/external.h  | 1 -
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/c/error.d b/src/c/error.d
index 96c171abc..5046de4d4 100644
--- a/src/c/error.d
+++ b/src/c/error.d
@@ -344,12 +344,6 @@ FEillegal_index(cl_object x, cl_object i)
 	FEerror("~S is an illegal index to ~S.", 2, i, x);
 }
 
-void
-FEtype_error_symbol(cl_object obj)
-{
-	FEwrong_type_argument(@'symbol', obj);
-}
-
 void
 FEdivision_by_zero(cl_object x, cl_object y)
 {
diff --git a/src/c/reference.d b/src/c/reference.d
index 815b2b4c3..73df140ab 100644
--- a/src/c/reference.d
+++ b/src/c/reference.d
@@ -132,7 +132,7 @@ cl_symbol_value(cl_object sym)
 		value = sym;
 	} else {
 		if (!SYMBOLP(sym)) {
-			FEtype_error_symbol(sym);
+			FEwrong_type_only_arg(@'symbol-value', sym, @'symbol');
 		}
 		value = ECL_SYM_VAL(the_env, sym);
 		if (value == OBJNULL)
@@ -148,7 +148,7 @@ ecl_boundp(cl_env_ptr env, cl_object sym)
 		return 1;
 	} else {
 		if (!SYMBOLP(sym))
-			FEtype_error_symbol(sym);
+			FEwrong_type_only_arg(@'boundp', sym, @'symbol');
 		return ECL_SYM_VAL(env, sym) != OBJNULL;
 	}
 }
diff --git a/src/h/eval.h b/src/h/eval.h
index 086b0d822..f94331a3c 100644
--- a/src/h/eval.h
+++ b/src/h/eval.h
@@ -14,8 +14,6 @@
     See file '../Copyright' for full details.
 */
 
-#define check_symbol(x) if (!SYMBOLP(x)) FEtype_error_symbol(x);
-
 #define CONS(a,d)	ecl_cons((a),(d))
 #define ACONS(a,b,c)	ecl_cons(ecl_cons((a),(b)),(c))
 #define CAR(x)		(Null(x)? (x) : ECL_CONS_CAR(x))
diff --git a/src/h/external.h b/src/h/external.h
index c1cbd5a2f..e724c958d 100755
--- a/src/h/external.h
+++ b/src/h/external.h
@@ -565,7 +565,6 @@ extern ECL_API void FEinvalid_function(cl_object obj) ecl_attr_noreturn;
 extern ECL_API void FEinvalid_function_name(cl_object obj) ecl_attr_noreturn;
 extern ECL_API cl_object CEerror(cl_object c, const char *err_str, int narg, ...);
 extern ECL_API void FEillegal_index(cl_object x, cl_object i) ecl_attr_noreturn;
-extern ECL_API void FEtype_error_symbol(cl_object obj) ecl_attr_noreturn;
 extern ECL_API void FElibc_error(const char *msg, int narg, ...) ecl_attr_noreturn;
 #if defined(mingw32) || defined(_MSC_VER) || defined(cygwin)
 extern ECL_API void FEwin32_error(const char *msg, int narg, ...) ecl_attr_noreturn;