[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 52/87: Remove special cases for <keyword>
From: |
Andy Wingo |
Subject: |
[Guile-commits] 52/87: Remove special cases for <keyword> |
Date: |
Thu, 22 Jan 2015 17:30:00 +0000 |
wingo pushed a commit to branch wip-goops-refactor
in repository guile.
commit 1edeaf4f1f361280e9ea4e93bee20171c08f246f
Author: Andy Wingo <address@hidden>
Date: Sun Jan 11 21:46:39 2015 +0100
Remove special cases for <keyword>
* libguile/goops.c (create_smob_classes, class_keyword)
(scm_sys_goops_early_init): Remove special case for <keyword>. It's a
smob type, so the generic case works.
* libguile/deprecated.c (scm_init_deprecated_goops): Load
scm_class_keyword from SMOB class table.
* module/oop/goops.scm (<keyword>): Remove special definition.
---
libguile/deprecated.c | 2 +-
libguile/goops.c | 2 --
module/oop/goops.scm | 1 -
3 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/libguile/deprecated.c b/libguile/deprecated.c
index 4a82e4f..06571b7 100644
--- a/libguile/deprecated.c
+++ b/libguile/deprecated.c
@@ -183,7 +183,7 @@ scm_init_deprecated_goops (void)
scm_class_real = scm_variable_ref (scm_c_lookup ("<real>"));
scm_class_integer = scm_variable_ref (scm_c_lookup ("<integer>"));
scm_class_fraction = scm_variable_ref (scm_c_lookup ("<fraction>"));
- scm_class_keyword = scm_variable_ref (scm_c_lookup ("<keyword>"));
+ scm_class_keyword = scm_i_smob_class[SCM_TC2SMOBNUM (scm_tc16_keyword)];
scm_class_unknown = scm_variable_ref (scm_c_lookup ("<unknown>"));
scm_class_procedure = scm_variable_ref (scm_c_lookup ("<procedure>"));
scm_class_primitive_generic = scm_variable_ref (scm_c_lookup
("<primitive-generic>"));
diff --git a/libguile/goops.c b/libguile/goops.c
index ef21184..24f5220 100644
--- a/libguile/goops.c
+++ b/libguile/goops.c
@@ -121,7 +121,6 @@ static SCM class_procedure_class;
static SCM class_applicable_struct_class;
static SCM class_applicable_struct_with_setter_class;
static SCM class_number, class_list;
-static SCM class_keyword;
static SCM class_port, class_input_output_port;
static SCM class_input_port, class_output_port;
static SCM class_foreign_slot;
@@ -1136,7 +1135,6 @@ SCM_DEFINE (scm_sys_goops_early_init,
"%goops-early-init", 0, 0, 0,
class_real = scm_variable_ref (scm_c_lookup ("<real>"));
class_integer = scm_variable_ref (scm_c_lookup ("<integer>"));
class_fraction = scm_variable_ref (scm_c_lookup ("<fraction>"));
- class_keyword = scm_variable_ref (scm_c_lookup ("<keyword>"));
class_unknown = scm_variable_ref (scm_c_lookup ("<unknown>"));
class_procedure = scm_variable_ref (scm_c_lookup ("<procedure>"));
class_primitive_generic = scm_variable_ref (scm_c_lookup
("<primitive-generic>"));
diff --git a/module/oop/goops.scm b/module/oop/goops.scm
index 9c82c29..359f15d 100644
--- a/module/oop/goops.scm
+++ b/module/oop/goops.scm
@@ -609,7 +609,6 @@
(define-standard-class <real> (<complex>))
(define-standard-class <integer> (<real>))
(define-standard-class <fraction> (<real>))
-(define-standard-class <keyword> (<top>))
(define-standard-class <unknown> (<top>))
(define-standard-class <procedure> (<applicable>)
#:metaclass <procedure-class>)
- [Guile-commits] 36/87: <class> accessors implemented in Scheme, (continued)
- [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, 2015/01/22
- [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 <=
- [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
- [Guile-commits] 54/87: Cosmetic goops refactors., Andy Wingo, 2015/01/22
- [Guile-commits] 47/87: Move <class> initialization to Scheme, Andy Wingo, 2015/01/22
- [Guile-commits] 50/87: Reimplement inherit-applicable! in Scheme, Andy Wingo, 2015/01/22
- [Guile-commits] 45/87: Rewrite %initialize-object in Scheme, Andy Wingo, 2015/01/22
- [Guile-commits] 49/87: Reimplement %allocate-instance in Scheme, Andy Wingo, 2015/01/22
- [Guile-commits] 51/87: goops.c no longer knows about <class> slot allocation, Andy Wingo, 2015/01/22