Migrated more functions to util

Makefile

@@ -1,7 +1,10 @@
 TESTSCM = unit-tests
 TESTFILES = $(addprefix tests/, $(addsuffix .scm, $(TESTSCM)))
 
-all: cyclone scheme/base.o scheme/read.o scheme/write.o scheme/char.o scheme/eval.o scheme/file.o icyc
+all: cyclone scheme/base.o scheme/read.o scheme/write.o scheme/char.o scheme/eval.o scheme/file.o icyc scheme/cyclone/util.o
+
+scheme/cyclone/util.o: cyclone scheme/cyclone/util.sld
+	./cyclone scheme/cyclone/util.sld
 
 scheme/base.o: cyclone scheme/base.sld
 	./cyclone scheme/base.sld

transforms.scm

@@ -190,17 +190,6 @@
     (define (void) (if #f #t)))
   (else #f))
 
-; char->natural : char -> natural
-(define (char->natural c)
-  (let ((i (char->integer c)))
-    (if (< i 0)
-        (* -2 i)
-        (+ (* 2 i) 1))))
-
-; integer->char-list : integer -> string
-(define (integer->char-list n)
-  (string->list (number->string n)))
-
 ; gensym-count : integer
 (define gensym-count 0)
 

util.scm

@@ -4,6 +4,17 @@
       (equal? (car exp) tag)
       #f))
 
+; char->natural : char -> natural
+(define (char->natural c)
+  (let ((i (char->integer c)))
+    (if (< i 0)
+        (* -2 i)
+        (+ (* 2 i) 1))))
+
+; integer->char-list : integer -> string
+(define (integer->char-list n)
+  (string->list (number->string n)))
+
 ;; Name-mangling.
 
 ;; We have to "mangle" Scheme identifiers into