Merge branch 'master' of git://factorcode.org/git/factor

2008-09-06 23:58:24 -05:00 · 2008-09-06 23:58:24 -05:00 · b8a273bc0f
parent dbd7b4f546 0589e061e1
commit b8a273bc0f
2 changed files with 7 additions and 4 deletions
--- a/extra/money/money.factor
+++ b/extra/money/money.factor
@ -6,14 +6,16 @@ IN: money
 : dollars/cents ( dollars -- dollars cents )
    100 * 100 /mod round ;

-: money. ( object -- )
-    dollars/cents
-    [
+: money>string ( object -- string )
+    dollars/cents [
        "$" %
        swap number>string
        <reversed> 3 group "," join <reversed> %
        "." % number>string 2 CHAR: 0 pad-left %
-    ] "" make print ;
+    ] "" make ;
+
+: money. ( object -- )
+    money>string print ;

 ERROR: not-a-decimal x ;

--- a/extra/spheres/tags.txt
+++ b/extra/spheres/tags.txt
@ -1,2 +1,3 @@
 opengl
 glsl
+demos