ECL was still using the deprecated c_string_to_object

This commit is contained in:
Juan Jose Garcia Ripoll 2009-08-29 10:53:54 +02:00
parent a9f70db3c2
commit 95ac61115c
7 changed files with 10 additions and 10 deletions

View file

@ -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))
}

View file

@ -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)

View file

@ -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.

View file

@ -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);
}

View file

@ -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;

View file

@ -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);
}

View file

@ -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 "