[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 44/87: Minor goops.c tidying
From: |
Andy Wingo |
Subject: |
[Guile-commits] 44/87: Minor goops.c tidying |
Date: |
Thu, 22 Jan 2015 17:29:57 +0000 |
wingo pushed a commit to branch wip-goops-refactor
in repository guile.
commit d6b6f856fa4ebf310ea19c51f2bb1f437605af6f
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 877a12b..dc8e34f 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] 31/87: More goops.c cleanups, and fix a security issue, (continued)
- [Guile-commits] 31/87: More goops.c cleanups, and fix a security issue, Andy Wingo, 2015/01/22
- [Guile-commits] 34/87: Statically compute offsets for slots of <class> in Scheme, Andy Wingo, 2015/01/22
- [Guile-commits] 33/87: Refactor to <class> slot computation, Andy Wingo, 2015/01/22
- [Guile-commits] 11/87: Move GOOPS boot to Scheme, Andy Wingo, 2015/01/22
- [Guile-commits] 39/87: Goops slot-unbound / slot-missing cleanups, Andy Wingo, 2015/01/22
- [Guile-commits] 37/87: Port method and generic accessors to Scheme, Andy Wingo, 2015/01/22
- [Guile-commits] 36/87: <class> accessors implemented in Scheme, Andy Wingo, 2015/01/22
- [Guile-commits] 38/87: Move slot-ref et al to Scheme, Andy Wingo, 2015/01/22
- [Guile-commits] 24/87: Deprecate C exports of GOOPS classes., Andy Wingo, 2015/01/22
- [Guile-commits] 42/87: No more concept of "pure generics", Andy Wingo, 2015/01/22
- [Guile-commits] 44/87: Minor goops.c tidying,
Andy Wingo <=
- [Guile-commits] 43/87: Remove scm_c_extend_primitive_generic, Andy Wingo, 2015/01/22
- [Guile-commits] 41/87: Remove TEST_CHANGE_CLASS, Andy Wingo, 2015/01/22
- [Guile-commits] 40/87: Remove pure-generic?, Andy Wingo, 2015/01/22
- [Guile-commits] 46/87: Deprecate scm_get_keyword, Andy Wingo, 2015/01/22
- [Guile-commits] 16/87: Fold GOOPS compile and dispatch modules into main GOOPS module, Andy Wingo, 2015/01/22
- [Guile-commits] 52/87: Remove special cases for <keyword>, Andy Wingo, 2015/01/22
- [Guile-commits] 53/87: Incorporate %inherit-magic! into %init-layout!, Andy Wingo, 2015/01/22
- [Guile-commits] 56/87: append-map rather than mapappend, Andy Wingo, 2015/01/22
- [Guile-commits] 55/87: GOOPS cleanup to use SRFI-1 better, Andy Wingo, 2015/01/22
- [Guile-commits] 48/87: Re-use the vtable "size" field for GOOPS nfields, Andy Wingo, 2015/01/22