diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-05-09 16:34:01 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-05-09 16:34:01 +0000 |
| commit | fe4b74b0a56bc60835a7f4e7f6344f7ceea0b0b6 (patch) | |
| tree | e04fba9d297f0f414733a2b3089380d715c0e8bf /src/interp/i-map.boot | |
| parent | b248654cba0d6c5ae213882837140358f92bab1c (diff) | |
| download | open-axiom-fe4b74b0a56bc60835a7f4e7f6344f7ceea0b0b6.tar.gz | |
* interp/bc-solve.boot: Move cleanup.
* interp/br-con.boot: Likewise.
* interp/br-op1.boot: Likewise.
* interp/br-saturn.boot: Likewise.
* interp/br-search.boot: Likewise.
* interp/br-util.boot: Likewise.
* interp/c-util.boot: Likewise.
* interp/cattable.boot: Likewise.
* interp/cparse.boot: Likewise.
* interp/cstream.boot: Likewise.
* interp/fortcall.boot: Likewise.
* interp/g-timer.boot: Likewise.
* interp/ht-util.boot: Likewise.
* interp/htcheck.boot: Likewise.
* interp/htsetvar.boot: Likewise.
* interp/i-map.boot: Likewise.
* interp/i-output.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/i-toplev.boot: Likewise.
* interp/i-util.boot: Likewise.
* interp/incl.boot: Likewise.
* interp/int-top.boot: Likewise.
* interp/interop.boot: Likewise.
* interp/intfile.boot: Likewise.
* interp/lisplib.boot: Likewise.
* interp/macex.boot: Likewise.
* interp/msgdb.boot: Likewise.
* interp/newfort.boot: Likewise.
* interp/nrunfast.boot: Likewise.
* interp/nrungo.boot: Likewise.
* interp/pathname.boot: Likewise.
* interp/profile.boot: Likewise.
* interp/pspad1.boot: Likewise.
* interp/ptrees.boot: Likewise.
* interp/scan.boot: Likewise.
* interp/sys-os.boot: Likewise.
* interp/sys-utility.boot: Likewise.
* interp/wi1.boot: Likewise.
Diffstat (limited to 'src/interp/i-map.boot')
| -rw-r--r-- | src/interp/i-map.boot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot index 41026051..661e5f5c 100644 --- a/src/interp/i-map.boot +++ b/src/interp/i-map.boot @@ -47,12 +47,12 @@ $mapThrowCount := 0 -- times a "return" occurs in map $specialMapNameSuffix := NIL makeInternalMapName(userName,numArgs,numMms,extraPart) == - name := CONCAT('"*",STRINGIMAGE numArgs,'";", + name := strconc('"*",STRINGIMAGE numArgs,'";", object2String userName,'";",STRINGIMAGE numMms,'";", object2String frameName first $interpreterFrameRing ) - if extraPart then name := CONCAT(name,'";",extraPart) + if extraPart then name := strconc(name,'";",extraPart) if $specialMapNameSuffix then - name := CONCAT(name,'";",$specialMapNameSuffix) + name := strconc(name,'";",$specialMapNameSuffix) INTERN name isInternalMapName name == @@ -441,11 +441,11 @@ simplifyMapConstructorRefs form == args is [obj,dom] => dom' := prefix2String dom --if atom dom' then dom' := [dom'] - --[op,obj,APPLY('CONCAT,dom')] + --[op,obj,apply('CONCAT,dom')] dom'' := atom dom' => dom' null rest dom' => first dom' - APPLY('CONCAT, dom') + apply('CONCAT, dom') [op,obj, dom''] form form @@ -977,7 +977,7 @@ mkValCheck(val,i) == mkSharpVar i == -- create #i - INTERN CONCAT('"#",STRINGIMAGE i) + INTERN strconc('"#",STRINGIMAGE i) mapPredTran pred == -- transforms "x in i..j" to "x>=i and x<=j" |