hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
hyung-hwan 2005-05-23 16:07:39 +00:00
parent efb5f7c4c2
commit 4160dd0867
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ase/stx/bootstrp.c
View File

@ -1,5 +1,5 @@
/* /*
* $Id: bootstrp.c,v 1.3 2005-05-23 15:51:03 bacon Exp $ * $Id: bootstrp.c,v 1.4 2005-05-23 16:07:39 bacon Exp $
*/ */
#include <xp/stx/bootstrp.h> #include <xp/stx/bootstrp.h>
@ -326,9 +326,9 @@ static void __create_bootstrapping_objects (xp_stx_t* stx)
static void __create_builtin_classes (xp_stx_t* stx) static void __create_builtin_classes (xp_stx_t* stx)
{ {
class_info_t* p; class_info_t* p;
xp_stx_word_t class, array; xp_stx_word_t class, superclass, array;
xp_stx_class_t* class_obj; xp_stx_class_t* class_obj, * superclass_obj;
xp_stx_word_t n; xp_stx_word_t n, spec = 0;
xp_stx_assert (stx->class_array != stx->nil); xp_stx_assert (stx->class_array != stx->nil);
@ -344,12 +344,24 @@ static void __create_builtin_classes (xp_stx_t* stx)
class_obj->superclass = (p->superclass == XP_NULL)? class_obj->superclass = (p->superclass == XP_NULL)?
stx->nil: xp_stx_lookup_class(stx,p->superclass); stx->nil: xp_stx_lookup_class(stx,p->superclass);
/*TODO:handle variables of super class first.... */ if (p->superclass != XP_NULL) {
superclass = xp_stx_lookup_class(stx,p->superclass);
xp_stx_assert (superclass != stx->nil);
while (superclass != stx->nil) {
superclass_obj = (xp_stx_class_t*)
XP_STX_WORD_OBJECT(stx,superclass);
spec += XP_STX_FROM_SMALLINT(superclass_obj->spec);
superclass = superclass_obj->superclass;
}
}
if (p->instance_variables != XP_NULL) { if (p->instance_variables != XP_NULL) {
n = __count_names (p->instance_variables); n = __count_names (p->instance_variables);
array = xp_stx_new_array (stx, n); array = xp_stx_new_array (stx, n);
__set_names (stx, XP_STX_DATA(stx,array), p->instance_variables); __set_names (stx, XP_STX_DATA(stx,array), p->instance_variables);
class_obj->variables = array; class_obj->variables = array;
xp_printf (L"%s, spec = %d\n", p->name, spec + n);
class_obj->spec = XP_STX_TO_SMALLINT(spec + n);
} }
if (p->class_variables != XP_NULL) { if (p->class_variables != XP_NULL) {