1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-04 14:20:26 +02:00

* snarf.h (SCM_CONST_LONG): Deprecated.

* tag.c (CONST_INUM): New macro.  Use it to define scm_utag_*.
This commit is contained in:
Keisuke Nishida 2001-03-16 05:11:34 +00:00
parent 6d583887bb
commit a9205f0774
3 changed files with 44 additions and 32 deletions

View file

@ -1,3 +1,8 @@
2001-03-16 Keisuke Nishida <kxn30@po.cwru.edu>
* snarf.h (SCM_CONST_LONG): Deprecated.
* tag.c (CONST_INUM): New macro. Use it to define scm_utag_*.
2001-03-15 Marius Vollmer <marius.vollmer@uni-dortmund.de> 2001-03-15 Marius Vollmer <marius.vollmer@uni-dortmund.de>
* numbers.c (scm_num2ulong): Check that a bignum is positive * numbers.c (scm_num2ulong): Check that a bignum is positive

View file

@ -183,9 +183,13 @@ SCM_SNARF_INIT(c_name = scm_permanent_object (scm_sysintern (scheme_name, init_v
SCM_SNARF_HERE(SCM c_name) \ SCM_SNARF_HERE(SCM c_name) \
SCM_SNARF_INIT(c_name = scm_permanent_object (scm_sysintern (scheme_name, init_val));) SCM_SNARF_INIT(c_name = scm_permanent_object (scm_sysintern (scheme_name, init_val));)
#if (SCM_DEBUG_DEPRECATED == 0)
#define SCM_CONST_LONG(c_name, scheme_name,value) \ #define SCM_CONST_LONG(c_name, scheme_name,value) \
SCM_VCELL_INIT(c_name, scheme_name, scm_long2num(value)) SCM_VCELL_INIT(c_name, scheme_name, scm_long2num(value))
#endif /* (SCM_DEBUG_DEPRECATED == 0) */
#ifdef SCM_MAGIC_SNARFER #ifdef SCM_MAGIC_SNARFER
#undef SCM_ASSERT #undef SCM_ASSERT
#define SCM_ASSERT(_cond, _arg, _pos, _subr) *&*&*&*SCM_ARG_BETTER_BE_IN_POSITION(_arg,_pos,__LINE__) #define SCM_ASSERT(_cond, _arg, _pos, _subr) *&*&*&*SCM_ARG_BETTER_BE_IN_POSITION(_arg,_pos,__LINE__)

View file

@ -50,42 +50,45 @@
#include "libguile/tag.h" #include "libguile/tag.h"
SCM_CONST_LONG (scm_utag_immediate_integer, "utag_immediate_integer", 0); #define CONST_INUM(c_name, scheme_name, value) \
SCM_CONST_LONG (scm_utag_immediate_char, "utag_immediate_char", 1); SCM_VCELL_INIT(c_name, scheme_name, SCM_MAKINUM (value))
SCM_CONST_LONG (scm_utag_pair, "utag_pair", 2);
SCM_CONST_LONG (scm_utag_closure, "utag_closure", 3); CONST_INUM (scm_utag_immediate_integer, "utag_immediate_integer", 0);
SCM_CONST_LONG (scm_utag_symbol, "utag_symbol", 4); CONST_INUM (scm_utag_immediate_char, "utag_immediate_char", 1);
SCM_CONST_LONG (scm_utag_vector, "utag_vector", 5); CONST_INUM (scm_utag_pair, "utag_pair", 2);
SCM_CONST_LONG (scm_utag_wvect, "utag_wvect", 6); CONST_INUM (scm_utag_closure, "utag_closure", 3);
CONST_INUM (scm_utag_symbol, "utag_symbol", 4);
CONST_INUM (scm_utag_vector, "utag_vector", 5);
CONST_INUM (scm_utag_wvect, "utag_wvect", 6);
#ifdef HAVE_ARRAYS #ifdef HAVE_ARRAYS
SCM_CONST_LONG (scm_utag_bvect, "utag_bvect", 7); CONST_INUM (scm_utag_bvect, "utag_bvect", 7);
SCM_CONST_LONG (scm_utag_byvect, "utag_byvect", 8); CONST_INUM (scm_utag_byvect, "utag_byvect", 8);
SCM_CONST_LONG (scm_utag_svect, "utag_svect", 9); CONST_INUM (scm_utag_svect, "utag_svect", 9);
SCM_CONST_LONG (scm_utag_ivect, "utag_ivect", 10); CONST_INUM (scm_utag_ivect, "utag_ivect", 10);
SCM_CONST_LONG (scm_utag_uvect, "utag_uvect", 11); CONST_INUM (scm_utag_uvect, "utag_uvect", 11);
SCM_CONST_LONG (scm_utag_fvect, "utag_fvect", 12); CONST_INUM (scm_utag_fvect, "utag_fvect", 12);
SCM_CONST_LONG (scm_utag_dvect, "utag_dvect", 13); CONST_INUM (scm_utag_dvect, "utag_dvect", 13);
SCM_CONST_LONG (scm_utag_cvect, "utag_cvect", 14); CONST_INUM (scm_utag_cvect, "utag_cvect", 14);
#endif #endif
SCM_CONST_LONG (scm_utag_string, "utag_string", 15); CONST_INUM (scm_utag_string, "utag_string", 15);
SCM_CONST_LONG (scm_utag_substring, "utag_substring", 17); CONST_INUM (scm_utag_substring, "utag_substring", 17);
SCM_CONST_LONG (scm_utag_asubr, "utag_asubr", 19); CONST_INUM (scm_utag_asubr, "utag_asubr", 19);
SCM_CONST_LONG (scm_utag_subr_0, "utag_subr_0", 20); CONST_INUM (scm_utag_subr_0, "utag_subr_0", 20);
SCM_CONST_LONG (scm_utag_subr_1, "utag_subr_1", 21); CONST_INUM (scm_utag_subr_1, "utag_subr_1", 21);
SCM_CONST_LONG (scm_utag_cxr, "utag_cxr", 22); CONST_INUM (scm_utag_cxr, "utag_cxr", 22);
SCM_CONST_LONG (scm_utag_subr_3, "utag_subr_3", 23); CONST_INUM (scm_utag_subr_3, "utag_subr_3", 23);
SCM_CONST_LONG (scm_utag_subr_2, "utag_subr_2", 24); CONST_INUM (scm_utag_subr_2, "utag_subr_2", 24);
SCM_CONST_LONG (scm_utag_rpsubr, "utag_rpsubr", 25); CONST_INUM (scm_utag_rpsubr, "utag_rpsubr", 25);
SCM_CONST_LONG (scm_utag_subr_1o, "utag_subr_1o", 26); CONST_INUM (scm_utag_subr_1o, "utag_subr_1o", 26);
SCM_CONST_LONG (scm_utag_subr_2o, "utag_subr_2o", 27); CONST_INUM (scm_utag_subr_2o, "utag_subr_2o", 27);
SCM_CONST_LONG (scm_utag_lsubr_2, "utag_lsubr_2", 28); CONST_INUM (scm_utag_lsubr_2, "utag_lsubr_2", 28);
SCM_CONST_LONG (scm_utag_lsubr, "utag_lsubr", 29); CONST_INUM (scm_utag_lsubr, "utag_lsubr", 29);
SCM_CONST_LONG (scm_utag_smob_base, "utag_smob_base", 252); CONST_INUM (scm_utag_smob_base, "utag_smob_base", 252);
SCM_CONST_LONG (scm_utag_port_base, "utag_port_base", 253); CONST_INUM (scm_utag_port_base, "utag_port_base", 253);
SCM_CONST_LONG (scm_utag_flag_base, "utag_flag_base", 254); CONST_INUM (scm_utag_flag_base, "utag_flag_base", 254);
SCM_CONST_LONG (scm_utag_struct_base, "utag_struct_base", 255); CONST_INUM (scm_utag_struct_base, "utag_struct_base", 255);
#if (SCM_DEBUG_DEPRECATED == 0) #if (SCM_DEBUG_DEPRECATED == 0)