aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2011-11-09 02:50:41 +0000
committerdos-reis <gdr@axiomatics.org>2011-11-09 02:50:41 +0000
commit2a7a7e349eb557f49e865d8ecf47aca4d0fd49dd (patch)
treeca4b476368d921975584e2c4c0079a78db6087b8
parent43be0bf7b21794f6e94027736b004fd7097c226f (diff)
downloadopen-axiom-2a7a7e349eb557f49e865d8ecf47aca4d0fd49dd.tar.gz
* 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.
-rw-r--r--src/ChangeLog35
-rw-r--r--src/interp/bc-matrix.boot10
-rw-r--r--src/interp/bc-solve.boot16
-rw-r--r--src/interp/bc-util.boot6
-rw-r--r--src/interp/br-con.boot14
-rw-r--r--src/interp/br-op1.boot4
-rw-r--r--src/interp/br-saturn.boot10
-rw-r--r--src/interp/c-doc.boot14
-rw-r--r--src/interp/c-util.boot18
-rw-r--r--src/interp/clam.boot18
-rw-r--r--src/interp/define.boot16
-rw-r--r--src/interp/format.boot5
-rw-r--r--src/interp/functor.boot4
-rw-r--r--src/interp/g-timer.boot12
-rw-r--r--src/interp/htsetvar.boot6
-rw-r--r--src/interp/i-funsel.boot6
-rw-r--r--src/interp/i-map.boot8
-rw-r--r--src/interp/i-output.boot6
-rw-r--r--src/interp/i-resolv.boot2
-rw-r--r--src/interp/i-special.boot2
-rw-r--r--src/interp/i-syscmd.boot4
-rw-r--r--src/interp/i-util.boot6
-rw-r--r--src/interp/msg.boot2
-rw-r--r--src/interp/newfort.boot4
-rw-r--r--src/interp/parse.boot2
-rw-r--r--src/interp/pathname.boot2
-rw-r--r--src/interp/setvars.boot2
-rw-r--r--src/interp/showimp.boot6
-rw-r--r--src/interp/slam.boot2
-rw-r--r--src/interp/trace.boot2
30 files changed, 139 insertions, 105 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f9b65634..e72ac886 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,38 @@
+2011-11-08 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * 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.
+
2011-11-07 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/lisplib.boot (isDomainForm): Tidy.
diff --git a/src/interp/bc-matrix.boot b/src/interp/bc-matrix.boot
index 1aacb08d..13997d7f 100644
--- a/src/interp/bc-matrix.boot
+++ b/src/interp/bc-matrix.boot
@@ -100,7 +100,7 @@ bcInputMatrixByFormulaGen htPage ==
nrows := htpProperty(htPage,'nrows)
ncols := htpProperty(htPage,'ncols)
bcGen strconc('"matrix([[",formula,'" for ",colVar,'" in 1..",
- STRINGIMAGE ncols,'"] for ",rowVar,'" in 1..",STRINGIMAGE nrows,'"])")
+ toString ncols,'"] for ",rowVar,'" in 1..",toString nrows,'"])")
bcInputExplicitMatrix(htPage,junk) ==
nrows :=
@@ -111,15 +111,15 @@ bcInputExplicitMatrix(htPage,junk) ==
readInteger htpLabelInputString(htPage,'cols)
cond := nil
k := 0
- wrows := # STRINGIMAGE nrows
- wcols := # STRINGIMAGE ncols
+ wrows := #toString nrows
+ wcols := #toString ncols
labelList :=
"append"/[[f for j in 1..ncols] for i in 1..nrows] where f() ==
rowpart := strconc('"{\em Row",htStringPad(i,wrows))
colpart := strconc('", Column",htStringPad(j,wcols),'":}\space{2}")
prefix := strconc(rowpart,colpart)
-- name := makeSymbol strconc(htMkName('"row",i),htMkName('"col",j))
- name := makeSymbol STRINGIMAGE (k := k + 1)
+ name := makeSymbol toString (k := k + 1)
[prefix,'"",30, 0,name,'P]
labelList :=
[['domainConditions, '(isDomain P (Polynomial $EmptyMode)), cond],
@@ -146,7 +146,7 @@ bcMatrixGen htPage ==
rowVar := (symbolTarget('rowVar,mat)).0
colVar := (symbolTarget('colVar,mat)).0
strconc('"matrix([[",formula,'" for ",colVar,'" in 1..",
- STRINGIMAGE ncols,'"] for ",rowVar,'" in 1..",STRINGIMAGE nrows,'"])")
+ toString ncols,'"] for ",rowVar,'" in 1..",toString nrows,'"])")
mat := htpProperty(htPage,'matrix) =>
mat := reverse mat
k := -1
diff --git a/src/interp/bc-solve.boot b/src/interp/bc-solve.boot
index abdc8293..ce1fce75 100644
--- a/src/interp/bc-solve.boot
+++ b/src/interp/bc-solve.boot
@@ -144,10 +144,10 @@ bcInputEquations(htPage,solutionMethod) ==
(bcStrings (6 0 r1 P)))
"append"/[f(i,numEqs,linearPred) for i in 1..numEqs] where f(i,n,linearp) ==
spacer := (i > 99 => 0; i > 9 => 1; 2)
- prefix := strconc('"\newline\tab{2}{\em Equation ",STRINGIMAGE i,'":}")
- prefix := strconc(prefix,'"\space{",STRINGIMAGE spacer,'"}")
- lnam := makeSymbol strconc('"l",STRINGIMAGE i)
- rnam := makeSymbol strconc('"r",STRINGIMAGE i)
+ prefix := strconc('"\newline\tab{2}{\em Equation ",toString i,'":}")
+ prefix := strconc(prefix,'"\space{",toString spacer,'"}")
+ lnam := makeSymbol strconc('"l",toString i)
+ rnam := makeSymbol strconc('"r",toString i)
var:=
linearp => bcMakeLinearEquations(i,n)
bcMakeEquations(i,n)
@@ -181,7 +181,7 @@ bcInputEquations(htPage,solutionMethod) ==
htShowPage()
bcCreateVariableString(i) ==
- strconc('"x",STRINGIMAGE i)
+ strconc('"x",toString i)
bcMakeUnknowns(number)==
apply(function strconc,[strconc(bcCreateVariableString(i),'" ") for i in 1..number])
@@ -275,10 +275,10 @@ bcLinearSolveMatrixInhomo(htPage,junk) ==
labelList :=
[f(i) for i in 1..ncols] where f(i) ==
spacer := (i > 99 => 0; i > 9 => 1; 2)
- prefix := strconc('"{\em Coefficient ",STRINGIMAGE i,'":}")
+ prefix := strconc('"{\em Coefficient ",toString i,'":}")
if spacer ~= 0 then
- prefix := strconc(prefix,'"\space{",STRINGIMAGE spacer,'"}")
- name := makeSymbol strconc('"c",STRINGIMAGE i)
+ prefix := strconc(prefix,'"\space{",toString spacer,'"}")
+ name := makeSymbol strconc('"c",toString i)
[prefix,"",30, 0,name, 'P]
page := htInitPage('"Linear Solve Basic Command",htpPropertyList htPage)
htpSetProperty(page,'matrix,htpProperty(htPage,'matrix))
diff --git a/src/interp/bc-util.boot b/src/interp/bc-util.boot
index 2d8a22b6..20d9104f 100644
--- a/src/interp/bc-util.boot
+++ b/src/interp/bc-util.boot
@@ -127,13 +127,13 @@ bcNotReady htPage ==
htShowPage()
htStringPad(n,w) ==
- s := STRINGIMAGE n
+ s := toString n
ws := #s
- strconc('"\space{",STRINGIMAGE (w - ws + 1),'"}",s)
+ strconc('"\space{",toString (w - ws + 1),'"}",s)
stringList2String x ==
null x => '"()"
strconc('"(",first x,strconc/[strconc('",",y) for y in rest x],'")")
-htMkName(s,n) == strconc(s,STRINGIMAGE n)
+htMkName(s,n) == strconc(s,toString n)
diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index 46ab6120..4439799b 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -109,7 +109,7 @@ kdPageInfo(name,abbrev,nargs,conform,signature,file?) ==
if abbrev ~= name then bcHt '" and"
bcHt
nargs = 1 => '" takes one argument:"
- [" takes ",STRINGIMAGE nargs," arguments:"]
+ [" takes ",toString nargs," arguments:"]
htSaturnBreak()
htSayStandard '"\indentrel{2}"
if nargs > 0 then kPageArgs(conform,signature)
@@ -292,9 +292,9 @@ kePageDisplay(htPage,which,opAlist) ==
if count ~= total then
if count = 1
then htSay('"1 name for ")
- else htSay(STRINGIMAGE count,'" names for ")
+ else htSay(toString count,'" names for ")
if total > 1
- then htSay(STRINGIMAGE total,'" ",pluralize which,'" are explicitly exported:")
+ then htSay(toString total,'" ",pluralize which,'" are explicitly exported:")
else htSay('"1 ",which,'" is explicitly exported:")
htSaySaturn '"\\"
data := dbGatherData(htPage,opAlist,which,'names)
@@ -568,7 +568,7 @@ kcnPage(htPage,junk) ==
dbShowCons(htPage,'names)
koPageInputAreaUnchanged?(htPage, nargs) ==
- [htpLabelInputString(htPage,makeSymbol strconc('"*",STRINGIMAGE i)) for i in 1..nargs]
+ [htpLabelInputString(htPage,makeSymbol strconc('"*",toString i)) for i in 1..nargs]
= htpProperty(htPage,'inputAreaList)
kDomainName(htPage,kind,name,nargs) ==
@@ -1014,7 +1014,7 @@ dbConsHeading(htPage,conlist,view,kind) ==
count := #(removeDuplicates conlist)
-- count := #conlist
thing = '"benefactor" =>
- [STRINGIMAGE count,'" Constructors Used by ",form2HtString(place,nil,true)]
+ [toString count,'" Constructors Used by ",form2HtString(place,nil,true)]
modifier :=
thing = '"argument" =>
rank := htPage and htpProperty(htPage,'rank)
@@ -1027,8 +1027,8 @@ dbConsHeading(htPage,conlist,view,kind) ==
$exposedOnlyIfTrue => '(" Exposed ")
nil
prefix :=
- count = 1 => [STRINGIMAGE count,:modifier,capitalize thing]
- firstWord := (count = 0 => '"No "; STRINGIMAGE count)
+ count = 1 => [toString count,:modifier,capitalize thing]
+ firstWord := (count = 0 => '"No "; toString count)
[firstWord,:exposureWord, :modifier,capitalize pluralize thing]
placepart :=
place => ['" of {\em ",form2HtString(place,nil,true),"}"]
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index ebd5b510..adc1403f 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -150,10 +150,10 @@ dbShowOp1(htPage,opAlist,which,key) ==
opCount = 0 => ['"No ",:exposurePart, pluralize capitalize which]
dataCount = 1 or dataCount = opCount =>
opCount = 1 => [:exposurePart, capitalize which,:namedPart]
- [STRINGIMAGE opCount,'" ",:exposurePart,
+ [toString opCount,'" ",:exposurePart,
pluralize capitalize which,:namedPart]
prefix := pluralSay(dataCount,what,whats)
- [:prefix,'" for ",STRINGIMAGE opCount,'" ",pluralize capitalize which,:namedPart]
+ [:prefix,'" for ",toString opCount,'" ",pluralize capitalize which,:namedPart]
page := htInitPageNoScroll(htCopyProplist htPage)
------------>above line used to call htInitPageHoHeading<----------
htAddHeading dbShowOpHeading([:firstPart,:fromHeading page], branch)
diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot
index 6bea4b28..6a2dcb6b 100644
--- a/src/interp/br-saturn.boot
+++ b/src/interp/br-saturn.boot
@@ -208,7 +208,7 @@ issueHTSaturn line == --called by htMakePageNoScroll and htMakeErrorPage
writeSaturnPrefix() ==
$saturnContextMenuLines =>
index :=
- STRINGIMAGE ($saturnContextMenuIndex := $saturnContextMenuIndex + 1)
+ toString ($saturnContextMenuIndex := $saturnContextMenuIndex + 1)
writeSaturnLines
['"\newmenu{BCM", index,
'"}{",:reverse! $saturnContextMenuLines,
@@ -950,7 +950,7 @@ kPageArgs([op,:args],[.,.,:source]) ==
if pred = true
then htMakePage [['bcLinks,[x,'"",'kArgPage,x]]]
else htSay('"{\em ",x,'"}")
- htSayStandard( '"\tab{",STRINGIMAGE( # PNAME x),'"}, ")
+ htSayStandard( '"\tab{",toString(#PNAME x),'"}, ")
htSaySaturnAmpersand()
htSay
pred => '"a domain of category "
@@ -1395,8 +1395,8 @@ htSayIndentRel(n,:options) ==
if flag then m := m + 2
if $standard then htSayStandard
n > 0 =>
- flag => ['"\indent{",STRINGIMAGE m,'"}\tab{-2}"]
- ['"\indent{",STRINGIMAGE m,'"}\tab{0}"]
+ flag => ['"\indent{",toString m,'"}\tab{-2}"]
+ ['"\indent{",toString m,'"}\tab{0}"]
n < 0 => ['"\indent{0}\newline "]
htSayUnexposed() ==
@@ -1474,7 +1474,7 @@ htSaySaturnAmpersand() == htSaySaturn $saturnAmpersand
htBlank(:options) ==
options is [n] =>
htSaySaturn(strconc/['"\phantom{*}" for i in 1..n])
- htSayStandard strconc('"\space{",STRINGIMAGE n,'"}")
+ htSayStandard strconc('"\space{",toString n,'"}")
htSaySaturn '"\phantom{*}"
htSayStandard '"\space{1}"
diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot
index c56883af..ffad1b3b 100644
--- a/src/interp/c-doc.boot
+++ b/src/interp/c-doc.boot
@@ -154,11 +154,11 @@ finalizeDocumentation ctor ==
litcnt := 1
if noHeading then
sayKeyedMsg("S2CD0003",
- [strconc('"(",STRINGIMAGE litcnt,'")"),ctor])
+ [strconc('"(",toString litcnt,'")"),ctor])
litcnt := litcnt + 1
if signatures then
sayKeyedMsg("S2CD0004",
- [strconc('"(",STRINGIMAGE litcnt,'")")])
+ [strconc('"(",toString litcnt,'")")])
litcnt := litcnt + 1
for [op,sig] in signatures repeat
s := formatOpSignature(op,sig)
@@ -167,7 +167,7 @@ finalizeDocumentation ctor ==
['%x9,:s]
if attributes then
sayKeyedMsg("S2CD0005",
- [strconc('"(",STRINGIMAGE litcnt,'")")])
+ [strconc('"(",toString litcnt,'")")])
litcnt := litcnt + 1
for x in attributes repeat
a := form2String x
@@ -175,7 +175,7 @@ finalizeDocumentation ctor ==
a isnt [.,:.] => ['%x9,a]
['%x9,:a]
if unusedCommentLineNumbers then
- sayKeyedMsg("S2CD0006",[strconc(STRINGIMAGE bigcnt,'"."),ctor])
+ sayKeyedMsg("S2CD0006",[strconc(toString bigcnt,'"."),ctor])
for [n,r] in unusedCommentLineNumbers repeat
sayMSG ['" ",:bright n,'" ",r]
form := dbConstructorForm constructorDB ctor
@@ -618,7 +618,7 @@ checkIndentedLines(u, margin) ==
u2 := [:u2, s]
verbatim => u2 := [:u2, subString(x, margin)]
margin = k => u2 := [:u2, s]
- u2 := [:u2, strconc('"\indented{",STRINGIMAGE(k-margin),'"}{",checkAddSpaceSegments(s,0),'"}")]
+ u2 := [:u2, strconc('"\indented{",toString(k-margin),'"}{",checkAddSpaceSegments(s,0),'"}")]
u2
newString2Words l ==
@@ -687,7 +687,7 @@ checkAddIndented(x,margin) ==
k := firstNonBlankPosition x
k = -1 => '"\blankline "
margin = k => x
- strconc('"\indented{",STRINGIMAGE(k-margin),'"}{",checkAddSpaceSegments(subString(x,k),0),'"}")
+ strconc('"\indented{",toString(k-margin),'"}{",checkAddSpaceSegments(subString(x,k),0),'"}")
checkAddSpaceSegments(u,k) ==
m := maxIndex u
@@ -697,7 +697,7 @@ checkAddSpaceSegments(u,k) ==
while (j := j + 1) < m and stringChar(u,j) = char " " repeat 'continue
n := j - i --number of blanks
n > 1 => strconc(subString(u,0,i),'"\space{",
- STRINGIMAGE n,'"}",checkAddSpaceSegments(subString(u,i + n),0))
+ toString n,'"}",checkAddSpaceSegments(subString(u,i + n),0))
checkAddSpaceSegments(u,j)
checkTrim($x,lines) == main where
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index 34cc5546..73fd9a83 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -392,9 +392,9 @@ displayComp level ==
sayBrightly ['"****** level",:bright level,'" ******"]
[$x,$m,$f,$exitModeStack]:= ELEM($s,level)
SAY("$x:= ",$x)
- SAY("$m:= ",$m)
- SAY "$f:="
- F_,PRINT_-ONE $f
+ sayBrightly ['"$m := ",form2String $m]
+ --SAY "$f:="
+ --F_,PRINT_-ONE $f
nil
mkErrorExpr level ==
@@ -903,13 +903,13 @@ flatten(l,key) ==
genDomainVar() ==
$Index:= $Index+1
- INTERNL strconc('"#D",STRINGIMAGE $Index)
+ makeSymbol strconc('"#D",toString $Index)
genVariable() ==
- INTERNL strconc('"#G",STRINGIMAGE ($genSDVar:= $genSDVar+1))
+ makeSymbol strconc('"#G",toString ($genSDVar:= $genSDVar+1))
genSomeVariable() ==
- INTERNL strconc('"##",STRINGIMAGE ($genSDVar:= $genSDVar+1))
+ makeSymbol strconc('"##",toString ($genSDVar:= $genSDVar+1))
listOfIdentifiersIn x ==
ident? x => [x]
@@ -1454,7 +1454,7 @@ backendCompileILAM(name,args,body) ==
$CLOSEDFNS := nil
MAKE_-CLOSEDFN_-NAME() ==
- INTERNL($FUNNAME,'"!", STRINGIMAGE # $CLOSEDFNS)
+ makeSymbol strconc($FUNNAME,'"!", toString # $CLOSEDFNS)
backendCompileNEWNAM: %Form -> %Void
backendCompileNEWNAM x ==
@@ -1479,7 +1479,7 @@ backendCompileNEWNAM x ==
backendCompileSLAM: (%Symbol,%List %Symbol,%Code) -> %Symbol
backendCompileSLAM(name,args,body) ==
al := mkCacheName name -- name of the cache alist.
- auxfn := INTERNL(name,'";") -- name of the worker function.
+ auxfn := makeSymbol strconc(name,'";") -- name of the worker function.
g1 := gensym() -- name for the parameter.
g2 := gensym() -- name for the cache value
u := -- body of the stub function
@@ -1511,7 +1511,7 @@ backendCompileSLAM(name,args,body) ==
backendCompileSPADSLAM: (%Symbol,%List %Symbol,%Code) -> %Symbol
backendCompileSPADSLAM(name,args,body) ==
al := mkCacheName name -- name of the cache hash table.
- auxfn := INTERNL(name,'";") -- name of the worker function.
+ auxfn := makeSymbol strconc(name,'";") -- name of the worker function.
g1 := gensym() -- name of the worker function parameter
g2 := gensym() -- name for the cache value.
u :=
diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index 98986f85..cfbd0287 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -98,15 +98,15 @@ compClam(op,argl,body,$clamList) ==
cacheCount=1 => ['"computed value only"]
[:bright cacheCount,'"computed values"]
sayBrightly [:bright op,'"will save last",:phrase]
- auxfn:= INTERNL(op,'";")
+ auxfn:= makeSymbol strconc(op,'";")
g1:= gensym() --argument or argument list
[arg,computeValue] :=
argl is [.] => [[g1],[auxfn,g1]] --g1 is a parameter
[g1,['APPLX,['function,auxfn],g1]] --g1 is a parameter list
cacheName:= mkCacheName op
if $reportCounts then
- hitCounter:= INTERNL(op,'";hit")
- callCounter:= INTERNL(op,'";calls")
+ hitCounter:= makeSymbol strconc(op,'";hit")
+ callCounter:= makeSymbol strconc(op,'";calls")
symbolValue(hitCounter) := 0
symbolValue(callCounter) := 0
callCountCode:= [['%store,callCounter,['%iinc,callCounter]]]
@@ -190,7 +190,7 @@ compHash(op,argl,body,cacheNameOrNil,eqEtc,countFl) ==
-- '"privately "
--sayBrightly
-- ["%b",op,"%d","hashes ",:middle,withWithout," reference counts"]
- auxfn:= INTERNL(op,'";")
+ auxfn:= makeSymbol strconc(op,'";")
g1:= gensym() --argument or argument list
[arg,cacheArgKey,computeValue] :=
-- arg: to be used as formal argument of lambda construction;
@@ -204,8 +204,8 @@ compHash(op,argl,body,cacheNameOrNil,eqEtc,countFl) ==
[g1,key,['APPLY,['function,auxfn],g1]] --g1 is a parameter list
cacheName:= cacheNameOrNil or mkCacheName op
if $reportCounts then
- hitCounter:= INTERNL(op,'";hit")
- callCounter:= INTERNL(op,'";calls")
+ hitCounter:= makeSymbol strconc(op,'";hit")
+ callCounter:= makeSymbol strconc(op,'";calls")
symbolValue(hitCounter) := 0
symbolValue(callCounter) := 0
callCountCode:= [['%store,callCounter,['%iinc,callCounter]]]
@@ -283,7 +283,7 @@ compHashGlobal(op,argl,body,cacheName,eqEtc,countFl) ==
if (not (eqEtc in '(UEQUAL))) then
sayBrightly "for hash option, only EQ, CVEC, and UEQUAL are allowed"
- auxfn:= INTERNL(op,'";")
+ auxfn:= makeSymbol strconc(op,'";")
g1:= gensym() --argument or argument list
[arg,cacheArgKey,computeValue] :=
-- arg: to be used as formal argument of lambda construction;
@@ -492,8 +492,8 @@ clamStats() ==
cacheVec:= property(op,'cacheInfo) or systemErrorHere ["clamStats",op]
prefix:=
$reportCounts ~= true => nil
- hitCounter:= INTERNL(op,'";hit")
- callCounter:= INTERNL(op,'";calls")
+ hitCounter:= makeSymbol strconc(op,'";hit")
+ callCounter:= makeSymbol strconc(op,'";calls")
res:= ["%b",eval hitCounter,"/",eval callCounter,"%d","calls to "]
symbolValue(hitCounter) := 0
symbolValue(callCounter) := 0
diff --git a/src/interp/define.boot b/src/interp/define.boot
index b46c7474..72014231 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -1443,7 +1443,7 @@ compDefineFunctor1(df is ['DEF,form,signature,body],
and (u := getSuperDomainFromDB rhsCtor) then
u := sublisFormal(rhsArgs,u,$AtVariables)
emitSubdomainInfo($form,first u, second u)
- T:= compFunctorBody(body,rettype,$e,parForm)
+ T:= compFunctorBody(db,body,rettype,$e)
body':= T.expr
lamOrSlam :=
dbInstanceCache db = nil => 'LAM
@@ -1475,28 +1475,28 @@ compDefineFunctor1(df is ['DEF,form,signature,body],
++ Finish the incomplete compilation of a functor body.
-incompleteFunctorBody(form,m,body,e) ==
+incompleteFunctorBody(db,m,body,e) ==
-- The slot numbers from the category shell are bogus at this point.
-- Nullify them so people don't think they bear any meaningful
-- semantics (well, they should not think these are forwarding either).
ops := nil
for [opsig,pred,funsel] in categoryExports $domainShell repeat
- if pred isnt 'T then
+ if pred isnt true then
pred := simpBool pred
if funsel is [op,.,.] and op in '(ELT CONST) then
third(funsel) := nil
ops := [[opsig,pred,funsel],:ops]
$lisplibOperationAlist := listSort(function GGREATERP,ops,function first)
- dbSuperDomain(constructorDB form.op) :=
+ dbSuperDomain(db) :=
body is ['SubDomain,dom,pred] => [dom,pred]
body is ['add,['SubDomain,dom,pred],:.] => [dom,pred]
nil
- [bootStrapError(form, _/EDITFILE),m,e]
+ [bootStrapError(dbConstructorForm db, _/EDITFILE),m,e]
++ Subroutine of compDefineFunctor1. Called to generate backend code
++ for a functor definition.
-compFunctorBody(body,m,e,parForm) ==
- $bootStrapMode => incompleteFunctorBody($functorForm,m,body,e)
+compFunctorBody(db,body,m,e) ==
+ $bootStrapMode => incompleteFunctorBody(db,m,body,e)
clearCapsuleDirectory() -- start collecting capsule functions.
T:= compOrCroak(body,m,e)
$capsuleFunctionStack := reverse! $capsuleFunctionStack
@@ -1821,7 +1821,7 @@ addDomain(domain,e) ==
domain isnt [.,:.] =>
domain="$EmptyMode" => e
domain="$NoValueMode" => e
- not ident? domain or 2 < #(s:= STRINGIMAGE domain) and
+ not ident? domain or 2 < #(s:= symbolName domain) and
char "#" = stringChar(s,0) and char "#" = stringChar(s,1) => e
symbolMember?(domain,getDomainsInScope e) => e
isLiteral(domain,e) => e
diff --git a/src/interp/format.boot b/src/interp/format.boot
index 5f670131..0d4f3d4b 100644
--- a/src/interp/format.boot
+++ b/src/interp/format.boot
@@ -345,7 +345,7 @@ prefix2String0 form ==
-- ident? form =>
-- constructor? form => app2StringWrap(formWrapId form, [form])
-- formWrapId form
--- formWrapId STRINGIMAGE form
+-- formWrapId symbolName form
form2StringWithWhere u ==
$permitWhere : local := true
@@ -447,7 +447,6 @@ form2String1 u ==
(null argl) or null (first argl) => [lo, '".."]
[lo, '"..", form2String1 first argl]
isBinaryInfix op => formatAsFortranExpression [op,:argl]
- -- COMPILED_-FUNCTION_-P(op) => form2String1 coerceMap2E(u1,nil)
application2String(op,[form2String1 x for x in argl], u1)
formWrapId id ==
@@ -796,7 +795,7 @@ form2Fence1 x ==
['" ", x]
form2FenceQuote x ==
- integer? x => [STRINGIMAGE x]
+ integer? x => [toString x]
symbol? x => [FORMAT(nil, '"|~a|", x)]
string? x => ['"_"",x,'"_""]
x isnt [.,:.] => systemErrorHere ["form2FenceQuote",x]
diff --git a/src/interp/functor.boot b/src/interp/functor.boot
index f60e0cd5..818e197a 100644
--- a/src/interp/functor.boot
+++ b/src/interp/functor.boot
@@ -133,7 +133,7 @@ DomainPrint1(D,brief,$e) ==
PRETTYPRINT uu
DPname() ==
- name := INTERNL strconc('"Where",toString $WhereCounter)
+ name := makeSymbol strconc('"Where",toString $WhereCounter)
$WhereCounter := $WhereCounter+1
name
@@ -791,7 +791,7 @@ encodeFunctionName(db,fun,signature,sep,count) ==
encodedPair() ==
n=1 => encodeItem x
strconc(toString n,encodeItem x)
- encodedName:= INTERNL(symbolName dbAbbreviation db,'";",
+ encodedName:= makeSymbol strconc(symbolName dbAbbreviation db,'";",
encodeItem fun,'";",encodedSig,sep,toString count)
dbCapsuleDefinitions(db) :=
[[encodedName,signature'],:dbCapsuleDefinitions db]
diff --git a/src/interp/g-timer.boot b/src/interp/g-timer.boot
index 4e3ab09d..7b9476c9 100644
--- a/src/interp/g-timer.boot
+++ b/src/interp/g-timer.boot
@@ -48,13 +48,13 @@ printNamedStatsByProperty(listofnames, prop) ==
total := +/[property(name,prop) for [name,:.] in listofnames]
for [name,:.] in listofnames repeat
n := property(name, prop)
- strname := STRINGIMAGE name
- strval := STRINGIMAGE n
+ strname := symbolName name
+ strval := toString n
sayBrightly concat(bright strname,
fillerSpaces(70-#strname-#strval,char "."),bright strval)
sayBrightly bright fillerSpaces(72,char "-")
sayBrightly concat(bright '"Total",
- fillerSpaces(65-# STRINGIMAGE total,char "."),bright STRINGIMAGE total)
+ fillerSpaces(65-# toString total,char "."),bright toString total)
makeLongStatStringByProperty _
(listofnames, listofclasses, prop, classprop, units, flag) ==
@@ -102,9 +102,9 @@ normalizeStatAndStringify t ==
integer? t =>
K := 1024
M := K*K
- t > 9*M => strconc(STRINGIMAGE((t + 512*K) quo M), '"M")
- t > 9*K => strconc(STRINGIMAGE((t + 512) quo K), '"K")
- STRINGIMAGE t
+ t > 9*M => strconc(toString((t + 512*K) quo M), '"M")
+ t > 9*K => strconc(toString((t + 512) quo K), '"K")
+ toString t
STRINGIMAGE t
significantStat t ==
diff --git a/src/interp/htsetvar.boot b/src/interp/htsetvar.boot
index e91a7dcd..1a8001a9 100644
--- a/src/interp/htsetvar.boot
+++ b/src/interp/htsetvar.boot
@@ -58,9 +58,9 @@ htShowSetTree(setTree) ==
maxWidth2 := MAX(htShowCount STRINGIMAGE setData.setLabel,maxWidth2)
maxWidth1 := MAX(9,maxWidth1)
maxWidth2 := MAX(41,maxWidth2)
- tabset1 := STRINGIMAGE (maxWidth1)
- tabset2 := STRINGIMAGE (maxWidth2 + maxWidth1 - 1)
- htSay('"\tab{2}\newline Variable\tab{",STRINGIMAGE (maxWidth1 + (maxWidth2 quo 3)),'"}Description\tab{",STRINGIMAGE(maxWidth2 + maxWidth1 + 2),'"}Value\newline\beginitems ")
+ tabset1 := toString (maxWidth1)
+ tabset2 := toString (maxWidth2 + maxWidth1 - 1)
+ htSay('"\tab{2}\newline Variable\tab{",toString (maxWidth1 + (maxWidth2 quo 3)),'"}Description\tab{",toString(maxWidth2 + maxWidth1 + 2),'"}Value\newline\beginitems ")
for setData in reverse okList repeat
htSay '"\item"
label := strconc('"\menuitemstyle{",setData.setName,'"}")
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot
index fb10e80a..12daa636 100644
--- a/src/interp/i-funsel.boot
+++ b/src/interp/i-funsel.boot
@@ -892,7 +892,7 @@ findFunctionInCategory(op,dc,tar,args1,args2,$Coerce,$SubDom) ==
if maxargs ~= -1 then
SL:= nil
for i in 1..maxargs repeat
- impls := substitute(gensym(),INTERNL('"#",STRINGIMAGE i),impls)
+ impls := substitute(gensym(),makeSymbol strconc('"#",toString i),impls)
impls and
SL:= constructSubst dc
for mm in impls repeat
@@ -964,7 +964,7 @@ constructSubst(d) ==
-- and the arguments of d for #1, #2 ..
SL:= list ['$,:d]
for x in rest d for i in 1.. repeat
- SL:= [[INTERNL('"#",STRINGIMAGE i),:x],:SL]
+ SL:= [[makeSymbol strconc('"#",toString i),:x],:SL]
SL
filterModemapsFromPackages(mms, names, op) ==
@@ -1734,7 +1734,7 @@ printMms(mmS) ==
-- mmS a list of modemap signatures
sayMSG '" "
for [sig,imp,.] in mmS for i in 1.. repeat
- istr := strconc('"[",STRINGIMAGE i,'"]")
+ istr := strconc('"[",toString i,'"]")
if #istr = 3 then istr := strconc(istr,'" ")
sayMSG [:bright istr,'"signature: ",:formatSignature rest sig]
first sig is 'local =>
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"
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 01af6206..af86f29e 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -1322,7 +1322,7 @@ PushMatrix m ==
for v in $MatrixList repeat
m = rest v => return first v
name => name
- name:=INTERNL('"matrix",STRINGIMAGE($MatrixCount:=$MatrixCount+1))
+ name := makeSymbol strconc('"matrix",toString($MatrixCount:=$MatrixCount+1))
$MatrixList:=[[name,:m],:$MatrixList]
name
@@ -1684,7 +1684,7 @@ outputDomainConstructor form ==
if VECTORP form then form := devaluate form
(u:= prefix2String form) isnt [.,:.] => u
v:= [object2String(x) for x in u]
- return INTERNL apply(function strconc,v)
+ return makeSymbol apply(function strconc,v)
getOutputAbbreviatedForm form ==
form is [op,:argl] =>
@@ -1706,7 +1706,7 @@ outputOp x ==
n:=
GETL(op,"NARY") => 2
#args
- newop:= makeSymbol strconc('"*",STRINGIMAGE n,PNAME op)
+ newop:= makeSymbol strconc('"*",toString n,PNAME op)
[newop,:[outputOp y for y in args]]
x
diff --git a/src/interp/i-resolv.boot b/src/interp/i-resolv.boot
index b2e37a7d..3ef90e9d 100644
--- a/src/interp/i-resolv.boot
+++ b/src/interp/i-resolv.boot
@@ -395,7 +395,7 @@ resolveTCat1(t,c) ==
t1 := nil
for ut in rest t for i in 1.. while (argN = 0) repeat
- sharp := INTERNL('"#",STRINGIMAGE i)
+ sharp := makeSymbol strconc('"#",toString i)
sharp = pat =>
argN := i
t1 := ut
diff --git a/src/interp/i-special.boot b/src/interp/i-special.boot
index ee5291ed..210996ee 100644
--- a/src/interp/i-special.boot
+++ b/src/interp/i-special.boot
@@ -2496,7 +2496,7 @@ up%Add t ==
-- them on the property list of the function name
for name in $specialOps repeat
- functionName:=INTERNL('up,name)
+ functionName := makeSymbol strconc('up,name)
property(name,'up) := functionName
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index ec20fd06..7ee5c2e4 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -2418,7 +2418,7 @@ undoCount(n) == --computes the number of undo's, given $IOindex
m :=
n >= 0 => $IOindex - n - 1
-n
- m >= $IOindex => userError strconc('"Magnitude of undo argument must be less than step number (",STRINGIMAGE $IOindex,'").")
+ m >= $IOindex => userError strconc('"Magnitude of undo argument must be less than step number (",toString $IOindex,'").")
m
@@ -2507,7 +2507,7 @@ removeUndoLines u == --called by writeInputLines
s1 = '")redo" => 0
s2 ~= '"" => undoCount readInteger s2
-1
- y.first := strconc('">",code,STRINGIMAGE n)
+ y.first := strconc('">",code,toString n)
nil
$IOindex := $IOindex + 1 --referenced by undoCount
acc := nil
diff --git a/src/interp/i-util.boot b/src/interp/i-util.boot
index 7bd3d8fe..634ea05d 100644
--- a/src/interp/i-util.boot
+++ b/src/interp/i-util.boot
@@ -68,13 +68,13 @@ MKPROMPT() ==
$inputPromptType = 'none => '""
$inputPromptType = 'plain => '"-> "
$inputPromptType = 'step =>
- strconc('"(",STRINGIMAGE $IOindex,'") -> ")
+ strconc('"(",toString $IOindex,'") -> ")
$inputPromptType = 'frame =>
strconc(STRINGIMAGE $interpreterFrameName,
- '" (",STRINGIMAGE $IOindex,'") -> ")
+ '" (",toString $IOindex,'") -> ")
strconc(STRINGIMAGE $interpreterFrameName,
'" [", subString(CURRENTTIME(),8),'"] [",
- STRINGIMAGE $IOindex, '"] -> ")
+ toString $IOindex, '"] -> ")
printPrompt(flush? == false) ==
diff --git a/src/interp/msg.boot b/src/interp/msg.boot
index 7fa2418f..9e14d732 100644
--- a/src/interp/msg.boot
+++ b/src/interp/msg.boot
@@ -516,7 +516,7 @@ makeMsgFromLine line ==
globalNumOfLine := poGlobalLinePosn posOfLine
localNumOfLine :=
i := poLinePosn posOfLine
- stNum := STRINGIMAGE i
+ stNum := toString i
strconc(rep(char " ", ($preLength - 7 - # stNum)),_
stNum)
['line,posOfLine,nil,nil, strconc('"Line", localNumOfLine),_
diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot
index 53cba5de..b8ae40b6 100644
--- a/src/interp/newfort.boot
+++ b/src/interp/newfort.boot
@@ -79,7 +79,7 @@ expression2Fortran1(name,e) ==
newFortranTempVar() ==
$exp2FortTempVarIndex := 1 + $exp2FortTempVarIndex
- newVar := makeSymbol strconc('"T",STRINGIMAGE $exp2FortTempVarIndex)
+ newVar := makeSymbol strconc('"T",toString $exp2FortTempVarIndex)
updateSymbolTable(newVar,$defaultFortranType)
newVar
@@ -909,7 +909,7 @@ fortSize e ==
z isnt [.,:.] => z
first z
-tempLen () == 1 + # STRINGIMAGE $exp2FortTempVarIndex
+tempLen () == 1 + # toString $exp2FortTempVarIndex
segment l ==
not $fortranSegment => l
diff --git a/src/interp/parse.boot b/src/interp/parse.boot
index 158e2dbf..beb9901a 100644
--- a/src/interp/parse.boot
+++ b/src/interp/parse.boot
@@ -384,7 +384,7 @@ superSub(name,x) ==
code:=
x is [[u]] => $quadSymbol
strconc('"_(",scriptTranRow first x,scriptTran rest x,'"_)")
- [INTERNL(symbolName name,"$",code),:y]
+ [makeSymbol strconc(symbolName name,"$",code),:y]
scriptTran: %List %Form -> %String
scriptTran x ==
diff --git a/src/interp/pathname.boot b/src/interp/pathname.boot
index 97cab246..3dece48d 100644
--- a/src/interp/pathname.boot
+++ b/src/interp/pathname.boot
@@ -138,7 +138,7 @@ getFunctionSourceFile1 fun ==
(file := KDR GETL(fun,'DEFLOC)) => pathname file
null ((fileinfo := FUNLOC fun) or
(fileinfo := FUNLOC unabbrev fun)) =>
- u := bootFind fun => getFunctionSourceFile1 SETQ($FUNCTION,INTERN u)
+ u := bootFind fun => getFunctionSourceFile1 SETQ($FUNCTION,makeSymbol u)
nil
3 = #fileinfo =>
[fn,ft,$FUNCTION] := fileinfo
diff --git a/src/interp/setvars.boot b/src/interp/setvars.boot
index b16fb1da..20e5b14b 100644
--- a/src/interp/setvars.boot
+++ b/src/interp/setvars.boot
@@ -694,7 +694,7 @@ countCache n ==
for x in l repeat
not ident? x => sayKeyedMsg("S2IF0007",[x])
$cacheAlist:= insertAlist(x,n,$cacheAlist)
- cacheCountName:= INTERNL(x,'";COUNT")
+ cacheCountName:= makeSymbol strconc(x,'";COUNT")
symbolValue(cacheCountName) := n
sayCacheCount(x,n)
optionError(CAAR $options,nil)
diff --git a/src/interp/showimp.boot b/src/interp/showimp.boot
index 48075d7c..de90aadc 100644
--- a/src/interp/showimp.boot
+++ b/src/interp/showimp.boot
@@ -281,7 +281,7 @@ dcSlots con ==
sayBrightlyNT bright i
item := template.i
item is [n,:op] and integer? n => dcOpLatchPrint(op,n)
- null item and i > 5 => sayBrightly ['"arg ",strconc('"#",STRINGIMAGE(i - 5))]
+ null item and i > 5 => sayBrightly ['"arg ",strconc('"#",toString(i - 5))]
item isnt [.,:.] => sayBrightly ['"fun ",item]
item is ['CONS,.,['FUNCALL,[.,a],b]] => sayBrightly ['"constant ",a]
sayBrightly concat('"lazy ",form2String formatSlotDomain i)
@@ -319,7 +319,7 @@ formatSlotDomain x ==
x = 2 => ["$$"]
integer? x =>
val := $infovec.0.x
- null val => [strconc('"#",STRINGIMAGE (x - 5))]
+ null val => [strconc('"#",toString (x - 5))]
formatSlotDomain val
x isnt [.,:.] => x
x is ['NRTEVAL,y] => (y isnt [.,:.] => [y]; y)
@@ -449,7 +449,7 @@ dcData1 vec ==
tens := n quo 10
for i in 0..tens repeat
start := 10*i
- sayBrightlyNT rightJustifyString(STRINGIMAGE start,6)
+ sayBrightlyNT rightJustifyString(toString start,6)
sayBrightlyNT '" |"
for j in start..MIN(start + 9,n) repeat
sayBrightlyNT rightJustifyString(STRINGIMAGE vec.j,6)
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index 7f11f33a..fc54d770 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -275,7 +275,7 @@ compileRecurrenceRelation(op,nam,argl,junk,[body,sharpArg,n,:initCode]) ==
stateNam:= GENVAR()
stateVar:= gensym()
stateVal:= gensym()
- lastArg := INTERNL strconc('"#",STRINGIMAGE(#argl + 1))
+ lastArg := makeSymbol strconc('"#",toString(#argl + 1))
decomposeBindings:=
[[gIndex,["ELT",lastArg,0]],:[[g,["ELT",lastArg,i]]
for g in gsList for i in 1..]]
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index c1e71e8b..010c4fe0 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.boot
@@ -659,7 +659,7 @@ shortenForPrinting val ==
val
spadTraceAlias(domainId,op,n) ==
- INTERNL(domainId,".",op,",",STRINGIMAGE n)
+ makeSymbol strconc(domainId,".",op,",",STRINGIMAGE n)
getOption(opt,l) ==
y:= ASSOC(opt,l) => rest y