diff options
Diffstat (limited to 'libguile')
-rw-r--r-- | libguile/goops.c | 19 | ||||
-rw-r--r-- | libguile/goops.h | 1 | ||||
-rw-r--r-- | libguile/struct.h | 14 |
3 files changed, 7 insertions, 27 deletions
diff --git a/libguile/goops.c b/libguile/goops.c index 7e7a26553..d0e646339 100644 --- a/libguile/goops.c +++ b/libguile/goops.c @@ -115,7 +115,7 @@ static SCM class_atomic_box; static SCM class_port, class_input_output_port; static SCM class_input_port, class_output_port; static SCM class_foreign_slot; -static SCM class_self, class_protected; +static SCM class_protected; static SCM class_hidden, class_opaque, class_read_only; static SCM class_protected_hidden, class_protected_opaque, class_protected_read_only; static SCM class_scm; @@ -542,22 +542,6 @@ SCM_DEFINE (scm_sys_modify_instance, "%modify-instance", 2, 0, 0, } #undef FUNC_NAME -SCM_DEFINE (scm_sys_modify_class, "%modify-class", 2, 0, 0, - (SCM old, SCM new), - "") -#define FUNC_NAME s_scm_sys_modify_class -{ - SCM_VALIDATE_CLASS (1, old); - SCM_VALIDATE_CLASS (2, new); - - scm_sys_modify_instance (old, new); - SCM_STRUCT_DATA (old)[scm_vtable_index_self] = SCM_UNPACK (old); - SCM_STRUCT_DATA (new)[scm_vtable_index_self] = SCM_UNPACK (new); - - return SCM_UNSPECIFIED; -} -#undef FUNC_NAME - /* Primitive generics: primitives that can dispatch to generics if their @@ -920,7 +904,6 @@ SCM_DEFINE (scm_sys_goops_early_init, "%goops-early-init", 0, 0, 0, class_hidden = scm_variable_ref (scm_c_lookup ("<hidden-slot>")); class_opaque = scm_variable_ref (scm_c_lookup ("<opaque-slot>")); class_read_only = scm_variable_ref (scm_c_lookup ("<read-only-slot>")); - class_self = scm_variable_ref (scm_c_lookup ("<self-slot>")); class_protected_opaque = scm_variable_ref (scm_c_lookup ("<protected-opaque-slot>")); class_protected_hidden = scm_variable_ref (scm_c_lookup ("<protected-hidden-slot>")); class_protected_read_only = scm_variable_ref (scm_c_lookup ("<protected-read-only-slot>")); diff --git a/libguile/goops.h b/libguile/goops.h index 202fef9eb..332635bd9 100644 --- a/libguile/goops.h +++ b/libguile/goops.h @@ -130,7 +130,6 @@ SCM_API SCM scm_method_procedure (SCM obj); SCM_API SCM scm_slot_bound_p (SCM obj, SCM slot_name); SCM_API SCM scm_slot_exists_p (SCM obj, SCM slot_name); SCM_API SCM scm_sys_modify_instance (SCM old, SCM newinst); -SCM_API SCM scm_sys_modify_class (SCM old, SCM newcls); SCM_API SCM scm_generic_capability_p (SCM proc); SCM_API SCM scm_enable_primitive_generic_x (SCM subrs); SCM_INTERNAL SCM scm_set_primitive_generic_x (SCM subr, SCM generic); diff --git a/libguile/struct.h b/libguile/struct.h index 0dfcf4618..25d5ae53f 100644 --- a/libguile/struct.h +++ b/libguile/struct.h @@ -56,7 +56,6 @@ #define SCM_VTABLE_BASE_LAYOUT \ "pr" /* layout */ \ "uh" /* flags */ \ - "sr" /* self */ \ "uh" /* finalizer */ \ "pw" /* printer */ \ "ph" /* name (hidden from make-struct for back-compat reasons) */ \ @@ -65,13 +64,12 @@ #define scm_vtable_index_layout 0 /* A symbol describing the physical arrangement of this type. */ #define scm_vtable_index_flags 1 /* Class flags */ -#define scm_vtable_index_self 2 /* A pointer to the vtable itself */ -#define scm_vtable_index_instance_finalize 3 /* Finalizer for instances of this struct type. */ -#define scm_vtable_index_instance_printer 4 /* A printer for this struct type. */ -#define scm_vtable_index_name 5 /* Name of this vtable. */ -#define scm_vtable_index_size 6 /* Number of fields, for simple structs. */ -#define scm_vtable_index_reserved_7 7 -#define scm_vtable_offset_user 8 /* Where do user fields start in the vtable? */ +#define scm_vtable_index_instance_finalize 2 /* Finalizer for instances of this struct type. */ +#define scm_vtable_index_instance_printer 3 /* A printer for this struct type. */ +#define scm_vtable_index_name 4 /* Name of this vtable. */ +#define scm_vtable_index_size 5 /* Number of fields, for simple structs. */ +#define scm_vtable_index_reserved_7 6 +#define scm_vtable_offset_user 7 /* Where do user fields start in the vtable? */ /* All applicable structs have the following fields. */ #define SCM_APPLICABLE_BASE_LAYOUT \ |