Commit ac3b64c1 authored by Jean-Claude Beaudoin's avatar Jean-Claude Beaudoin
Browse files

Get rid of any instance of @(return ...). Step toward retirement of dpp.

parent 38be7bc0
...@@ -201,10 +201,10 @@ mkcl_object mk_si_mangle_string(MKCL, mkcl_object string) ...@@ -201,10 +201,10 @@ mkcl_object mk_si_mangle_string(MKCL, mkcl_object string)
dest = push_mangled_string(string, dest); dest = push_mangled_string(string, dest);
@(return output); mkcl_return_value(output);
} }
else else
@(return mk_cl_Cnil); mkcl_return_value(mk_cl_Cnil);
} }
/* Universal prefix for ManKai Common Lisp. JCB */ /* Universal prefix for ManKai Common Lisp. JCB */
...@@ -270,9 +270,9 @@ mkcl_object mk_si_mangle_symbol(MKCL, mkcl_object symbol) ...@@ -270,9 +270,9 @@ mkcl_object mk_si_mangle_symbol(MKCL, mkcl_object symbol)
{ {
mkcl_call_stack_check(env); mkcl_call_stack_check(env);
if (MKCL_SYMBOLP(symbol)) if (MKCL_SYMBOLP(symbol))
{ @(return mangle_full_symbol_name(env, symbol, "")); } { mkcl_return_value(mangle_full_symbol_name(env, symbol, "")); }
else else
{ @(return mk_cl_Cnil); } { mkcl_return_value(mk_cl_Cnil); }
} }
...@@ -280,20 +280,20 @@ mkcl_object mk_si_mangle_name(MKCL, mkcl_object symbol) ...@@ -280,20 +280,20 @@ mkcl_object mk_si_mangle_name(MKCL, mkcl_object symbol)
{ {
mkcl_call_stack_check(env); mkcl_call_stack_check(env);
if (symbol == mk_cl_Cnil) if (symbol == mk_cl_Cnil)
{ @(return mk_cl_Ct mkcl_make_simple_base_string(env, "mk_cl_Cnil")); } { mkcl_return_2_values(mk_cl_Ct, mkcl_make_simple_base_string(env, "mk_cl_Cnil")); }
else if (symbol == mk_cl_Ct) else if (symbol == mk_cl_Ct)
{ @(return mk_cl_Ct mkcl_make_simple_base_string(env, "mk_cl_Ct")); } { mkcl_return_2_values(mk_cl_Ct, mkcl_make_simple_base_string(env, "mk_cl_Ct")); }
mkcl_index p = (mkcl_symbol_initializer*)symbol - mkcl_root_symbols; mkcl_index p = (mkcl_symbol_initializer*)symbol - mkcl_root_symbols;
if (/* p >= 0 && */ p <= mkcl_root_symbols_count) { if (/* p >= 0 && */ p <= mkcl_root_symbols_count) {
mkcl_object output = mk_cl_format(env, 4, mk_cl_Cnil, mkcl_object output = mk_cl_format(env, 4, mk_cl_Cnil,
mkcl_make_simple_base_string(env, "MKCL_SYM(~S,~D)"), mkcl_make_simple_base_string(env, "MKCL_SYM(~S,~D)"),
mkcl_symbol_name(env, symbol), MKCL_MAKE_FIXNUM(p)); mkcl_symbol_name(env, symbol), MKCL_MAKE_FIXNUM(p));
@(return mk_cl_Ct output); mkcl_return_2_values(mk_cl_Ct, output);
} }
mkcl_object output = mangle_full_symbol_name(env, symbol, "_symbol"); mkcl_object output = mangle_full_symbol_name(env, symbol, "_symbol");
@(return mk_cl_Cnil output); mkcl_return_2_values(mk_cl_Cnil, output);
} }
mkcl_object mk_si_mangle_function_name(MKCL, mkcl_object symbol) mkcl_object mk_si_mangle_function_name(MKCL, mkcl_object symbol)
...@@ -304,7 +304,7 @@ mkcl_object mk_si_mangle_function_name(MKCL, mkcl_object symbol) ...@@ -304,7 +304,7 @@ mkcl_object mk_si_mangle_function_name(MKCL, mkcl_object symbol)
mkcl_call_stack_check(env); mkcl_call_stack_check(env);
if (mkcl_Null(symbol)) symbol = mk_cl_Cnil_symbol; if (mkcl_Null(symbol)) symbol = mk_cl_Cnil_symbol;
else if (!MKCL_SYMBOLP(symbol)) { @(return mk_cl_Cnil mk_cl_Cnil); } else if (!MKCL_SYMBOLP(symbol)) { mkcl_return_2_values(mk_cl_Cnil, mk_cl_Cnil); }
if (((mkcl_object) &(mkcl_root_symbols[0].data)) <= symbol if (((mkcl_object) &(mkcl_root_symbols[0].data)) <= symbol
&& symbol < ((mkcl_object) &(mkcl_root_symbols[NB_STATIC_SYMBOLS-1].data))) && symbol < ((mkcl_object) &(mkcl_root_symbols[NB_STATIC_SYMBOLS-1].data)))
...@@ -325,11 +325,11 @@ mkcl_object mk_si_mangle_function_name(MKCL, mkcl_object symbol) ...@@ -325,11 +325,11 @@ mkcl_object mk_si_mangle_function_name(MKCL, mkcl_object symbol)
{ {
found = output = mk_cl_Cnil; found = output = mk_cl_Cnil;
} }
@(return found output minarg maxarg); mkcl_return_4_values(found, output, minarg, maxarg);
} }
mkcl_object output = mangle_full_symbol_name(env, symbol, ""); mkcl_object output = mangle_full_symbol_name(env, symbol, "");
@(return found output minarg maxarg); mkcl_return_4_values(found, output, minarg, maxarg);
} }
......
...@@ -120,13 +120,13 @@ mk_si_set_heap_size_limit(MKCL, mkcl_object size_limit) /* This function should ...@@ -120,13 +120,13 @@ mk_si_set_heap_size_limit(MKCL, mkcl_object size_limit) /* This function should
MKCL_GC_NO_INTR(env, MK_GC_FREE(mkcl_core.safety_region)); MKCL_GC_NO_INTR(env, MK_GC_FREE(mkcl_core.safety_region));
mkcl_core.safety_region = NULL; mkcl_core.safety_region = NULL;
} }
@(return size_limit); mkcl_return_value(size_limit);
} }
mkcl_object mkcl_object
mk_si_get_heap_size_limit(MKCL) /* This function should acquire the OOM lock. */ mk_si_get_heap_size_limit(MKCL) /* This function should acquire the OOM lock. */
{ {
@(return mkcl_make_unsigned_integer(env, mkcl_core.max_heap_size)); mkcl_return_value(mkcl_make_unsigned_integer(env, mkcl_core.max_heap_size));
} }
static void static void
...@@ -936,7 +936,7 @@ static struct mkcl_alloc_stats * mkcl_alloc_alloc_stats(MKCL) ...@@ -936,7 +936,7 @@ static struct mkcl_alloc_stats * mkcl_alloc_alloc_stats(MKCL)
mkcl_object mk_si_reset_allocation_statistics(MKCL) mkcl_object mk_si_reset_allocation_statistics(MKCL)
{ {
if (env->alloc) *(env->alloc) = blank_alloc_stats; if (env->alloc) *(env->alloc) = blank_alloc_stats;
@(return mk_cl_Cnil); mkcl_return_value(mk_cl_Cnil);
} }
#endif #endif
...@@ -1409,7 +1409,7 @@ mk_si_get_finalizer(MKCL, mkcl_object o) ...@@ -1409,7 +1409,7 @@ mk_si_get_finalizer(MKCL, mkcl_object o)
} else { } else {
output = mk_cl_Cnil; output = mk_cl_Cnil;
} }
@(return output); mkcl_return_value(output);
} }
mkcl_object mkcl_object
...@@ -1424,7 +1424,7 @@ mk_si_set_finalizer(MKCL, mkcl_object obj, mkcl_object finalizer) ...@@ -1424,7 +1424,7 @@ mk_si_set_finalizer(MKCL, mkcl_object obj, mkcl_object finalizer)
} else { } else {
MKCL_GC_NO_INTR(env, MK_GC_register_finalizer_no_order(obj, call_finalizer_on_mkcl_object, finalizer, &ofn, &odata)); MKCL_GC_NO_INTR(env, MK_GC_register_finalizer_no_order(obj, call_finalizer_on_mkcl_object, finalizer, &ofn, &odata));
} }
@(return); mkcl_return_no_value;
} }
mkcl_object mkcl_object
...@@ -1477,10 +1477,9 @@ mk_si_gc_stats(MKCL, mkcl_object enable) ...@@ -1477,10 +1477,9 @@ mk_si_gc_stats(MKCL, mkcl_object enable)
bytes = new_bytes; bytes = new_bytes;
} }
@(return mkcl_return_3_values(_mkcl_big_register_normalize(env, mkcl_core.bytes_consed),
_mkcl_big_register_normalize(env, mkcl_core.bytes_consed) _mkcl_big_register_normalize(env, mkcl_core.gc_counter),
_mkcl_big_register_normalize(env, mkcl_core.gc_counter) old_status);
old_status);
} }
mkcl_object mkcl_object
...@@ -1490,11 +1489,9 @@ mk_si_mem_stats(MKCL) ...@@ -1490,11 +1489,9 @@ mk_si_mem_stats(MKCL)
size_t heap_size = MK_GC_get_heap_size(); size_t heap_size = MK_GC_get_heap_size();
size_t free_bytes = MK_GC_get_free_bytes(); size_t free_bytes = MK_GC_get_free_bytes();
@(return mkcl_return_3_values(mkcl_make_unsigned_integer(env, heap_size),
mkcl_make_unsigned_integer(env, heap_size) mkcl_make_unsigned_integer(env, free_bytes),
mkcl_make_unsigned_integer(env, free_bytes) (MK_GC_get_parallel() ? mk_cl_Ct : mk_cl_Cnil));
(MK_GC_get_parallel() ? mk_cl_Ct : mk_cl_Cnil)
);
} }
size_t mkcl_GC_get_total_bytes(void) size_t mkcl_GC_get_total_bytes(void)
...@@ -1530,7 +1527,7 @@ mkcl_object mk_si_scrub_values(MKCL) ...@@ -1530,7 +1527,7 @@ mkcl_object mk_si_scrub_values(MKCL)
env->nvalues = MKCL_MULTIPLE_VALUES_LIMIT; env->nvalues = MKCL_MULTIPLE_VALUES_LIMIT;
for (i = 0; i < MKCL_MULTIPLE_VALUES_LIMIT; i++) for (i = 0; i < MKCL_MULTIPLE_VALUES_LIMIT; i++)
env->values[i] = mk_cl_Cnil; env->values[i] = mk_cl_Cnil;
@(return); mkcl_return_no_value;
} }
@(defun si::gc (&optional area) @(defun si::gc (&optional area)
...@@ -1538,28 +1535,28 @@ mkcl_object mk_si_scrub_values(MKCL) ...@@ -1538,28 +1535,28 @@ mkcl_object mk_si_scrub_values(MKCL)
mk_si_trim_dynamic_cons_stack(env); mk_si_trim_dynamic_cons_stack(env);
mk_si_scrub_values(env); mk_si_scrub_values(env);
MKCL_GC_NO_INTR(env, MK_GC_gcollect()); MKCL_GC_NO_INTR(env, MK_GC_gcollect());
@(return); mkcl_return_no_value;
@) @)
mkcl_object mkcl_object
mk_si_gc_dump(MKCL) mk_si_gc_dump(MKCL)
{ {
MKCL_GC_NO_INTR(env, MK_GC_dump()); MKCL_GC_NO_INTR(env, MK_GC_dump());
@(return); mkcl_return_no_value;
} }
mkcl_object mkcl_object
mk_si_gc_off(MKCL) mk_si_gc_off(MKCL)
{ {
MKCL_GC_NO_INTR(env, MK_GC_disable()); MKCL_GC_NO_INTR(env, MK_GC_disable());
@(return); mkcl_return_no_value;
} }
mkcl_object mkcl_object
mk_si_gc_on(MKCL) mk_si_gc_on(MKCL)
{ {
MKCL_GC_NO_INTR(env, MK_GC_enable()); MKCL_GC_NO_INTR(env, MK_GC_enable());
@(return); mkcl_return_no_value;
} }
static void mkcl_GC_abort(const char * const msg) static void mkcl_GC_abort(const char * const msg)
...@@ -1737,7 +1734,7 @@ mkcl_object mk_si_sample_allocation_statistics(MKCL) ...@@ -1737,7 +1734,7 @@ mkcl_object mk_si_sample_allocation_statistics(MKCL)
if (alloc.cons) if (alloc.cons)
stats = mkcl_cons(env, mkcl_cons(env, @'cons', mkcl_make_unsigned_integer(env, alloc.cons)), stats); stats = mkcl_cons(env, mkcl_cons(env, @'cons', mkcl_make_unsigned_integer(env, alloc.cons)), stats);
} }
@(return stats); mkcl_return_value(stats);
} }
...@@ -1833,7 +1830,7 @@ mk_si_room_report(MKCL, mkcl_object label) ...@@ -1833,7 +1830,7 @@ mk_si_room_report(MKCL, mkcl_object label)
fprintf(stderr, "\tcons: %lu\n", (unsigned long) alloc.cons); fprintf(stderr, "\tcons: %lu\n", (unsigned long) alloc.cons);
fflush(stderr); fflush(stderr);
} }
@(return mk_cl_Cnil); mkcl_return_value(mk_cl_Cnil);
} }
...@@ -174,7 +174,7 @@ mk_cl_row_major_aref(MKCL, mkcl_object x, mkcl_object indx) ...@@ -174,7 +174,7 @@ mk_cl_row_major_aref(MKCL, mkcl_object x, mkcl_object indx)
if (mkcl_unlikely(!(MKCL_FIXNUMP(indx) && ((j = mkcl_fixnum_to_word(indx)) < x->array.dim)))) if (mkcl_unlikely(!(MKCL_FIXNUMP(indx) && ((j = mkcl_fixnum_to_word(indx)) < x->array.dim))))
j = mkcl_fixnum_in_range(env, @'row-major-aref', "index", indx, 0, (mkcl_word)x->array.dim-1); j = mkcl_fixnum_in_range(env, @'row-major-aref', "index", indx, 0, (mkcl_word)x->array.dim-1);
@(return mkcl_aref_index(env, x, j)); mkcl_return_value(mkcl_aref_index(env, x, j));
} }
mkcl_object mkcl_object
...@@ -189,7 +189,7 @@ mk_si_row_major_aset(MKCL, mkcl_object x, mkcl_object indx, mkcl_object val) ...@@ -189,7 +189,7 @@ mk_si_row_major_aset(MKCL, mkcl_object x, mkcl_object indx, mkcl_object val)
if (mkcl_unlikely(!(MKCL_FIXNUMP(indx) && ((j = mkcl_fixnum_to_word(indx)) < x->array.dim)))) if (mkcl_unlikely(!(MKCL_FIXNUMP(indx) && ((j = mkcl_fixnum_to_word(indx)) < x->array.dim))))
j = mkcl_fixnum_in_range(env, @'si::row-major-aset', "index", indx, 0, (mkcl_word)x->array.dim-1); j = mkcl_fixnum_in_range(env, @'si::row-major-aset', "index", indx, 0, (mkcl_word)x->array.dim-1);
@(return mkcl_aset_index(env, x, j, val)); mkcl_return_value(mkcl_aset_index(env, x, j, val));
} }
@(defun array-row-major-index (x &rest indx) @(defun array-row-major-index (x &rest indx)
...@@ -231,7 +231,7 @@ mk_si_row_major_aset(MKCL, mkcl_object x, mkcl_object indx, mkcl_object val) ...@@ -231,7 +231,7 @@ mk_si_row_major_aset(MKCL, mkcl_object x, mkcl_object indx, mkcl_object val)
} }
mkcl_va_end(indx); mkcl_va_end(indx);
/* By construction, "j" is a valid array index and should thus be within the range of fixnum. */ /* By construction, "j" is a valid array index and should thus be within the range of fixnum. */
@(return MKCL_MAKE_FIXNUM(j)); mkcl_return_value(MKCL_MAKE_FIXNUM(j));
} }
@) @)
...@@ -335,7 +335,7 @@ mkcl_index mkcl_array_row_major_index_3_t(MKCL, mkcl_object a, mkcl_object i, mk ...@@ -335,7 +335,7 @@ mkcl_index mkcl_array_row_major_index_3_t(MKCL, mkcl_object a, mkcl_object i, mk
goto AGAIN; goto AGAIN;
} }
mkcl_va_end(indx); mkcl_va_end(indx);
@(return mkcl_aref_index(env, x, j)); mkcl_return_value(mkcl_aref_index(env, x, j));
} }
@) @)
...@@ -411,7 +411,7 @@ mkcl_vref(MKCL, mkcl_object v, mkcl_object index) ...@@ -411,7 +411,7 @@ mkcl_vref(MKCL, mkcl_object v, mkcl_object index)
goto AGAIN; goto AGAIN;
} }
mkcl_va_end(dims); mkcl_va_end(dims);
@(return mkcl_aset_index(env, x, j, v)); mkcl_return_value(mkcl_aset_index(env, x, j, v));
} }
@) @)
...@@ -550,7 +550,7 @@ mk_cl_svref(MKCL, mkcl_object x, mkcl_object index) ...@@ -550,7 +550,7 @@ mk_cl_svref(MKCL, mkcl_object x, mkcl_object index)
if (mkcl_unlikely(!(MKCL_FIXNUMP(index) && ((i = mkcl_fixnum_to_word(index)) < x->vector.dim)))) if (mkcl_unlikely(!(MKCL_FIXNUMP(index) && ((i = mkcl_fixnum_to_word(index)) < x->vector.dim))))
i = mkcl_fixnum_in_range(env, @'svref', "index", index, 0, (mkcl_word)x->vector.dim-1); i = mkcl_fixnum_in_range(env, @'svref', "index", index, 0, (mkcl_word)x->vector.dim-1);
@(return x->vector.self.t[i]); mkcl_return_value(x->vector.self.t[i]);
} }
mkcl_object mkcl_object
...@@ -569,7 +569,7 @@ mk_si_svset(MKCL, mkcl_object x, mkcl_object index, mkcl_object v) ...@@ -569,7 +569,7 @@ mk_si_svset(MKCL, mkcl_object x, mkcl_object index, mkcl_object v)
if (mkcl_unlikely(!(MKCL_FIXNUMP(index) && ((i = mkcl_fixnum_to_word(index)) < x->vector.dim)))) if (mkcl_unlikely(!(MKCL_FIXNUMP(index) && ((i = mkcl_fixnum_to_word(index)) < x->vector.dim))))
i = mkcl_fixnum_in_range(env, @'svref', "index", index, 0, (mkcl_word)x->vector.dim-1); i = mkcl_fixnum_in_range(env, @'svref', "index", index, 0, (mkcl_word)x->vector.dim-1);
@(return (x->vector.self.t[i] = v)); mkcl_return_value((x->vector.self.t[i] = v));
} }
...@@ -637,7 +637,7 @@ mk_si_make_pure_array(MKCL, mkcl_object etype, mkcl_object dims, mkcl_object adj ...@@ -637,7 +637,7 @@ mk_si_make_pure_array(MKCL, mkcl_object etype, mkcl_object dims, mkcl_object adj
mkcl_array_allocself(env, x); mkcl_array_allocself(env, x);
else else
displace(env, x, displ, disploff); displace(env, x, displ, disploff);
@(return x); mkcl_return_value(x);
} }
/* /*
...@@ -701,7 +701,7 @@ mk_si_make_vector(MKCL, mkcl_object etype, mkcl_object dim, mkcl_object adj, ...@@ -701,7 +701,7 @@ mk_si_make_vector(MKCL, mkcl_object etype, mkcl_object dim, mkcl_object adj,
mkcl_array_allocself(env, x); mkcl_array_allocself(env, x);
else else
displace(env, x, displ, disploff); displace(env, x, displ, disploff);
@(return x); mkcl_return_value(x);
} }
mkcl_object mkcl_object
...@@ -943,7 +943,7 @@ mkcl_object ...@@ -943,7 +943,7 @@ mkcl_object
mk_cl_array_element_type(MKCL, mkcl_object a) mk_cl_array_element_type(MKCL, mkcl_object a)
{ {
mkcl_call_stack_check(env); mkcl_call_stack_check(env);
@(return mkcl_elttype_to_symbol(env, mkcl_array_elttype(env, a))) mkcl_return_value(mkcl_elttype_to_symbol(env, mkcl_array_elttype(env, a)))
} }
/* /*
...@@ -1023,7 +1023,7 @@ mk_cl_array_rank(MKCL, mkcl_object a) ...@@ -1023,7 +1023,7 @@ mk_cl_array_rank(MKCL, mkcl_object a)
{ {
mkcl_call_stack_check(env); mkcl_call_stack_check(env);
mkcl_assert_type_array(env, a); mkcl_assert_type_array(env, a);
@(return ((mkcl_type_of(a) == mkcl_t_array) mkcl_return_value(((mkcl_type_of(a) == mkcl_t_array)
? MKCL_MAKE_FIXNUM(a->array.rank) ? MKCL_MAKE_FIXNUM(a->array.rank)
: MKCL_MAKE_FIXNUM(1))); : MKCL_MAKE_FIXNUM(1)));
} }
...@@ -1067,14 +1067,14 @@ mk_cl_array_dimension(MKCL, mkcl_object a, mkcl_object axis_number) ...@@ -1067,14 +1067,14 @@ mk_cl_array_dimension(MKCL, mkcl_object a, mkcl_object axis_number)
a = mkcl_type_error(env, @'array-dimension', "array", a, @'array'); a = mkcl_type_error(env, @'array-dimension', "array", a, @'array');
goto AGAIN; goto AGAIN;
} }
@(return MKCL_MAKE_FIXNUM(dim)); mkcl_return_value(MKCL_MAKE_FIXNUM(dim));
} }
mkcl_object mkcl_object
mk_cl_array_total_size(MKCL, mkcl_object a) mk_cl_array_total_size(MKCL, mkcl_object a)
{ {
mkcl_call_stack_check(env); mkcl_call_stack_check(env);
@(return MKCL_MAKE_FIXNUM(mkcl_array_total_size(env, a))); mkcl_return_value(MKCL_MAKE_FIXNUM(mkcl_array_total_size(env, a)));
} }
mkcl_object mkcl_object
...@@ -1082,7 +1082,7 @@ mk_cl_adjustable_array_p(MKCL, mkcl_object a) ...@@ -1082,7 +1082,7 @@ mk_cl_adjustable_array_p(MKCL, mkcl_object a)
{ {
mkcl_call_stack_check(env); mkcl_call_stack_check(env);
mkcl_assert_type_array(env, a); mkcl_assert_type_array(env, a);
@(return (a->array.adjustable ? mk_cl_Ct : mk_cl_Cnil)); mkcl_return_value((a->array.adjustable ? mk_cl_Ct : mk_cl_Cnil));
} }
/* /*
...@@ -1174,7 +1174,7 @@ mk_cl_array_displacement(MKCL, mkcl_object a) ...@@ -1174,7 +1174,7 @@ mk_cl_array_displacement(MKCL, mkcl_object a)
mkcl_FEbad_aet(env); mkcl_FEbad_aet(env);
} }
} }
@(return to_array MKCL_MAKE_FIXNUM(offset)); mkcl_return_2_values(to_array, MKCL_MAKE_FIXNUM(offset));
} }
mkcl_object mkcl_object
...@@ -1203,14 +1203,14 @@ mk_cl_array_has_fill_pointer_p(MKCL, mkcl_object a) ...@@ -1203,14 +1203,14 @@ mk_cl_array_has_fill_pointer_p(MKCL, mkcl_object a)
a = mkcl_type_error(env, @'array-has-fill-pointer-p',"argument", a, @'array'); a = mkcl_type_error(env, @'array-has-fill-pointer-p',"argument", a, @'array');
goto AGAIN; goto AGAIN;
} }
@(return r); mkcl_return_value(r);
} }
mkcl_object mkcl_object
mk_cl_fill_pointer(MKCL, mkcl_object a) mk_cl_fill_pointer(MKCL, mkcl_object a)
{ {
mkcl_call_stack_check(env); mkcl_call_stack_check(env);
@(return MKCL_MAKE_FIXNUM(mkcl_vector_fill_pointer(env, a))); mkcl_return_value(MKCL_MAKE_FIXNUM(mkcl_vector_fill_pointer(env, a)));
} }
/* /*
...@@ -1232,7 +1232,7 @@ mk_si_fill_pointer_set(MKCL, mkcl_object a, mkcl_object fp) ...@@ -1232,7 +1232,7 @@ mk_si_fill_pointer_set(MKCL, mkcl_object a, mkcl_object fp)
fillp = mkcl_fixnum_to_word(fp); fillp = mkcl_fixnum_to_word(fp);
else else
fillp = mkcl_fixnum_in_range(env, @'si::fill-pointer-set', "fill pointer", fp, 0, MKCL_MOST_POSITIVE_FIXNUM); fillp = mkcl_fixnum_in_range(env, @'si::fill-pointer-set', "fill pointer", fp, 0, MKCL_MOST_POSITIVE_FIXNUM);
@(return MKCL_MAKE_FIXNUM(mkcl_vector_fill_pointer_set(env, a, fillp))); mkcl_return_value(MKCL_MAKE_FIXNUM(mkcl_vector_fill_pointer_set(env, a, fillp)));
} }
/* /*
...@@ -1282,7 +1282,7 @@ mk_si_replace_array(MKCL, mkcl_object olda, mkcl_object newa) ...@@ -1282,7 +1282,7 @@ mk_si_replace_array(MKCL, mkcl_object olda, mkcl_object newa)
mkcl_FEerror(env, "Cannot replace the array ~S by the array ~S.", 2, olda, newa); mkcl_FEerror(env, "Cannot replace the array ~S by the array ~S.", 2, olda, newa);
} }
OUTPUT: OUTPUT:
@(return olda); mkcl_return_value(olda);
} }
void void
...@@ -1552,6 +1552,6 @@ mk_si_fill_array_with_elt(MKCL, mkcl_object x, mkcl_object elt, mkcl_object star ...@@ -1552,6 +1552,6 @@ mk_si_fill_array_with_elt(MKCL, mkcl_object x, mkcl_object elt, mkcl_object star
mkcl_FEbad_aet(env); mkcl_FEbad_aet(env);
} }
END: END:
@(return x); mkcl_return_value(x);
} }
...@@ -88,7 +88,7 @@ mk_cl_set(MKCL, mkcl_object var, mkcl_object val) ...@@ -88,7 +88,7 @@ mk_cl_set(MKCL, mkcl_object var, mkcl_object val)
mk_si_rem_sysprop(env, sym, @'si::setf-method'); mk_si_rem_sysprop(env, sym, @'si::setf-method');
mk_si_rem_sysprop(env, sym, @'si::setf-update'); mk_si_rem_sysprop(env, sym, @'si::setf-update');
} }
@(return def); mkcl_return_value(def);
@) @)
mkcl_object mkcl_object
...@@ -98,7 +98,7 @@ mk_cl_makunbound(MKCL, mkcl_object sym) ...@@ -98,7 +98,7 @@ mk_cl_makunbound(MKCL, mkcl_object sym)
if (mkcl_symbol_type(env, sym) & mkcl_stp_constant) if (mkcl_symbol_type(env, sym) & mkcl_stp_constant)
mkcl_FEinvalid_variable(env, "Cannot unbind the constant ~S.", sym); mkcl_FEinvalid_variable(env, "Cannot unbind the constant ~S.", sym);
MKCL_SETQ(env, sym, MKCL_OBJNULL); MKCL_SETQ(env, sym, MKCL_OBJNULL);
@(return sym); mkcl_return_value(sym);
} }
mkcl_object mkcl_object
...@@ -122,7 +122,7 @@ mk_cl_fmakunbound(MKCL, mkcl_object fname) ...@@ -122,7 +122,7 @@ mk_cl_fmakunbound(MKCL, mkcl_object fname)
mk_si_rem_sysprop(env, sym, @'si::setf-method'); mk_si_rem_sysprop(env, sym, @'si::setf-method');
mk_si_rem_sysprop(env, sym, @'si::setf-update'); mk_si_rem_sysprop(env, sym, @'si::setf-update');
} }
@(return fname); mkcl_return_value(fname);
} }
...@@ -137,18 +137,18 @@ mk_si_get_sysprop(MKCL, mkcl_object sym, mkcl_object prop) ...@@ -137,18 +137,18 @@ mk_si_get_sysprop(MKCL, mkcl_object sym, mkcl_object prop)
mkcl_object plist = sym->symbol.sys_plist; mkcl_object plist = sym->symbol.sys_plist;
mkcl_object val = mkcl_getf(env, plist, prop, MKCL_OBJNULL); mkcl_object val = mkcl_getf(env, plist, prop, MKCL_OBJNULL);
if (val == MKCL_OBJNULL) if (val == MKCL_OBJNULL)
{ @(return mk_cl_Cnil mk_cl_Cnil); } { mkcl_return_2_values(mk_cl_Cnil, mk_cl_Cnil); }
else else
{ @(return val mk_cl_Ct); } { mkcl_return_2_values(val, mk_cl_Ct); }
} }
else else
{ {
mkcl_object plist = mkcl_gethash_safe(env, sym, mkcl_core.system_properties, mk_cl_Cnil); mkcl_object plist = mkcl_gethash_safe(env, sym, mkcl_core.system_properties, mk_cl_Cnil);
prop = mkcl_getf(env, plist, prop, MKCL_OBJNULL);