From 2a7a7e349eb557f49e865d8ecf47aca4d0fd49dd Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Wed, 9 Nov 2011 02:50:41 +0000
Subject: 	* interp/define.boot (compFunctorBody): First argument is now
 a DB. 	Adjustt caller. 	(incompleteFunctorBody): Likewise. 	*
 interp/bc-matrix.boot: Use toString instead of STRINGIMAGE where 
 appropriate. 	* interp/bc-solve.boot: Likewise. 	* interp/bc-util.boot:
 Likewise. 	* interp/br-con.boot: Likewise. 	* interp/br-op1.boot:
 Likewise. 	* interp/br-saturn.boot: Likewise. 	* interp/c-doc.boot:
 Likewise. 	* interp/c-util.boot: Likewise. 	* interp/clam.boot:
 Likewise. 	* interp/format.boot: Likewise. 	* interp/functor.boot:
 Likewise. 	* interp/g-timer.boot: Likewise. 	*
 interp/htsetvar.boot: Likewise. 	* interp/i-funsel.boot: Likewise. 
 * interp/i-map.boot: Likewise. 	* interp/i-output.boot: Likewise. 
 * interp/i-resolv.boot: Likewise. 	* interp/i-special.boot: Likewise. 
 * interp/i-syscmd.boot: Likewise. 	* interp/i-util.boot: Likewise. 
 * interp/msg.boot: Likewise. 	* interp/newfort.boot: Likewise. 	*
 interp/parse.boot: Likewise. 	* interp/pathname.boot: Likewise. 	*
 interp/setvars.boot: Likewise. 	* interp/showimp.boot: Likewise. 
 * interp/slam.boot: Likewise. 	* interp/trace.boot: Likewise.

---
 src/interp/i-map.boot | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/interp/i-map.boot')

diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot
index dcdf4cf8..9bb13e51 100644
--- a/src/interp/i-map.boot
+++ b/src/interp/i-map.boot
@@ -48,8 +48,8 @@ $insideCompileBodyIfTrue := false
 $specialMapNameSuffix := nil
 
 makeInternalMapName(userName,numArgs,numMms,extraPart) ==
-  name := strconc('"*",STRINGIMAGE numArgs,'";",
-    object2String userName,'";",STRINGIMAGE numMms,'";",
+  name := strconc('"*",toString numArgs,'";",
+    object2String userName,'";",toString numMms,'";",
       object2String frameName first $interpreterFrameRing )
   if extraPart then name := strconc(name,'";",extraPart)
   if $specialMapNameSuffix then
@@ -485,7 +485,7 @@ getEqualSublis pred == fn(pred,nil) where fn(x,sl) ==
 --% User function analysis
 
 mapCatchName mapname ==
-   makeSymbol strconc('"$",STRINGIMAGE mapname,'"CatchMapIdentifier$")
+   makeSymbol strconc('"$",symbolName mapname,'"CatchMapIdentifier$")
 
 analyzeMap(op,argTypes,mapDef, tar) ==
   -- Top level enty point for map type analysis.  Sets up catch point
@@ -988,7 +988,7 @@ mkValCheck(val,i) ==
 
 mkSharpVar i ==
   -- create #i
-  makeSymbol strconc('"#",STRINGIMAGE i)
+  makeSymbol strconc('"#",toString i)
 
 mapPredTran pred ==
   -- transforms "x in i..j" to "x>=i and x<=j"
-- 
cgit v1.2.3