* utils.scm (concat): New function.

* insn.scm (-sub-insn-make!): Use concat instead of string-map.
* rtl.scm (rtx-dump): Same.
* semantics.scm (semantic-compile): Same.

diff --git a/cgen/ChangeLog b/cgen/ChangeLog
index 93e6bfb..cefc380 100644 (file)
--- a/cgen/ChangeLog
+++ b/cgen/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-20  Jim Blandy  <jimb@redhat.com>
+
+       * utils.scm (concat): New function.
+       * insn.scm (-sub-insn-make!): Use concat instead of string-map.
+       * rtl.scm (rtx-dump): Same.
+       * semantics.scm (semantic-compile): Same.
+
 2004-12-16  Jim Blandy  <jimb@redhat.com>
 
        * utils-cgen.scm (parse-name): Don't assume that string-map can be

diff --git a/cgen/insn.scm b/cgen/insn.scm
index 4241f77..1cdf919 100644 (file)
--- a/cgen/insn.scm
+++ b/cgen/insn.scm
@@ -271,10 +271,10 @@
         (obj:name insn)
         ":"
         (string-map (lambda (op newval)
-                      (string-append " "
-                                     (obj:name op)
-                                     "="
-                                     (obj:name newval)))
+                      (concat " "
+                              (obj:name op)
+                              "="
+                              (obj:name newval)))
                     anyof-operands new-values)
         " ...\n")
 

diff --git a/cgen/rtl.scm b/cgen/rtl.scm
index 9b7d4d1..77e9591 100644 (file)
--- a/cgen/rtl.scm
+++ b/cgen/rtl.scm
@@ -786,11 +786,11 @@
 
 (define (rtx-dump rtx)
   (cond ((list? rtx) (map rtx-dump rtx))
-       ((object? rtx) (string-append "#<object "
-                                     (object-class-name rtx)
-                                     " "
-                                     (obj:name rtx)
-                                     ">"))
+       ((object? rtx) (concat "#<object "
+                              (object-class-name rtx)
+                              " "
+                              (obj:name rtx)
+                              ">"))
        (else rtx))
 )
 

diff --git a/cgen/semantics.scm b/cgen/semantics.scm
index 4cca5fb..784b4ea 100644 (file)
--- a/cgen/semantics.scm
+++ b/cgen/semantics.scm
@@ -798,11 +798,11 @@
                  sorted-outs out-op-nums)
 
        (let ((dump (lambda (op)
-                     (string-append "  "
-                                    (obj:name op)
-                                    " "
-                                    (number->string (op:num op))
-                                    "\n"))))
+                     (concat "  "
+                             (obj:name op)
+                             " "
+                             (number->string (op:num op))
+                             "\n"))))
          (logit 4
                 "Input operands:\n"
                 (map dump sorted-ins)

diff --git a/cgen/utils.scm b/cgen/utils.scm
index 43988e6..25a0f7d 100644 (file)
--- a/cgen/utils.scm
+++ b/cgen/utils.scm
@@ -85,6 +85,12 @@
     (write (spaces n) port))
 )
 
+; Concatenate all the arguments and make a string.  Symbols are
+; converted to strings.
+(define (concat . sequences)
+  (define (sequence->string o) (if (symbol? o) (symbol->string o) o))
+  (apply string-append (map sequence->string sequences)))
+
 ; Often used idiom.
 
 (define (string-map fn . args) (apply string-append (apply map (cons fn args))))