diff --git a/ase/stx/bootstrp.c b/ase/stx/bootstrp.c index 7e221f37..43d4c105 100644 --- a/ase/stx/bootstrp.c +++ b/ase/stx/bootstrp.c @@ -1,5 +1,5 @@ /* - * $Id: bootstrp.c,v 1.5 2005-05-24 03:28:31 bacon Exp $ + * $Id: bootstrp.c,v 1.6 2005-05-24 03:29:43 bacon Exp $ */ #include @@ -47,7 +47,7 @@ static class_info_t class_info[] = { XP_STX_TEXT("Behavior"), XP_STX_TEXT("Object"), - XP_STX_TEXT("name instanceSize methods superclass intsanceVariables classVariables poolDictionaries category"), + XP_STX_TEXT("name instanceSize methods superclass intsanceVariables classVariables poolDictionaries"), XP_NULL, XP_NULL, 0 diff --git a/ase/stx/class.c b/ase/stx/class.c index 163087db..072434a6 100644 --- a/ase/stx/class.c +++ b/ase/stx/class.c @@ -1,5 +1,5 @@ /* - * $Id: class.c,v 1.5 2005-05-24 03:28:31 bacon Exp $ + * $Id: class.c,v 1.6 2005-05-24 03:29:43 bacon Exp $ */ #include @@ -31,7 +31,7 @@ xp_stx_word_t xp_stx_new_class (xp_stx_t* stx, const xp_stx_char_t* name) return class; } -xp_stx_word_t xp_stx_new_metaclass (xp_stx_t* stx, xp_stx_word class) +xp_stx_word_t xp_stx_new_metaclass (xp_stx_t* stx, xp_stx_word_t class) { meta = xp_stx_alloc_word_object (stx, XP_STX_METACLASS_SIZE); meta_obj = meta; diff --git a/ase/stx/class.h b/ase/stx/class.h index cbf89d27..cff6e9e6 100644 --- a/ase/stx/class.h +++ b/ase/stx/class.h @@ -1,5 +1,5 @@ /* - * $Id: class.h,v 1.2 2005-05-24 03:28:31 bacon Exp $ + * $Id: class.h,v 1.3 2005-05-24 03:29:43 bacon Exp $ */ #ifndef _XP_STX_CLASS_H_ @@ -8,7 +8,7 @@ #include /* definitions for common objects */ -#define XP_STX_CLASS_SIZE 8 +#define XP_STX_CLASS_SIZE 7 #define XP_STX_CLASS_NAME 0 #define XP_STX_CLASS_SPEC 1 #define XP_STX_CLASS_METHODS 2 @@ -16,7 +16,6 @@ #define XP_STX_CLASS_VARIABLES 4 #define XP_STX_CLASS_CLASSVARS 5 #define XP_STX_CLASS_POOLDICT 6 -#define XP_STX_CLASS_CATEGORY 7 #define XP_STX_METACLASS_SIZE 6 #define XP_STX_METACLASS_NAME 0 @@ -36,7 +35,6 @@ struct xp_stx_class_t xp_stx_word_t variables; xp_stx_word_t classvars; xp_stx_word_t pooldict; - xp_stx_word_t category; }; struct xp_stx_metaclass_t diff --git a/ase/stx/parser.c b/ase/stx/parser.c index ea18bea9..96d96e4f 100644 --- a/ase/stx/parser.c +++ b/ase/stx/parser.c @@ -1,5 +1,5 @@ /* - * $Id: parser.c,v 1.4 2005-05-23 14:43:03 bacon Exp $ + * $Id: parser.c,v 1.5 2005-05-24 03:28:31 bacon Exp $ */ #include @@ -64,4 +64,5 @@ int xp_stx_filein_raw (xp_stx_t* stx, xp_stx_getc_t getc) int xp_stx_get_token () { /* getc */ + return 0; }