From: Kilian Sprotte <kilian.sprotte@gmail.com>
Date: Thu, 20 Mar 2008 09:49:11 +0000 (+0100)
Subject: make gen-character more robust
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=037999f6c29bbb66aabaa85c8c46c21e20a897c1;p=fiveam.git

make gen-character more robust
code-char is allowed to return NIL for a given code.
gen-character now checks for this, so that it will always
return a character.
---

diff --git a/src/random.lisp b/src/random.lisp
index 53f423b..f46d3ba 100644
--- a/src/random.lisp
+++ b/src/random.lisp
@@ -200,16 +200,16 @@ CODE must be a generator of random integers. ALPHANUMERICP, if
 non-NIL, limits the returned chars to those which pass
 alphanumericp."
   (lambda ()
-    (if alphanumericp            
-        (loop
-           for count upfrom 0
-           for char = (code-char (funcall code))
-           until (alphanumericp char)
-           when (= 1000 count)
-             do (error "After 1000 iterations ~S has still not generated an alphanumeric character :(."
-                       code)
-           finally (return char))
-        (code-char (funcall code)))))
+    (loop
+       for count upfrom 0
+       for char = (code-char (funcall code))
+       until (and char
+                  (or (not alphanumericp)
+                      (alphanumericp char)))
+       when (= 1000 count)
+       do (error "After 1000 iterations ~S has still not generated ~:[a valid~;an alphanumeric~] character :(."
+                 code alphanumericp)
+       finally (return char))))
 
 (defun gen-string (&key (length (gen-integer :min 0 :max 80))
                         (elements (gen-character))