From f6088819c8b010fc20811131f8fce0dd67a6bf74 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Sat, 10 Jan 2015 23:26:41 +0100 Subject: [PATCH] Minor goops.c tidying * libguile/goops.c: Reorder static variables. Remove unused sym_procedure. --- libguile/goops.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libguile/goops.c b/libguile/goops.c index 5f9fcac9b..d722e0dde 100644 --- a/libguile/goops.c +++ b/libguile/goops.c @@ -55,6 +55,9 @@ #define SCM_OUT_PCLASS_INDEX SCM_I_MAX_PORT_TYPE_COUNT #define SCM_INOUT_PCLASS_INDEX (2 * SCM_I_MAX_PORT_TYPE_COUNT) +#define SCM_GOOPS_UNBOUND SCM_UNBOUND +#define SCM_GOOPS_UNBOUNDP(x) (scm_is_eq (x, SCM_GOOPS_UNBOUND)) + /* Objects have identity, so references to classes and instances are by value, not by reference. Redefinition of a class or modification of an instance causes in-place update; you can think of GOOPS as @@ -64,6 +67,8 @@ References to ordinary procedures is by reference (by variable), though, as in the rest of Guile. */ +static int goops_loaded_p = 0; + static SCM var_make_standard_class = SCM_BOOL_F; static SCM var_change_class = SCM_BOOL_F; static SCM var_make = SCM_BOOL_F; @@ -90,11 +95,6 @@ static SCM var_slot_set_x = SCM_BOOL_F; static SCM var_slot_bound_p = SCM_BOOL_F; static SCM var_slot_exists_p = SCM_BOOL_F; -#define SCM_GOOPS_UNBOUND SCM_UNBOUND -#define SCM_GOOPS_UNBOUNDP(x) (scm_is_eq (x, SCM_GOOPS_UNBOUND)) - -static int goops_loaded_p = 0; - /* These variables are filled in by the object system when loaded. */ static SCM class_boolean, class_char, class_pair; static SCM class_procedure, class_string, class_symbol; @@ -503,8 +503,6 @@ scm_is_method (SCM x) * ******************************************************************************/ -SCM_SYMBOL (sym_procedure, "procedure"); - SCM scm_class_name (SCM obj) {