eatspaces now eats comments

[scheme.forth.jl.git] / scheme-primitives.4th

diff --git a/scheme-primitives.4th b/scheme-primitives.4th
index 8e83f97..b268051 100644 (file)
--- a/scheme-primitives.4th
+++ b/scheme-primitives.4th
@@ -64,15 +64,25 @@
     drop character-type
 ; make-primitive integer->char
 
-: build-fixnum-charlist ( num )
-    dup 0= if
-        nil
-    else
-        dup 10 / recurse
-        rot 10 mod [char] 0 + character-type 2swap
-        cons
+: num-to-charlist ( num -- charlist )
+    ?dup 0= if
+        [char] 0 character-type nil cons
+        exit
     then
+
+    nil rot
+
+    begin
+        ?dup 0>
+    while
+        dup 10 mod swap 10 / swap
+        2swap rot
+        [char] 0 + character-type 2swap
+        cons
+        rot
+    repeat
 ;
+
 :noname ( args -- string )
     2dup 1 ensure-arg-count
     car fixnum-type ensure-arg-type
@@ -80,8 +90,7 @@
     drop
 
     dup 0< swap abs ( bool num )
-    build-fixnum-charlist
-    rot drop
+    num-to-charlist
     rot if
         [char] - character-type 2swap cons
     then
@@ -89,7 +98,39 @@
     drop string-type
 ; make-primitive number->string
 
-( = Arithmeic = )
+:noname ( args -- symbol )
+    2dup 1 ensure-arg-count
+    car string-type ensure-arg-type
+
+    drop pair-type
+
+    2dup car [char] - character-type objeq? if
+        cdr
+        true -rot
+    else
+        2dup car [char] + character-type objeq? if
+            cdr
+        then
+        false -rot
+    then
+
+    0 -rot
+    begin
+        2dup nil objeq? false =
+    while
+        2dup car drop [char] 0 - -rot
+        2swap swap 10 * + -rot
+        cdr
+    repeat
+
+    2drop
+
+    swap if -1 * then
+
+    fixnum-type
+; make-primitive string->number
+
+( = Arithmetic = )
 
 : add-prim ( args -- fixnum )
     2dup nil objeq? if