2004-05-24 04:15:49 +00:00
|
|
|
|
/* Copyright (C) 1998,1999,2000,2001,2002,2003,2004
|
|
|
|
|
|
* Free Software Foundation, Inc.
|
2002-04-22 17:46:06 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
2002-04-22 17:46:06 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
|
* Lesser General Public License for more details.
|
2002-04-22 17:46:06 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
|
*/
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This software is a derivative work of other copyrighted softwares; the
|
|
|
|
|
|
* copyright notices of these softwares are placed in the file COPYRIGHTS
|
|
|
|
|
|
*
|
|
|
|
|
|
* This file is based upon stklos.c from the STk distribution by
|
|
|
|
|
|
* Erick Gallesio <eg@unice.fr>.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
|
|
|
|
#include "libguile/_scm.h"
|
|
|
|
|
|
#include "libguile/alist.h"
|
|
|
|
|
|
#include "libguile/debug.h"
|
|
|
|
|
|
#include "libguile/dynl.h"
|
|
|
|
|
|
#include "libguile/dynwind.h"
|
|
|
|
|
|
#include "libguile/eval.h"
|
|
|
|
|
|
#include "libguile/hashtab.h"
|
|
|
|
|
|
#include "libguile/keywords.h"
|
|
|
|
|
|
#include "libguile/macros.h"
|
|
|
|
|
|
#include "libguile/modules.h"
|
|
|
|
|
|
#include "libguile/objects.h"
|
|
|
|
|
|
#include "libguile/ports.h"
|
|
|
|
|
|
#include "libguile/procprop.h"
|
|
|
|
|
|
#include "libguile/random.h"
|
2001-06-26 15:46:40 +00:00
|
|
|
|
#include "libguile/root.h"
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
#include "libguile/smob.h"
|
|
|
|
|
|
#include "libguile/strings.h"
|
|
|
|
|
|
#include "libguile/strports.h"
|
|
|
|
|
|
#include "libguile/vectors.h"
|
|
|
|
|
|
#include "libguile/weaks.h"
|
|
|
|
|
|
|
2000-11-24 10:55:23 +00:00
|
|
|
|
#include "libguile/validate.h"
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
#include "libguile/goops.h"
|
|
|
|
|
|
|
|
|
|
|
|
#define SPEC_OF(x) SCM_SLOT (x, scm_si_specializers)
|
|
|
|
|
|
|
2002-07-20 14:08:34 +00:00
|
|
|
|
#define DEFVAR(v, val) \
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
{ scm_eval (scm_list_3 (scm_sym_define_public, (v), (val)), \
|
|
|
|
|
|
scm_module_goops); }
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/* Temporary hack until we get the new module system */
|
|
|
|
|
|
/*fixme* Should optimize by keeping track of the variable object itself */
|
2001-06-26 15:46:40 +00:00
|
|
|
|
#define GETVAR(v) (SCM_VARIABLE_REF (scm_call_2 (scm_goops_lookup_closure, \
|
|
|
|
|
|
(v), SCM_BOOL_F)))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
/* Fixme: Should use already interned symbols */
|
2002-07-20 14:08:34 +00:00
|
|
|
|
#define CALL_GF1(name, a) (scm_call_1 (GETVAR (scm_str2symbol (name)), \
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
a))
|
2002-07-20 14:08:34 +00:00
|
|
|
|
#define CALL_GF2(name, a, b) (scm_call_2 (GETVAR (scm_str2symbol (name)), \
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
a, b))
|
2002-07-20 14:08:34 +00:00
|
|
|
|
#define CALL_GF3(name, a, b, c) (scm_call_3 (GETVAR (scm_str2symbol (name)), \
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
a, b, c))
|
2002-07-20 14:08:34 +00:00
|
|
|
|
#define CALL_GF4(name, a, b, c, d) (scm_call_4 (GETVAR (scm_str2symbol (name)), \
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
a, b, c, d))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
/* Class redefinition protocol:
|
|
|
|
|
|
|
|
|
|
|
|
A class is represented by a heap header h1 which points to a
|
|
|
|
|
|
malloc:ed memory block m1.
|
|
|
|
|
|
|
|
|
|
|
|
When a new version of a class is created, a new header h2 and
|
|
|
|
|
|
memory block m2 are allocated. The headers h1 and h2 then switch
|
|
|
|
|
|
pointers so that h1 refers to m2 and h2 to m1. In this way, names
|
|
|
|
|
|
bound to h1 will point to the new class at the same time as h2 will
|
|
|
|
|
|
be a handle which the GC will us to free m1.
|
|
|
|
|
|
|
|
|
|
|
|
The `redefined' slot of m1 will be set to point to h1. An old
|
|
|
|
|
|
instance will have it's class pointer (the CAR of the heap header)
|
|
|
|
|
|
pointing to m1. The non-immediate `redefined'-slot in m1 indicates
|
|
|
|
|
|
the class modification and the new class pointer can be found via
|
|
|
|
|
|
h1.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/* The following definition is located in libguile/objects.h:
|
|
|
|
|
|
#define SCM_OBJ_CLASS_REDEF(x) (SCM_STRUCT_VTABLE_DATA(x)[scm_si_redefined])
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2003-04-18 08:19:03 +00:00
|
|
|
|
#define TEST_CHANGE_CLASS(obj, class) \
|
|
|
|
|
|
{ \
|
|
|
|
|
|
class = SCM_CLASS_OF (obj); \
|
2003-04-20 23:38:18 +00:00
|
|
|
|
if (!SCM_FALSEP (SCM_OBJ_CLASS_REDEF (obj))) \
|
2003-04-18 08:19:03 +00:00
|
|
|
|
{ \
|
|
|
|
|
|
scm_change_object_class (obj, class, SCM_OBJ_CLASS_REDEF (obj));\
|
|
|
|
|
|
class = SCM_CLASS_OF (obj); \
|
|
|
|
|
|
} \
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#define NXT_MTHD_METHODS(m) (SCM_VELTS (m)[1])
|
|
|
|
|
|
#define NXT_MTHD_ARGS(m) (SCM_VELTS (m)[2])
|
|
|
|
|
|
|
|
|
|
|
|
#define SCM_GOOPS_UNBOUND SCM_UNBOUND
|
|
|
|
|
|
#define SCM_GOOPS_UNBOUNDP(x) ((x) == SCM_GOOPS_UNBOUND)
|
|
|
|
|
|
|
|
|
|
|
|
static int goops_loaded_p = 0;
|
2001-06-14 19:50:43 +00:00
|
|
|
|
static scm_t_rstate *goops_rstate;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
static SCM scm_goops_lookup_closure;
|
|
|
|
|
|
|
|
|
|
|
|
/* Some classes are defined in libguile/objects.c. */
|
|
|
|
|
|
SCM scm_class_top, scm_class_object, scm_class_class;
|
2003-03-19 08:57:47 +00:00
|
|
|
|
SCM scm_class_applicable;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM scm_class_entity, scm_class_entity_with_setter;
|
2003-01-08 13:24:41 +00:00
|
|
|
|
SCM scm_class_generic, scm_class_generic_with_setter;
|
2003-03-11 14:50:08 +00:00
|
|
|
|
SCM scm_class_accessor;
|
2003-01-08 13:24:41 +00:00
|
|
|
|
SCM scm_class_extended_generic, scm_class_extended_generic_with_setter;
|
2003-03-19 08:57:47 +00:00
|
|
|
|
SCM scm_class_extended_accessor;
|
2003-01-08 13:24:41 +00:00
|
|
|
|
SCM scm_class_method;
|
2003-03-11 14:50:08 +00:00
|
|
|
|
SCM scm_class_simple_method, scm_class_accessor_method;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM scm_class_procedure_class;
|
|
|
|
|
|
SCM scm_class_operator_class, scm_class_operator_with_setter_class;
|
|
|
|
|
|
SCM scm_class_entity_class;
|
|
|
|
|
|
SCM scm_class_number, scm_class_list;
|
|
|
|
|
|
SCM scm_class_keyword;
|
|
|
|
|
|
SCM scm_class_port, scm_class_input_output_port;
|
|
|
|
|
|
SCM scm_class_input_port, scm_class_output_port;
|
|
|
|
|
|
SCM scm_class_foreign_class, scm_class_foreign_object;
|
|
|
|
|
|
SCM scm_class_foreign_slot;
|
|
|
|
|
|
SCM scm_class_self, scm_class_protected;
|
|
|
|
|
|
SCM scm_class_opaque, scm_class_read_only;
|
|
|
|
|
|
SCM scm_class_protected_opaque, scm_class_protected_read_only;
|
|
|
|
|
|
SCM scm_class_scm;
|
|
|
|
|
|
SCM scm_class_int, scm_class_float, scm_class_double;
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYMBOL (scm_sym_define_public, "define-public");
|
|
|
|
|
|
|
|
|
|
|
|
static SCM scm_make_unbound (void);
|
|
|
|
|
|
static SCM scm_unbound_p (SCM obj);
|
2000-12-16 20:25:08 +00:00
|
|
|
|
static SCM scm_assert_bound (SCM value, SCM obj);
|
|
|
|
|
|
static SCM scm_at_assert_bound_ref (SCM obj, SCM index);
|
|
|
|
|
|
static SCM scm_sys_goops_loaded (void);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
|
|
*
|
|
|
|
|
|
* Compute-cpl
|
|
|
|
|
|
*
|
2003-01-08 13:24:41 +00:00
|
|
|
|
* This version doesn't fully handle multiple-inheritance. It serves
|
|
|
|
|
|
* only for booting classes and will be overloaded in Scheme
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
*
|
|
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
map (SCM (*proc) (SCM), SCM ls)
|
|
|
|
|
|
{
|
2001-07-18 10:14:29 +00:00
|
|
|
|
if (SCM_NULLP (ls))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return ls;
|
2001-07-18 10:14:29 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM res = scm_cons (proc (SCM_CAR (ls)), SCM_EOL);
|
|
|
|
|
|
SCM h = res;
|
|
|
|
|
|
ls = SCM_CDR (ls);
|
|
|
|
|
|
while (!SCM_NULLP (ls))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_SETCDR (h, scm_cons (proc (SCM_CAR (ls)), SCM_EOL));
|
|
|
|
|
|
h = SCM_CDR (h);
|
|
|
|
|
|
ls = SCM_CDR (ls);
|
|
|
|
|
|
}
|
|
|
|
|
|
return res;
|
|
|
|
|
|
}
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
filter_cpl (SCM ls)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM res = SCM_EOL;
|
2001-07-18 10:14:29 +00:00
|
|
|
|
while (!SCM_NULLP (ls))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM el = SCM_CAR (ls);
|
2000-12-01 17:57:42 +00:00
|
|
|
|
if (SCM_FALSEP (scm_c_memq (el, res)))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
res = scm_cons (el, res);
|
|
|
|
|
|
ls = SCM_CDR (ls);
|
|
|
|
|
|
}
|
|
|
|
|
|
return res;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
compute_cpl (SCM class)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (goops_loaded_p)
|
|
|
|
|
|
return CALL_GF1 ("compute-cpl", class);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM supers = SCM_SLOT (class, scm_si_direct_supers);
|
|
|
|
|
|
SCM ls = scm_append (scm_acons (class, supers,
|
|
|
|
|
|
map (compute_cpl, supers)));
|
|
|
|
|
|
return scm_reverse_x (filter_cpl (ls), SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
|
|
*
|
|
|
|
|
|
* compute-slots
|
|
|
|
|
|
*
|
|
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
remove_duplicate_slots (SCM l, SCM res, SCM slots_already_seen)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM tmp;
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_NULLP (l))
|
|
|
|
|
|
return res;
|
|
|
|
|
|
|
|
|
|
|
|
tmp = SCM_CAAR (l);
|
2000-12-18 17:36:44 +00:00
|
|
|
|
if (!SCM_SYMBOLP (tmp))
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_misc_error ("%compute-slots", "bad slot name ~S", scm_list_1 (tmp));
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
2000-12-01 17:57:42 +00:00
|
|
|
|
if (SCM_FALSEP (scm_c_memq (tmp, slots_already_seen))) {
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
res = scm_cons (SCM_CAR (l), res);
|
|
|
|
|
|
slots_already_seen = scm_cons (tmp, slots_already_seen);
|
|
|
|
|
|
}
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return remove_duplicate_slots (SCM_CDR (l), res, slots_already_seen);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
build_slots_list (SCM dslots, SCM cpl)
|
|
|
|
|
|
{
|
|
|
|
|
|
register SCM res = dslots;
|
|
|
|
|
|
|
2001-07-18 10:14:29 +00:00
|
|
|
|
for (cpl = SCM_CDR (cpl); !SCM_NULLP (cpl); cpl = SCM_CDR (cpl))
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
res = scm_append (scm_list_2 (SCM_SLOT (SCM_CAR (cpl),
|
|
|
|
|
|
scm_si_direct_slots),
|
|
|
|
|
|
res));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
/* res contains a list of slots. Remove slots which appears more than once */
|
|
|
|
|
|
return remove_duplicate_slots (scm_reverse (res), SCM_EOL, SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
maplist (SCM ls)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM orig = ls;
|
2001-07-18 10:14:29 +00:00
|
|
|
|
while (!SCM_NULLP (ls))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-18 17:36:44 +00:00
|
|
|
|
if (!SCM_CONSP (SCM_CAR (ls)))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM_SETCAR (ls, scm_cons (SCM_CAR (ls), SCM_EOL));
|
|
|
|
|
|
ls = SCM_CDR (ls);
|
|
|
|
|
|
}
|
|
|
|
|
|
return orig;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2000-12-01 16:05:33 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_compute_slots, "%compute-slots", 1, 0, 0,
|
|
|
|
|
|
(SCM class),
|
* list.c (scm_list, scm_cons_star, scm_null_p, scm_list_p),
(scm_length, scm_append, scm_reverse, scm_list_ref),
(scm_memq, scm_memv, scm_member, scm_delv_x, scm_delete_x),
(scm_delq, scm_delv, scm_delete, scm_delq1_x, scm_delv1_x),
(scm_delete1_x), gc.c (scm_map_free_list),
(scm_free_list_length), hash.c (scm_hashq, scm_hashv),
(scm_hash), hashtab.c (scm_hashq_ref, scm_hashq_set_x),
(scm_hashq_remove_x, scm_hashv_ref, scm_hashv_set_x),
(scm_hashv_remove_x, scm_hash_ref, scm_hash_set_x),
(scm_hash_remove_x), ports.c (scm_pt_size, scm_pt_member), print.c
(scm_current_pstate), scmsigs.c (scm_usleep), goops.c
(scm_get_keyword, scm_sys_compute_slots): Added texinfo markup.
* weaks.c (scm_weak_vector_p, scm_weak_key_hash_table_p),
(scm_weak_value_hash_table_p, scm_doubly_weak_hash_table_p),
rdelim.c (scm_read_delimited_x), strop.c (scm_string_index),
symbols.c (scm_symbol_interned_p), numbers.c
(scm_string_to_number), ports.c (scm_port_p): Corrected texinfo
markup.
2001-03-16 10:00:17 +00:00
|
|
|
|
"Return a list consisting of the names of all slots belonging to\n"
|
|
|
|
|
|
"class @var{class}, i. e. the slots of @var{class} and of all of\n"
|
2002-04-22 17:46:06 +00:00
|
|
|
|
"its superclasses.")
|
2000-12-01 16:05:33 +00:00
|
|
|
|
#define FUNC_NAME s_scm_sys_compute_slots
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, class);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return build_slots_list (SCM_SLOT (class, scm_si_direct_slots),
|
|
|
|
|
|
SCM_SLOT (class, scm_si_cpl));
|
|
|
|
|
|
}
|
2000-12-01 16:05:33 +00:00
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
|
|
*
|
|
|
|
|
|
* compute-getters-n-setters
|
2002-04-22 17:46:06 +00:00
|
|
|
|
*
|
|
|
|
|
|
* This version doesn't handle slot options. It serves only for booting
|
2001-06-07 23:10:33 +00:00
|
|
|
|
* classes and will be overloaded in Scheme.
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
*
|
|
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
SCM_KEYWORD (k_init_value, "init-value");
|
|
|
|
|
|
SCM_KEYWORD (k_init_thunk, "init-thunk");
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
compute_getters_n_setters (SCM slots)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM res = SCM_EOL;
|
|
|
|
|
|
SCM *cdrloc = &res;
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long i = 0;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2001-07-18 10:14:29 +00:00
|
|
|
|
for ( ; !SCM_NULLP (slots); slots = SCM_CDR (slots))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM init = SCM_BOOL_F;
|
|
|
|
|
|
SCM options = SCM_CDAR (slots);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
if (!SCM_NULLP (options))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
init = scm_get_keyword (k_init_value, options, 0);
|
|
|
|
|
|
if (init)
|
2004-05-24 04:15:49 +00:00
|
|
|
|
{
|
|
|
|
|
|
init = scm_i_eval_x (scm_list_3 (scm_sym_lambda,
|
|
|
|
|
|
SCM_EOL,
|
|
|
|
|
|
scm_list_2 (scm_sym_quote,
|
|
|
|
|
|
init)),
|
|
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
}
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
else
|
|
|
|
|
|
init = scm_get_keyword (k_init_thunk, options, SCM_BOOL_F);
|
|
|
|
|
|
}
|
|
|
|
|
|
*cdrloc = scm_cons (scm_cons (SCM_CAAR (slots),
|
|
|
|
|
|
scm_cons (init,
|
|
|
|
|
|
SCM_MAKINUM (i++))),
|
|
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
cdrloc = SCM_CDRLOC (*cdrloc);
|
|
|
|
|
|
}
|
|
|
|
|
|
return res;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
|
|
*
|
|
|
|
|
|
* initialize-object
|
|
|
|
|
|
*
|
|
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
/*fixme* Manufacture keywords in advance */
|
|
|
|
|
|
SCM
|
2001-05-26 20:51:22 +00:00
|
|
|
|
scm_i_get_keyword (SCM key, SCM l, long len, SCM default_value, const char *subr)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long i;
|
2000-12-01 16:05:33 +00:00
|
|
|
|
|
|
|
|
|
|
for (i = 0; i != len; i += 2)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-01 16:05:33 +00:00
|
|
|
|
SCM obj = SCM_CAR (l);
|
|
|
|
|
|
|
|
|
|
|
|
if (!SCM_KEYWORDP (obj))
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_misc_error (subr, "bad keyword: ~S", scm_list_1 (obj));
|
2000-12-01 16:05:33 +00:00
|
|
|
|
else if (SCM_EQ_P (obj, key))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return SCM_CADR (l);
|
2000-12-01 16:05:33 +00:00
|
|
|
|
else
|
|
|
|
|
|
l = SCM_CDDR (l);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-01 16:05:33 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return default_value;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2000-12-01 16:05:33 +00:00
|
|
|
|
SCM_DEFINE (scm_get_keyword, "get-keyword", 3, 0, 0,
|
|
|
|
|
|
(SCM key, SCM l, SCM default_value),
|
* list.c (scm_list, scm_cons_star, scm_null_p, scm_list_p),
(scm_length, scm_append, scm_reverse, scm_list_ref),
(scm_memq, scm_memv, scm_member, scm_delv_x, scm_delete_x),
(scm_delq, scm_delv, scm_delete, scm_delq1_x, scm_delv1_x),
(scm_delete1_x), gc.c (scm_map_free_list),
(scm_free_list_length), hash.c (scm_hashq, scm_hashv),
(scm_hash), hashtab.c (scm_hashq_ref, scm_hashq_set_x),
(scm_hashq_remove_x, scm_hashv_ref, scm_hashv_set_x),
(scm_hashv_remove_x, scm_hash_ref, scm_hash_set_x),
(scm_hash_remove_x), ports.c (scm_pt_size, scm_pt_member), print.c
(scm_current_pstate), scmsigs.c (scm_usleep), goops.c
(scm_get_keyword, scm_sys_compute_slots): Added texinfo markup.
* weaks.c (scm_weak_vector_p, scm_weak_key_hash_table_p),
(scm_weak_value_hash_table_p, scm_doubly_weak_hash_table_p),
rdelim.c (scm_read_delimited_x), strop.c (scm_string_index),
symbols.c (scm_symbol_interned_p), numbers.c
(scm_string_to_number), ports.c (scm_port_p): Corrected texinfo
markup.
2001-03-16 10:00:17 +00:00
|
|
|
|
"Determine an associated value for the keyword @var{key} from\n"
|
|
|
|
|
|
"the list @var{l}. The list @var{l} has to consist of an even\n"
|
|
|
|
|
|
"number of elements, where, starting with the first, every\n"
|
|
|
|
|
|
"second element is a keyword, followed by its associated value.\n"
|
|
|
|
|
|
"If @var{l} does not hold a value for @var{key}, the value\n"
|
|
|
|
|
|
"@var{default_value} is returned.")
|
2000-12-01 16:05:33 +00:00
|
|
|
|
#define FUNC_NAME s_scm_get_keyword
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long len;
|
2000-12-01 16:05:33 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_ASSERT (SCM_KEYWORDP (key), key, SCM_ARG1, FUNC_NAME);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
len = scm_ilength (l);
|
2001-01-27 00:13:55 +00:00
|
|
|
|
if (len < 0 || len % 2 == 1)
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_misc_error (FUNC_NAME, "Bad keyword-value list: ~S", scm_list_1 (l));
|
2000-12-01 16:05:33 +00:00
|
|
|
|
|
|
|
|
|
|
return scm_i_get_keyword (key, l, len, default_value, FUNC_NAME);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-01 16:05:33 +00:00
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_KEYWORD (k_init_keyword, "init-keyword");
|
|
|
|
|
|
|
|
|
|
|
|
static SCM get_slot_value (SCM class, SCM obj, SCM slotdef);
|
|
|
|
|
|
static SCM set_slot_value (SCM class, SCM obj, SCM slotdef, SCM value);
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_initialize_object, "%initialize-object", 2, 0, 0,
|
|
|
|
|
|
(SCM obj, SCM initargs),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Initialize the object @var{obj} with the given arguments\n"
|
|
|
|
|
|
"@var{initargs}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_sys_initialize_object
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM tmp, get_n_set, slots;
|
|
|
|
|
|
SCM class = SCM_CLASS_OF (obj);
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long n_initargs;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_INSTANCE (1, obj);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
n_initargs = scm_ilength (initargs);
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_ASSERT ((n_initargs & 1) == 0, initargs, SCM_ARG2, FUNC_NAME);
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
get_n_set = SCM_SLOT (class, scm_si_getters_n_setters);
|
|
|
|
|
|
slots = SCM_SLOT (class, scm_si_slots);
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/* See for each slot how it must be initialized */
|
|
|
|
|
|
for (;
|
2001-07-18 10:14:29 +00:00
|
|
|
|
!SCM_NULLP (slots);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
get_n_set = SCM_CDR (get_n_set), slots = SCM_CDR (slots))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM slot_name = SCM_CAR (slots);
|
|
|
|
|
|
SCM slot_value = 0;
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
2001-07-18 10:14:29 +00:00
|
|
|
|
if (!SCM_NULLP (SCM_CDR (slot_name)))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* This slot admits (perhaps) to be initialized at creation time */
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long n = scm_ilength (SCM_CDR (slot_name));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
if (n & 1) /* odd or -1 */
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_MISC_ERROR ("class contains bogus slot definition: ~S",
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_1 (slot_name));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
tmp = scm_i_get_keyword (k_init_keyword,
|
|
|
|
|
|
SCM_CDR (slot_name),
|
|
|
|
|
|
n,
|
|
|
|
|
|
0,
|
2000-12-16 20:25:08 +00:00
|
|
|
|
FUNC_NAME);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
slot_name = SCM_CAR (slot_name);
|
|
|
|
|
|
if (tmp)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* an initarg was provided for this slot */
|
2000-12-18 17:36:44 +00:00
|
|
|
|
if (!SCM_KEYWORDP (tmp))
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_MISC_ERROR ("initarg must be a keyword. It was ~S",
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_1 (tmp));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
slot_value = scm_i_get_keyword (tmp,
|
|
|
|
|
|
initargs,
|
|
|
|
|
|
n_initargs,
|
|
|
|
|
|
0,
|
2000-12-16 20:25:08 +00:00
|
|
|
|
FUNC_NAME);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (slot_value)
|
|
|
|
|
|
/* set slot to provided value */
|
|
|
|
|
|
set_slot_value (class, obj, SCM_CAR (get_n_set), slot_value);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* set slot to its :init-form if it exists */
|
|
|
|
|
|
tmp = SCM_CADAR (get_n_set);
|
2003-04-20 23:38:18 +00:00
|
|
|
|
if (!SCM_FALSEP (tmp))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
slot_value = get_slot_value (class, obj, SCM_CAR (get_n_set));
|
|
|
|
|
|
if (SCM_GOOPS_UNBOUNDP (slot_value))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM env = SCM_EXTEND_ENV (SCM_EOL, SCM_EOL, SCM_ENV (tmp));
|
|
|
|
|
|
set_slot_value (class,
|
|
|
|
|
|
obj,
|
|
|
|
|
|
SCM_CAR (get_n_set),
|
2002-01-10 20:52:45 +00:00
|
|
|
|
scm_eval_body (SCM_CLOSURE_BODY (tmp), env));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return obj;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2003-04-13 14:48:35 +00:00
|
|
|
|
/* NOTE: The following macros are interdependent with code
|
|
|
|
|
|
* in goops.scm:compute-getters-n-setters
|
|
|
|
|
|
*/
|
|
|
|
|
|
#define SCM_GNS_INSTANCE_ALLOCATED_P(gns) \
|
|
|
|
|
|
(SCM_INUMP (SCM_CDDR (gns)) \
|
|
|
|
|
|
|| (SCM_CONSP (SCM_CDDR (gns)) \
|
|
|
|
|
|
&& SCM_CONSP (SCM_CDDDR (gns)) \
|
|
|
|
|
|
&& SCM_CONSP (SCM_CDDDDR (gns))))
|
|
|
|
|
|
#define SCM_GNS_INDEX(gns) \
|
|
|
|
|
|
(SCM_INUMP (SCM_CDDR (gns)) \
|
|
|
|
|
|
? SCM_INUM (SCM_CDDR (gns)) \
|
|
|
|
|
|
: SCM_INUM (SCM_CAR (SCM_CDDDDR (gns))))
|
|
|
|
|
|
#define SCM_GNS_SIZE(gns) \
|
|
|
|
|
|
(SCM_INUMP (SCM_CDDR (gns)) \
|
|
|
|
|
|
? 1 \
|
|
|
|
|
|
: SCM_INUM (SCM_CADR (SCM_CDDDDR (gns))))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_KEYWORD (k_class, "class");
|
2003-01-08 15:05:55 +00:00
|
|
|
|
SCM_KEYWORD (k_allocation, "allocation");
|
|
|
|
|
|
SCM_KEYWORD (k_instance, "instance");
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_prep_layout_x, "%prep-layout!", 1, 0, 0,
|
|
|
|
|
|
(SCM class),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_prep_layout_x
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2003-04-13 14:48:35 +00:00
|
|
|
|
SCM slots, getters_n_setters, nfields;
|
2001-07-18 10:14:29 +00:00
|
|
|
|
unsigned long int n, i;
|
|
|
|
|
|
char *s;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_INSTANCE (1, class);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
slots = SCM_SLOT (class, scm_si_slots);
|
2003-04-13 14:48:35 +00:00
|
|
|
|
getters_n_setters = SCM_SLOT (class, scm_si_getters_n_setters);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
nfields = SCM_SLOT (class, scm_si_nfields);
|
|
|
|
|
|
if (!SCM_INUMP (nfields) || SCM_INUM (nfields) < 0)
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_MISC_ERROR ("bad value in nfields slot: ~S",
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_1 (nfields));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
n = 2 * SCM_INUM (nfields);
|
|
|
|
|
|
if (n < sizeof (SCM_CLASS_CLASS_LAYOUT) - 1
|
|
|
|
|
|
&& SCM_SUBCLASSP (class, scm_class_class))
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_MISC_ERROR ("class object doesn't have enough fields: ~S",
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_1 (nfields));
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* gc.h, gc.c (scm_gc_sweep): Issue deprecation warning when
non-zero is returned from a port or smob free function.
(scm_malloc, scm_realloc, scm_strndup, scm_strdup,
scm_gc_register_collectable_memory,
scm_gc_unregister_collectable_memory, scm_gc_malloc,
scm_gc_realloc, scm_gc_free, scm_gc_strndup, scm_gc_strdup): New.
* backtrace.c, continuations.c, convert.i.c, coop-threads.c,
debug-malloc.c, dynl.c, environments.c, environments.h,
extensions.c, filesys.c, fports.c, gc.c, gc.h, gh_data.c, goops.c,
guardians.c, hooks.c, init.c, keywords.c, load.c, numbers.c,
ports.c, posix.c, procs.c, rdelim.c, regex-posix.c, root.c,
smob.c, stime.c, strings.c, struct.c, struct.h, symbols.c, unif.c,
vectors.c, weaks.c: Use scm_gc_malloc/scm_malloc and
scm_gc_free/free instead of scm_must_malloc and scm_must_free, as
appropriate. Return zero from smob and port free functions.
* debug-malloc.c (scm_malloc_reregister): Handle "old == NULL".
* fports.c (scm_setvbuf): Reset read buffer to saved values when
it is pointing to the putback buffer.
2002-02-11 18:06:50 +00:00
|
|
|
|
s = n > 0 ? scm_malloc (n) : 0;
|
2003-04-13 14:48:35 +00:00
|
|
|
|
i = 0;
|
|
|
|
|
|
while (SCM_CONSP (getters_n_setters))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2003-04-13 14:48:35 +00:00
|
|
|
|
if (SCM_GNS_INSTANCE_ALLOCATED_P (SCM_CAR (getters_n_setters)))
|
2003-01-08 15:05:55 +00:00
|
|
|
|
{
|
2003-04-13 14:48:35 +00:00
|
|
|
|
SCM type;
|
|
|
|
|
|
int len, index, size;
|
|
|
|
|
|
char p, a;
|
|
|
|
|
|
|
|
|
|
|
|
if (i >= n || !SCM_CONSP (slots))
|
|
|
|
|
|
goto inconsistent;
|
|
|
|
|
|
|
|
|
|
|
|
/* extract slot type */
|
2003-01-08 15:05:55 +00:00
|
|
|
|
len = scm_ilength (SCM_CDAR (slots));
|
2003-04-13 14:48:35 +00:00
|
|
|
|
type = scm_i_get_keyword (k_class, SCM_CDAR (slots),
|
|
|
|
|
|
len, SCM_BOOL_F, FUNC_NAME);
|
|
|
|
|
|
/* determine slot GC protection and access mode */
|
|
|
|
|
|
if (SCM_FALSEP (type))
|
2001-07-18 10:14:29 +00:00
|
|
|
|
{
|
2003-04-13 14:48:35 +00:00
|
|
|
|
p = 'p';
|
|
|
|
|
|
a = 'w';
|
2001-07-18 10:14:29 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
2003-04-13 14:48:35 +00:00
|
|
|
|
if (!SCM_CLASSP (type))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (s)
|
|
|
|
|
|
free (s);
|
|
|
|
|
|
SCM_MISC_ERROR ("bad slot class", SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (SCM_SUBCLASSP (type, scm_class_foreign_slot))
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_SUBCLASSP (type, scm_class_self))
|
|
|
|
|
|
p = 's';
|
|
|
|
|
|
else if (SCM_SUBCLASSP (type, scm_class_protected))
|
|
|
|
|
|
p = 'p';
|
|
|
|
|
|
else
|
|
|
|
|
|
p = 'u';
|
|
|
|
|
|
|
|
|
|
|
|
if (SCM_SUBCLASSP (type, scm_class_opaque))
|
|
|
|
|
|
a = 'o';
|
|
|
|
|
|
else if (SCM_SUBCLASSP (type, scm_class_read_only))
|
|
|
|
|
|
a = 'r';
|
|
|
|
|
|
else
|
|
|
|
|
|
a = 'w';
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
p = 'p';
|
|
|
|
|
|
a = 'w';
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
index = SCM_GNS_INDEX (SCM_CAR (getters_n_setters));
|
|
|
|
|
|
if (index != (i >> 1))
|
|
|
|
|
|
goto inconsistent;
|
|
|
|
|
|
size = SCM_GNS_SIZE (SCM_CAR (getters_n_setters));
|
|
|
|
|
|
while (size)
|
|
|
|
|
|
{
|
|
|
|
|
|
s[i++] = p;
|
|
|
|
|
|
s[i++] = a;
|
|
|
|
|
|
--size;
|
2001-07-18 10:14:29 +00:00
|
|
|
|
}
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
slots = SCM_CDR (slots);
|
2003-04-13 14:48:35 +00:00
|
|
|
|
getters_n_setters = SCM_CDR (getters_n_setters);
|
|
|
|
|
|
}
|
|
|
|
|
|
if (!SCM_NULLP (slots))
|
|
|
|
|
|
{
|
|
|
|
|
|
inconsistent:
|
|
|
|
|
|
if (s)
|
|
|
|
|
|
free (s);
|
|
|
|
|
|
SCM_MISC_ERROR ("inconsistent getters-n-setters", SCM_EOL);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (class, scm_si_layout, scm_mem2symbol (s, n));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
if (s)
|
* gc.h, gc.c (scm_gc_sweep): Issue deprecation warning when
non-zero is returned from a port or smob free function.
(scm_malloc, scm_realloc, scm_strndup, scm_strdup,
scm_gc_register_collectable_memory,
scm_gc_unregister_collectable_memory, scm_gc_malloc,
scm_gc_realloc, scm_gc_free, scm_gc_strndup, scm_gc_strdup): New.
* backtrace.c, continuations.c, convert.i.c, coop-threads.c,
debug-malloc.c, dynl.c, environments.c, environments.h,
extensions.c, filesys.c, fports.c, gc.c, gc.h, gh_data.c, goops.c,
guardians.c, hooks.c, init.c, keywords.c, load.c, numbers.c,
ports.c, posix.c, procs.c, rdelim.c, regex-posix.c, root.c,
smob.c, stime.c, strings.c, struct.c, struct.h, symbols.c, unif.c,
vectors.c, weaks.c: Use scm_gc_malloc/scm_malloc and
scm_gc_free/free instead of scm_must_malloc and scm_must_free, as
appropriate. Return zero from smob and port free functions.
* debug-malloc.c (scm_malloc_reregister): Handle "old == NULL".
* fports.c (scm_setvbuf): Reset read buffer to saved values when
it is pointing to the putback buffer.
2002-02-11 18:06:50 +00:00
|
|
|
|
free (s);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
static void prep_hashsets (SCM);
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_inherit_magic_x, "%inherit-magic!", 2, 0, 0,
|
|
|
|
|
|
(SCM class, SCM dsupers),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_inherit_magic_x
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM ls = dsupers;
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long flags = 0;
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_INSTANCE (1, class);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
while (!SCM_NULLP (ls))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-18 17:36:44 +00:00
|
|
|
|
SCM_ASSERT (SCM_CONSP (ls)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
&& SCM_INSTANCEP (SCM_CAR (ls)),
|
|
|
|
|
|
dsupers,
|
|
|
|
|
|
SCM_ARG2,
|
2000-12-16 20:25:08 +00:00
|
|
|
|
FUNC_NAME);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
flags |= SCM_CLASS_FLAGS (SCM_CAR (ls));
|
|
|
|
|
|
ls = SCM_CDR (ls);
|
|
|
|
|
|
}
|
|
|
|
|
|
flags &= SCM_CLASSF_INHERIT;
|
|
|
|
|
|
if (flags & SCM_CLASSF_ENTITY)
|
|
|
|
|
|
SCM_SET_CLASS_DESTRUCTOR (class, scm_struct_free_entity);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long n = SCM_INUM (SCM_SLOT (class, scm_si_nfields));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
#if 0
|
|
|
|
|
|
/*
|
* gc.h, gc.c (scm_gc_sweep): Issue deprecation warning when
non-zero is returned from a port or smob free function.
(scm_malloc, scm_realloc, scm_strndup, scm_strdup,
scm_gc_register_collectable_memory,
scm_gc_unregister_collectable_memory, scm_gc_malloc,
scm_gc_realloc, scm_gc_free, scm_gc_strndup, scm_gc_strdup): New.
* backtrace.c, continuations.c, convert.i.c, coop-threads.c,
debug-malloc.c, dynl.c, environments.c, environments.h,
extensions.c, filesys.c, fports.c, gc.c, gc.h, gh_data.c, goops.c,
guardians.c, hooks.c, init.c, keywords.c, load.c, numbers.c,
ports.c, posix.c, procs.c, rdelim.c, regex-posix.c, root.c,
smob.c, stime.c, strings.c, struct.c, struct.h, symbols.c, unif.c,
vectors.c, weaks.c: Use scm_gc_malloc/scm_malloc and
scm_gc_free/free instead of scm_must_malloc and scm_must_free, as
appropriate. Return zero from smob and port free functions.
* debug-malloc.c (scm_malloc_reregister): Handle "old == NULL".
* fports.c (scm_setvbuf): Reset read buffer to saved values when
it is pointing to the putback buffer.
2002-02-11 18:06:50 +00:00
|
|
|
|
* We could avoid calling scm_gc_malloc in the allocation code
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
* (in which case the following two lines are needed). Instead
|
|
|
|
|
|
* we make 0-slot instances non-light, so that the light case
|
|
|
|
|
|
* can be handled without special cases.
|
|
|
|
|
|
*/
|
|
|
|
|
|
if (n == 0)
|
|
|
|
|
|
SCM_SET_CLASS_DESTRUCTOR (class, scm_struct_free_0);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
if (n > 0 && !(flags & SCM_CLASSF_METACLASS))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* NOTE: The following depends on scm_struct_i_size. */
|
|
|
|
|
|
flags |= SCM_STRUCTF_LIGHT + n * sizeof (SCM); /* use light representation */
|
|
|
|
|
|
SCM_SET_CLASS_DESTRUCTOR (class, scm_struct_free_light);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_SET_CLASS_FLAGS (class, flags);
|
|
|
|
|
|
|
|
|
|
|
|
prep_hashsets (class);
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2003-04-13 17:46:54 +00:00
|
|
|
|
static void
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
prep_hashsets (SCM class)
|
|
|
|
|
|
{
|
2001-06-07 23:10:33 +00:00
|
|
|
|
unsigned int i;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 7; ++i)
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_HASHSET (class, i, scm_c_uniform32 (goops_rstate));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_basic_basic_make_class (SCM class, SCM name, SCM dsupers, SCM dslots)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM z, cpl, slots, nfields, g_n_s;
|
|
|
|
|
|
|
|
|
|
|
|
/* Allocate one instance */
|
|
|
|
|
|
z = scm_make_struct (class, SCM_INUM0, SCM_EOL);
|
|
|
|
|
|
|
|
|
|
|
|
/* Initialize its slots */
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (z, scm_si_direct_supers, dsupers);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
cpl = compute_cpl (z);
|
|
|
|
|
|
slots = build_slots_list (maplist (dslots), cpl);
|
|
|
|
|
|
nfields = SCM_MAKINUM (scm_ilength (slots));
|
|
|
|
|
|
g_n_s = compute_getters_n_setters (slots);
|
|
|
|
|
|
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (z, scm_si_name, name);
|
|
|
|
|
|
SCM_SET_SLOT (z, scm_si_direct_slots, dslots);
|
|
|
|
|
|
SCM_SET_SLOT (z, scm_si_direct_subclasses, SCM_EOL);
|
|
|
|
|
|
SCM_SET_SLOT (z, scm_si_direct_methods, SCM_EOL);
|
|
|
|
|
|
SCM_SET_SLOT (z, scm_si_cpl, cpl);
|
|
|
|
|
|
SCM_SET_SLOT (z, scm_si_slots, slots);
|
|
|
|
|
|
SCM_SET_SLOT (z, scm_si_nfields, nfields);
|
|
|
|
|
|
SCM_SET_SLOT (z, scm_si_getters_n_setters, g_n_s);
|
|
|
|
|
|
SCM_SET_SLOT (z, scm_si_redefined, SCM_BOOL_F);
|
|
|
|
|
|
SCM_SET_SLOT (z, scm_si_environment,
|
|
|
|
|
|
scm_top_level_env (SCM_TOP_LEVEL_LOOKUP_CLOSURE));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
/* Add this class in the direct-subclasses slot of dsupers */
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM tmp;
|
2001-06-07 23:10:33 +00:00
|
|
|
|
for (tmp = dsupers; !SCM_NULLP (tmp); tmp = SCM_CDR (tmp))
|
|
|
|
|
|
SCM_SET_SLOT (SCM_CAR (tmp), scm_si_direct_subclasses,
|
|
|
|
|
|
scm_cons (z, SCM_SLOT (SCM_CAR (tmp),
|
|
|
|
|
|
scm_si_direct_subclasses)));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Support for the underlying structs: */
|
|
|
|
|
|
SCM_SET_CLASS_FLAGS (z, (class == scm_class_entity_class
|
|
|
|
|
|
? (SCM_CLASSF_GOOPS_OR_VALID
|
|
|
|
|
|
| SCM_CLASSF_OPERATOR
|
|
|
|
|
|
| SCM_CLASSF_ENTITY)
|
|
|
|
|
|
: class == scm_class_operator_class
|
|
|
|
|
|
? SCM_CLASSF_GOOPS_OR_VALID | SCM_CLASSF_OPERATOR
|
|
|
|
|
|
: SCM_CLASSF_GOOPS_OR_VALID));
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_basic_make_class (SCM class, SCM name, SCM dsupers, SCM dslots)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM z = scm_basic_basic_make_class (class, name, dsupers, dslots);
|
|
|
|
|
|
scm_sys_inherit_magic_x (z, dsupers);
|
|
|
|
|
|
scm_sys_prep_layout_x (z);
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
2001-07-18 10:14:29 +00:00
|
|
|
|
SCM_SYMBOL (sym_layout, "layout");
|
|
|
|
|
|
SCM_SYMBOL (sym_vcell, "vcell");
|
|
|
|
|
|
SCM_SYMBOL (sym_vtable, "vtable");
|
|
|
|
|
|
SCM_SYMBOL (sym_print, "print");
|
|
|
|
|
|
SCM_SYMBOL (sym_procedure, "procedure");
|
|
|
|
|
|
SCM_SYMBOL (sym_setter, "setter");
|
|
|
|
|
|
SCM_SYMBOL (sym_redefined, "redefined");
|
|
|
|
|
|
SCM_SYMBOL (sym_h0, "h0");
|
|
|
|
|
|
SCM_SYMBOL (sym_h1, "h1");
|
|
|
|
|
|
SCM_SYMBOL (sym_h2, "h2");
|
|
|
|
|
|
SCM_SYMBOL (sym_h3, "h3");
|
|
|
|
|
|
SCM_SYMBOL (sym_h4, "h4");
|
|
|
|
|
|
SCM_SYMBOL (sym_h5, "h5");
|
|
|
|
|
|
SCM_SYMBOL (sym_h6, "h6");
|
|
|
|
|
|
SCM_SYMBOL (sym_h7, "h7");
|
|
|
|
|
|
SCM_SYMBOL (sym_name, "name");
|
|
|
|
|
|
SCM_SYMBOL (sym_direct_supers, "direct-supers");
|
|
|
|
|
|
SCM_SYMBOL (sym_direct_slots, "direct-slots");
|
|
|
|
|
|
SCM_SYMBOL (sym_direct_subclasses, "direct-subclasses");
|
|
|
|
|
|
SCM_SYMBOL (sym_direct_methods, "direct-methods");
|
|
|
|
|
|
SCM_SYMBOL (sym_cpl, "cpl");
|
|
|
|
|
|
SCM_SYMBOL (sym_default_slot_definition_class, "default-slot-definition-class");
|
|
|
|
|
|
SCM_SYMBOL (sym_slots, "slots");
|
|
|
|
|
|
SCM_SYMBOL (sym_getters_n_setters, "getters-n-setters");
|
|
|
|
|
|
SCM_SYMBOL (sym_keyword_access, "keyword-access");
|
|
|
|
|
|
SCM_SYMBOL (sym_nfields, "nfields");
|
|
|
|
|
|
SCM_SYMBOL (sym_environment, "environment");
|
|
|
|
|
|
|
|
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
build_class_class_slots ()
|
|
|
|
|
|
{
|
2001-07-18 10:14:29 +00:00
|
|
|
|
return scm_list_n (
|
|
|
|
|
|
scm_list_3 (sym_layout, k_class, scm_class_protected_read_only),
|
|
|
|
|
|
scm_list_3 (sym_vtable, k_class, scm_class_self),
|
|
|
|
|
|
scm_list_1 (sym_print),
|
|
|
|
|
|
scm_list_3 (sym_procedure, k_class, scm_class_protected_opaque),
|
|
|
|
|
|
scm_list_3 (sym_setter, k_class, scm_class_protected_opaque),
|
|
|
|
|
|
scm_list_1 (sym_redefined),
|
|
|
|
|
|
scm_list_3 (sym_h0, k_class, scm_class_int),
|
|
|
|
|
|
scm_list_3 (sym_h1, k_class, scm_class_int),
|
|
|
|
|
|
scm_list_3 (sym_h2, k_class, scm_class_int),
|
|
|
|
|
|
scm_list_3 (sym_h3, k_class, scm_class_int),
|
|
|
|
|
|
scm_list_3 (sym_h4, k_class, scm_class_int),
|
|
|
|
|
|
scm_list_3 (sym_h5, k_class, scm_class_int),
|
|
|
|
|
|
scm_list_3 (sym_h6, k_class, scm_class_int),
|
|
|
|
|
|
scm_list_3 (sym_h7, k_class, scm_class_int),
|
|
|
|
|
|
scm_list_1 (sym_name),
|
|
|
|
|
|
scm_list_1 (sym_direct_supers),
|
|
|
|
|
|
scm_list_1 (sym_direct_slots),
|
|
|
|
|
|
scm_list_1 (sym_direct_subclasses),
|
|
|
|
|
|
scm_list_1 (sym_direct_methods),
|
|
|
|
|
|
scm_list_1 (sym_cpl),
|
|
|
|
|
|
scm_list_1 (sym_default_slot_definition_class),
|
|
|
|
|
|
scm_list_1 (sym_slots),
|
|
|
|
|
|
scm_list_1 (sym_getters_n_setters),
|
|
|
|
|
|
scm_list_1 (sym_keyword_access),
|
|
|
|
|
|
scm_list_1 (sym_nfields),
|
|
|
|
|
|
scm_list_1 (sym_environment),
|
|
|
|
|
|
SCM_UNDEFINED);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
create_basic_classes (void)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* SCM slots_of_class = build_class_class_slots (); */
|
|
|
|
|
|
|
|
|
|
|
|
/**** <scm_class_class> ****/
|
|
|
|
|
|
SCM cs = scm_makfrom0str (SCM_CLASS_CLASS_LAYOUT
|
|
|
|
|
|
+ 2 * scm_vtable_offset_user);
|
2000-12-08 17:08:34 +00:00
|
|
|
|
SCM name = scm_str2symbol ("<class>");
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_class_class = scm_permanent_object (scm_make_vtable_vtable (cs,
|
|
|
|
|
|
SCM_INUM0,
|
|
|
|
|
|
SCM_EOL));
|
|
|
|
|
|
SCM_SET_CLASS_FLAGS (scm_class_class, (SCM_CLASSF_GOOPS_OR_VALID
|
|
|
|
|
|
| SCM_CLASSF_METACLASS));
|
|
|
|
|
|
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (scm_class_class, scm_si_name, name);
|
|
|
|
|
|
SCM_SET_SLOT (scm_class_class, scm_si_direct_supers, SCM_EOL); /* will be changed */
|
|
|
|
|
|
/* SCM_SET_SLOT (scm_class_class, scm_si_direct_slots, slots_of_class); */
|
|
|
|
|
|
SCM_SET_SLOT (scm_class_class, scm_si_direct_subclasses, SCM_EOL);
|
2002-04-22 17:46:06 +00:00
|
|
|
|
SCM_SET_SLOT (scm_class_class, scm_si_direct_methods, SCM_EOL);
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (scm_class_class, scm_si_cpl, SCM_EOL); /* will be changed */
|
|
|
|
|
|
/* SCM_SET_SLOT (scm_class_class, scm_si_slots, slots_of_class); */
|
|
|
|
|
|
SCM_SET_SLOT (scm_class_class, scm_si_nfields, SCM_MAKINUM (SCM_N_CLASS_SLOTS));
|
|
|
|
|
|
/* SCM_SET_SLOT (scm_class_class, scm_si_getters_n_setters,
|
|
|
|
|
|
compute_getters_n_setters (slots_of_class)); */
|
|
|
|
|
|
SCM_SET_SLOT (scm_class_class, scm_si_redefined, SCM_BOOL_F);
|
|
|
|
|
|
SCM_SET_SLOT (scm_class_class, scm_si_environment,
|
|
|
|
|
|
scm_top_level_env (SCM_TOP_LEVEL_LOOKUP_CLOSURE));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
prep_hashsets (scm_class_class);
|
|
|
|
|
|
|
|
|
|
|
|
DEFVAR(name, scm_class_class);
|
|
|
|
|
|
|
|
|
|
|
|
/**** <scm_class_top> ****/
|
2000-12-08 17:08:34 +00:00
|
|
|
|
name = scm_str2symbol ("<top>");
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_class_top = scm_permanent_object (scm_basic_make_class (scm_class_class,
|
|
|
|
|
|
name,
|
|
|
|
|
|
SCM_EOL,
|
|
|
|
|
|
SCM_EOL));
|
|
|
|
|
|
|
|
|
|
|
|
DEFVAR(name, scm_class_top);
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/**** <scm_class_object> ****/
|
2000-12-08 17:08:34 +00:00
|
|
|
|
name = scm_str2symbol ("<object>");
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_class_object = scm_permanent_object (scm_basic_make_class (scm_class_class,
|
|
|
|
|
|
name,
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_1 (scm_class_top),
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM_EOL));
|
|
|
|
|
|
|
|
|
|
|
|
DEFVAR (name, scm_class_object);
|
|
|
|
|
|
|
|
|
|
|
|
/* <top> <object> and <class> were partially initialized. Correct them here */
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
SCM_SET_SLOT (scm_class_object, scm_si_direct_subclasses, scm_list_1 (scm_class_class));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
SCM_SET_SLOT (scm_class_class, scm_si_direct_supers, scm_list_1 (scm_class_object));
|
|
|
|
|
|
SCM_SET_SLOT (scm_class_class, scm_si_cpl, scm_list_3 (scm_class_class, scm_class_object, scm_class_top));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_instance_p, "instance?", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return @code{#t} if @var{obj} is an instance.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_instance_p
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-18 17:36:44 +00:00
|
|
|
|
return SCM_BOOL (SCM_INSTANCEP (obj));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/******************************************************************************
|
2002-04-22 17:46:06 +00:00
|
|
|
|
*
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
* Meta object accessors
|
|
|
|
|
|
*
|
|
|
|
|
|
******************************************************************************/
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_class_name, "class-name", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the class name of @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_class_name
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, obj);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
return scm_slot_ref (obj, sym_name);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_class_direct_supers, "class-direct-supers", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the direct superclasses of the class @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_class_direct_supers
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, obj);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
return scm_slot_ref (obj, sym_direct_supers);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_class_direct_slots, "class-direct-slots", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the direct slots of the class @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_class_direct_slots
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, obj);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
return scm_slot_ref (obj, sym_direct_slots);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_class_direct_subclasses, "class-direct-subclasses", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the direct subclasses of the class @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_class_direct_subclasses
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, obj);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
return scm_slot_ref(obj, sym_direct_subclasses);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_class_direct_methods, "class-direct-methods", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the direct methods of the class @var{obj}")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_class_direct_methods
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, obj);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
return scm_slot_ref (obj, sym_direct_methods);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_class_precedence_list, "class-precedence-list", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the class precedence list of the class @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_class_precedence_list
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, obj);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
return scm_slot_ref (obj, sym_cpl);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_class_slots, "class-slots", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the slot list of the class @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_class_slots
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, obj);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
return scm_slot_ref (obj, sym_slots);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_class_environment, "class-environment", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the environment of the class @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_class_environment
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, obj);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
return scm_slot_ref(obj, sym_environment);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_generic_function_name, "generic-function-name", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the name of the generic function @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_generic_function_name
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_GENERIC (1, obj);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return scm_procedure_property (obj, scm_sym_name);
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2003-01-08 13:24:41 +00:00
|
|
|
|
SCM_SYMBOL (sym_methods, "methods");
|
|
|
|
|
|
SCM_SYMBOL (sym_extended_by, "extended-by");
|
|
|
|
|
|
SCM_SYMBOL (sym_extends, "extends");
|
|
|
|
|
|
|
|
|
|
|
|
static
|
|
|
|
|
|
SCM fold_downward_gf_methods (SCM method_lists, SCM gf)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM gfs = scm_slot_ref (gf, sym_extended_by);
|
|
|
|
|
|
method_lists = scm_cons (scm_slot_ref (gf, sym_methods), method_lists);
|
|
|
|
|
|
while (!SCM_NULLP (gfs))
|
|
|
|
|
|
{
|
|
|
|
|
|
method_lists = fold_downward_gf_methods (method_lists, SCM_CAR (gfs));
|
|
|
|
|
|
gfs = SCM_CDR (gfs);
|
|
|
|
|
|
}
|
|
|
|
|
|
return method_lists;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static
|
|
|
|
|
|
SCM fold_upward_gf_methods (SCM method_lists, SCM gf)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (SCM_IS_A_P (gf, scm_class_extended_generic))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM gfs = scm_slot_ref (gf, sym_extends);
|
|
|
|
|
|
while (!SCM_NULLP (gfs))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM methods = scm_slot_ref (SCM_CAR (gfs), sym_methods);
|
|
|
|
|
|
method_lists = fold_upward_gf_methods (scm_cons (methods,
|
|
|
|
|
|
method_lists),
|
|
|
|
|
|
SCM_CAR (gfs));
|
|
|
|
|
|
gfs = SCM_CDR (gfs);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
return method_lists;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_generic_function_methods, "generic-function-methods", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the methods of the generic function @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_generic_function_methods
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2003-01-08 13:24:41 +00:00
|
|
|
|
SCM methods;
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_GENERIC (1, obj);
|
2003-01-08 13:24:41 +00:00
|
|
|
|
methods = fold_upward_gf_methods (SCM_EOL, obj);
|
|
|
|
|
|
methods = fold_downward_gf_methods (methods, obj);
|
|
|
|
|
|
return scm_append (methods);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_method_generic_function, "method-generic-function", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
2002-03-15 10:37:40 +00:00
|
|
|
|
"Return the generic function for the method @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_method_generic_function
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_METHOD (1, obj);
|
2000-12-08 17:08:34 +00:00
|
|
|
|
return scm_slot_ref (obj, scm_str2symbol ("generic-function"));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_method_specializers, "method-specializers", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return specializers of the method @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_method_specializers
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_METHOD (1, obj);
|
2000-12-08 17:08:34 +00:00
|
|
|
|
return scm_slot_ref (obj, scm_str2symbol ("specializers"));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_method_procedure, "method-procedure", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the procedure of the method @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_method_procedure
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_METHOD (1, obj);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
return scm_slot_ref (obj, sym_procedure);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_accessor_method_slot_definition, "accessor-method-slot-definition", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the slot definition of the accessor @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_accessor_method_slot_definition
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_ACCESSOR (1, obj);
|
2000-12-08 17:08:34 +00:00
|
|
|
|
return scm_slot_ref (obj, scm_str2symbol ("slot-definition"));
|
2000-12-16 20:25:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2001-03-04 20:46:04 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_tag_body, "%tag-body", 1, 0, 0,
|
|
|
|
|
|
(SCM body),
|
2001-03-04 05:27:41 +00:00
|
|
|
|
"Internal GOOPS magic---don't use this function!")
|
2001-03-04 20:46:04 +00:00
|
|
|
|
#define FUNC_NAME s_scm_sys_tag_body
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_cons (SCM_IM_LAMBDA, body);
|
2001-03-04 05:27:41 +00:00
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
|
|
*
|
|
|
|
|
|
* S l o t a c c e s s
|
|
|
|
|
|
*
|
|
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_make_unbound, "make-unbound", 0, 0, 0,
|
|
|
|
|
|
(),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the unbound value.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_make_unbound
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
return SCM_GOOPS_UNBOUND;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_unbound_p, "unbound?", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return @code{#t} if @var{obj} is unbound.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_unbound_p
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
return SCM_GOOPS_UNBOUNDP (obj) ? SCM_BOOL_T : SCM_BOOL_F;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_assert_bound, "assert-bound", 2, 0, 0,
|
|
|
|
|
|
(SCM value, SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return @var{value} if it is bound, and invoke the\n"
|
|
|
|
|
|
"@var{slot-unbound} method of @var{obj} if it is not.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_assert_bound
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (SCM_GOOPS_UNBOUNDP (value))
|
|
|
|
|
|
return CALL_GF1 ("slot-unbound", obj);
|
|
|
|
|
|
return value;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_at_assert_bound_ref, "@assert-bound-ref", 2, 0, 0,
|
|
|
|
|
|
(SCM obj, SCM index),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Like @code{assert-bound}, but use @var{index} for accessing\n"
|
|
|
|
|
|
"the value from @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_at_assert_bound_ref
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM value = SCM_SLOT (obj, SCM_INUM (index));
|
|
|
|
|
|
if (SCM_GOOPS_UNBOUNDP (value))
|
|
|
|
|
|
return CALL_GF1 ("slot-unbound", obj);
|
|
|
|
|
|
return value;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_fast_slot_ref, "%fast-slot-ref", 2, 0, 0,
|
|
|
|
|
|
(SCM obj, SCM index),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the slot value with index @var{index} from @var{obj}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_sys_fast_slot_ref
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2001-07-18 10:14:29 +00:00
|
|
|
|
unsigned long int i;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_INSTANCE (1, obj);
|
|
|
|
|
|
SCM_VALIDATE_INUM (2, index);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
SCM_ASSERT_RANGE (2, index, SCM_INUM (index) >= 0);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
i = SCM_INUM (index);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
SCM_ASSERT_RANGE (2, index, i < SCM_NUMBER_OF_SLOTS (obj));
|
|
|
|
|
|
|
2003-04-15 01:17:36 +00:00
|
|
|
|
return SCM_SLOT (obj, i);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-11-24 10:55:23 +00:00
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_fast_slot_set_x, "%fast-slot-set!", 3, 0, 0,
|
|
|
|
|
|
(SCM obj, SCM index, SCM value),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Set the slot with index @var{index} in @var{obj} to\n"
|
|
|
|
|
|
"@var{value}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_sys_fast_slot_set_x
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2001-07-18 10:14:29 +00:00
|
|
|
|
unsigned long int i;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_INSTANCE (1, obj);
|
|
|
|
|
|
SCM_VALIDATE_INUM (2, index);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
SCM_ASSERT_RANGE (2, index, SCM_INUM (index) >= 0);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
i = SCM_INUM (index);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
SCM_ASSERT_RANGE (2, index, i < SCM_NUMBER_OF_SLOTS (obj));
|
|
|
|
|
|
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (obj, i, value);
|
2000-11-24 10:55:23 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
2000-11-24 10:55:23 +00:00
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2003-05-04 08:36:56 +00:00
|
|
|
|
SCM_SYNTAX (s_atslot_ref, "@slot-ref", scm_i_makbimacro, scm_m_atslot_ref);
|
|
|
|
|
|
SCM_SYNTAX (s_atslot_set_x, "@slot-set!", scm_i_makbimacro, scm_m_atslot_set_x);
|
2003-04-28 06:05:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/** Utilities **/
|
|
|
|
|
|
|
|
|
|
|
|
/* In the future, this function will return the effective slot
|
|
|
|
|
|
* definition associated with SLOT_NAME. Now it just returns some of
|
|
|
|
|
|
* the information which will be stored in the effective slot
|
|
|
|
|
|
* definition.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
slot_definition_using_name (SCM class, SCM slot_name)
|
|
|
|
|
|
{
|
|
|
|
|
|
register SCM slots = SCM_SLOT (class, scm_si_getters_n_setters);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
for (; !SCM_NULLP (slots); slots = SCM_CDR (slots))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
if (SCM_CAAR (slots) == slot_name)
|
|
|
|
|
|
return SCM_CAR (slots);
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
2001-06-07 21:12:19 +00:00
|
|
|
|
get_slot_value (SCM class SCM_UNUSED, SCM obj, SCM slotdef)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM access = SCM_CDDR (slotdef);
|
|
|
|
|
|
/* Two cases here:
|
|
|
|
|
|
* - access is an integer (the offset of this slot in the slots vector)
|
|
|
|
|
|
* - otherwise (car access) is the getter function to apply
|
2000-12-01 16:05:33 +00:00
|
|
|
|
*/
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
if (SCM_INUMP (access))
|
|
|
|
|
|
return SCM_SLOT (obj, SCM_INUM (access));
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
2002-04-22 17:46:06 +00:00
|
|
|
|
/* We must evaluate (apply (car access) (list obj))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
* where (car access) is known to be a closure of arity 1 */
|
|
|
|
|
|
register SCM code, env;
|
|
|
|
|
|
|
|
|
|
|
|
code = SCM_CAR (access);
|
|
|
|
|
|
if (!SCM_CLOSUREP (code))
|
|
|
|
|
|
return SCM_SUBRF (code) (obj);
|
2001-04-19 14:46:01 +00:00
|
|
|
|
env = SCM_EXTEND_ENV (SCM_CLOSURE_FORMALS (code),
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_1 (obj),
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM_ENV (code));
|
|
|
|
|
|
/* Evaluate the closure body */
|
2002-01-10 20:52:45 +00:00
|
|
|
|
return scm_eval_body (SCM_CLOSURE_BODY (code), env);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
get_slot_value_using_name (SCM class, SCM obj, SCM slot_name)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM slotdef = slot_definition_using_name (class, slot_name);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
if (!SCM_FALSEP (slotdef))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return get_slot_value (class, obj, slotdef);
|
|
|
|
|
|
else
|
|
|
|
|
|
return CALL_GF3 ("slot-missing", class, obj, slot_name);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
2001-06-07 21:12:19 +00:00
|
|
|
|
set_slot_value (SCM class SCM_UNUSED, SCM obj, SCM slotdef, SCM value)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM access = SCM_CDDR (slotdef);
|
|
|
|
|
|
/* Two cases here:
|
|
|
|
|
|
* - access is an integer (the offset of this slot in the slots vector)
|
|
|
|
|
|
* - otherwise (cadr access) is the setter function to apply
|
|
|
|
|
|
*/
|
|
|
|
|
|
if (SCM_INUMP (access))
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (obj, SCM_INUM (access), value);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* We must evaluate (apply (cadr l) (list obj value))
|
|
|
|
|
|
* where (cadr l) is known to be a closure of arity 2 */
|
|
|
|
|
|
register SCM code, env;
|
|
|
|
|
|
|
|
|
|
|
|
code = SCM_CADR (access);
|
|
|
|
|
|
if (!SCM_CLOSUREP (code))
|
|
|
|
|
|
SCM_SUBRF (code) (obj, value);
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
2001-04-19 14:46:01 +00:00
|
|
|
|
env = SCM_EXTEND_ENV (SCM_CLOSURE_FORMALS (code),
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_2 (obj, value),
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM_ENV (code));
|
|
|
|
|
|
/* Evaluate the closure body */
|
2002-01-10 20:52:45 +00:00
|
|
|
|
scm_eval_body (SCM_CLOSURE_BODY (code), env);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
set_slot_value_using_name (SCM class, SCM obj, SCM slot_name, SCM value)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM slotdef = slot_definition_using_name (class, slot_name);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
if (!SCM_FALSEP (slotdef))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return set_slot_value (class, obj, slotdef, value);
|
|
|
|
|
|
else
|
|
|
|
|
|
return CALL_GF4 ("slot-missing", class, obj, slot_name, value);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
2001-06-07 21:12:19 +00:00
|
|
|
|
test_slot_existence (SCM class SCM_UNUSED, SCM obj, SCM slot_name)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
register SCM l;
|
|
|
|
|
|
|
2001-05-27 22:00:03 +00:00
|
|
|
|
for (l = SCM_ACCESSORS_OF (obj); !SCM_NULLP (l); l = SCM_CDR (l))
|
|
|
|
|
|
if (SCM_EQ_P (SCM_CAAR (l), slot_name))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* ======================================== */
|
|
|
|
|
|
|
2000-12-01 16:05:33 +00:00
|
|
|
|
SCM_DEFINE (scm_slot_ref_using_class, "slot-ref-using-class", 3, 0, 0,
|
|
|
|
|
|
(SCM class, SCM obj, SCM slot_name),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_slot_ref_using_class
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM res;
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, class);
|
|
|
|
|
|
SCM_VALIDATE_INSTANCE (2, obj);
|
|
|
|
|
|
SCM_VALIDATE_SYMBOL (3, slot_name);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
res = get_slot_value_using_name (class, obj, slot_name);
|
|
|
|
|
|
if (SCM_GOOPS_UNBOUNDP (res))
|
|
|
|
|
|
return CALL_GF3 ("slot-unbound", class, obj, slot_name);
|
|
|
|
|
|
return res;
|
|
|
|
|
|
}
|
2000-12-01 16:05:33 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-01 16:05:33 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_slot_set_using_class_x, "slot-set-using-class!", 4, 0, 0,
|
|
|
|
|
|
(SCM class, SCM obj, SCM slot_name, SCM value),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_slot_set_using_class_x
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, class);
|
|
|
|
|
|
SCM_VALIDATE_INSTANCE (2, obj);
|
|
|
|
|
|
SCM_VALIDATE_SYMBOL (3, slot_name);
|
2000-12-01 16:05:33 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return set_slot_value_using_name (class, obj, slot_name, value);
|
|
|
|
|
|
}
|
2000-12-01 16:05:33 +00:00
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_slot_bound_using_class_p, "slot-bound-using-class?", 3, 0, 0,
|
|
|
|
|
|
(SCM class, SCM obj, SCM slot_name),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_slot_bound_using_class_p
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, class);
|
|
|
|
|
|
SCM_VALIDATE_INSTANCE (2, obj);
|
|
|
|
|
|
SCM_VALIDATE_SYMBOL (3, slot_name);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
return (SCM_GOOPS_UNBOUNDP (get_slot_value_using_name (class, obj, slot_name))
|
|
|
|
|
|
? SCM_BOOL_F
|
|
|
|
|
|
: SCM_BOOL_T);
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_slot_exists_using_class_p, "slot-exists-using-class?", 3, 0, 0,
|
|
|
|
|
|
(SCM class, SCM obj, SCM slot_name),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_slot_exists_using_class_p
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_VALIDATE_CLASS (1, class);
|
|
|
|
|
|
SCM_VALIDATE_INSTANCE (2, obj);
|
|
|
|
|
|
SCM_VALIDATE_SYMBOL (3, slot_name);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return test_slot_existence (class, obj, slot_name);
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* ======================================== */
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_slot_ref, "slot-ref", 2, 0, 0,
|
|
|
|
|
|
(SCM obj, SCM slot_name),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return the value from @var{obj}'s slot with the name\n"
|
|
|
|
|
|
"@var{slot_name}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_slot_ref
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM res, class;
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_INSTANCE (1, obj);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
TEST_CHANGE_CLASS (obj, class);
|
|
|
|
|
|
|
|
|
|
|
|
res = get_slot_value_using_name (class, obj, slot_name);
|
|
|
|
|
|
if (SCM_GOOPS_UNBOUNDP (res))
|
|
|
|
|
|
return CALL_GF3 ("slot-unbound", class, obj, slot_name);
|
|
|
|
|
|
return res;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_slot_set_x, "slot-set!", 3, 0, 0,
|
|
|
|
|
|
(SCM obj, SCM slot_name, SCM value),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Set the slot named @var{slot_name} of @var{obj} to @var{value}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_slot_set_x
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM class;
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_INSTANCE (1, obj);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
TEST_CHANGE_CLASS(obj, class);
|
|
|
|
|
|
|
|
|
|
|
|
return set_slot_value_using_name (class, obj, slot_name, value);
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
const char *scm_s_slot_set_x = s_scm_slot_set_x;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_slot_bound_p, "slot-bound?", 2, 0, 0,
|
|
|
|
|
|
(SCM obj, SCM slot_name),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return @code{#t} if the slot named @var{slot_name} of @var{obj}\n"
|
|
|
|
|
|
"is bound.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_slot_bound_p
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM class;
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_INSTANCE (1, obj);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
TEST_CHANGE_CLASS(obj, class);
|
|
|
|
|
|
|
|
|
|
|
|
return (SCM_GOOPS_UNBOUNDP (get_slot_value_using_name (class,
|
|
|
|
|
|
obj,
|
|
|
|
|
|
slot_name))
|
|
|
|
|
|
? SCM_BOOL_F
|
|
|
|
|
|
: SCM_BOOL_T);
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2002-04-22 17:46:06 +00:00
|
|
|
|
SCM_DEFINE (scm_slot_exists_p, "slot-exists?", 2, 0, 0,
|
2000-12-16 20:25:08 +00:00
|
|
|
|
(SCM obj, SCM slot_name),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return @code{#t} if @var{obj} has a slot named @var{slot_name}.")
|
2002-04-22 17:46:06 +00:00
|
|
|
|
#define FUNC_NAME s_scm_slot_exists_p
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM class;
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_INSTANCE (1, obj);
|
|
|
|
|
|
SCM_VALIDATE_SYMBOL (2, slot_name);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
TEST_CHANGE_CLASS (obj, class);
|
|
|
|
|
|
|
|
|
|
|
|
return test_slot_existence (class, obj, slot_name);
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
|
|
*
|
|
|
|
|
|
* %allocate-instance (the low level instance allocation primitive)
|
|
|
|
|
|
*
|
|
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
static void clear_method_cache (SCM);
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
2001-05-26 20:51:22 +00:00
|
|
|
|
wrap_init (SCM class, SCM *m, long n)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long i;
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/* Set all slots to unbound */
|
|
|
|
|
|
for (i = 0; i < n; i++)
|
|
|
|
|
|
m[i] = SCM_GOOPS_UNBOUND;
|
|
|
|
|
|
|
Changes in doc/ref:
* api.txt, data-rep.texi: Renamed the struct scm_cell to
scm_t_cell.
* data-rep.texi: Renamed scm_alloc_cell to scm_cell and
scm_alloc_double_cell to scm_double_cell.
Changes in libguile:
* gc.c (SCM_HEAP_SEG_SIZE, CELL_UP, CELL_DN, NEXT_DATA_CELL,
init_heap_seg, alloc_some_heap), gc.h (struct scm_cell, struct
scm_t_cell, SCM_CELLPTR, SCM_GC_CARD_SIZE,
SCM_GC_IN_CARD_HEADERP), tags.h (SCM_CELLP): Renamed the struct
scm_cell and all its uses to scm_t_cell in accordance to Guile's
naming scheme for types.
* alist.c (scm_acons), convert.i.c (CTYPES2UVECT,
CTYPES2UVECT_OPTIONAL), coop-threads.c (scm_call_with_new_thread,
scm_spawn_thread), debug.c (scm_make_debugobj), environments.c
(scm_make_environment), eval.c (scm_closure), fports.c
(scm_fdes_to_port), gc.c (scm_deprecated_newcell,
scm_deprecated_newcell2), inline.h (scm_alloc_cell, scm_cell),
list.c (SCM_I_CONS), numbers.c (scm_i_mkbig), pairs.c (scm_cons),
ports.c (scm_void_port), procs.c (scm_c_make_subr, scm_makcclo),
smob.c (scm_make_smob), smob.h (SCM_NEWSMOB), strings.c
(scm_take_str, scm_allocate_string), strports.c (scm_mkstrport),
unif.c (scm_make_uve), variable.c (make_variable), vectors.c
(scm_c_make_vector), vports.c (scm_make_soft_port): Renamed
scm_alloc_cell to scm_cell.
* environments.c (core_environments_observe), gc.c
(scm_deprecated_newcell2), goops.c (wrap_init, scm_wrap_object),
inline.h (scm_alloc_double_cell, scm_double_cell), num2float.i.c
(FLOAT2NUM), numbers.c (scm_make_real), procs.c
(scm_make_procedure_with_setter), smob.h (SCM_NEWSMOB2,
SCM_NEWSMOB3), struct.c (scm_make_struct, scm_make_vtable_vtable),
symbols.c (scm_mem2symbol, scm_mem2uninterned_symbol), weaks.c
(allocate_weak_vector): Renamed scm_alloc_double_cell to
scm_double_cell.
2002-03-01 00:19:20 +00:00
|
|
|
|
return scm_double_cell ((((scm_t_bits) SCM_STRUCT_DATA (class))
|
|
|
|
|
|
| scm_tc3_struct),
|
|
|
|
|
|
(scm_t_bits) m, 0, 0);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_allocate_instance, "%allocate-instance", 2, 0, 0,
|
|
|
|
|
|
(SCM class, SCM initargs),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Create a new instance of class @var{class} and initialize it\n"
|
|
|
|
|
|
"from the arguments @var{initargs}.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_sys_allocate_instance
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM *m;
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long n;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, class);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
/* Most instances */
|
|
|
|
|
|
if (SCM_CLASS_FLAGS (class) & SCM_STRUCTF_LIGHT)
|
|
|
|
|
|
{
|
|
|
|
|
|
n = SCM_INUM (SCM_SLOT (class, scm_si_nfields));
|
* gc.h, gc.c (scm_gc_sweep): Issue deprecation warning when
non-zero is returned from a port or smob free function.
(scm_malloc, scm_realloc, scm_strndup, scm_strdup,
scm_gc_register_collectable_memory,
scm_gc_unregister_collectable_memory, scm_gc_malloc,
scm_gc_realloc, scm_gc_free, scm_gc_strndup, scm_gc_strdup): New.
* backtrace.c, continuations.c, convert.i.c, coop-threads.c,
debug-malloc.c, dynl.c, environments.c, environments.h,
extensions.c, filesys.c, fports.c, gc.c, gc.h, gh_data.c, goops.c,
guardians.c, hooks.c, init.c, keywords.c, load.c, numbers.c,
ports.c, posix.c, procs.c, rdelim.c, regex-posix.c, root.c,
smob.c, stime.c, strings.c, struct.c, struct.h, symbols.c, unif.c,
vectors.c, weaks.c: Use scm_gc_malloc/scm_malloc and
scm_gc_free/free instead of scm_must_malloc and scm_must_free, as
appropriate. Return zero from smob and port free functions.
* debug-malloc.c (scm_malloc_reregister): Handle "old == NULL".
* fports.c (scm_setvbuf): Reset read buffer to saved values when
it is pointing to the putback buffer.
2002-02-11 18:06:50 +00:00
|
|
|
|
m = (SCM *) scm_gc_malloc (n * sizeof (SCM), "struct");
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return wrap_init (class, m, n);
|
|
|
|
|
|
}
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/* Foreign objects */
|
|
|
|
|
|
if (SCM_CLASS_FLAGS (class) & SCM_CLASSF_FOREIGN)
|
|
|
|
|
|
return scm_make_foreign_object (class, initargs);
|
|
|
|
|
|
|
|
|
|
|
|
n = SCM_INUM (SCM_SLOT (class, scm_si_nfields));
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/* Entities */
|
|
|
|
|
|
if (SCM_CLASS_FLAGS (class) & SCM_CLASSF_ENTITY)
|
|
|
|
|
|
{
|
* gc.h, gc.c (scm_gc_sweep): Issue deprecation warning when
non-zero is returned from a port or smob free function.
(scm_malloc, scm_realloc, scm_strndup, scm_strdup,
scm_gc_register_collectable_memory,
scm_gc_unregister_collectable_memory, scm_gc_malloc,
scm_gc_realloc, scm_gc_free, scm_gc_strndup, scm_gc_strdup): New.
* backtrace.c, continuations.c, convert.i.c, coop-threads.c,
debug-malloc.c, dynl.c, environments.c, environments.h,
extensions.c, filesys.c, fports.c, gc.c, gc.h, gh_data.c, goops.c,
guardians.c, hooks.c, init.c, keywords.c, load.c, numbers.c,
ports.c, posix.c, procs.c, rdelim.c, regex-posix.c, root.c,
smob.c, stime.c, strings.c, struct.c, struct.h, symbols.c, unif.c,
vectors.c, weaks.c: Use scm_gc_malloc/scm_malloc and
scm_gc_free/free instead of scm_must_malloc and scm_must_free, as
appropriate. Return zero from smob and port free functions.
* debug-malloc.c (scm_malloc_reregister): Handle "old == NULL".
* fports.c (scm_setvbuf): Reset read buffer to saved values when
it is pointing to the putback buffer.
2002-02-11 18:06:50 +00:00
|
|
|
|
m = (SCM *) scm_alloc_struct (n, scm_struct_entity_n_extra_words,
|
|
|
|
|
|
"entity struct");
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
m[scm_struct_i_setter] = SCM_BOOL_F;
|
|
|
|
|
|
m[scm_struct_i_procedure] = SCM_BOOL_F;
|
|
|
|
|
|
/* Generic functions */
|
|
|
|
|
|
if (SCM_CLASS_FLAGS (class) & SCM_CLASSF_PURE_GENERIC)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM gf = wrap_init (class, m, n);
|
|
|
|
|
|
clear_method_cache (gf);
|
|
|
|
|
|
return gf;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
return wrap_init (class, m, n);
|
|
|
|
|
|
}
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/* Class objects */
|
|
|
|
|
|
if (SCM_CLASS_FLAGS (class) & SCM_CLASSF_METACLASS)
|
|
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long i;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
/* allocate class object */
|
|
|
|
|
|
SCM z = scm_make_struct (class, SCM_INUM0, SCM_EOL);
|
|
|
|
|
|
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (z, scm_si_print, SCM_GOOPS_UNBOUND);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
for (i = scm_si_goops_fields; i < n; i++)
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (z, i, SCM_GOOPS_UNBOUND);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
if (SCM_SUBCLASSP (class, scm_class_entity_class))
|
|
|
|
|
|
SCM_SET_CLASS_FLAGS (z, SCM_CLASSF_OPERATOR | SCM_CLASSF_ENTITY);
|
|
|
|
|
|
else if (SCM_SUBCLASSP (class, scm_class_operator_class))
|
|
|
|
|
|
SCM_SET_CLASS_FLAGS (z, SCM_CLASSF_OPERATOR);
|
|
|
|
|
|
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/* Non-light instances */
|
|
|
|
|
|
{
|
* gc.h, gc.c (scm_gc_sweep): Issue deprecation warning when
non-zero is returned from a port or smob free function.
(scm_malloc, scm_realloc, scm_strndup, scm_strdup,
scm_gc_register_collectable_memory,
scm_gc_unregister_collectable_memory, scm_gc_malloc,
scm_gc_realloc, scm_gc_free, scm_gc_strndup, scm_gc_strdup): New.
* backtrace.c, continuations.c, convert.i.c, coop-threads.c,
debug-malloc.c, dynl.c, environments.c, environments.h,
extensions.c, filesys.c, fports.c, gc.c, gc.h, gh_data.c, goops.c,
guardians.c, hooks.c, init.c, keywords.c, load.c, numbers.c,
ports.c, posix.c, procs.c, rdelim.c, regex-posix.c, root.c,
smob.c, stime.c, strings.c, struct.c, struct.h, symbols.c, unif.c,
vectors.c, weaks.c: Use scm_gc_malloc/scm_malloc and
scm_gc_free/free instead of scm_must_malloc and scm_must_free, as
appropriate. Return zero from smob and port free functions.
* debug-malloc.c (scm_malloc_reregister): Handle "old == NULL".
* fports.c (scm_setvbuf): Reset read buffer to saved values when
it is pointing to the putback buffer.
2002-02-11 18:06:50 +00:00
|
|
|
|
m = (SCM *) scm_alloc_struct (n, scm_struct_n_extra_words, "heavy struct");
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return wrap_init (class, m, n);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_set_object_setter_x, "%set-object-setter!", 2, 0, 0,
|
|
|
|
|
|
(SCM obj, SCM setter),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_set_object_setter_x
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-18 17:36:44 +00:00
|
|
|
|
SCM_ASSERT (SCM_STRUCTP (obj)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
&& ((SCM_CLASS_FLAGS (obj) & SCM_CLASSF_OPERATOR)
|
|
|
|
|
|
|| SCM_I_ENTITYP (obj)),
|
|
|
|
|
|
obj,
|
|
|
|
|
|
SCM_ARG1,
|
2000-12-16 20:25:08 +00:00
|
|
|
|
FUNC_NAME);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
if (SCM_I_ENTITYP (obj))
|
2001-01-11 21:03:18 +00:00
|
|
|
|
SCM_SET_ENTITY_SETTER (obj, setter);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
else
|
|
|
|
|
|
SCM_OPERATOR_CLASS (obj)->setter = setter;
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
|
|
*
|
|
|
|
|
|
* %modify-instance (used by change-class to modify in place)
|
2002-04-22 17:46:06 +00:00
|
|
|
|
*
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_modify_instance, "%modify-instance", 2, 0, 0,
|
|
|
|
|
|
(SCM old, SCM new),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_modify_instance
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_INSTANCE (1, old);
|
|
|
|
|
|
SCM_VALIDATE_INSTANCE (2, new);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2002-04-22 17:46:06 +00:00
|
|
|
|
/* Exchange the data contained in old and new. We exchange rather than
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
* scratch the old value with new to be correct with GC.
|
|
|
|
|
|
* See "Class redefinition protocol above".
|
|
|
|
|
|
*/
|
|
|
|
|
|
SCM_REDEFER_INTS;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM car = SCM_CAR (old);
|
|
|
|
|
|
SCM cdr = SCM_CDR (old);
|
|
|
|
|
|
SCM_SETCAR (old, SCM_CAR (new));
|
|
|
|
|
|
SCM_SETCDR (old, SCM_CDR (new));
|
|
|
|
|
|
SCM_SETCAR (new, car);
|
|
|
|
|
|
SCM_SETCDR (new, cdr);
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_REALLOW_INTS;
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_modify_class, "%modify-class", 2, 0, 0,
|
|
|
|
|
|
(SCM old, SCM new),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_modify_class
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, old);
|
|
|
|
|
|
SCM_VALIDATE_CLASS (2, new);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_REDEFER_INTS;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM car = SCM_CAR (old);
|
|
|
|
|
|
SCM cdr = SCM_CDR (old);
|
|
|
|
|
|
SCM_SETCAR (old, SCM_CAR (new));
|
|
|
|
|
|
SCM_SETCDR (old, SCM_CDR (new));
|
2001-05-27 22:00:03 +00:00
|
|
|
|
SCM_STRUCT_DATA (old)[scm_vtable_index_vtable] = SCM_UNPACK (old);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM_SETCAR (new, car);
|
|
|
|
|
|
SCM_SETCDR (new, cdr);
|
2001-05-27 22:00:03 +00:00
|
|
|
|
SCM_STRUCT_DATA (new)[scm_vtable_index_vtable] = SCM_UNPACK (new);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
SCM_REALLOW_INTS;
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_invalidate_class, "%invalidate-class", 1, 0, 0,
|
|
|
|
|
|
(SCM class),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_invalidate_class
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_CLASS (1, class);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM_CLEAR_CLASS_FLAGS (class, SCM_CLASSF_GOOPS_VALID);
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
/* When instances change class, they finally get a new body, but
|
|
|
|
|
|
* before that, they go through purgatory in hell. Odd as it may
|
|
|
|
|
|
* seem, this data structure saves us from eternal suffering in
|
|
|
|
|
|
* infinite recursions.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2001-06-14 19:50:43 +00:00
|
|
|
|
static scm_t_bits **hell;
|
2001-05-26 20:51:22 +00:00
|
|
|
|
static long n_hell = 1; /* one place for the evil one himself */
|
|
|
|
|
|
static long hell_size = 4;
|
2002-10-27 20:13:24 +00:00
|
|
|
|
static SCM hell_mutex;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2001-05-26 20:51:22 +00:00
|
|
|
|
static long
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
burnin (SCM o)
|
|
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long i;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
for (i = 1; i < n_hell; ++i)
|
2001-07-18 10:14:29 +00:00
|
|
|
|
if (SCM_STRUCT_DATA (o) == hell[i])
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return i;
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
go_to_hell (void *o)
|
|
|
|
|
|
{
|
2001-07-18 10:14:29 +00:00
|
|
|
|
SCM obj = SCM_PACK ((scm_t_bits) o);
|
2002-10-27 20:13:24 +00:00
|
|
|
|
scm_lock_mutex (hell_mutex);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
if (n_hell == hell_size)
|
|
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long new_size = 2 * hell_size;
|
* gc.h, gc.c (scm_gc_sweep): Issue deprecation warning when
non-zero is returned from a port or smob free function.
(scm_malloc, scm_realloc, scm_strndup, scm_strdup,
scm_gc_register_collectable_memory,
scm_gc_unregister_collectable_memory, scm_gc_malloc,
scm_gc_realloc, scm_gc_free, scm_gc_strndup, scm_gc_strdup): New.
* backtrace.c, continuations.c, convert.i.c, coop-threads.c,
debug-malloc.c, dynl.c, environments.c, environments.h,
extensions.c, filesys.c, fports.c, gc.c, gc.h, gh_data.c, goops.c,
guardians.c, hooks.c, init.c, keywords.c, load.c, numbers.c,
ports.c, posix.c, procs.c, rdelim.c, regex-posix.c, root.c,
smob.c, stime.c, strings.c, struct.c, struct.h, symbols.c, unif.c,
vectors.c, weaks.c: Use scm_gc_malloc/scm_malloc and
scm_gc_free/free instead of scm_must_malloc and scm_must_free, as
appropriate. Return zero from smob and port free functions.
* debug-malloc.c (scm_malloc_reregister): Handle "old == NULL".
* fports.c (scm_setvbuf): Reset read buffer to saved values when
it is pointing to the putback buffer.
2002-02-11 18:06:50 +00:00
|
|
|
|
hell = scm_realloc (hell, new_size);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
hell_size = new_size;
|
|
|
|
|
|
}
|
2001-07-18 10:14:29 +00:00
|
|
|
|
hell[n_hell++] = SCM_STRUCT_DATA (obj);
|
2002-10-27 20:13:24 +00:00
|
|
|
|
scm_unlock_mutex (hell_mutex);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
go_to_heaven (void *o)
|
|
|
|
|
|
{
|
2002-10-27 20:13:24 +00:00
|
|
|
|
scm_lock_mutex (hell_mutex);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
hell[burnin (SCM_PACK ((scm_t_bits) o))] = hell[--n_hell];
|
2002-10-27 20:13:24 +00:00
|
|
|
|
scm_unlock_mutex (hell_mutex);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2001-07-18 10:14:29 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_SYMBOL (scm_sym_change_class, "change-class");
|
|
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
static SCM
|
|
|
|
|
|
purgatory (void *args)
|
|
|
|
|
|
{
|
2002-04-22 17:46:06 +00:00
|
|
|
|
return scm_apply_0 (GETVAR (scm_sym_change_class),
|
2001-07-18 10:14:29 +00:00
|
|
|
|
SCM_PACK ((scm_t_bits) args));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2003-01-10 12:58:40 +00:00
|
|
|
|
/* This function calls the generic function change-class for all
|
|
|
|
|
|
* instances which aren't currently undergoing class change.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
void
|
2001-06-07 21:12:19 +00:00
|
|
|
|
scm_change_object_class (SCM obj, SCM old_class SCM_UNUSED, SCM new_class)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (!burnin (obj))
|
|
|
|
|
|
scm_internal_dynamic_wind (go_to_hell, purgatory, go_to_heaven,
|
2001-07-18 10:14:29 +00:00
|
|
|
|
(void *) SCM_UNPACK (scm_list_2 (obj, new_class)),
|
|
|
|
|
|
(void *) SCM_UNPACK (obj));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
|
|
*
|
2002-04-22 17:46:06 +00:00
|
|
|
|
* GGGG FFFFF
|
|
|
|
|
|
* G F
|
|
|
|
|
|
* G GG FFF
|
|
|
|
|
|
* G G F
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
* GGG E N E R I C F U N C T I O N S
|
|
|
|
|
|
*
|
|
|
|
|
|
* This implementation provides
|
|
|
|
|
|
* - generic functions (with class specializers)
|
|
|
|
|
|
* - multi-methods
|
2002-04-22 17:46:06 +00:00
|
|
|
|
* - next-method
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
* - a hard-coded MOP for standard gf, which can be overloaded for non-std gf
|
|
|
|
|
|
*
|
|
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
SCM_KEYWORD (k_name, "name");
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYMBOL (sym_no_method, "no-method");
|
|
|
|
|
|
|
|
|
|
|
|
static SCM list_of_no_method;
|
|
|
|
|
|
|
2003-04-13 17:46:54 +00:00
|
|
|
|
SCM_GLOBAL_SYMBOL (scm_sym_args, "args");
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2003-04-28 06:05:10 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_make_method_cache (SCM gf)
|
|
|
|
|
|
{
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
return scm_list_5 (SCM_IM_DISPATCH,
|
|
|
|
|
|
scm_sym_args,
|
|
|
|
|
|
SCM_MAKINUM (1),
|
|
|
|
|
|
scm_c_make_vector (SCM_INITIAL_MCACHE_SIZE,
|
|
|
|
|
|
list_of_no_method),
|
|
|
|
|
|
gf);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
clear_method_cache (SCM gf)
|
|
|
|
|
|
{
|
2001-01-11 21:03:18 +00:00
|
|
|
|
SCM cache = scm_make_method_cache (gf);
|
|
|
|
|
|
SCM_SET_ENTITY_PROCEDURE (gf, cache);
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (gf, scm_si_used_by, SCM_BOOL_F);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_invalidate_method_cache_x, "%invalidate-method-cache!", 1, 0, 0,
|
|
|
|
|
|
(SCM gf),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_invalidate_method_cache_x
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM used_by;
|
2000-12-21 17:07:38 +00:00
|
|
|
|
SCM_ASSERT (SCM_PUREGENERICP (gf), gf, SCM_ARG1, FUNC_NAME);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
used_by = SCM_SLOT (gf, scm_si_used_by);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
if (!SCM_FALSEP (used_by))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM methods = SCM_SLOT (gf, scm_si_methods);
|
2000-12-18 17:36:44 +00:00
|
|
|
|
for (; SCM_CONSP (used_by); used_by = SCM_CDR (used_by))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_sys_invalidate_method_cache_x (SCM_CAR (used_by));
|
|
|
|
|
|
clear_method_cache (gf);
|
2000-12-18 17:36:44 +00:00
|
|
|
|
for (; SCM_CONSP (methods); methods = SCM_CDR (methods))
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (SCM_CAR (methods), scm_si_code_table, SCM_EOL);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
{
|
2000-11-07 02:17:58 +00:00
|
|
|
|
SCM n = SCM_SLOT (gf, scm_si_n_specialized);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/* The sign of n is a flag indicating rest args. */
|
2000-11-07 02:17:58 +00:00
|
|
|
|
SCM_SET_MCACHE_N_SPECIALIZED (SCM_ENTITY_PROCEDURE (gf), n);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_generic_capability_p, "generic-capability?", 1, 0, 0,
|
|
|
|
|
|
(SCM proc),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_generic_capability_p
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2001-07-18 10:14:29 +00:00
|
|
|
|
SCM_ASSERT (!SCM_FALSEP (scm_procedure_p (proc)),
|
2000-12-16 20:25:08 +00:00
|
|
|
|
proc, SCM_ARG1, FUNC_NAME);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return (scm_subr_p (proc) && SCM_SUBR_GENERIC (proc)
|
|
|
|
|
|
? SCM_BOOL_T
|
|
|
|
|
|
: SCM_BOOL_F);
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_enable_primitive_generic_x, "enable-primitive-generic!", 0, 0, 1,
|
|
|
|
|
|
(SCM subrs),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_enable_primitive_generic_x
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2001-07-18 10:14:29 +00:00
|
|
|
|
SCM_VALIDATE_REST_ARGUMENT (subrs);
|
|
|
|
|
|
while (!SCM_NULLP (subrs))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM subr = SCM_CAR (subrs);
|
|
|
|
|
|
SCM_ASSERT (scm_subr_p (subr) && SCM_SUBR_GENERIC (subr),
|
2000-12-16 20:25:08 +00:00
|
|
|
|
subr, SCM_ARGn, FUNC_NAME);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
*SCM_SUBR_GENERIC (subr)
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
= scm_make (scm_list_3 (scm_class_generic,
|
|
|
|
|
|
k_name,
|
|
|
|
|
|
SCM_SNAME (subr)));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
subrs = SCM_CDR (subrs);
|
|
|
|
|
|
}
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_primitive_generic_generic, "primitive-generic-generic", 1, 0, 0,
|
|
|
|
|
|
(SCM subr),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_primitive_generic_generic
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
if (scm_subr_p (subr) && SCM_SUBR_GENERIC (subr))
|
|
|
|
|
|
{
|
2003-03-06 12:51:57 +00:00
|
|
|
|
if (!*SCM_SUBR_GENERIC (subr))
|
|
|
|
|
|
scm_enable_primitive_generic_x (scm_list_1 (subr));
|
|
|
|
|
|
return *SCM_SUBR_GENERIC (subr);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2001-03-04 17:09:34 +00:00
|
|
|
|
SCM_WRONG_TYPE_ARG (SCM_ARG1, subr);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2003-03-06 12:51:57 +00:00
|
|
|
|
typedef struct t_extension {
|
|
|
|
|
|
struct t_extension *next;
|
|
|
|
|
|
SCM extended;
|
|
|
|
|
|
SCM extension;
|
|
|
|
|
|
} t_extension;
|
|
|
|
|
|
|
|
|
|
|
|
static t_extension *extensions = 0;
|
|
|
|
|
|
|
|
|
|
|
|
SCM_VARIABLE (scm_var_make_extended_generic, "make-extended-generic");
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
scm_c_extend_primitive_generic (SCM extended, SCM extension)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (goops_loaded_p)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM gf, gext;
|
|
|
|
|
|
if (!*SCM_SUBR_GENERIC (extended))
|
|
|
|
|
|
scm_enable_primitive_generic_x (scm_list_1 (extended));
|
|
|
|
|
|
gf = *SCM_SUBR_GENERIC (extended);
|
|
|
|
|
|
gext = scm_call_2 (SCM_VARIABLE_REF (scm_var_make_extended_generic),
|
|
|
|
|
|
gf,
|
|
|
|
|
|
SCM_SNAME (extension));
|
|
|
|
|
|
*SCM_SUBR_GENERIC (extension) = gext;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
t_extension *e = scm_malloc (sizeof (t_extension));
|
|
|
|
|
|
t_extension **loc = &extensions;
|
|
|
|
|
|
/* Make sure that extensions are placed before their own
|
|
|
|
|
|
* extensions in the extensions list. O(N^2) algorithm, but
|
|
|
|
|
|
* extensions of primitive generics are rare.
|
|
|
|
|
|
*/
|
|
|
|
|
|
while (*loc && extension != (*loc)->extended)
|
|
|
|
|
|
loc = &(*loc)->next;
|
|
|
|
|
|
e->next = *loc;
|
|
|
|
|
|
e->extended = extended;
|
|
|
|
|
|
e->extension = extension;
|
|
|
|
|
|
*loc = e;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
setup_extended_primitive_generics ()
|
|
|
|
|
|
{
|
|
|
|
|
|
while (extensions)
|
|
|
|
|
|
{
|
|
|
|
|
|
t_extension *e = extensions;
|
|
|
|
|
|
scm_c_extend_primitive_generic (e->extended, e->extension);
|
|
|
|
|
|
extensions = e->next;
|
|
|
|
|
|
free (e);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/******************************************************************************
|
2002-04-22 17:46:06 +00:00
|
|
|
|
*
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
* Protocol for calling a generic fumction
|
2002-04-22 17:46:06 +00:00
|
|
|
|
* This protocol is roughly equivalent to (parameter are a little bit different
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
* for efficiency reasons):
|
|
|
|
|
|
*
|
|
|
|
|
|
* + apply-generic (gf args)
|
|
|
|
|
|
* + compute-applicable-methods (gf args ...)
|
|
|
|
|
|
* + sort-applicable-methods (methods args)
|
|
|
|
|
|
* + apply-methods (gf methods args)
|
2002-04-22 17:46:06 +00:00
|
|
|
|
*
|
|
|
|
|
|
* apply-methods calls make-next-method to build the "continuation" of a a
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
* method. Applying a next-method will call apply-next-method which in
|
|
|
|
|
|
* turn will call apply again to call effectively the following method.
|
|
|
|
|
|
*
|
|
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
|
applicablep (SCM actual, SCM formal)
|
|
|
|
|
|
{
|
2000-12-01 17:57:42 +00:00
|
|
|
|
/* We already know that the cpl is well formed. */
|
|
|
|
|
|
return !SCM_FALSEP (scm_c_memq (formal, SCM_SLOT (actual, scm_si_cpl)));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2002-07-20 14:08:34 +00:00
|
|
|
|
more_specificp (SCM m1, SCM m2, SCM const *targs)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
register SCM s1, s2;
|
2001-05-26 20:51:22 +00:00
|
|
|
|
register long i;
|
2002-04-22 17:46:06 +00:00
|
|
|
|
/*
|
|
|
|
|
|
* Note:
|
|
|
|
|
|
* m1 and m2 can have != length (i.e. one can be one element longer than the
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
* other when we have a dotted parameter list). For instance, with the call
|
|
|
|
|
|
* (M 1)
|
|
|
|
|
|
* with
|
|
|
|
|
|
* (define-method M (a . l) ....)
|
2002-04-22 17:46:06 +00:00
|
|
|
|
* (define-method M (a) ....)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
*
|
|
|
|
|
|
* we consider that the second method is more specific.
|
|
|
|
|
|
*
|
|
|
|
|
|
* BTW, targs is an array of types. We don't need it's size since
|
|
|
|
|
|
* we already know that m1 and m2 are applicable (no risk to go past
|
|
|
|
|
|
* the end of this array).
|
|
|
|
|
|
*
|
|
|
|
|
|
*/
|
2002-07-20 14:08:34 +00:00
|
|
|
|
for (i=0, s1=SPEC_OF(m1), s2=SPEC_OF(m2); ; i++, s1=SCM_CDR(s1), s2=SCM_CDR(s2)) {
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
if (SCM_NULLP(s1)) return 1;
|
|
|
|
|
|
if (SCM_NULLP(s2)) return 0;
|
|
|
|
|
|
if (SCM_CAR(s1) != SCM_CAR(s2)) {
|
|
|
|
|
|
register SCM l, cs1 = SCM_CAR(s1), cs2 = SCM_CAR(s2);
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
2001-06-07 23:10:33 +00:00
|
|
|
|
for (l = SCM_SLOT (targs[i], scm_si_cpl); ; l = SCM_CDR(l)) {
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
if (cs1 == SCM_CAR(l))
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
if (cs2 == SCM_CAR(l))
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
return 0;/* should not occur! */
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
return 0; /* should not occur! */
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#define BUFFSIZE 32 /* big enough for most uses */
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
2001-05-26 20:51:22 +00:00
|
|
|
|
scm_i_vector2list (SCM l, long len)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long j;
|
2001-02-02 04:56:25 +00:00
|
|
|
|
SCM z = scm_c_make_vector (len, SCM_UNDEFINED);
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
for (j = 0; j < len; j++, l = SCM_CDR (l)) {
|
2002-07-20 14:08:34 +00:00
|
|
|
|
SCM_VECTOR_SET (z, j, SCM_CAR (l));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
2002-07-20 14:08:34 +00:00
|
|
|
|
sort_applicable_methods (SCM method_list, long size, SCM const *targs)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long i, j, incr;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM *v, vector = SCM_EOL;
|
|
|
|
|
|
SCM buffer[BUFFSIZE];
|
|
|
|
|
|
SCM save = method_list;
|
|
|
|
|
|
|
|
|
|
|
|
/* For reasonably sized method_lists we can try to avoid all the
|
|
|
|
|
|
* consing and reorder the list in place...
|
|
|
|
|
|
* This idea is due to David McClain <Dave_McClain@msn.com>
|
|
|
|
|
|
*/
|
|
|
|
|
|
if (size <= BUFFSIZE)
|
|
|
|
|
|
{
|
|
|
|
|
|
for (i = 0; i < size; i++)
|
|
|
|
|
|
{
|
|
|
|
|
|
buffer[i] = SCM_CAR (method_list);
|
|
|
|
|
|
method_list = SCM_CDR (method_list);
|
|
|
|
|
|
}
|
|
|
|
|
|
v = buffer;
|
2002-04-22 17:46:06 +00:00
|
|
|
|
}
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* Too many elements in method_list to keep everything locally */
|
|
|
|
|
|
vector = scm_i_vector2list (save, size);
|
2002-07-20 14:08:34 +00:00
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
This is a new vector. Don't worry about the write barrier.
|
|
|
|
|
|
We're not allocating elements in this routine, so this should
|
|
|
|
|
|
pose no problem.
|
|
|
|
|
|
*/
|
2003-01-08 13:24:41 +00:00
|
|
|
|
v = SCM_WRITABLE_VELTS (vector);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2002-04-22 17:46:06 +00:00
|
|
|
|
/* Use a simple shell sort since it is generally faster than qsort on
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
* small vectors (which is probably mostly the case when we have to
|
|
|
|
|
|
* sort a list of applicable methods).
|
|
|
|
|
|
*/
|
|
|
|
|
|
for (incr = size / 2; incr; incr /= 2)
|
|
|
|
|
|
{
|
|
|
|
|
|
for (i = incr; i < size; i++)
|
|
|
|
|
|
{
|
|
|
|
|
|
for (j = i - incr; j >= 0; j -= incr)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (more_specificp (v[j], v[j+incr], targs))
|
|
|
|
|
|
break;
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM tmp = v[j + incr];
|
|
|
|
|
|
v[j + incr] = v[j];
|
|
|
|
|
|
v[j] = tmp;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (size <= BUFFSIZE)
|
|
|
|
|
|
{
|
|
|
|
|
|
/* We did it in locally, so restore the original list (reordered) in-place */
|
|
|
|
|
|
for (i = 0, method_list = save; i < size; i++, v++)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_SETCAR (method_list, *v);
|
|
|
|
|
|
method_list = SCM_CDR (method_list);
|
|
|
|
|
|
}
|
|
|
|
|
|
return save;
|
|
|
|
|
|
}
|
2002-04-22 17:46:06 +00:00
|
|
|
|
/* If we are here, that's that we did it the hard way... */
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return scm_vector_to_list (vector);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
2001-05-26 20:51:22 +00:00
|
|
|
|
scm_compute_applicable_methods (SCM gf, SCM args, long len, int find_method_p)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
register long i;
|
|
|
|
|
|
long count = 0;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM l, fl, applicable = SCM_EOL;
|
|
|
|
|
|
SCM save = args;
|
2002-07-20 14:08:34 +00:00
|
|
|
|
SCM buffer[BUFFSIZE];
|
|
|
|
|
|
SCM const *types;
|
|
|
|
|
|
SCM *p;
|
|
|
|
|
|
SCM tmp = SCM_EOL;
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/* Build the list of arguments types */
|
|
|
|
|
|
if (len >= BUFFSIZE) {
|
2001-02-02 04:56:25 +00:00
|
|
|
|
tmp = scm_c_make_vector (len, SCM_UNDEFINED);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/* NOTE: Using pointers to malloced memory won't work if we
|
|
|
|
|
|
1. have preemtive threading, and,
|
|
|
|
|
|
2. have a GC which moves objects. */
|
2002-07-20 14:08:34 +00:00
|
|
|
|
types = p = SCM_WRITABLE_VELTS(tmp);
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
note that we don't have to work to reset the generation
|
|
|
|
|
|
count. TMP is a new vector anyway, and it is found
|
|
|
|
|
|
conservatively.
|
|
|
|
|
|
*/
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
types = p = buffer;
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
|
|
|
|
|
for ( ; !SCM_NULLP (args); args = SCM_CDR (args))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
*p++ = scm_class_of (SCM_CAR (args));
|
2002-07-20 14:08:34 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/* Build a list of all applicable methods */
|
2003-01-08 13:24:41 +00:00
|
|
|
|
for (l = scm_generic_function_methods (gf); !SCM_NULLP (l); l = SCM_CDR (l))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
fl = SPEC_OF (SCM_CAR (l));
|
|
|
|
|
|
/* Only accept accessors which match exactly in first arg. */
|
|
|
|
|
|
if (SCM_ACCESSORP (SCM_CAR (l))
|
2001-07-18 10:14:29 +00:00
|
|
|
|
&& (SCM_NULLP (fl) || types[0] != SCM_CAR (fl)))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
continue;
|
|
|
|
|
|
for (i = 0; ; i++, fl = SCM_CDR (fl))
|
|
|
|
|
|
{
|
2000-12-18 17:36:44 +00:00
|
|
|
|
if (SCM_INSTANCEP (fl)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/* We have a dotted argument list */
|
|
|
|
|
|
|| (i >= len && SCM_NULLP (fl)))
|
|
|
|
|
|
{ /* both list exhausted */
|
|
|
|
|
|
applicable = scm_cons (SCM_CAR (l), applicable);
|
|
|
|
|
|
count += 1;
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
if (i >= len
|
|
|
|
|
|
|| SCM_NULLP (fl)
|
|
|
|
|
|
|| !applicablep (types[i], SCM_CAR (fl)))
|
|
|
|
|
|
break;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (count == 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (find_method_p)
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
CALL_GF2 ("no-applicable-method", gf, save);
|
|
|
|
|
|
/* if we are here, it's because no-applicable-method hasn't signaled an error */
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
2002-07-20 14:08:34 +00:00
|
|
|
|
|
2002-07-22 00:17:26 +00:00
|
|
|
|
scm_remember_upto_here_1 (tmp);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return (count == 1
|
|
|
|
|
|
? applicable
|
|
|
|
|
|
: sort_applicable_methods (applicable, count, types));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
|
SCM_PROC (s_sys_compute_applicable_methods, "%compute-applicable-methods", 2, 0, 0, scm_sys_compute_applicable_methods);
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
static const char s_sys_compute_applicable_methods[] = "%compute-applicable-methods";
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_sys_compute_applicable_methods (SCM gf, SCM args)
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_sys_compute_applicable_methods
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long n;
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_GENERIC (1, gf);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
n = scm_ilength (args);
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_ASSERT (n >= 0, args, SCM_ARG2, FUNC_NAME);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return scm_compute_applicable_methods (gf, args, n, 1);
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2001-05-15 14:57:22 +00:00
|
|
|
|
SCM_SYMBOL (sym_compute_applicable_methods, "compute-applicable-methods");
|
(scm_c_make_gsubr, scm_c_define_gsubr, scm_c_make_gsubr_with_generic,
scm_c_define_gsubr_with_generic): New functions. They replace
scm_make_gsubr and scm_make_gsubr_with_generic. The `make' variants
only create the gsubr object, while the `define' variants also put it
into the current module. Changed all callers. (scm_make_gsubr,
scm_make_gsubr_with_generic): Deprecated.
(scm_c_make_subr, scm_c_define_subr, scm_c_make_subr_with_generic,
scm_c_define_subr_with_generic): New functions. They replace
scm_make_subr, scm_make_subr_opt and scm_make_subr_with_generic. The
`make' variants only create the subr object, while the `define'
variants also put it into the current module. Changed all callers.
(scm_make_subr, scm_make_subr_opt, scm_make_subr_with_generic):
Deprecated.
2001-05-20 00:35:43 +00:00
|
|
|
|
SCM_VARIABLE_INIT (var_compute_applicable_methods, "compute-applicable-methods", scm_c_define_gsubr (s_sys_compute_applicable_methods, 2, 0, 0, scm_sys_compute_applicable_methods));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
lock_cache_mutex (void *m)
|
|
|
|
|
|
{
|
2001-07-18 10:14:29 +00:00
|
|
|
|
SCM mutex = SCM_PACK ((scm_t_bits) m);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_lock_mutex (mutex);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
unlock_cache_mutex (void *m)
|
|
|
|
|
|
{
|
2001-07-18 10:14:29 +00:00
|
|
|
|
SCM mutex = SCM_PACK ((scm_t_bits) m);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_unlock_mutex (mutex);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
|
|
|
|
|
call_memoize_method (void *a)
|
|
|
|
|
|
{
|
2001-07-18 10:14:29 +00:00
|
|
|
|
SCM args = SCM_PACK ((scm_t_bits) a);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM gf = SCM_CAR (args);
|
|
|
|
|
|
SCM x = SCM_CADR (args);
|
|
|
|
|
|
/* First check if another thread has inserted a method between
|
|
|
|
|
|
* the cache miss and locking the mutex.
|
|
|
|
|
|
*/
|
|
|
|
|
|
SCM cmethod = scm_mcache_lookup_cmethod (x, SCM_CDDR (args));
|
2001-07-18 10:14:29 +00:00
|
|
|
|
if (!SCM_FALSEP (cmethod))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return cmethod;
|
|
|
|
|
|
/*fixme* Use scm_apply */
|
|
|
|
|
|
return CALL_GF3 ("memoize-method!", gf, SCM_CDDR (args), x);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_memoize_method (SCM x, SCM args)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM gf = SCM_CAR (scm_last_pair (x));
|
2001-07-18 10:14:29 +00:00
|
|
|
|
return scm_internal_dynamic_wind (
|
|
|
|
|
|
lock_cache_mutex,
|
|
|
|
|
|
call_memoize_method,
|
|
|
|
|
|
unlock_cache_mutex,
|
|
|
|
|
|
(void *) SCM_UNPACK (scm_cons2 (gf, x, args)),
|
|
|
|
|
|
(void *) SCM_UNPACK (SCM_SLOT (gf, scm_si_cache_mutex)));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
|
|
*
|
|
|
|
|
|
* A simple make (which will be redefined later in Scheme)
|
|
|
|
|
|
* This version handles only creation of gf, methods and classes (no instances)
|
|
|
|
|
|
*
|
2002-04-22 17:46:06 +00:00
|
|
|
|
* Since this code will disappear when Goops will be fully booted,
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
* no precaution is taken to be efficient.
|
|
|
|
|
|
*
|
|
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
SCM_KEYWORD (k_setter, "setter");
|
|
|
|
|
|
SCM_KEYWORD (k_specializers, "specializers");
|
|
|
|
|
|
SCM_KEYWORD (k_procedure, "procedure");
|
|
|
|
|
|
SCM_KEYWORD (k_dsupers, "dsupers");
|
|
|
|
|
|
SCM_KEYWORD (k_slots, "slots");
|
|
|
|
|
|
SCM_KEYWORD (k_gf, "generic-function");
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_make, "make", 0, 0, 1,
|
|
|
|
|
|
(SCM args),
|
2001-02-24 23:46:04 +00:00
|
|
|
|
"Make a new object. @var{args} must contain the class and\n"
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"all necessary initialization information.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_make
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM class, z;
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long len = scm_ilength (args);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
if (len <= 0 || (len & 1) == 0)
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_WRONG_NUM_ARGS ();
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
class = SCM_CAR(args);
|
|
|
|
|
|
args = SCM_CDR(args);
|
|
|
|
|
|
|
2003-03-11 14:50:08 +00:00
|
|
|
|
if (class == scm_class_generic || class == scm_class_accessor)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
z = scm_make_struct (class, SCM_INUM0,
|
2003-01-08 13:24:41 +00:00
|
|
|
|
scm_list_5 (SCM_EOL,
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
SCM_INUM0,
|
|
|
|
|
|
SCM_BOOL_F,
|
2003-01-08 13:24:41 +00:00
|
|
|
|
scm_make_mutex (),
|
|
|
|
|
|
SCM_EOL));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_set_procedure_property_x (z, scm_sym_name,
|
|
|
|
|
|
scm_get_keyword (k_name,
|
|
|
|
|
|
args,
|
|
|
|
|
|
SCM_BOOL_F));
|
|
|
|
|
|
clear_method_cache (z);
|
2003-03-11 14:50:08 +00:00
|
|
|
|
if (class == scm_class_accessor)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM setter = scm_get_keyword (k_setter, args, SCM_BOOL_F);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
if (!SCM_FALSEP (setter))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_sys_set_object_setter_x (z, setter);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
z = scm_sys_allocate_instance (class, args);
|
|
|
|
|
|
|
|
|
|
|
|
if (class == scm_class_method
|
|
|
|
|
|
|| class == scm_class_simple_method
|
2003-03-11 14:50:08 +00:00
|
|
|
|
|| class == scm_class_accessor_method)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2002-04-22 17:46:06 +00:00
|
|
|
|
SCM_SET_SLOT (z, scm_si_generic_function,
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_i_get_keyword (k_gf,
|
|
|
|
|
|
args,
|
|
|
|
|
|
len - 1,
|
|
|
|
|
|
SCM_BOOL_F,
|
2001-06-07 23:10:33 +00:00
|
|
|
|
FUNC_NAME));
|
2002-04-22 17:46:06 +00:00
|
|
|
|
SCM_SET_SLOT (z, scm_si_specializers,
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_i_get_keyword (k_specializers,
|
|
|
|
|
|
args,
|
|
|
|
|
|
len - 1,
|
|
|
|
|
|
SCM_EOL,
|
2001-06-07 23:10:33 +00:00
|
|
|
|
FUNC_NAME));
|
2002-04-22 17:46:06 +00:00
|
|
|
|
SCM_SET_SLOT (z, scm_si_procedure,
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_i_get_keyword (k_procedure,
|
|
|
|
|
|
args,
|
|
|
|
|
|
len - 1,
|
|
|
|
|
|
SCM_EOL,
|
2001-06-07 23:10:33 +00:00
|
|
|
|
FUNC_NAME));
|
|
|
|
|
|
SCM_SET_SLOT (z, scm_si_code_table, SCM_EOL);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* In all the others case, make a new class .... No instance here */
|
2002-04-22 17:46:06 +00:00
|
|
|
|
SCM_SET_SLOT (z, scm_si_name,
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_i_get_keyword (k_name,
|
|
|
|
|
|
args,
|
|
|
|
|
|
len - 1,
|
2000-12-08 17:08:34 +00:00
|
|
|
|
scm_str2symbol ("???"),
|
2001-06-07 23:10:33 +00:00
|
|
|
|
FUNC_NAME));
|
2002-04-22 17:46:06 +00:00
|
|
|
|
SCM_SET_SLOT (z, scm_si_direct_supers,
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_i_get_keyword (k_dsupers,
|
|
|
|
|
|
args,
|
|
|
|
|
|
len - 1,
|
|
|
|
|
|
SCM_EOL,
|
2001-06-07 23:10:33 +00:00
|
|
|
|
FUNC_NAME));
|
2002-04-22 17:46:06 +00:00
|
|
|
|
SCM_SET_SLOT (z, scm_si_direct_slots,
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_i_get_keyword (k_slots,
|
|
|
|
|
|
args,
|
|
|
|
|
|
len - 1,
|
|
|
|
|
|
SCM_EOL,
|
2001-06-07 23:10:33 +00:00
|
|
|
|
FUNC_NAME));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
return z;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_find_method, "find-method", 0, 0, 1,
|
|
|
|
|
|
(SCM l),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_find_method
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM gf;
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long len = scm_ilength (l);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
if (len == 0)
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_WRONG_NUM_ARGS ();
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
gf = SCM_CAR(l); l = SCM_CDR(l);
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_GENERIC (1, gf);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
if (SCM_NULLP (SCM_SLOT (gf, scm_si_methods)))
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
SCM_MISC_ERROR ("no methods for generic ~S", scm_list_1 (gf));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
return scm_compute_applicable_methods (gf, l, len - 1, 1);
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_method_more_specific_p, "%method-more-specific?", 3, 0, 0,
|
|
|
|
|
|
(SCM m1, SCM m2, SCM targs),
|
|
|
|
|
|
"")
|
|
|
|
|
|
#define FUNC_NAME s_scm_sys_method_more_specific_p
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM l, v;
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long i, len;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_VALIDATE_METHOD (1, m1);
|
|
|
|
|
|
SCM_VALIDATE_METHOD (2, m2);
|
|
|
|
|
|
SCM_ASSERT ((len = scm_ilength (targs)) != -1, targs, SCM_ARG3, FUNC_NAME);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
/* Verify that all the arguments of targs are classes and place them in a vector*/
|
2001-02-02 04:56:25 +00:00
|
|
|
|
v = scm_c_make_vector (len, SCM_EOL);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2001-07-18 10:14:29 +00:00
|
|
|
|
for (i = 0, l = targs; !SCM_NULLP (l); i++, l = SCM_CDR (l)) {
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_ASSERT (SCM_CLASSP (SCM_CAR (l)), targs, SCM_ARG3, FUNC_NAME);
|
2002-07-20 14:08:34 +00:00
|
|
|
|
SCM_VECTOR_SET (v, i, SCM_CAR(l));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
return more_specificp (m1, m2, SCM_VELTS(v)) ? SCM_BOOL_T: SCM_BOOL_F;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
/******************************************************************************
|
|
|
|
|
|
*
|
2002-04-22 17:46:06 +00:00
|
|
|
|
* Initializations
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
*
|
|
|
|
|
|
******************************************************************************/
|
|
|
|
|
|
|
2003-03-19 08:57:47 +00:00
|
|
|
|
static void
|
|
|
|
|
|
fix_cpl (SCM c, SCM before, SCM after)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM cpl = SCM_SLOT (c, scm_si_cpl);
|
|
|
|
|
|
SCM ls = scm_c_memq (after, cpl);
|
|
|
|
|
|
SCM tail = scm_delq1_x (before, SCM_CDR (ls));
|
|
|
|
|
|
if (SCM_FALSEP (ls))
|
|
|
|
|
|
/* if this condition occurs, fix_cpl should not be applied this way */
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
SCM_SETCAR (ls, before);
|
|
|
|
|
|
SCM_SETCDR (ls, scm_cons (after, tail));
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM dslots = SCM_SLOT (c, scm_si_direct_slots);
|
|
|
|
|
|
SCM slots = build_slots_list (maplist (dslots), cpl);
|
|
|
|
|
|
SCM g_n_s = compute_getters_n_setters (slots);
|
|
|
|
|
|
SCM_SET_SLOT (c, scm_si_slots, slots);
|
|
|
|
|
|
SCM_SET_SLOT (c, scm_si_getters_n_setters, g_n_s);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
make_stdcls (SCM *var, char *name, SCM meta, SCM super, SCM slots)
|
|
|
|
|
|
{
|
2000-12-08 17:08:34 +00:00
|
|
|
|
SCM tmp = scm_str2symbol (name);
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
*var = scm_permanent_object (scm_basic_make_class (meta,
|
|
|
|
|
|
tmp,
|
|
|
|
|
|
SCM_CONSP (super)
|
|
|
|
|
|
? super
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
: scm_list_1 (super),
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
slots));
|
|
|
|
|
|
DEFVAR(tmp, *var);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SCM_KEYWORD (k_slot_definition, "slot-definition");
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
create_standard_classes (void)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM slots;
|
2002-04-22 17:46:06 +00:00
|
|
|
|
SCM method_slots = scm_list_4 (scm_str2symbol ("generic-function"),
|
|
|
|
|
|
scm_str2symbol ("specializers"),
|
2001-07-18 10:14:29 +00:00
|
|
|
|
sym_procedure,
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_str2symbol ("code-table"));
|
|
|
|
|
|
SCM amethod_slots = scm_list_1 (scm_list_3 (scm_str2symbol ("slot-definition"),
|
|
|
|
|
|
k_init_keyword,
|
|
|
|
|
|
k_slot_definition));
|
|
|
|
|
|
SCM mutex_slot = scm_list_1 (scm_str2symbol ("make-mutex"));
|
2004-05-24 04:15:49 +00:00
|
|
|
|
SCM mutex_closure = scm_i_eval_x (scm_list_3 (scm_sym_lambda,
|
|
|
|
|
|
SCM_EOL,
|
|
|
|
|
|
mutex_slot),
|
|
|
|
|
|
SCM_EOL);
|
2003-01-08 13:24:41 +00:00
|
|
|
|
SCM gf_slots = scm_list_5 (scm_str2symbol ("methods"),
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_3 (scm_str2symbol ("n-specialized"),
|
|
|
|
|
|
k_init_value,
|
|
|
|
|
|
SCM_INUM0),
|
|
|
|
|
|
scm_list_3 (scm_str2symbol ("used-by"),
|
|
|
|
|
|
k_init_value,
|
|
|
|
|
|
SCM_BOOL_F),
|
|
|
|
|
|
scm_list_3 (scm_str2symbol ("cache-mutex"),
|
|
|
|
|
|
k_init_thunk,
|
2004-05-24 04:15:49 +00:00
|
|
|
|
mutex_closure),
|
2003-01-08 13:24:41 +00:00
|
|
|
|
scm_list_3 (scm_str2symbol ("extended-by"),
|
|
|
|
|
|
k_init_value,
|
|
|
|
|
|
SCM_EOL));
|
|
|
|
|
|
SCM egf_slots = scm_list_1 (scm_list_3 (scm_str2symbol ("extends"),
|
|
|
|
|
|
k_init_value,
|
|
|
|
|
|
SCM_EOL));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/* Foreign class slot classes */
|
|
|
|
|
|
make_stdcls (&scm_class_foreign_slot, "<foreign-slot>",
|
|
|
|
|
|
scm_class_class, scm_class_top, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_protected, "<protected-slot>",
|
|
|
|
|
|
scm_class_class, scm_class_foreign_slot, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_opaque, "<opaque-slot>",
|
|
|
|
|
|
scm_class_class, scm_class_foreign_slot, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_read_only, "<read-only-slot>",
|
|
|
|
|
|
scm_class_class, scm_class_foreign_slot, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_self, "<self-slot>",
|
|
|
|
|
|
scm_class_class,
|
2003-03-19 08:57:47 +00:00
|
|
|
|
scm_class_read_only,
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_protected_opaque, "<protected-opaque-slot>",
|
|
|
|
|
|
scm_class_class,
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_2 (scm_class_protected, scm_class_opaque),
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_protected_read_only, "<protected-read-only-slot>",
|
|
|
|
|
|
scm_class_class,
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_2 (scm_class_protected, scm_class_read_only),
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_scm, "<scm-slot>",
|
|
|
|
|
|
scm_class_class, scm_class_protected, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_int, "<int-slot>",
|
|
|
|
|
|
scm_class_class, scm_class_foreign_slot, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_float, "<float-slot>",
|
|
|
|
|
|
scm_class_class, scm_class_foreign_slot, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_double, "<double-slot>",
|
|
|
|
|
|
scm_class_class, scm_class_foreign_slot, SCM_EOL);
|
|
|
|
|
|
|
|
|
|
|
|
/* Continue initialization of class <class> */
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
slots = build_class_class_slots ();
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (scm_class_class, scm_si_direct_slots, slots);
|
|
|
|
|
|
SCM_SET_SLOT (scm_class_class, scm_si_slots, slots);
|
|
|
|
|
|
SCM_SET_SLOT (scm_class_class, scm_si_getters_n_setters,
|
|
|
|
|
|
compute_getters_n_setters (slots));
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
make_stdcls (&scm_class_foreign_class, "<foreign-class>",
|
|
|
|
|
|
scm_class_class, scm_class_class,
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_2 (scm_list_3 (scm_str2symbol ("constructor"),
|
|
|
|
|
|
k_class,
|
|
|
|
|
|
scm_class_opaque),
|
|
|
|
|
|
scm_list_3 (scm_str2symbol ("destructor"),
|
|
|
|
|
|
k_class,
|
|
|
|
|
|
scm_class_opaque)));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
make_stdcls (&scm_class_foreign_object, "<foreign-object>",
|
|
|
|
|
|
scm_class_foreign_class, scm_class_object, SCM_EOL);
|
|
|
|
|
|
SCM_SET_CLASS_FLAGS (scm_class_foreign_object, SCM_CLASSF_FOREIGN);
|
|
|
|
|
|
|
|
|
|
|
|
/* scm_class_generic functions classes */
|
|
|
|
|
|
make_stdcls (&scm_class_procedure_class, "<procedure-class>",
|
|
|
|
|
|
scm_class_class, scm_class_class, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_entity_class, "<entity-class>",
|
|
|
|
|
|
scm_class_class, scm_class_procedure_class, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_operator_class, "<operator-class>",
|
|
|
|
|
|
scm_class_class, scm_class_procedure_class, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_operator_with_setter_class,
|
|
|
|
|
|
"<operator-with-setter-class>",
|
|
|
|
|
|
scm_class_class, scm_class_operator_class, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_method, "<method>",
|
|
|
|
|
|
scm_class_class, scm_class_object, method_slots);
|
|
|
|
|
|
make_stdcls (&scm_class_simple_method, "<simple-method>",
|
|
|
|
|
|
scm_class_class, scm_class_method, SCM_EOL);
|
|
|
|
|
|
SCM_SET_CLASS_FLAGS (scm_class_simple_method, SCM_CLASSF_SIMPLE_METHOD);
|
2003-03-11 14:50:08 +00:00
|
|
|
|
make_stdcls (&scm_class_accessor_method, "<accessor-method>",
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_class_class, scm_class_simple_method, amethod_slots);
|
2003-03-11 14:50:08 +00:00
|
|
|
|
SCM_SET_CLASS_FLAGS (scm_class_accessor_method, SCM_CLASSF_ACCESSOR_METHOD);
|
2003-03-19 08:57:47 +00:00
|
|
|
|
make_stdcls (&scm_class_applicable, "<applicable>",
|
|
|
|
|
|
scm_class_class, scm_class_top, SCM_EOL);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
make_stdcls (&scm_class_entity, "<entity>",
|
2003-03-19 08:57:47 +00:00
|
|
|
|
scm_class_entity_class,
|
|
|
|
|
|
scm_list_2 (scm_class_object, scm_class_applicable),
|
|
|
|
|
|
SCM_EOL);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
make_stdcls (&scm_class_entity_with_setter, "<entity-with-setter>",
|
|
|
|
|
|
scm_class_entity_class, scm_class_entity, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_generic, "<generic>",
|
|
|
|
|
|
scm_class_entity_class, scm_class_entity, gf_slots);
|
|
|
|
|
|
SCM_SET_CLASS_FLAGS (scm_class_generic, SCM_CLASSF_PURE_GENERIC);
|
2003-01-08 13:24:41 +00:00
|
|
|
|
make_stdcls (&scm_class_extended_generic, "<extended-generic>",
|
2003-03-11 14:50:08 +00:00
|
|
|
|
scm_class_entity_class, scm_class_generic, egf_slots);
|
2003-01-08 13:24:41 +00:00
|
|
|
|
SCM_SET_CLASS_FLAGS (scm_class_extended_generic, SCM_CLASSF_PURE_GENERIC);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
make_stdcls (&scm_class_generic_with_setter, "<generic-with-setter>",
|
|
|
|
|
|
scm_class_entity_class,
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_2 (scm_class_generic, scm_class_entity_with_setter),
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
SCM_SET_CLASS_FLAGS (scm_class_generic_with_setter, SCM_CLASSF_PURE_GENERIC);
|
2003-03-11 14:50:08 +00:00
|
|
|
|
make_stdcls (&scm_class_accessor, "<accessor>",
|
|
|
|
|
|
scm_class_entity_class, scm_class_generic_with_setter, SCM_EOL);
|
|
|
|
|
|
SCM_SET_CLASS_FLAGS (scm_class_accessor, SCM_CLASSF_PURE_GENERIC);
|
2003-01-08 13:24:41 +00:00
|
|
|
|
make_stdcls (&scm_class_extended_generic_with_setter,
|
|
|
|
|
|
"<extended-generic-with-setter>",
|
|
|
|
|
|
scm_class_entity_class,
|
2003-03-19 08:57:47 +00:00
|
|
|
|
scm_list_2 (scm_class_generic_with_setter,
|
|
|
|
|
|
scm_class_extended_generic),
|
2003-01-08 13:24:41 +00:00
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
SCM_SET_CLASS_FLAGS (scm_class_extended_generic_with_setter,
|
|
|
|
|
|
SCM_CLASSF_PURE_GENERIC);
|
2003-03-19 08:57:47 +00:00
|
|
|
|
make_stdcls (&scm_class_extended_accessor, "<extended-accessor>",
|
|
|
|
|
|
scm_class_entity_class,
|
|
|
|
|
|
scm_list_2 (scm_class_accessor,
|
|
|
|
|
|
scm_class_extended_generic_with_setter),
|
|
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
fix_cpl (scm_class_extended_accessor,
|
|
|
|
|
|
scm_class_extended_generic, scm_class_generic);
|
|
|
|
|
|
SCM_SET_CLASS_FLAGS (scm_class_extended_accessor, SCM_CLASSF_PURE_GENERIC);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
/* Primitive types classes */
|
|
|
|
|
|
make_stdcls (&scm_class_boolean, "<boolean>",
|
|
|
|
|
|
scm_class_class, scm_class_top, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_char, "<char>",
|
|
|
|
|
|
scm_class_class, scm_class_top, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_list, "<list>",
|
|
|
|
|
|
scm_class_class, scm_class_top, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_pair, "<pair>",
|
|
|
|
|
|
scm_class_class, scm_class_list, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_null, "<null>",
|
|
|
|
|
|
scm_class_class, scm_class_list, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_string, "<string>",
|
|
|
|
|
|
scm_class_class, scm_class_top, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_symbol, "<symbol>",
|
|
|
|
|
|
scm_class_class, scm_class_top, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_vector, "<vector>",
|
|
|
|
|
|
scm_class_class, scm_class_top, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_number, "<number>",
|
|
|
|
|
|
scm_class_class, scm_class_top, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_complex, "<complex>",
|
|
|
|
|
|
scm_class_class, scm_class_number, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_real, "<real>",
|
|
|
|
|
|
scm_class_class, scm_class_complex, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_integer, "<integer>",
|
|
|
|
|
|
scm_class_class, scm_class_real, SCM_EOL);
|
* print.c (scm_iprin1): Handle fractions.
* objects.h (scm_class_fraction): New.
* objects.c (scm_class_fraction): New.
(scm_class_of): Handle fractions.
* hash.c (scm_hasher): Handle fractions.
* numbers.c: New code for handling fraction all over the place.
(scm_odd_p, scm_even_p): Handle inexact integers.
(scm_rational_p): New function, same as scm_real_p.
(scm_round_number, scm_truncate_number, scm_ceiling, scm_floor):
New exact functions that replace the inexact 'dsubr'
implementations.
(scm_numerator, scm_denominator): New.
* numbers.h (SCM_NUMP): Recognize fractions.
(SCM_FRACTIONP, SCM_SLOPPY_FRACTIONP, SCM_FRACTION_NUMERATOR,
SCM_FRACTION_DENOMINATOR, SCM_FRACTION_SET_NUMERATOR,
SCM_FRACTION_SET_DENOMINATOR, SCM_FRACTION_REDUCED_BIT,
SCM_FRACTION_REDUCED_SET, SCM_FRACTION_REDUCED_CLEAR,
SCM_FRACTION_REDUCED): New.
(scm_floor, scm_ceiling, scm_truncate_number, scm_round_number):
New prototypes.
(scm_make_ratio, scm_rationalize, scm_numerator, scm_denominator,
scm_rational_p): New prototypes.
(scm_i_dbl2num, scm_i_fraction2double, scm_i_fraction_equalp,
scm_i_print_fraction): New prototypes.
* goops.c (create_standard_classes): Create "<fraction>" class.
* gc-mark.c (scm_gc_mark_dependencies): Handle fractions.
* gc-card.c (scm_i_sweep_card): Include scm_tc16_fraction as a
case in the switch, but do nothing for now.
* eval.c (SCM_CEVAL, SCM_APPLY, call_dsubr_1): Convert fractions
to doubles when calling 'dsubr' functions.
* eq.c (scm_eqv_p, scm_equal_p): Handle fractions.
2003-11-18 19:59:53 +00:00
|
|
|
|
make_stdcls (&scm_class_fraction, "<fraction>",
|
|
|
|
|
|
scm_class_class, scm_class_real, SCM_EOL);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
make_stdcls (&scm_class_keyword, "<keyword>",
|
|
|
|
|
|
scm_class_class, scm_class_top, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_unknown, "<unknown>",
|
|
|
|
|
|
scm_class_class, scm_class_top, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_procedure, "<procedure>",
|
2003-03-19 08:57:47 +00:00
|
|
|
|
scm_class_procedure_class, scm_class_applicable, SCM_EOL);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
make_stdcls (&scm_class_procedure_with_setter, "<procedure-with-setter>",
|
|
|
|
|
|
scm_class_procedure_class, scm_class_procedure, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_primitive_generic, "<primitive-generic>",
|
|
|
|
|
|
scm_class_procedure_class, scm_class_procedure, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_port, "<port>",
|
|
|
|
|
|
scm_class_class, scm_class_top, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_input_port, "<input-port>",
|
|
|
|
|
|
scm_class_class, scm_class_port, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_output_port, "<output-port>",
|
|
|
|
|
|
scm_class_class, scm_class_port, SCM_EOL);
|
|
|
|
|
|
make_stdcls (&scm_class_input_output_port, "<input-output-port>",
|
|
|
|
|
|
scm_class_class,
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_2 (scm_class_input_port, scm_class_output_port),
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**********************************************************************
|
|
|
|
|
|
*
|
|
|
|
|
|
* Smob classes
|
|
|
|
|
|
*
|
|
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
2003-10-07 15:58:19 +00:00
|
|
|
|
make_class_from_template (char const *template, char const *type_name, SCM supers, int applicablep)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM class, name;
|
|
|
|
|
|
if (type_name)
|
|
|
|
|
|
{
|
|
|
|
|
|
char buffer[100];
|
|
|
|
|
|
sprintf (buffer, template, type_name);
|
2000-12-08 17:08:34 +00:00
|
|
|
|
name = scm_str2symbol (buffer);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
name = SCM_GOOPS_UNBOUND;
|
|
|
|
|
|
|
2003-03-19 08:57:47 +00:00
|
|
|
|
class = scm_permanent_object (scm_basic_make_class (applicablep
|
|
|
|
|
|
? scm_class_procedure_class
|
|
|
|
|
|
: scm_class_class,
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
name,
|
|
|
|
|
|
supers,
|
|
|
|
|
|
SCM_EOL));
|
|
|
|
|
|
|
|
|
|
|
|
/* Only define name if doesn't already exist. */
|
|
|
|
|
|
if (!SCM_GOOPS_UNBOUNDP (name)
|
2001-06-26 15:46:40 +00:00
|
|
|
|
&& SCM_FALSEP (scm_call_2 (scm_goops_lookup_closure, name, SCM_BOOL_F)))
|
2001-02-22 20:53:55 +00:00
|
|
|
|
DEFVAR (name, class);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return class;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
2003-10-07 15:58:19 +00:00
|
|
|
|
scm_make_extended_class (char const *type_name, int applicablep)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
return make_class_from_template ("<%s>",
|
|
|
|
|
|
type_name,
|
2003-03-19 08:57:47 +00:00
|
|
|
|
scm_list_1 (applicablep
|
|
|
|
|
|
? scm_class_applicable
|
|
|
|
|
|
: scm_class_top),
|
|
|
|
|
|
applicablep);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
scm_i_inherit_applicable (SCM c)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!SCM_SUBCLASSP (c, scm_class_applicable))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM dsupers = SCM_SLOT (c, scm_si_direct_supers);
|
|
|
|
|
|
SCM cpl = SCM_SLOT (c, scm_si_cpl);
|
|
|
|
|
|
/* patch scm_class_applicable into direct-supers */
|
|
|
|
|
|
SCM top = scm_c_memq (scm_class_top, dsupers);
|
|
|
|
|
|
if (SCM_FALSEP (top))
|
|
|
|
|
|
dsupers = scm_append (scm_list_2 (dsupers,
|
|
|
|
|
|
scm_list_1 (scm_class_applicable)));
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_SETCAR (top, scm_class_applicable);
|
|
|
|
|
|
SCM_SETCDR (top, scm_cons (scm_class_top, SCM_CDR (top)));
|
|
|
|
|
|
}
|
|
|
|
|
|
SCM_SET_SLOT (c, scm_si_direct_supers, dsupers);
|
|
|
|
|
|
/* patch scm_class_applicable into cpl */
|
|
|
|
|
|
top = scm_c_memq (scm_class_top, cpl);
|
|
|
|
|
|
if (SCM_FALSEP (top))
|
|
|
|
|
|
abort ();
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_SETCAR (top, scm_class_applicable);
|
|
|
|
|
|
SCM_SETCDR (top, scm_cons (scm_class_top, SCM_CDR (top)));
|
|
|
|
|
|
}
|
|
|
|
|
|
/* add class to direct-subclasses of scm_class_applicable */
|
|
|
|
|
|
SCM_SET_SLOT (scm_class_applicable,
|
|
|
|
|
|
scm_si_direct_subclasses,
|
|
|
|
|
|
scm_cons (c, SCM_SLOT (scm_class_applicable,
|
|
|
|
|
|
scm_si_direct_subclasses)));
|
|
|
|
|
|
}
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
create_smob_classes (void)
|
|
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long i;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2002-08-16 22:01:10 +00:00
|
|
|
|
scm_smob_class = (SCM *) scm_malloc (255 * sizeof (SCM));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
for (i = 0; i < 255; ++i)
|
|
|
|
|
|
scm_smob_class[i] = 0;
|
|
|
|
|
|
|
|
|
|
|
|
scm_smob_class[SCM_TC2SMOBNUM (scm_tc16_keyword)] = scm_class_keyword;
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
for (i = 0; i < scm_numsmob; ++i)
|
|
|
|
|
|
if (!scm_smob_class[i])
|
2003-03-19 08:57:47 +00:00
|
|
|
|
scm_smob_class[i] = scm_make_extended_class (SCM_SMOBNAME (i),
|
|
|
|
|
|
scm_smobs[i].apply != 0);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2001-05-26 20:51:22 +00:00
|
|
|
|
scm_make_port_classes (long ptobnum, char *type_name)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM c, class = make_class_from_template ("<%s-port>",
|
|
|
|
|
|
type_name,
|
2003-03-19 08:57:47 +00:00
|
|
|
|
scm_list_1 (scm_class_port),
|
|
|
|
|
|
0);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_port_class[SCM_IN_PCLASS_INDEX + ptobnum]
|
|
|
|
|
|
= make_class_from_template ("<%s-input-port>",
|
|
|
|
|
|
type_name,
|
2003-03-19 08:57:47 +00:00
|
|
|
|
scm_list_2 (class, scm_class_input_port),
|
|
|
|
|
|
0);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_port_class[SCM_OUT_PCLASS_INDEX + ptobnum]
|
|
|
|
|
|
= make_class_from_template ("<%s-output-port>",
|
|
|
|
|
|
type_name,
|
2003-03-19 08:57:47 +00:00
|
|
|
|
scm_list_2 (class, scm_class_output_port),
|
|
|
|
|
|
0);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_port_class[SCM_INOUT_PCLASS_INDEX + ptobnum]
|
|
|
|
|
|
= c
|
|
|
|
|
|
= make_class_from_template ("<%s-input-output-port>",
|
|
|
|
|
|
type_name,
|
2003-03-19 08:57:47 +00:00
|
|
|
|
scm_list_2 (class, scm_class_input_output_port),
|
|
|
|
|
|
0);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
/* Patch cpl (since this tree is too complex for the C level compute-cpl) */
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (c, scm_si_cpl,
|
|
|
|
|
|
scm_cons2 (c, class, SCM_SLOT (scm_class_input_output_port, scm_si_cpl)));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
create_port_classes (void)
|
|
|
|
|
|
{
|
2001-05-26 20:51:22 +00:00
|
|
|
|
long i;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
2002-08-16 22:01:10 +00:00
|
|
|
|
scm_port_class = (SCM *) scm_malloc (3 * 256 * sizeof (SCM));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
for (i = 0; i < 3 * 256; ++i)
|
|
|
|
|
|
scm_port_class[i] = 0;
|
|
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < scm_numptob; ++i)
|
|
|
|
|
|
scm_make_port_classes (i, SCM_PTOBNAME (i));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
2003-03-19 08:57:47 +00:00
|
|
|
|
make_struct_class (void *closure SCM_UNUSED,
|
|
|
|
|
|
SCM vtable, SCM data, SCM prev SCM_UNUSED)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2001-07-18 10:14:29 +00:00
|
|
|
|
if (!SCM_FALSEP (SCM_STRUCT_TABLE_NAME (data)))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM_SET_STRUCT_TABLE_CLASS (data,
|
|
|
|
|
|
scm_make_extended_class
|
2003-03-19 08:57:47 +00:00
|
|
|
|
(SCM_SYMBOL_CHARS (SCM_STRUCT_TABLE_NAME (data)),
|
|
|
|
|
|
SCM_CLASS_FLAGS (vtable) & SCM_CLASSF_OPERATOR));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
create_struct_classes (void)
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_internal_hash_fold (make_struct_class, 0, SCM_BOOL_F, scm_struct_table);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**********************************************************************
|
|
|
|
|
|
*
|
|
|
|
|
|
* C interface
|
|
|
|
|
|
*
|
|
|
|
|
|
**********************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
scm_load_goops ()
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!goops_loaded_p)
|
2001-05-19 00:33:25 +00:00
|
|
|
|
scm_c_resolve_module ("oop goops");
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2001-03-12 14:34:44 +00:00
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_make_foreign_object (SCM class, SCM initargs)
|
2001-03-12 14:34:44 +00:00
|
|
|
|
#define FUNC_NAME s_scm_make
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
void * (*constructor) (SCM)
|
|
|
|
|
|
= (void * (*) (SCM)) SCM_SLOT (class, scm_si_constructor);
|
2001-03-12 14:34:44 +00:00
|
|
|
|
if (constructor == 0)
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
SCM_MISC_ERROR ("Can't make instances of class ~S", scm_list_1 (class));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return scm_wrap_object (class, constructor (initargs));
|
|
|
|
|
|
}
|
2001-03-12 14:34:44 +00:00
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
static size_t
|
|
|
|
|
|
scm_free_foreign_object (SCM *class, SCM *data)
|
|
|
|
|
|
{
|
|
|
|
|
|
size_t (*destructor) (void *)
|
|
|
|
|
|
= (size_t (*) (void *)) class[scm_si_destructor];
|
|
|
|
|
|
return destructor (data);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_make_class (SCM meta, char *s_name, SCM supers, size_t size,
|
|
|
|
|
|
void * (*constructor) (SCM initargs),
|
|
|
|
|
|
size_t (*destructor) (void *))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM name, class;
|
2000-12-08 17:08:34 +00:00
|
|
|
|
name = scm_str2symbol (s_name);
|
2001-07-18 10:14:29 +00:00
|
|
|
|
if (SCM_NULLP (supers))
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
supers = scm_list_1 (scm_class_foreign_object);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
class = scm_basic_basic_make_class (meta, name, supers, SCM_EOL);
|
|
|
|
|
|
scm_sys_inherit_magic_x (class, supers);
|
|
|
|
|
|
|
|
|
|
|
|
if (destructor != 0)
|
|
|
|
|
|
{
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (class, scm_si_destructor, (SCM) destructor);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM_SET_CLASS_DESTRUCTOR (class, scm_free_foreign_object);
|
|
|
|
|
|
}
|
|
|
|
|
|
else if (size > 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_SET_CLASS_DESTRUCTOR (class, scm_struct_free_light);
|
|
|
|
|
|
SCM_SET_CLASS_INSTANCE_SIZE (class, size);
|
|
|
|
|
|
}
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (class, scm_si_layout, scm_str2symbol (""));
|
|
|
|
|
|
SCM_SET_SLOT (class, scm_si_constructor, (SCM) constructor);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
return class;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYMBOL (sym_o, "o");
|
|
|
|
|
|
SCM_SYMBOL (sym_x, "x");
|
|
|
|
|
|
|
|
|
|
|
|
SCM_KEYWORD (k_accessor, "accessor");
|
|
|
|
|
|
SCM_KEYWORD (k_getter, "getter");
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
2001-06-07 21:12:19 +00:00
|
|
|
|
default_setter (SCM obj SCM_UNUSED, SCM c SCM_UNUSED)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
scm_misc_error ("slot-set!", "read-only slot", SCM_EOL);
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
scm_add_slot (SCM class, char *slot_name, SCM slot_class,
|
|
|
|
|
|
SCM (*getter) (SCM obj),
|
|
|
|
|
|
SCM (*setter) (SCM obj, SCM x),
|
|
|
|
|
|
char *accessor_name)
|
|
|
|
|
|
{
|
|
|
|
|
|
{
|
(scm_c_make_gsubr, scm_c_define_gsubr, scm_c_make_gsubr_with_generic,
scm_c_define_gsubr_with_generic): New functions. They replace
scm_make_gsubr and scm_make_gsubr_with_generic. The `make' variants
only create the gsubr object, while the `define' variants also put it
into the current module. Changed all callers. (scm_make_gsubr,
scm_make_gsubr_with_generic): Deprecated.
(scm_c_make_subr, scm_c_define_subr, scm_c_make_subr_with_generic,
scm_c_define_subr_with_generic): New functions. They replace
scm_make_subr, scm_make_subr_opt and scm_make_subr_with_generic. The
`make' variants only create the subr object, while the `define'
variants also put it into the current module. Changed all callers.
(scm_make_subr, scm_make_subr_opt, scm_make_subr_with_generic):
Deprecated.
2001-05-20 00:35:43 +00:00
|
|
|
|
SCM get = scm_c_make_subr ("goops:get", scm_tc7_subr_1, getter);
|
|
|
|
|
|
SCM set = scm_c_make_subr ("goops:set", scm_tc7_subr_2,
|
|
|
|
|
|
setter ? setter : default_setter);
|
2004-05-24 04:15:49 +00:00
|
|
|
|
|
|
|
|
|
|
/* Dirk:FIXME:: The following two expressions make use of the fact that
|
|
|
|
|
|
* the memoizer will accept a subr-object in the place of a function.
|
|
|
|
|
|
* This is not guaranteed to stay this way. */
|
|
|
|
|
|
SCM getm = scm_i_eval_x (scm_list_3 (scm_sym_lambda,
|
|
|
|
|
|
scm_list_1 (sym_o),
|
|
|
|
|
|
scm_list_2 (get, sym_o)),
|
|
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
SCM setm = scm_i_eval_x (scm_list_3 (scm_sym_lambda,
|
|
|
|
|
|
scm_list_2 (sym_o, sym_x),
|
|
|
|
|
|
scm_list_3 (set, sym_o, sym_x)),
|
|
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-08 17:08:34 +00:00
|
|
|
|
SCM name = scm_str2symbol (slot_name);
|
|
|
|
|
|
SCM aname = scm_str2symbol (accessor_name);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
SCM gf = scm_ensure_accessor (aname);
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
SCM slot = scm_list_5 (name,
|
|
|
|
|
|
k_class,
|
|
|
|
|
|
slot_class,
|
|
|
|
|
|
setter ? k_accessor : k_getter,
|
|
|
|
|
|
gf);
|
2003-03-11 14:50:08 +00:00
|
|
|
|
scm_add_method (gf, scm_make (scm_list_5 (scm_class_accessor_method,
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
k_specializers,
|
|
|
|
|
|
scm_list_1 (class),
|
|
|
|
|
|
k_procedure,
|
|
|
|
|
|
getm)));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_add_method (scm_setter (gf),
|
2003-03-11 14:50:08 +00:00
|
|
|
|
scm_make (scm_list_5 (scm_class_accessor_method,
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
k_specializers,
|
|
|
|
|
|
scm_list_2 (class, scm_class_top),
|
|
|
|
|
|
k_procedure,
|
|
|
|
|
|
setm)));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
DEFVAR (aname, gf);
|
2002-04-22 17:46:06 +00:00
|
|
|
|
|
2001-06-07 23:10:33 +00:00
|
|
|
|
SCM_SET_SLOT (class, scm_si_slots,
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_append_x (scm_list_2 (SCM_SLOT (class, scm_si_slots),
|
|
|
|
|
|
scm_list_1 (slot))));
|
2003-04-13 14:48:35 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM n = SCM_SLOT (class, scm_si_nfields);
|
|
|
|
|
|
SCM gns = scm_list_n (name, SCM_BOOL_F, get, set, n, SCM_MAKINUM (1));
|
|
|
|
|
|
SCM_SET_SLOT (class, scm_si_getters_n_setters,
|
|
|
|
|
|
scm_append_x (scm_list_2 (SCM_SLOT (class, scm_si_getters_n_setters),
|
|
|
|
|
|
scm_list_1 (gns))));
|
|
|
|
|
|
SCM_SET_SLOT (class, scm_si_nfields, SCM_MAKINUM (SCM_INUM (n) + 1));
|
|
|
|
|
|
}
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_wrap_object (SCM class, void *data)
|
|
|
|
|
|
{
|
Changes in doc/ref:
* api.txt, data-rep.texi: Renamed the struct scm_cell to
scm_t_cell.
* data-rep.texi: Renamed scm_alloc_cell to scm_cell and
scm_alloc_double_cell to scm_double_cell.
Changes in libguile:
* gc.c (SCM_HEAP_SEG_SIZE, CELL_UP, CELL_DN, NEXT_DATA_CELL,
init_heap_seg, alloc_some_heap), gc.h (struct scm_cell, struct
scm_t_cell, SCM_CELLPTR, SCM_GC_CARD_SIZE,
SCM_GC_IN_CARD_HEADERP), tags.h (SCM_CELLP): Renamed the struct
scm_cell and all its uses to scm_t_cell in accordance to Guile's
naming scheme for types.
* alist.c (scm_acons), convert.i.c (CTYPES2UVECT,
CTYPES2UVECT_OPTIONAL), coop-threads.c (scm_call_with_new_thread,
scm_spawn_thread), debug.c (scm_make_debugobj), environments.c
(scm_make_environment), eval.c (scm_closure), fports.c
(scm_fdes_to_port), gc.c (scm_deprecated_newcell,
scm_deprecated_newcell2), inline.h (scm_alloc_cell, scm_cell),
list.c (SCM_I_CONS), numbers.c (scm_i_mkbig), pairs.c (scm_cons),
ports.c (scm_void_port), procs.c (scm_c_make_subr, scm_makcclo),
smob.c (scm_make_smob), smob.h (SCM_NEWSMOB), strings.c
(scm_take_str, scm_allocate_string), strports.c (scm_mkstrport),
unif.c (scm_make_uve), variable.c (make_variable), vectors.c
(scm_c_make_vector), vports.c (scm_make_soft_port): Renamed
scm_alloc_cell to scm_cell.
* environments.c (core_environments_observe), gc.c
(scm_deprecated_newcell2), goops.c (wrap_init, scm_wrap_object),
inline.h (scm_alloc_double_cell, scm_double_cell), num2float.i.c
(FLOAT2NUM), numbers.c (scm_make_real), procs.c
(scm_make_procedure_with_setter), smob.h (SCM_NEWSMOB2,
SCM_NEWSMOB3), struct.c (scm_make_struct, scm_make_vtable_vtable),
symbols.c (scm_mem2symbol, scm_mem2uninterned_symbol), weaks.c
(allocate_weak_vector): Renamed scm_alloc_double_cell to
scm_double_cell.
2002-03-01 00:19:20 +00:00
|
|
|
|
return scm_double_cell (SCM_UNPACK (SCM_CDR (class)) | scm_tc3_struct,
|
|
|
|
|
|
(scm_t_bits) data,
|
|
|
|
|
|
0, 0);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM scm_components;
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_wrap_component (SCM class, SCM container, void *data)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM obj = scm_wrap_object (class, data);
|
|
|
|
|
|
SCM handle = scm_hash_fn_create_handle_x (scm_components,
|
|
|
|
|
|
obj,
|
|
|
|
|
|
SCM_BOOL_F,
|
|
|
|
|
|
scm_struct_ihashq,
|
|
|
|
|
|
scm_sloppy_assq,
|
|
|
|
|
|
0);
|
|
|
|
|
|
SCM_SETCDR (handle, container);
|
|
|
|
|
|
return obj;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_ensure_accessor (SCM name)
|
|
|
|
|
|
{
|
2001-06-26 15:46:40 +00:00
|
|
|
|
SCM gf = scm_call_2 (SCM_TOP_LEVEL_LOOKUP_CLOSURE, name, SCM_BOOL_F);
|
2003-03-11 14:50:08 +00:00
|
|
|
|
if (!SCM_IS_A_P (gf, scm_class_accessor))
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
gf = scm_make (scm_list_3 (scm_class_generic, k_name, name));
|
2003-03-11 14:50:08 +00:00
|
|
|
|
gf = scm_make (scm_list_5 (scm_class_accessor,
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
k_name, name, k_setter, gf));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
return gf;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCM_SYMBOL (sym_internal_add_method_x, "internal-add-method!");
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
scm_add_method (SCM gf, SCM m)
|
|
|
|
|
|
{
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_eval (scm_list_3 (sym_internal_add_method_x, gf, m), scm_module_goops);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef GUILE_DEBUG
|
|
|
|
|
|
/*
|
|
|
|
|
|
* Debugging utilities
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_pure_generic_p, "pure-generic?", 1, 0, 0,
|
|
|
|
|
|
(SCM obj),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Return @code{#t} if @var{obj} is a pure generic.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_pure_generic_p
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2000-12-21 17:07:38 +00:00
|
|
|
|
return SCM_BOOL (SCM_PUREGENERICP (obj));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
#endif /* GUILE_DEBUG */
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
* Initialization
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2000-12-16 20:25:08 +00:00
|
|
|
|
SCM_DEFINE (scm_sys_goops_loaded, "%goops-loaded", 0, 0, 0,
|
|
|
|
|
|
(),
|
(scm_sys_initialize_object, scm_instance_p, scm_class_name,
scm_class_precedence_list, scm_class_slots, scm_class_environment,
scm_generic_function_name, scm_generic_function_methods,
scm_method_generic_function, scm_method_specializers,
scm_method_procedure, scm_make_unbound, scm_unbound_p,
scm_assert_bound, scm_at_assert_bound_ref, scm_sys_fast_slot_ref,
scm_sys_fast_slot_set_x, scm_slot_ref, scm_slot_set_x,
_scm_slot_bound_p, scm_slots_exists_p, scm_sys_allocate_instance,
scm_make, scm_pure_generic_p, scm_class_direct_supers,
scm_class_direct_slots, scm_class_direct_subclasses,
scm_class_direct_methods, scm_accessor_method_slot_definition,
scm_sys_goops_loaded): Added docstrings.
2001-02-16 14:59:22 +00:00
|
|
|
|
"Announce that GOOPS is loaded and perform initialization\n"
|
|
|
|
|
|
"on the C level which depends on the loaded GOOPS modules.")
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#define FUNC_NAME s_scm_sys_goops_loaded
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
|
|
|
|
|
goops_loaded_p = 1;
|
2001-05-15 14:57:22 +00:00
|
|
|
|
var_compute_applicable_methods =
|
|
|
|
|
|
scm_sym2var (sym_compute_applicable_methods, scm_goops_lookup_closure,
|
|
|
|
|
|
SCM_BOOL_F);
|
2003-03-06 12:51:57 +00:00
|
|
|
|
setup_extended_primitive_generics ();
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
2000-12-16 20:25:08 +00:00
|
|
|
|
#undef FUNC_NAME
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
SCM scm_module_goops;
|
|
|
|
|
|
|
2001-05-19 00:33:25 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_init_goops_builtins (void)
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
2001-05-19 00:33:25 +00:00
|
|
|
|
scm_module_goops = scm_current_module ();
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_goops_lookup_closure = scm_module_lookup_closure (scm_module_goops);
|
|
|
|
|
|
|
2002-04-22 17:46:06 +00:00
|
|
|
|
/* Not really necessary right now, but who knows...
|
2001-02-22 20:53:55 +00:00
|
|
|
|
*/
|
|
|
|
|
|
scm_permanent_object (scm_module_goops);
|
|
|
|
|
|
scm_permanent_object (scm_goops_lookup_closure);
|
|
|
|
|
|
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_components = scm_permanent_object (scm_make_weak_key_hash_table
|
|
|
|
|
|
(SCM_MAKINUM (37)));
|
|
|
|
|
|
|
|
|
|
|
|
goops_rstate = scm_c_make_rstate ("GOOPS", 5);
|
|
|
|
|
|
|
|
|
|
|
|
#include "libguile/goops.x"
|
|
|
|
|
|
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
list_of_no_method = scm_permanent_object (scm_list_1 (sym_no_method));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
* gc.h, gc.c (scm_gc_sweep): Issue deprecation warning when
non-zero is returned from a port or smob free function.
(scm_malloc, scm_realloc, scm_strndup, scm_strdup,
scm_gc_register_collectable_memory,
scm_gc_unregister_collectable_memory, scm_gc_malloc,
scm_gc_realloc, scm_gc_free, scm_gc_strndup, scm_gc_strdup): New.
* backtrace.c, continuations.c, convert.i.c, coop-threads.c,
debug-malloc.c, dynl.c, environments.c, environments.h,
extensions.c, filesys.c, fports.c, gc.c, gc.h, gh_data.c, goops.c,
guardians.c, hooks.c, init.c, keywords.c, load.c, numbers.c,
ports.c, posix.c, procs.c, rdelim.c, regex-posix.c, root.c,
smob.c, stime.c, strings.c, struct.c, struct.h, symbols.c, unif.c,
vectors.c, weaks.c: Use scm_gc_malloc/scm_malloc and
scm_gc_free/free instead of scm_must_malloc and scm_must_free, as
appropriate. Return zero from smob and port free functions.
* debug-malloc.c (scm_malloc_reregister): Handle "old == NULL".
* fports.c (scm_setvbuf): Reset read buffer to saved values when
it is pointing to the putback buffer.
2002-02-11 18:06:50 +00:00
|
|
|
|
hell = scm_malloc (hell_size);
|
2002-10-27 20:13:24 +00:00
|
|
|
|
hell_mutex = scm_permanent_object (scm_make_mutex ());
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
|
|
|
|
|
|
create_basic_classes ();
|
|
|
|
|
|
create_standard_classes ();
|
|
|
|
|
|
create_smob_classes ();
|
|
|
|
|
|
create_struct_classes ();
|
|
|
|
|
|
create_port_classes ();
|
|
|
|
|
|
|
|
|
|
|
|
{
|
2000-12-08 17:08:34 +00:00
|
|
|
|
SCM name = scm_str2symbol ("no-applicable-method");
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
scm_no_applicable_method
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
= scm_permanent_object (scm_make (scm_list_3 (scm_class_generic,
|
|
|
|
|
|
k_name,
|
|
|
|
|
|
name)));
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
DEFVAR (name, scm_no_applicable_method);
|
|
|
|
|
|
}
|
2001-05-19 00:33:25 +00:00
|
|
|
|
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
2001-05-19 00:33:25 +00:00
|
|
|
|
scm_init_goops ()
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
{
|
(scm_c_make_gsubr, scm_c_define_gsubr, scm_c_make_gsubr_with_generic,
scm_c_define_gsubr_with_generic): New functions. They replace
scm_make_gsubr and scm_make_gsubr_with_generic. The `make' variants
only create the gsubr object, while the `define' variants also put it
into the current module. Changed all callers. (scm_make_gsubr,
scm_make_gsubr_with_generic): Deprecated.
(scm_c_make_subr, scm_c_define_subr, scm_c_make_subr_with_generic,
scm_c_define_subr_with_generic): New functions. They replace
scm_make_subr, scm_make_subr_opt and scm_make_subr_with_generic. The
`make' variants only create the subr object, while the `define'
variants also put it into the current module. Changed all callers.
(scm_make_subr, scm_make_subr_opt, scm_make_subr_with_generic):
Deprecated.
2001-05-20 00:35:43 +00:00
|
|
|
|
scm_c_define_gsubr ("%init-goops-builtins", 0, 0, 0,
|
|
|
|
|
|
scm_init_goops_builtins);
|
* goops.c, objects.c, objects.h, eval.c (scm_make_extended_class,
scm_make_port_classes, scm_change_object_class,
scm_memoize_method): Changed to ordinary functions (was plugin
slots).
* goops.c (wrap_init, scm_wrap_object): Unconditionally use
SCM_STRUCT_GC_CHAIN.
(scm_goops_version): Removed.
(scm_oldfmt): and all uses of it: Removed.
(scm_shared_array_root, scm_shared_array_offset,
scm_shared_array_increments): Removed.
(scm_init_goops): No need to support two arg mutex init.
Removed #include "versiondat.h", #include "goops.h".
2000-10-25 14:49:31 +00:00
|
|
|
|
}
|
2000-12-01 16:05:33 +00:00
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
Local Variables:
|
|
|
|
|
|
c-file-style: "gnu"
|
|
|
|
|
|
End:
|
|
|
|
|
|
*/
|