-/* Copyright (C) 1995,1996 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1999, 2000 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* If you write modifications of your own for GUILE, it is your choice
* whether to permit this exception to apply to your modifications.
* If you do not wish that, delete this exception notice. */
+
+/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
+ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
+
\f
/* This file and objects.h contains those minimal pieces of the Guile
* libguile. See the comments in objects.h.
*/
-#include "_scm.h"
-
-#include "struct.h"
-#include "procprop.h"
-#include "chars.h"
-#include "keywords.h"
-#include "smob.h"
-#include "eval.h"
-#include "alist.h"
-
-#include "objects.h"
+#include "libguile/_scm.h"
+
+#include "libguile/struct.h"
+#include "libguile/procprop.h"
+#include "libguile/chars.h"
+#include "libguile/keywords.h"
+#include "libguile/smob.h"
+#include "libguile/eval.h"
+#include "libguile/alist.h"
+#include "libguile/ports.h"
+#include "libguile/strings.h"
+#include "libguile/vectors.h"
+
+#include "libguile/validate.h"
+#include "libguile/objects.h"
\f
SCM scm_metaclass_standard;
return scm_class_integer;
case scm_tc3_imm24:
- if (SCM_ICHRP (x))
+ if (SCM_CHARP (x))
return scm_class_char;
else
{
return scm_class_pair;
case scm_tcs_closures:
return scm_class_procedure;
- case scm_tcs_symbols:
+ case scm_tc7_symbol:
return scm_class_symbol;
case scm_tc7_vector:
case scm_tc7_wvect:
+#ifdef HAVE_ARRAYS
case scm_tc7_bvect:
case scm_tc7_byvect:
case scm_tc7_svect:
case scm_tc7_fvect:
case scm_tc7_dvect:
case scm_tc7_cvect:
+#endif
return scm_class_vector;
case scm_tc7_string:
case scm_tc7_substring:
case scm_tc7_smob:
{
- SCM type = SCM_TYP16 (x);
- if (type == scm_tc16_flo)
- {
- if (SCM_CAR (x) & SCM_IMAG_PART)
- return scm_class_complex;
- else
- return scm_class_real;
- }
- else if (type != scm_tc16_port_with_ps)
+ long type = SCM_TYP16 (x);
+ if (type != scm_tc16_port_with_ps)
return scm_smob_class[SCM_TC2SMOBNUM (type)];
x = SCM_PORT_WITH_PS_PORT (x);
/* fall through to ports */
}
case scm_tc7_port:
- return scm_port_class[(SCM_WRTNG & SCM_CAR (x)
- ? (SCM_RDNG & SCM_CAR (x)
+ return scm_port_class[(SCM_WRTNG & SCM_CELL_WORD_0 (x)
+ ? (SCM_RDNG & SCM_CELL_WORD_0 (x)
? SCM_INOUT_PCLASS_INDEX | SCM_PTOBNUM (x)
: SCM_OUT_PCLASS_INDEX | SCM_PTOBNUM (x))
: SCM_IN_PCLASS_INDEX | SCM_PTOBNUM (x))];
else if (SCM_OBJ_CLASS_FLAGS (x) & SCM_CLASSF_GOOPS)
{
/* Goops object */
- if (SCM_OBJ_CLASS_REDEF (x) != SCM_BOOL_F)
+ if (! SCM_FALSEP (SCM_OBJ_CLASS_REDEF (x)))
scm_change_object_class (x,
SCM_CLASS_OF (x), /* old */
SCM_OBJ_CLASS_REDEF (x)); /* new */
SCM class = scm_make_extended_class (SCM_NFALSEP (name)
? SCM_ROCHARS (name)
: 0);
- SCM_SET_STRUCT_TABLE_CLASS (handle, class);
+ SCM_SET_STRUCT_TABLE_CLASS (SCM_CDR (handle), class);
return class;
}
}
if (SCM_NIMP (ls))
do
{
- i += (SCM_STRUCT_DATA (scm_class_of (SCM_CAR (ls)))
- [scm_si_hashsets + hashset]);
+ i += SCM_STRUCT_DATA (scm_class_of (SCM_CAR (ls)))
+ [scm_si_hashsets + hashset];
ls = SCM_CDR (ls);
}
while (--j && SCM_NIMP (ls));
do
{
/* More arguments than specifiers => CLASS != ENV */
- if (scm_class_of (SCM_CAR (ls)) != SCM_CAR (z))
+ if (! SCM_EQ_P (scm_class_of (SCM_CAR (ls)), SCM_CAR (z)))
goto next_method;
ls = SCM_CDR (ls);
z = SCM_CDR (z);
return scm_apply_generic (gf, SCM_LIST3 (a1, a2, a3));
}
-SCM_PROC (s_entity_p, "entity?", 1, 0, 0, scm_entity_p);
-
-SCM
-scm_entity_p (SCM obj)
+SCM_DEFINE (scm_entity_p, "entity?", 1, 0, 0,
+ (SCM obj),
+"")
+#define FUNC_NAME s_scm_entity_p
{
- return (SCM_NIMP (obj) && SCM_STRUCTP (obj) && SCM_I_ENTITYP (obj)
- ? SCM_BOOL_T
- : SCM_BOOL_F);
+ return SCM_BOOL(SCM_STRUCTP (obj) && SCM_I_ENTITYP (obj));
}
+#undef FUNC_NAME
-SCM_PROC (s_operator_p, "operator?", 1, 0, 0, scm_operator_p);
-
-SCM
-scm_operator_p (SCM obj)
+SCM_DEFINE (scm_operator_p, "operator?", 1, 0, 0,
+ (SCM obj),
+"")
+#define FUNC_NAME s_scm_operator_p
{
- return (SCM_NIMP (obj)
- && SCM_STRUCTP (obj)
- && SCM_I_OPERATORP (obj)
- && !SCM_I_ENTITYP (obj)
- ? SCM_BOOL_T
- : SCM_BOOL_F);
+ return SCM_BOOL(SCM_STRUCTP (obj)
+ && SCM_I_OPERATORP (obj)
+ && !SCM_I_ENTITYP (obj));
}
+#undef FUNC_NAME
-SCM_PROC (s_set_object_procedure_x, "set-object-procedure!", 2, 0, 0, scm_set_object_procedure_x);
-
-SCM
-scm_set_object_procedure_x (SCM obj, SCM proc)
+SCM_DEFINE (scm_set_object_procedure_x, "set-object-procedure!", 2, 0, 0,
+ (SCM obj, SCM proc),
+"")
+#define FUNC_NAME s_scm_set_object_procedure_x
{
- SCM_ASSERT (SCM_NIMP (obj) && SCM_STRUCTP (obj)
+ SCM_ASSERT (SCM_STRUCTP (obj)
&& ((SCM_CLASS_FLAGS (obj) & SCM_CLASSF_OPERATOR)
|| (SCM_I_ENTITYP (obj)
&& !(SCM_OBJ_CLASS_FLAGS (obj)
& SCM_CLASSF_PURE_GENERIC))),
obj,
SCM_ARG1,
- s_set_object_procedure_x);
- SCM_ASSERT (SCM_NFALSEP (scm_procedure_p (proc)),
- proc, SCM_ARG2, s_set_object_procedure_x);
+ FUNC_NAME);
+ SCM_VALIDATE_PROC (2,proc);
if (SCM_I_ENTITYP (obj))
- SCM_ENTITY_PROCEDURE (obj) = proc;
+ SCM_SET_ENTITY_PROCEDURE (obj, proc);
else
SCM_OPERATOR_CLASS (obj)->procedure = proc;
return SCM_UNSPECIFIED;
}
+#undef FUNC_NAME
#ifdef GUILE_DEBUG
-SCM_PROC (s_object_procedure, "object-procedure", 1, 0, 0, scm_object_procedure);
-
-SCM
-scm_object_procedure (SCM obj)
+SCM_DEFINE (scm_object_procedure, "object-procedure", 1, 0, 0,
+ (SCM obj),
+"")
+#define FUNC_NAME s_scm_object_procedure
{
- SCM_ASSERT (SCM_NIMP (obj) && SCM_STRUCTP (obj)
+ SCM_ASSERT (SCM_STRUCTP (obj)
&& ((SCM_CLASS_FLAGS (obj) & SCM_CLASSF_OPERATOR)
|| SCM_I_ENTITYP (obj)),
- obj, SCM_ARG1, s_object_procedure);
+ obj, SCM_ARG1, FUNC_NAME);
return (SCM_I_ENTITYP (obj)
? SCM_ENTITY_PROCEDURE (obj)
: SCM_OPERATOR_CLASS (obj)->procedure);
}
+#undef FUNC_NAME
#endif /* GUILE_DEBUG */
/* The following procedures are not a part of Goops but a minimal
return c;
}
-SCM_PROC (s_make_class_object, "make-class-object", 2, 0, 0, scm_make_class_object);
-
-SCM
-scm_make_class_object (SCM metaclass, SCM layout)
+SCM_DEFINE (scm_make_class_object, "make-class-object", 2, 0, 0,
+ (SCM metaclass, SCM layout),
+"")
+#define FUNC_NAME s_scm_make_class_object
{
unsigned long flags = 0;
- SCM_ASSERT (SCM_NIMP (metaclass) && SCM_STRUCTP (metaclass),
- metaclass, SCM_ARG1, s_make_class_object);
- SCM_ASSERT (SCM_NIMP (layout) && SCM_STRINGP (layout),
- layout, SCM_ARG2, s_make_class_object);
- if (metaclass == scm_metaclass_operator)
+ SCM_VALIDATE_STRUCT (1,metaclass);
+ SCM_VALIDATE_STRING (2,layout);
+ if (SCM_EQ_P (metaclass, scm_metaclass_operator))
flags = SCM_CLASSF_OPERATOR;
return scm_i_make_class_object (metaclass, layout, flags);
}
+#undef FUNC_NAME
-SCM_PROC (s_make_subclass_object, "make-subclass-object", 2, 0, 0, scm_make_subclass_object);
-
-SCM
-scm_make_subclass_object (SCM class, SCM layout)
+SCM_DEFINE (scm_make_subclass_object, "make-subclass-object", 2, 0, 0,
+ (SCM class, SCM layout),
+"")
+#define FUNC_NAME s_scm_make_subclass_object
{
SCM pl;
- SCM_ASSERT (SCM_NIMP (class) && SCM_STRUCTP (class),
- class,
- SCM_ARG1,
- s_make_subclass_object);
- SCM_ASSERT (SCM_NIMP (layout) && SCM_STRINGP (layout),
- layout,
- SCM_ARG2,
- s_make_subclass_object);
- pl = SCM_STRUCT_DATA (class)[scm_vtable_index_layout];
+ SCM_VALIDATE_STRUCT (1,class);
+ SCM_VALIDATE_STRING (2,layout);
+ pl = SCM_PACK (SCM_STRUCT_DATA (class) [scm_vtable_index_layout]);
/* Convert symbol->string */
pl = scm_makfromstr (SCM_CHARS (pl), (scm_sizet) SCM_LENGTH (pl), 0);
return scm_i_make_class_object (SCM_STRUCT_VTABLE (class),
scm_string_append (SCM_LIST2 (pl, layout)),
SCM_CLASS_FLAGS (class));
}
+#undef FUNC_NAME
void
scm_init_objects ()
{
SCM ms = scm_makfrom0str (SCM_METACLASS_STANDARD_LAYOUT);
- SCM ml = scm_make_struct_layout (ms);
- SCM mt = scm_make_vtable_vtable (ml, SCM_INUM0,
+ SCM mt = scm_make_vtable_vtable (ms, SCM_INUM0,
SCM_LIST3 (SCM_BOOL_F, SCM_EOL, SCM_EOL));
SCM os = scm_makfrom0str (SCM_METACLASS_OPERATOR_LAYOUT);
- SCM ol = scm_make_struct_layout (os);
- SCM ot = scm_make_vtable_vtable (ol, SCM_INUM0,
+ SCM ot = scm_make_vtable_vtable (os, SCM_INUM0,
SCM_LIST3 (SCM_BOOL_F, SCM_EOL, SCM_EOL));
SCM es = scm_makfrom0str (SCM_ENTITY_LAYOUT);
SCM_SET_CLASS_DESTRUCTOR (et, scm_struct_free_entity);
scm_sysintern ("<entity>", et);
-#include "objects.x"
+#include "libguile/objects.x"
}
+
+/*
+ Local Variables:
+ c-file-style: "gnu"
+ End:
+*/
HCoop / bpt / guile.git / blobdiff