diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2012-04-10 16:11:15 -0700 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2012-04-10 16:11:15 -0700 |
commit | 38abf85defad8a15899687e35c7037bb2ddf42b0 (patch) | |
tree | 7ddde67b2bab7bb6b589249e6cb079f375c1a760 /lib.c | |
parent | 407377d0d945ccab189546ce0ce9d5f7d4a7f076 (diff) | |
download | txr-38abf85defad8a15899687e35c7037bb2ddf42b0.tar.gz txr-38abf85defad8a15899687e35c7037bb2ddf42b0.tar.bz2 txr-38abf85defad8a15899687e35c7037bb2ddf42b0.zip |
* arith.c (INT_PTR_MAX_MP): New static variable.
(in_int_ptr_range): New function.
(arith_init): Initialize INT_PTR_MAX_MP.
* arith.h (in_int_ptr_range): Declared.
* lib.c (c_num): Allow bignums to be converted to a cnum, if
they are in range, rather than allowing only fixnums.
* rand.c (make_random_state): Now that we have such a function,
initialize random seed using time value from time_sec_usec rather than
from time and clock. clock is bad for random seeding because it
measures virtual time since the start of the process.
Diffstat (limited to 'lib.c')
-rw-r--r-- | lib.c | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -1151,11 +1151,18 @@ val num(cnum n) cnum c_num(val num) { - switch (tag(num)) { - case TAG_CHR: case TAG_NUM: + switch (type(num)) { + case CHR: case NUM: return ((cnum) num) >> TAG_SHIFT; + case BGNUM: + if (in_int_ptr_range(num)) { + int_ptr_t out; + mp_get_intptr(mp(num), &out); + return out; + } + uw_throwf(error_s, lit("c_num: ~s is out of cnum range"), num, nao); default: - type_mismatch(lit("~s is not a fixnum"), num, nao); + type_mismatch(lit("c_num: ~s is not an integer"), num, nao); } } |