From ebafd5f858e29cc75f89e098cd8d564cb7d92144 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Wed, 15 Dec 2010 10:00:12 +0000
Subject: 	* boot/tokens.boot: symbolName is now a builtin function. 
 * interp/sys-utility.boot (stringImage): New. 	* interp/format.boot
 (form2String1): Use it. Tidy.

---
 src/interp/format.boot      | 3 +--
 src/interp/sys-utility.boot | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/interp')

diff --git a/src/interp/format.boot b/src/interp/format.boot
index 29093903..3d03184f 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -391,8 +391,7 @@ form2String1 u ==
       constructor? u => app2StringWrap(formWrapId u, [u])
       formWrapId u
     SUBRP u => formWrapId BPINAME u
-    string? u => formWrapId u
-    formWrapId toString u
+    stringImage u
   u1 := u
   [op,:argl] := u
   op='Join or op= 'mkCategory => formJoin1(op,argl)
diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot
index 04079a7a..f113444f 100644
--- a/src/interp/sys-utility.boot
+++ b/src/interp/sys-utility.boot
@@ -341,6 +341,12 @@ closeFile file ==
   CLOSE file
   nil
 
+--%
+stringImage x ==
+  symbol? x => symbolName x
+  string? x => strconc('"_"",x,'"_"")
+  toString x
+
 --% Socket I/O
 
 ++ Attempt to establish a client TCP/IP socket connection.  The IP numeric
-- 
cgit v1.2.3