diff options
author | Marius Vollmer <mvo@zagadka.de> | 2004-07-23 15:43:02 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2004-07-23 15:43:02 +0000 |
commit | e11e83f3d99305ada6354cae7123fb8c0e998703 (patch) | |
tree | 23dccd2a0fd1741abb8561214acadc347036480b /libguile/srcprop.c | |
parent | 928e0f421070bb610f3375d5808a6378d5edfa1b (diff) | |
download | guile-e11e83f3d99305ada6354cae7123fb8c0e998703.tar.gz |
* deprecated.h, deprecated.c, numbers.h (SCM_INUMP, SCM_NINUMP,
SCM_INUM): Deprecated by reenaming them to SCM_I_INUMP, SCM_I_NINUMP
and SCM_I_INUM, respectively and adding deprecated versions to
deprecated.h and deprecated.c. Changed all uses to either use the
SCM_I_ variants or scm_is_*, scm_to_*, or scm_from_*, as appropriate.
Diffstat (limited to 'libguile/srcprop.c')
-rw-r--r-- | libguile/srcprop.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libguile/srcprop.c b/libguile/srcprop.c index a237fb06c..72f2db490 100644 --- a/libguile/srcprop.c +++ b/libguile/srcprop.c @@ -141,8 +141,8 @@ scm_srcprops_to_plist (SCM obj) plist = scm_acons (scm_sym_copy, SRCPROPCOPY (obj), plist); if (!SCM_UNBNDP (SRCPROPFNAME (obj))) plist = scm_acons (scm_sym_filename, SRCPROPFNAME (obj), plist); - plist = scm_acons (scm_sym_column, SCM_I_MAKINUM (SRCPROPCOL (obj)), plist); - plist = scm_acons (scm_sym_line, SCM_I_MAKINUM (SRCPROPLINE (obj)), plist); + plist = scm_acons (scm_sym_column, scm_from_int (SRCPROPCOL (obj)), plist); + plist = scm_acons (scm_sym_line, scm_from_int (SRCPROPLINE (obj)), plist); plist = scm_acons (scm_sym_breakpoint, scm_from_bool (SRCPROPBRK (obj)), plist); return plist; } @@ -203,8 +203,8 @@ SCM_DEFINE (scm_source_property, "source-property", 2, 0, 0, if (!SRCPROPSP (p)) goto plist; if (SCM_EQ_P (scm_sym_breakpoint, key)) p = scm_from_bool (SRCPROPBRK (p)); - else if (SCM_EQ_P (scm_sym_line, key)) p = SCM_I_MAKINUM (SRCPROPLINE (p)); - else if (SCM_EQ_P (scm_sym_column, key)) p = SCM_I_MAKINUM (SRCPROPCOL (p)); + else if (SCM_EQ_P (scm_sym_line, key)) p = scm_from_int (SRCPROPLINE (p)); + else if (SCM_EQ_P (scm_sym_column, key)) p = scm_from_int (SRCPROPCOL (p)); else if (SCM_EQ_P (scm_sym_filename, key)) p = SRCPROPFNAME (p); else if (SCM_EQ_P (scm_sym_copy, key)) p = SRCPROPCOPY (p); else @@ -310,7 +310,7 @@ scm_init_srcprop () scm_set_smob_free (scm_tc16_srcprops, srcprops_free); scm_set_smob_print (scm_tc16_srcprops, srcprops_print); - scm_source_whash = scm_make_weak_key_hash_table (SCM_I_MAKINUM (2047)); + scm_source_whash = scm_make_weak_key_hash_table (scm_from_int (2047)); scm_c_define ("source-whash", scm_source_whash); #include "libguile/srcprop.x" |