Cnil and Ct are now part of legacy

This commit is contained in:
Juan Jose Garcia Ripoll 2012-06-30 23:01:40 +02:00
parent 738d844fc0
commit 825fc8cbd3
111 changed files with 1859 additions and 1856 deletions

View file

@ -86,20 +86,20 @@ ecl_parse_integer(cl_object str, cl_index start, cl_index end,
s++;
}
if (s >= e) {
if (junk_allowed != Cnil)
@(return Cnil ecl_make_fixnum(s))
if (junk_allowed != ECL_NIL)
@(return ECL_NIL ecl_make_fixnum(s))
else
goto CANNOT_PARSE;
}
x = ecl_parse_integer(strng, s, e, &ep, ecl_fixnum(radix));
if (x == OBJNULL) {
if (junk_allowed != Cnil) {
@(return Cnil ecl_make_fixnum(ep));
if (junk_allowed != ECL_NIL) {
@(return ECL_NIL ecl_make_fixnum(ep));
} else {
goto CANNOT_PARSE;
}
}
if (junk_allowed != Cnil) {
if (junk_allowed != ECL_NIL) {
@(return x ecl_make_fixnum(ep));
}
for (s = ep; s < e; s++) {
@ -107,7 +107,7 @@ ecl_parse_integer(cl_object str, cl_index start, cl_index end,
!= cat_whitespace)
{
CANNOT_PARSE: FEparse_error("Cannot parse an integer in the string ~S.",
Cnil, 1, strng);
ECL_NIL, 1, strng);
}
}
@(return x ecl_make_fixnum(e));