mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-29 19:30:36 +02:00
4a2d78b4d4
* 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.
59 lines
1.5 KiB
C
59 lines
1.5 KiB
C
#ifndef SCM_VALUES_H
|
||
#define SCM_VALUES_H
|
||
|
||
/* Copyright 2000-2001,2006,2008,2012,2018
|
||
Free Software Foundation, Inc.
|
||
|
||
This file is part of Guile.
|
||
|
||
Guile is free software: you can redistribute it and/or modify it
|
||
under the terms of the GNU Lesser General Public License as published
|
||
by the Free Software Foundation, either version 3 of the License, or
|
||
(at your option) any later version.
|
||
|
||
Guile is distributed in the hope that it will be useful, but WITHOUT
|
||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
||
License for more details.
|
||
|
||
You should have received a copy of the GNU Lesser General Public
|
||
License along with Guile. If not, see
|
||
<https://www.gnu.org/licenses/>. */
|
||
|
||
|
||
|
||
#include "libguile/gc.h"
|
||
|
||
static inline int
|
||
scm_is_values (SCM x)
|
||
{
|
||
return SCM_HAS_TYP7 (x, scm_tc7_values);
|
||
}
|
||
|
||
#ifdef BUILDING_LIBGUILE
|
||
static inline size_t
|
||
scm_i_nvalues (SCM x)
|
||
{
|
||
return SCM_CELL_WORD_0 (x) >> 8;
|
||
}
|
||
|
||
static inline SCM
|
||
scm_i_value_ref (SCM x, size_t n)
|
||
{
|
||
return SCM_CELL_OBJECT (x, n+1);
|
||
}
|
||
#endif
|
||
|
||
#define SCM_VALUESP(x) (scm_is_values (x))
|
||
|
||
SCM_INTERNAL void scm_i_extract_values_2 (SCM obj, SCM *p1, SCM *p2);
|
||
|
||
SCM_API SCM scm_values (SCM args);
|
||
SCM_API SCM scm_c_values (SCM *base, size_t n);
|
||
SCM_API SCM scm_values_2 (SCM a, SCM b);
|
||
SCM_API SCM scm_values_3 (SCM a, SCM b, SCM c);
|
||
SCM_API size_t scm_c_nvalues (SCM obj);
|
||
SCM_API SCM scm_c_value_ref (SCM obj, size_t idx);
|
||
SCM_INTERNAL void scm_init_values (void);
|
||
|
||
#endif /* SCM_VALUES_H */
|