summaryrefslogtreecommitdiff
path: root/libguile/eval.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-06-25 15:49:34 +0200
committerAndy Wingo <wingo@pobox.com>2018-06-25 17:50:29 +0200
commit4a2d78b4d463cd29226f3eee776dcad9f64e6152 (patch)
tree8e5913c97dcc0741d1de3149d8aeae09e7fda70d /libguile/eval.c
parent08bf4aba30d6365d5fc73fe5ced5f83ff819205c (diff)
downloadguile-4a2d78b4d463cd29226f3eee776dcad9f64e6152.tar.gz
Give multiple-values objects a tc7
* libguile/scm.h (scm_tc7_values): New tc7. Never seen by Scheme, so we don't need to update it anywhere else. * libguile/values.h (scm_is_values): New public static inline function. (scm_i_nvalues, scm_i_value_ref): New private static inline functions. (SCM_VALUESP): Use scm_is_value. (scm_values_2, scm_values_3): New functions. (scm_values_vtable): Remove; values objects are not structs any more. * libguile/values.c (scm_i_extract_values_2): Adapt to new values representation. (print_values): Remove now-unused function. (scm_c_nvalues): Use scm_i_nvalues. (scm_c_value_ref): Use scm_i_value_ref. (scm_values, scm_c_values): Make the new-style objects, which store their values inline. (scm_values_2, scm_values_3): New helpers, to avoid consing little useless lists. * libguile/vm-engine.c (halt, subr-call) * libguile/eval.c (eval): Adapt to new values representation. * libguile/i18n.c (scm_locale_string_to_integer) (scm_locale_string_to_integer) * libguile/numbers.c (scm_i_floor_divide, scm_i_ceiling_divide) (scm_i_truncate_divide, scm_i_centered_divide, scm_i_round_divide) (scm_i_exact_integer_sqrt) * libguile/r6rs-ports.c (make_bytevector_output_port) * libguile/srfi-1.c (scm_srfi1_partition, scm_srfi1_partition_x) * libguile/srfi-14.c (scm_char_set_diff_plus_intersection) (scm_char_set_diff_plus_intersection_x) * libguile/posix.c (scm_getrlimit, scm_open_process): Adapt to use scm_values_2 or scm_values_3. * libguile/print.c (iprin1): Add printer for values objects.
Diffstat (limited to 'libguile/eval.c')
-rw-r--r--libguile/eval.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/libguile/eval.c b/libguile/eval.c
index f80a9f3f5..1403a14f5 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -224,13 +224,12 @@ static void error_unrecognized_keyword (SCM proc, SCM kw)
static SCM
truncate_values (SCM x)
{
- if (SCM_LIKELY (!SCM_VALUESP (x)))
+ if (SCM_LIKELY (!scm_is_values (x)))
return x;
else
{
- SCM l = scm_struct_ref (x, SCM_INUM0);
- if (SCM_LIKELY (scm_is_pair (l)))
- return scm_car (l);
+ if (SCM_LIKELY (scm_i_nvalues (x) > 0))
+ return scm_i_value_ref (x, 0);
else
{
scm_ithrow (scm_from_latin1_symbol ("vm-run"),
@@ -368,8 +367,13 @@ eval (SCM x, SCM env)
/* `proc' is the consumer. */
proc = EVAL1 (CDR (mx), env);
v = scm_call_0 (producer);
- if (SCM_VALUESP (v))
- args = scm_struct_ref (v, SCM_INUM0);
+ if (scm_is_values (v))
+ {
+ size_t i = scm_i_nvalues (v);
+ args = SCM_EOL;
+ while (i--)
+ args = scm_cons (scm_i_value_ref (v, i), args);
+ }
else
args = scm_list_1 (v);
goto apply_proc;