From 95ac61115ce19af2efdc06a82f3fe18d8f99e5c3 Mon Sep 17 00:00:00 2001
From: Juan Jose Garcia Ripoll <jjgarcia@jjgr-2.local>
Date: Sat, 29 Aug 2009 10:53:54 +0200
Subject: [PATCH] ECL was still using the deprecated c_string_to_object

---
 src/c/array.d       | 2 +-
 src/c/character.d   | 2 +-
 src/c/hash.d        | 4 ++--
 src/c/instance.d    | 6 +++---
 src/c/num_rand.d    | 2 +-
 src/c/typespec.d    | 2 +-
 src/cmp/cmpmain.lsp | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/c/array.d b/src/c/array.d
index 01a3cd737..8ea0c59a2 100644
--- a/src/c/array.d
+++ b/src/c/array.d
@@ -907,7 +907,7 @@ cl_fill_pointer(cl_object a)
 	assert_type_vector(a);
 	if (!ECL_ARRAY_HAS_FILL_POINTER_P(a)) {
 		a = ecl_type_error(@'fill-pointer', "argument",
-				   a, c_string_to_object("(AND VECTOR (SATISFIES ARRAY-HAS-FILL-POINTER-P))"));
+				   a, ecl_read_from_cstring("(AND VECTOR (SATISFIES ARRAY-HAS-FILL-POINTER-P))"));
 	}
 	@(return MAKE_FIXNUM(a->vector.fillp))
 }
diff --git a/src/c/character.d b/src/c/character.d
index 55794efa1..d995160b3 100644
--- a/src/c/character.d
+++ b/src/c/character.d
@@ -351,7 +351,7 @@ cl_character(cl_object x)
 		}
 	default: ERROR:
 		x = ecl_type_error(@'character',"character designator",
-				   x,c_string_to_object("(OR CHARACTER SYMBOL (ARRAY CHARACTER (1)) (ARRAY BASE-CHAR (1)))"));
+				   x,ecl_read_from_cstring("(OR CHARACTER SYMBOL (ARRAY CHARACTER (1)) (ARRAY BASE-CHAR (1)))"));
 		goto AGAIN;
 	}
 	@(return x)
diff --git a/src/c/hash.d b/src/c/hash.d
index 9afe30340..f464a874a 100644
--- a/src/c/hash.d
+++ b/src/c/hash.d
@@ -462,7 +462,7 @@ cl__make_hash_table(cl_object test, cl_object size, cl_object rehash_size,
 		rehash_size =
 			ecl_type_error(@'make-hash-table',"rehash-size",
 				       rehash_size,
-				       c_string_to_object("(OR (INTEGER 1 *) (FLOAT 0 (1)))"));
+				       ecl_read_from_cstring("(OR (INTEGER 1 *) (FLOAT 0 (1)))"));
 		goto AGAIN;
 	}
 	if (floatp(rehash_size)) {
@@ -481,7 +481,7 @@ cl__make_hash_table(cl_object test, cl_object size, cl_object rehash_size,
 		rehash_threshold =
 			ecl_type_error(@'make-hash-table',"rehash-threshold",
 				       rehash_threshold,
-				       c_string_to_object("(REAL 0 1)"));
+				       ecl_read_from_cstring("(REAL 0 1)"));
 	}
 	/*
 	 * Build actual hash.
diff --git a/src/c/instance.d b/src/c/instance.d
index c55d61f68..17334f66d 100644
--- a/src/c/instance.d
+++ b/src/c/instance.d
@@ -200,15 +200,15 @@ si_copy_instance(cl_object x)
 cl_object
 ecl_slot_value(cl_object x, const char *slot)
 {
-	cl_object slot_name = c_string_to_object(slot);
+	cl_object slot_name = ecl_read_from_cstring(slot);
 	return funcall(3, @'slot-value', x, slot_name);
 }
 
 cl_object
 ecl_slot_value_set(cl_object x, const char *slot, cl_object value)
 {
-	cl_object slot_name = c_string_to_object(slot);
-	cl_object slot_setter = c_string_to_object("(SETF SLOT-VALUE)");
+	cl_object slot_name = ecl_read_from_cstring(slot);
+	cl_object slot_setter = ecl_read_from_cstring("(SETF SLOT-VALUE)");
 	return funcall(4, ecl_fdefinition(slot_setter), value, x, slot_name);
 }
 
diff --git a/src/c/num_rand.d b/src/c/num_rand.d
index 104f3e979..3cfa76f93 100644
--- a/src/c/num_rand.d
+++ b/src/c/num_rand.d
@@ -162,7 +162,7 @@ rando(cl_object x, cl_object rs)
 	default:
 	ERROR:
 		x = ecl_type_error(@'random',"limit",x,
-				   c_string_to_object("(OR (INTEGER (0) *) (FLOAT (0) *))"));
+				   ecl_read_from_cstring("(OR (INTEGER (0) *) (FLOAT (0) *))"));
 		goto AGAIN;
 	}
 	return z;
diff --git a/src/c/typespec.d b/src/c/typespec.d
index 6504c49aa..41a85bb4e 100644
--- a/src/c/typespec.d
+++ b/src/c/typespec.d
@@ -57,7 +57,7 @@ FEtype_error_proper_list(cl_object x) {
 	cl_error(9, @'simple-type-error', @':format-control',
 		    make_constant_base_string("Not a proper list ~D"),
 		    @':format-arguments', cl_list(1, x),
-		    @':expected-type', c_string_to_object("si::proper-list"),
+		    @':expected-type', ecl_read_from_cstring("si::proper-list"),
 		    @':datum', x);
 }
 
diff --git a/src/cmp/cmpmain.lsp b/src/cmp/cmpmain.lsp
index ee986e14b..e20d9d775 100644
--- a/src/cmp/cmpmain.lsp
+++ b/src/cmp/cmpmain.lsp
@@ -344,7 +344,7 @@ filesystem or in the database of ASDF modules."
 		   (princ ";
 cl_object output;
 si_select_package(make_simple_base_string(\"CL-USER\"));
-output = si_safe_eval(3, c_string_to_object(lisp_code), Cnil, OBJNULL);
+output = si_safe_eval(3, ecl_read_from_cstring(lisp_code), Cnil, OBJNULL);
 " stream)
 		   (when (eq target :program)
 		     (princ "