Changeset 2773

Timestamp:

03/20/08 11:11:27 (10 months ago)

Author:

ksprotte

Message:

fiveam: pulled patch 'make gen-character more robust'

Files:

• trunk/thirdparty/fiveam/_darcs/inventory (modified) (1 diff)
• trunk/thirdparty/fiveam/_darcs/patches/20080320094911-7ef6b-2d018cccef118c4f714ba775a1a1f8189a47d3d0.gz (added)
• trunk/thirdparty/fiveam/_darcs/prefs/defaultrepo (modified) (1 diff)
• trunk/thirdparty/fiveam/_darcs/prefs/repos (modified) (1 diff)
• trunk/thirdparty/fiveam/_darcs/pristine/src/random.lisp (modified) (1 diff)
• trunk/thirdparty/fiveam/src/random.lisp (modified) (1 diff)

trunk/thirdparty/fiveam/_darcs/inventory

@@ -237 +237 @@
-Maciek Pasternacki <maciekp@japhy.fnord.org>**20080210171224] 
-[added package nickname "TEST"
-
+
+
+
+
+
+

trunk/thirdparty/fiveam/_darcs/prefs/defaultrepo

@@ -1 @@
-private/tmp/ggg
+Users/paul/src/lisp

trunk/thirdparty/fiveam/_darcs/prefs/repos

@@ -1 +1 @@
-/private/tmp/ggg/fiveam
+/Users/paul/src/lisp/fiveam

trunk/thirdparty/fiveam/_darcs/pristine/src/random.lisp

@@ -201 +201 @@
-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))

trunk/thirdparty/fiveam/src/random.lisp

@@ -201 +201 @@
-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))