fix mandel.factor

diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index b6cacd1dd572d285e98e6c02687934f3268d1b5c..7202a609b633c8496adfd101bc6dad0a34068ea8 100644 (file)
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -38,6 +38,7 @@
 - FactorLib.equal() not very good\r
 - do nset-nth, nremove-nth, nsubstitute, ninject\r
 - IN: format base: work with all types of numbers\r
+- investigate mandel.factor\r
 \r
 + listener/plugin:\r
 \r

diff --git a/contrib/mandel.factor b/contrib/mandel.factor
index 7db6c076d8ef9133c6ea309ed307a3807e611d61..fa48a2c7e80b4cd49c347127c0ac5e32d4d09970 100644 (file)
--- a/contrib/mandel.factor
+++ b/contrib/mandel.factor
@@ -13,7 +13,6 @@
 !                (princ (code-char c))))
 !        (format t "~%"))
 
-USE: arithmetic
 USE: combinators
 USE: math
 USE: prettyprint
@@ -28,14 +27,14 @@ USE: strings
         r> f
     ] ifte ;
 
-: mandel-step ( a z c -- c )
-    [ ?mandel-step ] [ ] while nip nip ;
+: mandel-step ( a z c -- )
+    [ ?mandel-step ] [ ] while >char write 2drop ;
 
 : mandel-x ( x y -- )
-    rect> dup CHAR: ~ mandel-step >char write ;
+    rect> dup CHAR: ~ mandel-step ;
 
 : mandel-y ( y -- )
-    75 [ dupd 25 / 2 - swap mandel-x ] times* drop terpri ;
+    75 [ dupd 25 / 2 - >float swap mandel-x ] times* drop ;
 
 : mandel ( -- )
-    21 [ 10 / 1 - mandel-y ] times* ;
+    21 [ 10 / 1 - >float mandel-y terpri ] times* ;