Changeset 3614

Timestamp:

09/08/03 12:38:05 (20 years ago)

Author:

piso

Message:

RANDOM: limit must be positive integer or positive float.

File:

• trunk/j/src/org/armedbear/lisp/Primitives.java (modified) (2 diffs)

trunk/j/src/org/armedbear/lisp/Primitives.java

@@ -3 +3 @@
  *
  * Copyright (C) 2002-2003 Peter Graves
- * $Id: Primitives.java,v 1.374 2003-09-08 02:35:47 piso Exp $
+ * $Id: Primitives.java,v 1.375 2003-09-08 12:38:05 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -4193 +4193 @@
             if (args[0] instanceof Fixnum) {
                 int limit = ((Fixnum)args[0]).getValue();
-                int n = random.nextInt((int)limit);
-                Debug.assertTrue(n < limit);
-                return new Fixnum(n);
-            }
-            if (args[0] instanceof Bignum) {
+                if (limit > 0) {
+                    int n = random.nextInt((int)limit);
+                    return new Fixnum(n);
+                }
+            } else if (args[0] instanceof Bignum) {
                 BigInteger limit = ((Bignum)args[0]).getValue();
-                int bitLength = limit.bitLength();
-                BigInteger rand = new BigInteger(bitLength + 1, random);
-                BigInteger remainder = rand.remainder(limit);
-                return number(remainder);
-            }
-            if (args[0] instanceof LispFloat) {
+                if (limit.signum() > 0) {
+                    int bitLength = limit.bitLength();
+                    BigInteger rand = new BigInteger(bitLength + 1, random);
+                    BigInteger remainder = rand.remainder(limit);
+                    return number(remainder);
+                }
+            } else if (args[0] instanceof LispFloat) {
                 double limit = ((LispFloat)args[0]).getValue();
-                double rand = random.nextDouble();
-                return new LispFloat(rand * limit);
-            }
-            throw new TypeError(args[0], "number");
+                if (limit > 0) {
+                    double rand = random.nextDouble();
+                    return new LispFloat(rand * limit);
+                }
+            }
+            throw new TypeError(args[0], "positive integer or positive float");
         }
     };