Random states of type random-state, not *random-state*.

* lib.c (compat_fixup): Call rand_compat_fixup.

* rand.c (random_state_var_s): New global symbol variable.
(rand_compat_fixup): New static function.
(rand_init): Initialize random_state_var_s by intering
the earmuffed symbol *random-state*. Initialize random_state_s
to the non-earmuffed symbol random-state.

* rand.h (random_state_var_s): Declared.
(random_state): Macro updated to look up the special
variable using random_state_var_s, rather than random_state_s.
(rand_compat_fixup): Declared.

1 files changed, 14 insertions, 3 deletions

diff --git a/rand.c b/rand.c
index b6ccdda2..b127dae0 100644
--- a/rand.c
+++ b/rand.c
@@ -44,6 +44,7 @@
 #include "signal.h"
 #include "unwind.h"
 #include "arith.h"
+#include "txr.h"
 #include "rand.h"
 #include "eval.h"
 
@@ -62,7 +63,7 @@ struct rand_state {
   unsigned cur;
 };
 
-val random_state_s;
+val random_state_s, random_state_var_s;
 
 static struct cobj_ops random_state_ops = cobj_ops_init(eq,
                                                         cobj_print_op,
@@ -261,8 +262,18 @@ val rnd(val modulus, val state)
   return random(state, modulus);
 }
 
+void rand_compat_fixup(int compat_ver)
+{
+  if (compat_ver <= 114) {
+    loc l = lookup_var_l(nil, random_state_var_s);
+    random_state_s = random_state_var_s;
+    set(l, make_random_state(num_fast(42)));
+  }
+}
+
 void rand_init(void)
 {
-  random_state_s = intern(lit("*random-state*"), user_package);
-  reg_var(random_state_s, make_random_state(num_fast(42)));
+  random_state_var_s = intern(lit("*random-state*"), user_package);
+  random_state_s = intern(lit("random-state"), user_package);
+  reg_var(random_state_var_s, make_random_state(num_fast(42)));
 }