From 99788ea850ff5cfcf0fc0639b87a989b5e8dc2ce Mon Sep 17 00:00:00 2001
From: hyung-hwan <hyunghwan.chung@gmail.com>
Date: Thu, 18 Aug 2005 15:16:39 +0000
Subject: [PATCH] *** empty log message ***

---
 ase/stx/array.h     |  4 +--
 ase/stx/bootstrp.h  |  4 +--
 ase/stx/builtin.h   |  9 -------
 ase/stx/bytecode.h  |  4 +--
 ase/stx/class.h     |  4 +--
 ase/stx/context.h   |  4 +--
 ase/stx/dict.h      |  4 +--
 ase/stx/interp.h    |  4 +--
 ase/stx/makefile.cl |  2 +-
 ase/stx/memory.h    |  4 +--
 ase/stx/method.h    |  4 +--
 ase/stx/misc.h      |  4 +--
 ase/stx/name.h      |  4 +--
 ase/stx/object.h    |  4 +--
 ase/stx/parser.h    |  4 +--
 ase/stx/stx.c       |  4 +--
 ase/stx/stx.h       | 50 +-------------------------------------
 ase/stx/stxi.h      | 59 +++++++++++++++++++++++++++++++++++++++++++++
 18 files changed, 89 insertions(+), 87 deletions(-)
 delete mode 100644 ase/stx/builtin.h
 create mode 100644 ase/stx/stxi.h

diff --git a/ase/stx/array.h b/ase/stx/array.h
index 3e03bc94..7bf5fce0 100644
--- a/ase/stx/array.h
+++ b/ase/stx/array.h
@@ -1,11 +1,11 @@
 /*
- * $Id: array.h,v 1.1 2005-08-15 16:03:57 bacon Exp $
+ * $Id: array.h,v 1.2 2005-08-18 15:16:39 bacon Exp $
  */
 
 #ifndef _XP_STX_ARRAY_H_
 #define _XP_STX_ARRAY_H_
 
-#include <xp/stx/stx.h>
+#include <xp/stx/stxi.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ase/stx/bootstrp.h b/ase/stx/bootstrp.h
index 91ac2d53..712311dd 100644
--- a/ase/stx/bootstrp.h
+++ b/ase/stx/bootstrp.h
@@ -1,11 +1,11 @@
 /*
- * $Id: bootstrp.h,v 1.6 2005-07-11 13:41:59 bacon Exp $
+ * $Id: bootstrp.h,v 1.7 2005-08-18 15:16:39 bacon Exp $
  */
 
 #ifndef _XP_STX_BOOTSTRP_H_
 #define _XP_STX_BOOTSTRP_H_
 
-#include <xp/stx/stx.h>
+#include <xp/stx/stxi.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ase/stx/builtin.h b/ase/stx/builtin.h
deleted file mode 100644
index ba36da27..00000000
--- a/ase/stx/builtin.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * $Id: builtin.h,v 1.1 2005-07-16 04:50:19 bacon Exp $
- */
-
-#ifndef _XP_STX_BUILTIN_H_
-#define _XP_STX_BUILTIN_H_
-
-
-#endif
diff --git a/ase/stx/bytecode.h b/ase/stx/bytecode.h
index 34cd394b..a3656127 100644
--- a/ase/stx/bytecode.h
+++ b/ase/stx/bytecode.h
@@ -1,11 +1,11 @@
 /*
- * $Id: bytecode.h,v 1.8 2005-08-11 16:16:04 bacon Exp $
+ * $Id: bytecode.h,v 1.9 2005-08-18 15:16:39 bacon Exp $
  */
 
 #ifndef _XP_STX_BYTECODE_H_
 #define _XP_STX_BYTECODE_H_
 
-#include <xp/stx/stx.h>
+#include <xp/stx/stxi.h>
 
 #define PUSH_RECEIVER_VARIABLE            0x00
 #define PUSH_TEMPORARY_LOCATION           0x10
diff --git a/ase/stx/class.h b/ase/stx/class.h
index 8df46de7..7886572e 100644
--- a/ase/stx/class.h
+++ b/ase/stx/class.h
@@ -1,11 +1,11 @@
 /*
- * $Id: class.h,v 1.11 2005-07-05 04:29:31 bacon Exp $
+ * $Id: class.h,v 1.12 2005-08-18 15:16:39 bacon Exp $
  */
 
 #ifndef _XP_STX_CLASS_H_
 #define _XP_STX_CLASS_H_
 
-#include <xp/stx/stx.h>
+#include <xp/stx/stxi.h>
 
 /* definitions for common objects */
 #define XP_STX_CLASS_SIZE              8
diff --git a/ase/stx/context.h b/ase/stx/context.h
index 50af8a97..217d90c9 100644
--- a/ase/stx/context.h
+++ b/ase/stx/context.h
@@ -1,11 +1,11 @@
 /* 
- * $Id: context.h,v 1.3 2005-06-08 16:00:51 bacon Exp $
+ * $Id: context.h,v 1.4 2005-08-18 15:16:39 bacon Exp $
  */
 
 #ifndef _XP_STX_CONTEXT_H_
 #define _XP_STX_CONTEXT_H_
 
-#include <xp/stx/stx.h>
+#include <xp/stx/stxi.h>
 
 #define PUSH_OBJECT 0xA0
 #define SEND_UNARY_MESSAGE 0xB0
diff --git a/ase/stx/dict.h b/ase/stx/dict.h
index f5b28f42..a6468c86 100644
--- a/ase/stx/dict.h
+++ b/ase/stx/dict.h
@@ -1,11 +1,11 @@
 /*
- * $Id: dict.h,v 1.2 2005-07-19 12:08:04 bacon Exp $
+ * $Id: dict.h,v 1.3 2005-08-18 15:16:39 bacon Exp $
  */
 
 #ifndef _XP_STX_DICT_H_
 #define _XP_STX_DICT_H_
 
-#include <xp/stx/stx.h>
+#include <xp/stx/stxi.h>
 
 #define XP_STX_ASSOCIATION_SIZE  2
 #define XP_STX_ASSOCIATION_KEY   0
diff --git a/ase/stx/interp.h b/ase/stx/interp.h
index 95ca7aa3..9a43cfa9 100644
--- a/ase/stx/interp.h
+++ b/ase/stx/interp.h
@@ -1,11 +1,11 @@
 /*
- * $Id: interp.h,v 1.2 2005-07-07 07:45:05 bacon Exp $
+ * $Id: interp.h,v 1.3 2005-08-18 15:16:39 bacon Exp $
  */
 
 #ifndef _XP_STX_INTERP_H_
 #define _XP_STX_INTERP_H_
 
-#include <xp/stx/stx.h>
+#include <xp/stx/stxi.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ase/stx/makefile.cl b/ase/stx/makefile.cl
index 0530b2f0..6f6b7511 100644
--- a/ase/stx/makefile.cl
+++ b/ase/stx/makefile.cl
@@ -1,6 +1,6 @@
 SRCS = \
 	stx.c memory.c object.c symbol.c class.c array.c \
-	dict.c misc.c context.c name.c token.c parser.c bootstrp.c \
+	dict.c misc.c name.c token.c parser.c bootstrp.c \
 	bytecode.c interp.c 
 OBJS = $(SRCS:.c=.obj)
 OUT = xpstx.lib
diff --git a/ase/stx/memory.h b/ase/stx/memory.h
index 7f3b4319..3d62855b 100644
--- a/ase/stx/memory.h
+++ b/ase/stx/memory.h
@@ -1,11 +1,11 @@
 /*
- * $Id: memory.h,v 1.6 2005-06-08 16:00:51 bacon Exp $
+ * $Id: memory.h,v 1.7 2005-08-18 15:16:39 bacon Exp $
  */
 
 #ifndef _XP_STX_MEMORY_H_
 #define _XP_STX_MEMORY_H_
 
-#include <xp/stx/stx.h>
+#include <xp/stx/stxi.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ase/stx/method.h b/ase/stx/method.h
index f4c9d126..fc0af2cf 100644
--- a/ase/stx/method.h
+++ b/ase/stx/method.h
@@ -1,11 +1,11 @@
 /*
- * $Id: method.h,v 1.3 2005-08-16 15:49:04 bacon Exp $
+ * $Id: method.h,v 1.4 2005-08-18 15:16:39 bacon Exp $
  */
 
 #ifndef _XP_STX_METHOD_H_
 #define _XP_STX_METHOD_H_
 
-#include <xp/stx/stx.h>
+#include <xp/stx/stxi.h>
 
 #define XP_STX_METHOD_SIZE           3
 #define XP_STX_METHOD_TEXT           0
diff --git a/ase/stx/misc.h b/ase/stx/misc.h
index 22e50e4d..217c3072 100644
--- a/ase/stx/misc.h
+++ b/ase/stx/misc.h
@@ -1,11 +1,11 @@
 /*
- * $Id: misc.h,v 1.13 2005-07-07 16:32:37 bacon Exp $
+ * $Id: misc.h,v 1.14 2005-08-18 15:16:39 bacon Exp $
  */
 
 #ifndef _XP_STX_MISC_H_
 #define _XP_STX_MISC_H_
 
-#include <xp/stx/stx.h>
+#include <xp/stx/stxi.h>
 
 /* TODO: remove this header later */
 #include <xp/bas/stdio.h>
diff --git a/ase/stx/name.h b/ase/stx/name.h
index 568c602a..2bfa7d74 100644
--- a/ase/stx/name.h
+++ b/ase/stx/name.h
@@ -1,11 +1,11 @@
 /*
- * $Id: name.h,v 1.1 2005-06-12 16:22:03 bacon Exp $
+ * $Id: name.h,v 1.2 2005-08-18 15:16:39 bacon Exp $
  */
 
 #ifndef _XP_STX_NAME_H_
 #define _XP_STX_NAME_H_
 
-#include <xp/stx/stx.h>
+#include <xp/stx/stxi.h>
 
 struct xp_stx_name_t 
 {
diff --git a/ase/stx/object.h b/ase/stx/object.h
index e0df1b7c..eb830445 100644
--- a/ase/stx/object.h
+++ b/ase/stx/object.h
@@ -1,11 +1,11 @@
 /*
- * $Id: object.h,v 1.28 2005-07-19 15:52:19 bacon Exp $
+ * $Id: object.h,v 1.29 2005-08-18 15:16:39 bacon Exp $
  */
 
 #ifndef _XP_STX_OBJECT_H_
 #define _XP_STX_OBJECT_H_
 
-#include <xp/stx/stx.h>
+#include <xp/stx/stxi.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ase/stx/parser.h b/ase/stx/parser.h
index a62ff29f..d531d77d 100644
--- a/ase/stx/parser.h
+++ b/ase/stx/parser.h
@@ -1,11 +1,11 @@
 /*
- * $Id: parser.h,v 1.32 2005-07-11 13:41:59 bacon Exp $
+ * $Id: parser.h,v 1.33 2005-08-18 15:16:39 bacon Exp $
  */
 
 #ifndef _XP_STX_PARSER_H_
 #define _XP_STX_PARSER_H_
 
-#include <xp/stx/stx.h>
+#include <xp/stx/stxi.h>
 #include <xp/stx/name.h>
 #include <xp/stx/token.h>
 #include <xp/bas/array.h>
diff --git a/ase/stx/stx.c b/ase/stx/stx.c
index 193e4434..80a825cf 100644
--- a/ase/stx/stx.c
+++ b/ase/stx/stx.c
@@ -1,8 +1,8 @@
 /*
- * $Id: stx.c,v 1.37 2005-08-15 16:03:57 bacon Exp $
+ * $Id: stx.c,v 1.38 2005-08-18 15:16:39 bacon Exp $
  */
 
-#include <xp/stx/stx.h>
+#include <xp/stx/stxi.h>
 #include <xp/stx/memory.h>
 #include <xp/stx/misc.h>
 
diff --git a/ase/stx/stx.h b/ase/stx/stx.h
index 5dab3900..9649a4ed 100644
--- a/ase/stx/stx.h
+++ b/ase/stx/stx.h
@@ -1,5 +1,5 @@
 /*
- * $Id: stx.h,v 1.41 2005-08-15 16:03:57 bacon Exp $
+ * $Id: stx.h,v 1.42 2005-08-18 15:16:39 bacon Exp $
  */
 
 #ifndef _XP_STX_STX_H_
@@ -13,7 +13,6 @@ typedef struct xp_stx_object_t xp_stx_object_t;
 typedef struct xp_stx_word_object_t xp_stx_word_object_t;
 typedef struct xp_stx_byte_object_t xp_stx_byte_object_t;
 typedef struct xp_stx_char_object_t xp_stx_char_object_t;
-typedef struct xp_stx_memory_t xp_stx_memory_t;
 typedef struct xp_stx_t xp_stx_t;
 
 /* common object structure */
@@ -49,53 +48,6 @@ struct xp_stx_char_object_t
 	xp_char_t data[1];
 };
 
-struct xp_stx_memory_t
-{
-	xp_word_t capacity;
-	xp_stx_object_t** slots;
-	xp_stx_object_t** free;
-	xp_bool_t __malloced;
-};
-
-struct xp_stx_symtab_t
-{
-	xp_word_t* datum;
-	xp_word_t  size;
-	xp_word_t  capacity;
-};
-
-typedef struct xp_stx_symtab_t xp_stx_symtab_t;
-
-struct xp_stx_t
-{
-	xp_stx_memory_t memory;
-	xp_stx_symtab_t symtab;
-
-	xp_word_t nil;
-	xp_word_t true;
-	xp_word_t false;
-
-	xp_word_t smalltalk;
-
-	xp_word_t class_symbol;
-	xp_word_t class_metaclass;
-	xp_word_t class_association;
-
-	xp_word_t class_object;
-	xp_word_t class_class;
-	xp_word_t class_array;
-	xp_word_t class_bytearray;
-	xp_word_t class_string;
-	xp_word_t class_character;
-	xp_word_t class_context;
-	xp_word_t class_system_dictionary;
-	xp_word_t class_method;
-	xp_word_t class_smallinteger;
-
-	xp_bool_t __malloced;
-	xp_bool_t __wantabort; /* TODO: make it a function pointer */
-};
-
 #define XP_STX_IS_SMALLINT(x)   (((x) & 0x01) == 0x01)
 #define XP_STX_TO_SMALLINT(x)   (((x) << 1) | 0x01)
 #define XP_STX_FROM_SMALLINT(x) ((x) >> 1)
diff --git a/ase/stx/stxi.h b/ase/stx/stxi.h
new file mode 100644
index 00000000..69f3f902
--- /dev/null
+++ b/ase/stx/stxi.h
@@ -0,0 +1,59 @@
+/*
+ * $Id: stxi.h,v 1.1 2005-08-18 15:16:39 bacon Exp $
+ */
+
+#ifndef _XP_STX_STXI_H_
+#define _XP_STX_STXI_H_
+
+#include <xp/stx/stx.h>
+
+typedef struct xp_stx_memory_t xp_stx_memory_t;
+typedef struct xp_stx_symtab_t xp_stx_symtab_t;
+
+struct xp_stx_memory_t
+{
+	xp_word_t capacity;
+	xp_stx_object_t** slots;
+	xp_stx_object_t** free;
+	xp_bool_t __malloced;
+};
+
+struct xp_stx_symtab_t
+{
+	xp_word_t* datum;
+	xp_word_t  size;
+	xp_word_t  capacity;
+};
+
+
+struct xp_stx_t
+{
+	xp_stx_memory_t memory;
+	xp_stx_symtab_t symtab;
+
+	xp_word_t nil;
+	xp_word_t true;
+	xp_word_t false;
+
+	xp_word_t smalltalk;
+
+	xp_word_t class_symbol;
+	xp_word_t class_metaclass;
+	xp_word_t class_association;
+
+	xp_word_t class_object;
+	xp_word_t class_class;
+	xp_word_t class_array;
+	xp_word_t class_bytearray;
+	xp_word_t class_string;
+	xp_word_t class_character;
+	xp_word_t class_context;
+	xp_word_t class_system_dictionary;
+	xp_word_t class_method;
+	xp_word_t class_smallinteger;
+
+	xp_bool_t __malloced;
+	xp_bool_t __wantabort; /* TODO: make it a function pointer */
+};
+
+#endif