From 1d0654a9d71e0cff2fec98d1538dafc12a4c4a43 Mon Sep 17 00:00:00 2001 From: Justin Ethier Date: Fri, 8 Jun 2018 16:34:55 -0400 Subject: [PATCH] Converted (vector?) to a macro --- include/cyclone/runtime.h | 7 ++++--- runtime.c | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/cyclone/runtime.h b/include/cyclone/runtime.h index 052ac076..3740b65b 100644 --- a/include/cyclone/runtime.h +++ b/include/cyclone/runtime.h @@ -441,15 +441,16 @@ object equalp(object, object); object Cyc_has_cycle(object lst); object Cyc_is_boolean(object o); #define Cyc_is_pair(o) ((is_object_type(o) && ((list) o)->tag == pair_tag) ? boolean_t : boolean_f) -#define Cyc_is_null(o) make_boolean(o == NULL) -TODO: convert all of these to macros (if it makes sense, most should), and remove them from runtime.c: +#define Cyc_is_null(o) (make_boolean(o == NULL)) +//TODO: convert all of these to macros (if it makes sense, most should), and remove them from runtime.c: object Cyc_is_number(object o); object Cyc_is_complex(object o); object Cyc_is_real(object o); object Cyc_is_integer(object o); object Cyc_is_fixnum(object o); object Cyc_is_bignum(object o); -object Cyc_is_vector(object o); +//object Cyc_is_vector(object o); +#define Cyc_is_vector(o) (make_boolean(is_object_type(o) && ((list) o)->tag == vector_tag)) object Cyc_is_bytevector(object o); object Cyc_is_port(object o); object Cyc_is_mutex(object o); diff --git a/runtime.c b/runtime.c index 58b9e32b..9f4c31fc 100644 --- a/runtime.c +++ b/runtime.c @@ -1618,12 +1618,12 @@ object Cyc_is_symbol(object o) return boolean_f; } -object Cyc_is_vector(object o) -{ - if ((o != NULL) && !is_value_type(o) && ((list) o)->tag == vector_tag) - return boolean_t; - return boolean_f; -} +//object Cyc_is_vector(object o) +//{ +// if ((o != NULL) && !is_value_type(o) && ((list) o)->tag == vector_tag) +// return boolean_t; +// return boolean_f; +//} object Cyc_is_bytevector(object o) {