From 166927780f449e7b0c77345cad3150684d42d150 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Mon, 18 Jan 2016 06:42:10 -0800
Subject: New random-state-get-vec function.

* arith.c (UINT_PTR_MAX_MP): New static variable.
(biggnum_from_uintptr): New function.
(in_uint_ptr_range): New static function.
(c_uint_ptr_num): New function.
(arith_init): Initialize UINT_PTR_MAX_MP.

* arith.h (bignum_from_uintptr, c_uint_ptr_num): Declared.

* eval.c (eval_init): Register random-state-get-vec.

* mpi/mpi.c (mp_set_uintptr, mp_get_uintptr): New functions.
(mp_set_intptr, mp_get_intptr): Expressed in terms of
mp_set_uintptr and mp_get_uintptr.

* mpi/mpi.h (mp_set_uintptr, mp_get_uintptr): Declared.

* rand.c (make_random_state): Handle vector seed.
(random_state_get_vec): New function.

* rand.h (random_state_get_vec): Declared.

* txr.1: Documented new feature in make-random-state
and new random-state-get-vec function.
---
 rand.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'rand.c')

diff --git a/rand.c b/rand.c
index fe3b6044..e2d5c9d7 100644
--- a/rand.c
+++ b/rand.c
@@ -156,6 +156,18 @@ val make_random_state(val seed)
                                       cobj_handle(seed, random_state_s));
     *r = *rseed;
     copy = 1;
+  } else if (vectorp(seed)) {
+    int i;
+
+    if (length(seed) < num_fast(17))
+      uw_throwf(error_s, lit("make-random-state: vector ~s too short"),
+                seed, nao);
+
+    for (i = 0; i < 16; i++)
+      r->state[i] = c_uint_ptr_num(seed->v.vec[i]);
+
+    r->cur = c_num(seed->v.vec[i]);
+    copy = 1;
   } else {
     uw_throwf(error_s, lit("make-random-state: seed ~s is not a number"),
               seed, nao);
@@ -170,6 +182,22 @@ val make_random_state(val seed)
   return rs;
 }
 
+val random_state_get_vec(val state)
+{
+  struct rand_state *r = coerce(struct rand_state *,
+                                cobj_handle(default_arg(state, random_state),
+                                            random_state_s));
+  int i;
+  val vec = vector(num_fast(17), nil);
+
+  for (i = 0; i < 16; i++)
+    vec->v.vec[i] = normalize(bignum_from_uintptr(r->state[i]));
+
+  vec->v.vec[i] = num(r->cur);
+
+  return vec;
+}
+
 val random_fixnum(val state)
 {
   struct rand_state *r = coerce(struct rand_state *,
-- 
cgit v1.2.3