Mercurial > hg > xemacs-beta
diff src/symbols.c @ 5117:3742ea8250b5 ben-lisp-object ben-lisp-object-final-ws-year-2005
Checking in final CVS version of workspace 'ben-lisp-object'
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Sat, 26 Dec 2009 00:20:27 -0600 |
| parents | b7f26b2f78bd |
| children | e0db3c197671 |
line wrap: on
line diff
--- a/src/symbols.c Sat Dec 26 00:20:16 2009 -0600 +++ b/src/symbols.c Sat Dec 26 00:20:27 2009 -0600 @@ -136,8 +136,7 @@ return external_remprop (&XSYMBOL (symbol)->plist, property, 0, ERROR_ME); } -DEFINE_BASIC_LRECORD_IMPLEMENTATION_WITH_PROPS ("symbol", symbol, - 1, /*dumpable-flag*/ +DEFINE_BASIC_LISP_OBJECT_WITH_PROPS ("symbol", symbol, mark_symbol, print_symbol, 0, 0, 0, symbol_description, symbol_getprop, @@ -1009,33 +1008,29 @@ { XD_END } }; -DEFINE_LRECORD_IMPLEMENTATION ("symbol-value-forward", +DEFINE_LISP_OBJECT ("symbol-value-forward", symbol_value_forward, - 1, /*dumpable-flag*/ 0, print_symbol_value_magic, 0, 0, 0, symbol_value_forward_description, struct symbol_value_forward); -DEFINE_LRECORD_IMPLEMENTATION ("symbol-value-buffer-local", +DEFINE_LISP_OBJECT ("symbol-value-buffer-local", symbol_value_buffer_local, - 1, /*dumpable-flag*/ mark_symbol_value_buffer_local, print_symbol_value_magic, 0, 0, 0, symbol_value_buffer_local_description, struct symbol_value_buffer_local); -DEFINE_LRECORD_IMPLEMENTATION ("symbol-value-lisp-magic", +DEFINE_LISP_OBJECT ("symbol-value-lisp-magic", symbol_value_lisp_magic, - 1, /*dumpable-flag*/ mark_symbol_value_lisp_magic, print_symbol_value_magic, 0, 0, 0, symbol_value_lisp_magic_description, struct symbol_value_lisp_magic); -DEFINE_LRECORD_IMPLEMENTATION ("symbol-value-varalias", +DEFINE_LISP_OBJECT ("symbol-value-varalias", symbol_value_varalias, - 1, /*dumpable-flag*/ mark_symbol_value_varalias, print_symbol_value_magic, 0, 0, 0, symbol_value_varalias_description, @@ -2187,8 +2182,8 @@ { struct symbol_value_buffer_local *bfwd - = ALLOC_LCRECORD_TYPE (struct symbol_value_buffer_local, - &lrecord_symbol_value_buffer_local); + = XSYMBOL_VALUE_BUFFER_LOCAL + (ALLOC_LISP_OBJECT (symbol_value_buffer_local)); Lisp_Object foo; bfwd->magic.type = SYMVAL_BUFFER_LOCAL; @@ -2295,8 +2290,8 @@ } /* Make sure variable is set up to hold per-buffer values */ - bfwd = ALLOC_LCRECORD_TYPE (struct symbol_value_buffer_local, - &lrecord_symbol_value_buffer_local); + bfwd = XSYMBOL_VALUE_BUFFER_LOCAL + (ALLOC_LISP_OBJECT (symbol_value_buffer_local)); bfwd->magic.type = SYMVAL_SOME_BUFFER_LOCAL; bfwd->current_buffer = Qnil; @@ -3015,8 +3010,9 @@ valcontents = XSYMBOL (variable)->value; if (!SYMBOL_VALUE_LISP_MAGIC_P (valcontents)) { - bfwd = ALLOC_LCRECORD_TYPE (struct symbol_value_lisp_magic, - &lrecord_symbol_value_lisp_magic); + bfwd = + XSYMBOL_VALUE_LISP_MAGIC + (ALLOC_LISP_OBJECT (symbol_value_lisp_magic)); bfwd->magic.type = SYMVAL_LISP_MAGIC; for (i = 0; i < MAGIC_HANDLER_MAX; i++) { @@ -3151,8 +3147,8 @@ invalid_change ("Variable is magic and cannot be aliased", variable); reject_constant_symbols (variable, Qunbound, 0, Qt); - bfwd = ALLOC_LCRECORD_TYPE (struct symbol_value_varalias, - &lrecord_symbol_value_varalias); + bfwd = + XSYMBOL_VALUE_VARALIAS (ALLOC_LISP_OBJECT (symbol_value_varalias)); bfwd->magic.type = SYMVAL_VARALIAS; bfwd->aliasee = alias; bfwd->shadowed = valcontents; @@ -3275,11 +3271,11 @@ void init_symbols_once_early (void) { - INIT_LRECORD_IMPLEMENTATION (symbol); - INIT_LRECORD_IMPLEMENTATION (symbol_value_forward); - INIT_LRECORD_IMPLEMENTATION (symbol_value_buffer_local); - INIT_LRECORD_IMPLEMENTATION (symbol_value_lisp_magic); - INIT_LRECORD_IMPLEMENTATION (symbol_value_varalias); + INIT_LISP_OBJECT (symbol); + INIT_LISP_OBJECT (symbol_value_forward); + INIT_LISP_OBJECT (symbol_value_buffer_local); + INIT_LISP_OBJECT (symbol_value_lisp_magic); + INIT_LISP_OBJECT (symbol_value_varalias); reinit_symbols_early ();