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)
dest = push_mangled_string(string, dest);
@(return output);
mkcl_return_value(output);
}
else
@(return mk_cl_Cnil);
mkcl_return_value(mk_cl_Cnil);
}
/* Universal prefix for ManKai Common Lisp. JCB */
......@@ -270,9 +270,9 @@ mkcl_object mk_si_mangle_symbol(MKCL, mkcl_object symbol)
{
mkcl_call_stack_check(env);
if (MKCL_SYMBOLP(symbol))
{ @(return mangle_full_symbol_name(env, symbol, "")); }
{ mkcl_return_value(mangle_full_symbol_name(env, symbol, "")); }
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)
{
mkcl_call_stack_check(env);
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)
{ @(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;
if (/* p >= 0 && */ p <= mkcl_root_symbols_count) {
mkcl_object output = mk_cl_format(env, 4, mk_cl_Cnil,
mkcl_make_simple_base_string(env, "MKCL_SYM(~S,~D)"),
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");
@(return mk_cl_Cnil output);
mkcl_return_2_values(mk_cl_Cnil, output);
}
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);
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
&& 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)
{
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, "");
@(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
MKCL_GC_NO_INTR(env, MK_GC_FREE(mkcl_core.safety_region));
mkcl_core.safety_region = NULL;
}
@(return size_limit);
mkcl_return_value(size_limit);
}
mkcl_object
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
......@@ -936,7 +936,7 @@ static struct mkcl_alloc_stats * mkcl_alloc_alloc_stats(MKCL)
mkcl_object mk_si_reset_allocation_statistics(MKCL)
{
if (env->alloc) *(env->alloc) = blank_alloc_stats;
@(return mk_cl_Cnil);
mkcl_return_value(mk_cl_Cnil);
}
#endif
......@@ -1409,7 +1409,7 @@ mk_si_get_finalizer(MKCL, mkcl_object o)
} else {
output = mk_cl_Cnil;
}
@(return output);
mkcl_return_value(output);
}
mkcl_object
......@@ -1424,7 +1424,7 @@ mk_si_set_finalizer(MKCL, mkcl_object obj, mkcl_object finalizer)
} else {
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
......@@ -1477,10 +1477,9 @@ mk_si_gc_stats(MKCL, mkcl_object enable)
bytes = new_bytes;
}
@(return
_mkcl_big_register_normalize(env, mkcl_core.bytes_consed)
_mkcl_big_register_normalize(env, mkcl_core.gc_counter)
old_status);
mkcl_return_3_values(_mkcl_big_register_normalize(env, mkcl_core.bytes_consed),
_mkcl_big_register_normalize(env, mkcl_core.gc_counter),
old_status);
}
mkcl_object
......@@ -1490,11 +1489,9 @@ mk_si_mem_stats(MKCL)
size_t heap_size = MK_GC_get_heap_size();
size_t free_bytes = MK_GC_get_free_bytes();
@(return
mkcl_make_unsigned_integer(env, heap_size)
mkcl_make_unsigned_integer(env, free_bytes)
(MK_GC_get_parallel() ? mk_cl_Ct : mk_cl_Cnil)
);
mkcl_return_3_values(mkcl_make_unsigned_integer(env, heap_size),
mkcl_make_unsigned_integer(env, free_bytes),
(MK_GC_get_parallel() ? mk_cl_Ct : mk_cl_Cnil));
}
size_t mkcl_GC_get_total_bytes(void)
......@@ -1530,7 +1527,7 @@ mkcl_object mk_si_scrub_values(MKCL)
env->nvalues = MKCL_MULTIPLE_VALUES_LIMIT;
for (i = 0; i < MKCL_MULTIPLE_VALUES_LIMIT; i++)
env->values[i] = mk_cl_Cnil;
@(return);
mkcl_return_no_value;
}
@(defun si::gc (&optional area)
......@@ -1538,28 +1535,28 @@ mkcl_object mk_si_scrub_values(MKCL)
mk_si_trim_dynamic_cons_stack(env);
mk_si_scrub_values(env);
MKCL_GC_NO_INTR(env, MK_GC_gcollect());
@(return);
mkcl_return_no_value;
@)
mkcl_object
mk_si_gc_dump(MKCL)
{
MKCL_GC_NO_INTR(env, MK_GC_dump());
@(return);
mkcl_return_no_value;
}
mkcl_object
mk_si_gc_off(MKCL)
{
MKCL_GC_NO_INTR(env, MK_GC_disable());
@(return);
mkcl_return_no_value;
}
mkcl_object
mk_si_gc_on(MKCL)
{
MKCL_GC_NO_INTR(env, MK_GC_enable());
@(return);
mkcl_return_no_value;
}
static void mkcl_GC_abort(const char * const msg)
......@@ -1737,7 +1734,7 @@ mkcl_object mk_si_sample_allocation_statistics(MKCL)
if (alloc.cons)
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)
fprintf(stderr, "\tcons: %lu\n", (unsigned long) alloc.cons);
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)
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);
@(return mkcl_aref_index(env, x, j));
mkcl_return_value(mkcl_aref_index(env, x, j));
}
mkcl_object
......@@ -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))))
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)
......@@ -231,7 +231,7 @@ mk_si_row_major_aset(MKCL, mkcl_object x, mkcl_object indx, mkcl_object val)
}
mkcl_va_end(indx);
/* 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
goto AGAIN;
}
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)
goto AGAIN;
}
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)
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);
@(return x->vector.self.t[i]);
mkcl_return_value(x->vector.self.t[i]);
}
mkcl_object
......@@ -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))))
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
mkcl_array_allocself(env, x);
else
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,
mkcl_array_allocself(env, x);
else
displace(env, x, displ, disploff);
@(return x);
mkcl_return_value(x);
}
mkcl_object
......@@ -943,7 +943,7 @@ mkcl_object
mk_cl_array_element_type(MKCL, mkcl_object a)
{
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)
{
mkcl_call_stack_check(env);
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(1)));
}
......@@ -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');
goto AGAIN;
}
@(return MKCL_MAKE_FIXNUM(dim));
mkcl_return_value(MKCL_MAKE_FIXNUM(dim));
}
mkcl_object
mk_cl_array_total_size(MKCL, mkcl_object a)
{
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
......@@ -1082,7 +1082,7 @@ mk_cl_adjustable_array_p(MKCL, mkcl_object a)
{
mkcl_call_stack_check(env);
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)
mkcl_FEbad_aet(env);
}
}
@(return to_array MKCL_MAKE_FIXNUM(offset));
mkcl_return_2_values(to_array, MKCL_MAKE_FIXNUM(offset));
}
mkcl_object
......@@ -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');
goto AGAIN;
}
@(return r);
mkcl_return_value(r);
}
mkcl_object
mk_cl_fill_pointer(MKCL, mkcl_object a)
{
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)
fillp = mkcl_fixnum_to_word(fp);
else
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)
mkcl_FEerror(env, "Cannot replace the array ~S by the array ~S.", 2, olda, newa);
}
OUTPUT:
@(return olda);
mkcl_return_value(olda);
}
void
......@@ -1552,6 +1552,6 @@ mk_si_fill_array_with_elt(MKCL, mkcl_object x, mkcl_object elt, mkcl_object star
mkcl_FEbad_aet(env);
}
END:
@(return x);
mkcl_return_value(x);
}
......@@ -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-update');
}
@(return def);
mkcl_return_value(def);
@)
mkcl_object
......@@ -98,7 +98,7 @@ mk_cl_makunbound(MKCL, mkcl_object sym)
if (mkcl_symbol_type(env, sym) & mkcl_stp_constant)
mkcl_FEinvalid_variable(env, "Cannot unbind the constant ~S.", sym);
MKCL_SETQ(env, sym, MKCL_OBJNULL);
@(return sym);
mkcl_return_value(sym);
}
mkcl_object
......@@ -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-update');
}
@(return fname);
mkcl_return_value(fname);
}
......@@ -137,18 +137,18 @@ mk_si_get_sysprop(MKCL, mkcl_object sym, mkcl_object prop)
mkcl_object plist = sym->symbol.sys_plist;
mkcl_object val = mkcl_getf(env, plist, prop, MKCL_OBJNULL);
if (val == MKCL_OBJNULL)
{ @(return mk_cl_Cnil mk_cl_Cnil); }
{ mkcl_return_2_values(mk_cl_Cnil, mk_cl_Cnil); }
else
{ @(return val mk_cl_Ct); }
{ mkcl_return_2_values(val, mk_cl_Ct); }
}
else
{
mkcl_object plist = mkcl_gethash_safe(env, sym, mkcl_core.system_properties, mk_cl_Cnil);
prop = mkcl_getf(env, plist, prop, MKCL_OBJNULL);
if (prop == MKCL_OBJNULL) {
@(return mk_cl_Cnil mk_cl_Cnil);
mkcl_return_2_values(mk_cl_Cnil, mk_cl_Cnil);
} else {
@(return prop mk_cl_Ct);
mkcl_return_2_values(prop, mk_cl_Ct);
}
}
}
......@@ -174,7 +174,7 @@ mk_si_put_sysprop(MKCL, mkcl_object sym, mkcl_object prop, mkcl_object value)
} MKCL_UNWIND_PROTECT_EXIT {
if (locked) SYSTEM_PROPERTIES_UNLOCK();
} MKCL_UNWIND_PROTECT_END;
@(return value);
mkcl_return_value(value);
}
else
{
......@@ -193,7 +193,7 @@ mk_si_put_sysprop(MKCL, mkcl_object sym, mkcl_object prop, mkcl_object value)
} MKCL_UNWIND_PROTECT_EXIT {
if (locked) SYSTEM_PROPERTIES_UNLOCK();
} MKCL_UNWIND_PROTECT_END;
@(return value);
mkcl_return_value(value);
}
}
......@@ -221,7 +221,7 @@ mk_si_rem_sysprop(MKCL, mkcl_object sym, mkcl_object prop)
} MKCL_UNWIND_PROTECT_EXIT {
if (locked) SYSTEM_PROPERTIES_UNLOCK();
} MKCL_UNWIND_PROTECT_END;
@(return found);
mkcl_return_value(found);
}
else
{
......@@ -242,7 +242,7 @@ mk_si_rem_sysprop(MKCL, mkcl_object sym, mkcl_object prop)
} MKCL_UNWIND_PROTECT_EXIT {
if (locked) SYSTEM_PROPERTIES_UNLOCK();
} MKCL_UNWIND_PROTECT_END;
@(return found);
mkcl_return_value(found);
}
}
......@@ -252,7 +252,7 @@ mk_si_system_properties(MKCL)
{
/* Maybe we should lock the system properties,
then copy the hashtable and finally return the copy. JCB */
@(return mkcl_core.system_properties);
mkcl_return_value(mkcl_core.system_properties);
}
......
......@@ -255,7 +255,7 @@ quasiquote_macro(MKCL, mkcl_object whole, mkcl_object lex_env)
{
if (mkcl_length(env, whole) != 2)
mkcl_FEprogram_error(env, "Syntax error: ~S.", 1, whole);
@(return backq(env, MKCL_CADR(whole)));
mkcl_return_value(backq(env, MKCL_CADR(whole)));
}
void
......
......@@ -236,14 +236,14 @@ mkcl_object
mk_si_trace_closure_creation(MKCL)
{
mkcl_trace_closure_creation = TRUE;
@(return mk_cl_Ct);
mkcl_return_value(mk_cl_Ct);
}
mkcl_object
mk_si_untrace_closure_creation(MKCL)
{
mkcl_trace_closure_creation = FALSE;
@(return mk_cl_Cnil);
mkcl_return_value(mk_cl_Cnil);
}
#endif
......@@ -553,7 +553,7 @@ mkcl_clone_cclosure(MKCL, mkcl_object c0, mkcl_object new_cenv)
}
}
mkcl_va_end(args);
@(return head);
mkcl_return_value(head);
@)
mkcl_object
......@@ -563,9 +563,9 @@ mk_si_closure_siblings_p(MKCL, mkcl_object c1, mkcl_object c2)
mkcl_object c1_env = mk_si_closure_env(env, c1);
if (mkcl_Null(c1_env))
{ @(return mk_cl_Cnil); }
{ mkcl_return_value(mk_cl_Cnil); }
else
{ @(return ((c1_env == mk_si_closure_env(env, c2)) ? mk_cl_Ct : mk_cl_Cnil)); }
{ mkcl_return_value(((c1_env == mk_si_closure_env(env, c2)) ? mk_cl_Ct : mk_cl_Cnil)); }
}
......@@ -582,7 +582,7 @@ mk_si_closure_depth(MKCL, mkcl_object disp)
mkcl_call_stack_check(env);
if (mkcl_type_of(disp) != mkcl_t_cdisplay)
mkcl_FEinvalid_cdisplay(env, disp);
@(return mkcl_make_unsigned_integer(env, disp->display.nb_levels));
mkcl_return_value(mkcl_make_unsigned_integer(env, disp->display.nb_levels));
}
mkcl_object
......@@ -595,9 +595,9 @@ mk_si_closure_level(MKCL, mkcl_object disp, mkcl_object i)
mkcl_FEinvalid_cdisplay(env, disp);
if (disp->display.nb_levels > index)
{ @(return disp->display.level[index]); }
{ mkcl_return_value(disp->display.level[index]); }
else
{ @(return mk_cl_Cnil); }
{ mkcl_return_value(mk_cl_Cnil); }
}
mkcl_object
......@@ -606,7 +606,7 @@ mk_si_closure_level_size(MKCL, mkcl_object level)
mkcl_call_stack_check(env);
if (mkcl_type_of(level) != mkcl_t_clevel_block)
mkcl_FEwrong_type_argument(env, @'si::compiled-closure-level', level);
@(return mkcl_make_unsigned_integer(env, level->lblock.nb_vars));
mkcl_return_value(mkcl_make_unsigned_integer(env, level->lblock.nb_vars));
}
mkcl_object
......@@ -619,9 +619,9 @@ mk_si_closure_level_var(MKCL, mkcl_object level, mkcl_object i)
mkcl_FEwrong_type_argument(env, @'si::compiled-closure-level', level);
if (level->lblock.nb_vars > index)
{ @(return level->lblock.var[index]); }
{ mkcl_return_value(level->lblock.var[index]); }
else
{ @(return MKCL_OBJNULL); }
{ mkcl_return_value(MKCL_OBJNULL); }
}
mkcl_object
......@@ -636,7 +636,7 @@ mk_si_closure_level_set_var(MKCL, mkcl_object level, mkcl_object i, mkcl_object
if (level->lblock.nb_vars > index)
level->lblock.var[index] = val;
@(return val);
mkcl_return_value(val);
}
mkcl_object
......@@ -645,7 +645,7 @@ mk_si_closure_level_outer_level(MKCL, mkcl_object level)
mkcl_call_stack_check(env);
if (mkcl_type_of(level) != mkcl_t_clevel_block)
mkcl_FEwrong_type_argument(env, @'si::compiled-closure-level', level);
@(return level->lblock.outer);
mkcl_return_value(level->lblock.outer);
}
void
......@@ -690,7 +690,7 @@ mk_si_compiled_function_name(MKCL, mkcl_object fun)
default:
mkcl_FEinvalid_function(env, fun);
}
@(return output);
mkcl_return_value(output);
}
mkcl_object
......@@ -709,7 +709,7 @@ mk_si_set_compiled_function_name(MKCL, mkcl_object fun, mkcl_object name)
default:
mkcl_FEinvalid_function(env, fun);
}
@(return name);
mkcl_return_value(name);
}
mkcl_object
......@@ -755,7 +755,7 @@ mk_cl_function_lambda_expression(MKCL, mkcl_object fun)
default:
mkcl_FEinvalid_function(env, fun);
}
@(return lambda_expr closure_p name);
mkcl_return_3_values(lambda_expr, closure_p, name);
}
mkcl_object
......@@ -766,8 +766,8 @@ mk_si_closurep(MKCL, mkcl_object fun)
{
case mkcl_t_bclosure:
case mkcl_t_cclosure:
@(return mk_cl_Ct);
default: @(return mk_cl_Cnil);
mkcl_return_value(mk_cl_Ct);
default: mkcl_return_value(mk_cl_Cnil);
}
}
......@@ -778,10 +778,10 @@ mk_si_closure_env(MKCL, mkcl_object fun)
switch(mkcl_type_of(fun))
{
case mkcl_t_bclosure:
@(return fun->bclosure.lex mk_cl_Cnil);
mkcl_return_2_values(fun->bclosure.lex, mk_cl_Cnil);
case mkcl_t_cclosure:
@(return fun->cclosure.cenv fun->cclosure.syms_cenv);
default: @(return mk_cl_Cnil mk_cl_Cnil);
mkcl_return_2_values(fun->cclosure.cenv, fun->cclosure.syms_cenv);
default: mkcl_return_2_values(mk_cl_Cnil, mk_cl_Cnil);
}
}
......@@ -792,10 +792,10 @@ mk_si_closure_producer(MKCL, mkcl_object fun)
switch(mkcl_type_of(fun))
{
case mkcl_t_bclosure:
@(return fun->bclosure.producer);
mkcl_return_value(fun->bclosure.producer);
case mkcl_t_cclosure:
@(return fun->cclosure.producer);
default: @(return mk_cl_Cnil);
mkcl_return_value(fun->cclosure.producer);
default: mkcl_return_value(mk_cl_Cnil);
}
}
......@@ -813,7 +813,7 @@ mk_si_compiled_function_block(MKCL, mkcl_object fun)
default:
mkcl_FEerror(env, "~S is not a C compiled function.", 1, fun);