core: Remove symbol_to_list, char_to_integer, integer_to_char.

* mes.c (symbol_to_list, char_to_integer, integer_to_char): Remove
* module/mes/read-0.mes (symbol->list, integer->char,
  symbol->keyword): New function.
  (read-word): Use symbol->keyword.
* module/mes/type-0.mes (char->integer): New function.
* module/mes/scm.mes (keyword->symbol): New function.

mes.c

@@ -868,27 +868,6 @@ write_char (SCM x) ///((arity . n))
   return c;
 }
 
-SCM
-symbol_to_list (SCM x)
-{
-  assert (TYPE (x) == SYMBOL);
-  return STRING (x);
-}
-
-SCM
-char_to_integer (SCM x)
-{
-  assert (TYPE (x) == CHAR);
-  return MAKE_NUMBER (VALUE (x));
-}
-
-SCM
-integer_to_char (SCM x)
-{
-  assert (TYPE (x) == NUMBER);
-  return MAKE_CHAR (VALUE (x));
-}
-
 void
 make_tmps (scm* cells)
 {

module/mes/read-0.mes

@@ -104,12 +104,24 @@
                (quote ((current-module))))))
      (current-module))) (current-module))
 
+  (define <cell:character> 0)
   (define <cell:keyword> 3)
   (define <cell:string> 9)
 
+  (define (list->symbol lst) (make-symbol lst))
+
+  (define (symbol->list s)
+    (core:car s))
+
   (define (list->string lst)
     (make-cell <cell:string> lst 0))
 
+  (define (integer->char x)
+    (make-cell <cell:character> 0 x))
+
+  (define (symbol->keyword s)
+    (make-cell <cell:keyword> (symbol->list s) 0))
+  
   (define (read)
     (read-word (read-byte) (list) (current-module)))
 
@@ -190,8 +202,6 @@
   (define (not x)
     (if x #f #t))
   
-  (define (list->symbol lst) (make-symbol lst))
-
   (define (read-character)
     (define (read-octal c p n)
       (if (not (and (> p 47) (< p 56))) n
@@ -289,7 +299,7 @@
                   ((eq? (peek-byte) 39) (read-byte)
                    (cons (quote syntax) (cons (read-word (read-byte) w a) (list))))
                   ((eq? (peek-byte) 58) (read-byte)
-                   (make-cell <cell:keyword> (symbol->list (read-word (read-byte) (list) a)) 0))
+                   (symbol->keyword (read-word (read-byte) (list) a)))
                   ((eq? (peek-byte) 59) (read-byte)
                    (read-word (read-byte) w a)
                    (read-word (read-byte) w a))

module/mes/scm.mes

@@ -237,6 +237,11 @@
         (set! counter (+ counter 1))
         (string->symbol (string-append "g" value))))))
 
+
+;;; Keywords
+(define (keyword->symbol s)
+  (list->symbol (keyword->list s)))
+
 
 ;;; Characters
 (define (char=? x y)

module/mes/type-0.mes

@@ -127,8 +127,17 @@
 (define (symbol->list s)
   (core:car s))
 
+(define (keyword->list s)
+  (core:car s))
+
 (define (symbol->string s)
   (apply string (symbol->list s)))
 
 (define (string-append . rest)
   (apply string (apply append (map1 string->list rest))))
+
+(define (integer->char x)
+  (make-cell <cell:character> 0 x))
+
+(define (char->integer x)
+  (make-cell <cell:number> 0 x))