[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 46/88: Minor goops.c tidying
From: |
Andy Wingo |
Subject: |
[Guile-commits] 46/88: Minor goops.c tidying |
Date: |
Fri, 23 Jan 2015 15:25:45 +0000 |
wingo pushed a commit to branch master
in repository guile.
commit f6088819c8b010fc20811131f8fce0dd67a6bf74
Author: Andy Wingo <address@hidden>
Date: Sat Jan 10 23:26:41 2015 +0100
Minor goops.c tidying
* libguile/goops.c: Reorder static variables. Remove unused
sym_procedure.
---
libguile/goops.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/libguile/goops.c b/libguile/goops.c
index 5f9fcac..d722e0d 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)
{
- [Guile-commits] 30/88: Remove private var_no_applicable_method capture, (continued)
- [Guile-commits] 30/88: Remove private var_no_applicable_method capture, Andy Wingo, 2015/01/23
- [Guile-commits] 26/88: Deprecate C exports of GOOPS classes., Andy Wingo, 2015/01/23
- [Guile-commits] 41/88: Goops slot-unbound / slot-missing cleanups, Andy Wingo, 2015/01/23
- [Guile-commits] 40/88: Move slot-ref et al to Scheme, Andy Wingo, 2015/01/23
- [Guile-commits] 44/88: No more concept of "pure generics", Andy Wingo, 2015/01/23
- [Guile-commits] 45/88: Remove scm_c_extend_primitive_generic, Andy Wingo, 2015/01/23
- [Guile-commits] 47/88: Rewrite %initialize-object in Scheme, Andy Wingo, 2015/01/23
- [Guile-commits] 48/88: Deprecate scm_get_keyword, Andy Wingo, 2015/01/23
- [Guile-commits] 43/88: Remove TEST_CHANGE_CLASS, Andy Wingo, 2015/01/23
- [Guile-commits] 42/88: Remove pure-generic?, Andy Wingo, 2015/01/23
- [Guile-commits] 46/88: Minor goops.c tidying,
Andy Wingo <=
- [Guile-commits] 37/88: goops: use computed class slot offsets; untabify and fix whitepace, Andy Wingo, 2015/01/23
- [Guile-commits] 50/88: Re-use the vtable "size" field for GOOPS nfields, Andy Wingo, 2015/01/23
- [Guile-commits] 52/88: Reimplement inherit-applicable! in Scheme, Andy Wingo, 2015/01/23
- [Guile-commits] 54/88: Incorporate %inherit-magic! into %init-layout!, Andy Wingo, 2015/01/23
- [Guile-commits] 49/88: Move <class> initialization to Scheme, Andy Wingo, 2015/01/23
- [Guile-commits] 56/88: GOOPS cleanup to use SRFI-1 better, Andy Wingo, 2015/01/23
- [Guile-commits] 57/88: append-map rather than mapappend, Andy Wingo, 2015/01/23
- [Guile-commits] 58/88: GOOPS utils module cleanups, Andy Wingo, 2015/01/23
- [Guile-commits] 55/88: Cosmetic goops refactors., Andy Wingo, 2015/01/23
- [Guile-commits] 53/88: goops.c no longer knows about <class> slot allocation, Andy Wingo, 2015/01/23