From 3e8db2c72ab53170ed96a57be5fad7d61bce5883 Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Sun, 22 May 2005 17:02:58 +0000
Subject: [PATCH] *** empty log message ***

---
 ase/stx/bootstrap.c | 89 +++++++++++++++++++++++++++++++++++----------
 ase/test/stx/stx.c  | 20 +++++++++-
 2 files changed, 88 insertions(+), 21 deletions(-)

diff --git a/ase/stx/bootstrap.c b/ase/stx/bootstrap.c
index 6030b394..4e65ed95 100644
--- a/ase/stx/bootstrap.c
+++ b/ase/stx/bootstrap.c
@@ -1,5 +1,5 @@
 /*
- * $Id: bootstrap.c,v 1.2 2005-05-22 16:26:58 bacon Exp $
+ * $Id: bootstrap.c,v 1.3 2005-05-22 17:02:58 bacon Exp $
  */
 
 #include <xp/stx/bootstrap.h>
@@ -10,6 +10,7 @@
 #include <xp/stx/misc.h>
 
 static void __create_bootstrapping_objects (xp_stx_t* stx);
+static void __create_builtin_classes (xp_stx_t* stx);
 
 struct class_info_t 
 {
@@ -95,6 +96,48 @@ static class_info_t class_info[] =
 		XP_NULL,
 		XP_NULL
 	},
+	{
+		T("Method"),
+		T("Object"),
+		T("text message bytecodes literals stackSize temporarySize class"),
+		XP_NULL,
+		XP_NULL
+	},
+	{
+		T("Magnitude"),
+		T("Object"),
+		XP_NULL,
+		XP_NULL,
+		XP_NULL
+	},
+	{
+		T("Collection"),
+		T("Magnitude"),
+		XP_NULL,
+		XP_NULL,
+		XP_NULL
+	},
+	{
+		T("IndexedCollection"),
+		T("Collection"),
+		XP_NULL,
+		XP_NULL,
+		XP_NULL
+	},
+	{
+		T("SymbolTable"),
+		T("IndexedCollection"),
+		XP_NULL,
+		XP_NULL,
+		XP_NULL
+	},
+	{
+		T("SystemDictionary"),
+		T("IndexedCollection"),
+		XP_NULL,
+		XP_NULL,
+		XP_NULL
+	},
 	{
 		XP_NULL,
 		XP_NULL,
@@ -111,12 +154,13 @@ int xp_stx_bootstrap (xp_stx_t* stx)
 	xp_stx_word_t tmp;
 
 	__create_bootstrapping_objects (stx);
+	__create_builtin_classes (stx);
 
 	/* more initialization */
 	XP_STX_CLASS(stx,stx->symbol_table) = 
-		xp_stx_new_class (stx, XP_STX_TEXT("SymbolTable"));
+		xp_stx_lookup_class (stx, XP_STX_TEXT("SymbolTable"));
 	XP_STX_CLASS(stx,stx->smalltalk) = 
-		xp_stx_new_class (stx, XP_STX_TEXT("SystemDictionary"));
+		xp_stx_lookup_class (stx, XP_STX_TEXT("SystemDictionary"));
 
 	symbol_Smalltalk = 
 		xp_stx_new_symbol (stx, XP_STX_TEXT("Smalltalk"));
@@ -124,6 +168,12 @@ int xp_stx_bootstrap (xp_stx_t* stx)
 		xp_stx_hash_char_object(stx,symbol_Smalltalk),
 		symbol_Smalltalk, stx->smalltalk);	
 
+	/* adjust the class-metaclass cycle */
+	class_Object = xp_stx_lookup_class (stx, XP_STX_TEXT("Object"));
+	class_Class = xp_stx_lookup_class (stx, XP_STX_TEXT("Class"));
+	tmp = XP_STX_CLASS(stx,class_Object);
+	XP_STX_AT(stx,tmp,XP_STX_CLASS_SUPERCLASS) = class_Class;
+
 	/* create #nil, #true, #false */
 	xp_stx_new_symbol (stx, XP_STX_TEXT("nil"));
 	xp_stx_new_symbol (stx, XP_STX_TEXT("true"));
@@ -131,23 +181,13 @@ int xp_stx_bootstrap (xp_stx_t* stx)
 
 	/* nil setClass: UndefinedObject */
 	XP_STX_CLASS(stx,stx->nil) =
-		xp_stx_new_class (stx, XP_STX_TEXT("UndefinedObject"));
+		xp_stx_lookup_class (stx, XP_STX_TEXT("UndefinedObject"));
 	/* true setClass: True */
 	XP_STX_CLASS(stx,stx->true) =
-		xp_stx_new_class (stx, XP_STX_TEXT("True"));
+		xp_stx_lookup_class (stx, XP_STX_TEXT("True"));
 	/* fales setClass: False */
 	XP_STX_CLASS(stx,stx->false) = 
-		xp_stx_new_class (stx, XP_STX_TEXT("False"));
-
-	/* weave the class-metaclass chain */
-	class_Object = xp_stx_new_class (stx, XP_STX_TEXT("Object"));
-	class_Class = xp_stx_new_class (stx, XP_STX_TEXT("Class"));
-	tmp = XP_STX_CLASS(stx,class_Object);
-	XP_STX_AT(stx,tmp,XP_STX_CLASS_SUPERCLASS) = class_Class;
-
-	/* useful classes */
-	stx->class_method = xp_stx_new_class (stx, XP_STX_TEXT("Method"));
-	stx->class_context = xp_stx_new_class (stx, XP_STX_TEXT("Context"));
+		xp_stx_lookup_class (stx, XP_STX_TEXT("False"));
 
 	return 0;
 }
@@ -260,13 +300,24 @@ static void __create_bootstrapping_objects (xp_stx_t* stx)
 }
 
 
-static void __create_classes (xp_stx_t* stx)
+static void __create_builtin_classes (xp_stx_t* stx)
 {
 	class_info_t* p = class_info;
+	xp_stx_word_t class;
+	xp_stx_class_t* class_obj;
 
 	while (p->name != XP_NULL) {
-		if (xp_stx_lookup_class(stx, p->name) == stx->nil) {
-			xp_stx_new_class (stx, p->name);
+		class = xp_stx_lookup_class(stx, p->name);
+		if (class == stx->nil) {
+			class = xp_stx_new_class (stx, p->name);
 		}
+
+		xp_stx_assert (class != stx->nil);
+		class_obj = (xp_stx_class_t*)XP_STX_WORD_OBJECT(stx, class);
+
+		class_obj->superclass = (p->superclass == XP_NULL)?
+			stx->nil: xp_stx_lookup_class(stx,p->superclass);
+
+		p++;
 	}
 }
diff --git a/ase/test/stx/stx.c b/ase/test/stx/stx.c
index bcd6dce4..db99a663 100644
--- a/ase/test/stx/stx.c
+++ b/ase/test/stx/stx.c
@@ -66,7 +66,7 @@ int xp_main (int argc, xp_char_t* argv[])
 	xp_printf (XP_TEXT("-------------\n"));
 
 	{
-		xp_size_t n;
+		xp_stx_word_t n;
 		xp_stx_class_t* obj;
 		n = xp_stx_lookup_class (&stx, XP_STX_TEXT("UndefinedObject"));
 		obj = (xp_stx_class_t*)XP_STX_WORD_OBJECT(&stx,n);
@@ -74,7 +74,23 @@ int xp_main (int argc, xp_char_t* argv[])
 			(unsigned long)obj->name,
 			XP_STX_DATA(&stx, obj->name));
 	}
-	
+	xp_printf (XP_TEXT("-------------\n"));
+
+	{
+		xp_stx_word_t n;
+		xp_stx_class_t* obj;
+
+		n = xp_stx_lookup_class (&stx, XP_STX_TEXT("SymbolTable"));
+		xp_printf (XP_TEXT("Class hierarchy for the class SymbolTable\n"));
+
+		while (n != stx.nil) {
+			obj = (xp_stx_class_t*)XP_STX_WORD_OBJECT(&stx,n);
+			xp_printf (XP_TEXT("%lu, %s\n"), 
+				(unsigned long)obj->name,
+				XP_STX_DATA(&stx, obj->name));
+			n = obj->superclass;
+		}
+	}
 	xp_printf (XP_TEXT("-------------\n"));
 
 	{