diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-01-06 14:16:03 -0500 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-01-23 16:16:00 +0100 |
| commit | 57898597ad17d5590fd4a29f2ad34f7e4b94b0b8 (patch) | |
| tree | 00793335a70116b62a79cf1f8931777878ac88a3 /libguile/smob.c | |
| parent | 6c7dd9ebd3702c71adf5dcce9509294ebb52f226 (diff) | |
| download | guile-57898597ad17d5590fd4a29f2ad34f7e4b94b0b8.tar.gz | |
Deprecate C exports of GOOPS classes.
* libguile/deprecated.h:
(scm_class_boolean, scm_class_char, scm_class_pair)
(scm_class_procedure, scm_class_string, scm_class_symbol)
(scm_class_primitive_generic, scm_class_vector, scm_class_null)
(scm_class_real, scm_class_complex, scm_class_integer)
(scm_class_fraction, scm_class_unknown, scm_class_top)
(scm_class_object, scm_class_class, scm_class_applicable)
(scm_class_applicable_struct, scm_class_applicable_struct_with_setter)
(scm_class_generic, scm_class_generic_with_setter, scm_class_accessor)
(scm_class_extended_generic, scm_class_extended_generic_with_setter)
(scm_class_extended_accessor, scm_class_method)
(scm_class_accessor_method, scm_class_procedure_class)
(scm_class_applicable_struct_class, scm_class_number, scm_class_list)
(scm_class_keyword, scm_class_port, scm_class_input_output_port)
(scm_class_input_port, scm_class_output_port, scm_class_foreign_slot)
(scm_class_self, scm_class_protected, scm_class_hidden)
(scm_class_opaque, scm_class_read_only, scm_class_protected_hidden)
(scm_class_protected_opaque, scm_class_protected_read_only)
(scm_class_scm, scm_class_int, scm_class_float)
(scm_class_double, scm_port_class, scm_smob_class): Deprecate.
* libguile/deprecated.c:
* libguile/goops.c:
* libguile/goops.h: Adapt to deprecation.
* libguile/goops.h
* libguile/goops.c (scm_is_generic, scm_is_method): New interfaces.
(SCM_GENERICP, SCM_METHODP): Change to use new interfaces.
* libguile/ports.c (scm_make_port_type):
* libguile/smob.c (scm_make_smob_type, scm_set_smob_apply): Use internal
names for the port and smob class arrays.
Diffstat (limited to 'libguile/smob.c')
| -rw-r--r-- | libguile/smob.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libguile/smob.c b/libguile/smob.c index 768257840..2a6c96f3a 100644 --- a/libguile/smob.c +++ b/libguile/smob.c @@ -1,5 +1,5 @@ /* Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2003, 2004, 2006, - * 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. + * 2009, 2010, 2011, 2012, 2013, 2015 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -218,8 +218,8 @@ scm_make_smob_type (char const *name, size_t size) scm_smobs[new_smob].size = size; /* Make a class object if Goops is present. */ - if (SCM_UNPACK (scm_smob_class[0]) != 0) - scm_smob_class[new_smob] = scm_make_extended_class (name, 0); + if (SCM_UNPACK (scm_i_smob_class[0]) != 0) + scm_i_smob_class[new_smob] = scm_make_extended_class (name, 0); return scm_tc7_smob + new_smob * 256; } @@ -259,8 +259,8 @@ scm_set_smob_apply (scm_t_bits tc, SCM (*apply) (), scm_smobs[SCM_TC2SMOBNUM (tc)].apply = apply; scm_smobs[SCM_TC2SMOBNUM (tc)].apply_trampoline = trampoline; - if (SCM_UNPACK (scm_smob_class[0]) != 0) - scm_i_inherit_applicable (scm_smob_class[SCM_TC2SMOBNUM (tc)]); + if (SCM_UNPACK (scm_i_smob_class[0]) != 0) + scm_i_inherit_applicable (scm_i_smob_class[SCM_TC2SMOBNUM (tc)]); } SCM |