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 | |
| 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')
40 files changed, 175 insertions, 134 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 09ee6ec7..931cd612 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,46 @@ 2010-05-09 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/bc-solve.boot: Move cleanups. + * 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. + +2010-05-09 Gabriel Dos Reis <gdr@cs.tamu.edu> + * boot/tokens.boot: Don't rename 'cons'. * interp/msg.boot: Remove uses of cons. * interp/postpar.boot: Likewise. diff --git a/src/interp/bc-solve.boot b/src/interp/bc-solve.boot index 73487edc..be4a176b 100644 --- a/src/interp/bc-solve.boot +++ b/src/interp/bc-solve.boot @@ -184,14 +184,14 @@ bcCreateVariableString(i) == STRCONC('"x",STRINGIMAGE i) bcMakeUnknowns(number)== - APPLY('CONCAT,[STRCONC(bcCreateVariableString(i)," ") for i in 1..number]) + apply('CONCAT,[STRCONC(bcCreateVariableString(i)," ") for i in 1..number]) bcMakeEquations(i,number)== number =1 => STRCONC(bcCreateVariableString(1),"^2+1") bcCreateVariableString(i) STRCONC( STRCONC( - APPLY('CONCAT,[STRCONC(bcCreateVariableString(j),"+") for j in 1..number]),"1"), + apply('CONCAT,[STRCONC(bcCreateVariableString(j),"+") for j in 1..number]),"1"), STRCONC("-2*",STRCONC(bcCreateVariableString(i),"^2"))) @@ -202,7 +202,7 @@ bcMakeLinearEquations(i,number)== STRCONC(bcCreateVariableString(1),STRCONC("-",bcCreateVariableString(2))) STRCONC( STRCONC( - APPLY('CONCAT,[STRCONC(bcCreateVariableString(j),"+") for j in 1..number]),"1"), + apply('CONCAT,[STRCONC(bcCreateVariableString(j),"+") for j in 1..number]),"1"), STRCONC("-2*",bcCreateVariableString(i))) diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot index 46bd1b22..88aa8d8d 100644 --- a/src/interp/br-con.boot +++ b/src/interp/br-con.boot @@ -978,7 +978,7 @@ dbShowCons1(htPage,cAlist,key) == htPage => htCopyProplist htPage nil page := htInitPageNoScroll(proplist,dbConsHeading(htPage,conlist,key,kind)) - if u := htpProperty(page,'specialMessage) then APPLY(first u,rest u) + if u := htpProperty(page,'specialMessage) then apply(first u,rest u) htSayStandard('"\beginscroll ") htpSetProperty(page,'cAlist,cAlist) $conformsAreDomains: local := htpProperty(page,'domname) @@ -1320,5 +1320,5 @@ digits2Names s == n := DIGIT_-CHAR_-P c => ('("Zero" "One" "Two" "Three" "Four" "Five" "Six" "Seven" "Eight" "Nine")).n c - CONCAT(str, segment) + strconc(str, segment) str diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot index 6d48665c..c3737af7 100644 --- a/src/interp/br-op1.boot +++ b/src/interp/br-op1.boot @@ -162,7 +162,7 @@ dbShowOp1(htPage,opAlist,which,key) == htpSetProperty(page,'data,data) htpSetProperty(page,'branch,branch) -- the only place where specialMessage property is set seems to be commented. out - if u := htpProperty(page,'specialMessage) then APPLY(first u,rest u) + if u := htpProperty(page,'specialMessage) then apply(first u,rest u) htSayStandard('"\beginscroll ") FUNCALL(fn,page,opAlist,which,data) --apply branch function dbOpsExposureMessage() @@ -218,7 +218,7 @@ conform2StringList(form,opFn,argFn,exception) == exception := exception or '"%%%nothing%%%" [op1,:args] := form op := IFCAR HGET($lowerCaseConTb,op1) or op1 - null args => APPLY(opFn,[op]) + null args => apply(opFn,[op]) special := op in '(Union Record Mapping) cosig := special => ['T for x in args] @@ -236,7 +236,7 @@ conform2StringList(form,opFn,argFn,exception) == x = exception => dbOpsForm exception pred => string? x => [x] - u := APPLY(argFn,[x]) + u := apply(argFn,[x]) atom u and [u] or u typ := sublisFormal(args,atype) if x is ['QUOTE,a] then x := a @@ -248,7 +248,7 @@ conform2StringList(form,opFn,argFn,exception) == op = 'Mapping => dbMapping2StringList sargl head := special => [op] - APPLY(opFn,[form]) + apply(opFn,[form]) [:head,'"(",:first sargl,:"append"/[[",",:y] for y in rest sargl],'")"] @@ -305,7 +305,7 @@ dbConformGen1(form,opButton?) == originalOp=op => form [op, :args] args => conform2StringList(form, opFunction,FUNCTION dbConformGen,nil) - APPLY(opFunction,[form]) + apply(opFunction,[form]) unAbbreviateIfNecessary op == IFCAR HGET($lowerCaseConTb, op) or op diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot index 261137b2..b9779a85 100644 --- a/src/interp/br-saturn.boot +++ b/src/interp/br-saturn.boot @@ -181,13 +181,13 @@ htShowPageNoScroll() == if $standard then $htLineList := nil htMakePage htpPageDescription $curPage - if $htLineList then line := apply(function CONCAT, nreverse $htLineList) + if $htLineList then line := apply(function strconc, nreverse $htLineList) issueHTStandard line ---------------------- if $saturn then $htLineList := nil htMakePage htpPageDescription $saturnPage - if $htLineList then line := apply(function CONCAT, nreverse $htLineList) + if $htLineList then line := apply(function strconc, nreverse $htLineList) issueHTSaturn line ---------------------- endHTPage() @@ -230,7 +230,7 @@ htMakeErrorPage htPage == if $standard then $curPage := htPage if $saturn then $saturnPage := htPage htMakePage htpPageDescription htPage - line := apply(function CONCAT, nreverse $htLineList) + line := apply(function strconc, nreverse $htLineList) issueHT line endHTPage() @@ -560,7 +560,7 @@ htProcessBcStrings strings == setUpDefault(stringName, ['string, default, spadType, filter]) if htpLabelErrorMsg(page(), stringName) then iht ['"\centerline{{\em ", htpLabelErrorMsg(page(), stringName), '"}}"] - mess2 := CONCAT(mess2, bcSadFaces()) + mess2 := strconc(mess2, bcSadFaces()) htpSetLabelErrorMsg(page(), stringName, nil) iht ['"\inputstring{", stringName, '"}{", numChars, '"}{", htpLabelDefault(page(),stringName), '"} ", mess2] diff --git a/src/interp/br-search.boot b/src/interp/br-search.boot index 18448cb4..5bc3b53b 100644 --- a/src/interp/br-search.boot +++ b/src/interp/br-search.boot @@ -353,7 +353,7 @@ spadType(x) == --called by \spadtype{x} from HyperDoc systemError ['"Argument: ",s,'" to spadType won't parse"] if atom form then form := [form] op := opOf form - looksLikeDomainForm form => APPLY(function conPage,form) + looksLikeDomainForm form => apply(function conPage,form) conPage(op) looksLikeDomainForm x == diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot index 2f976504..d8ec427b 100644 --- a/src/interp/br-util.boot +++ b/src/interp/br-util.boot @@ -112,11 +112,11 @@ capitalize s == escapeSpecialIds u == --very expensive function x := LASSOC(u,$htCharAlist) => [x] #u = 1 => - member(u, $htSpecialChars) => [CONCAT('"_\", u)] + member(u, $htSpecialChars) => [strconc('"_\", u)] [u] c := char u.0 or/[c = char y for y in $htSpecialChars] => - [CONCAT('"_\",u)] + [strconc('"_\",u)] [u] escapeString com == --this makes changes on single comment lines @@ -489,7 +489,7 @@ bcNameCountTable(u,fn,gn,:options) == dbSayItemsItalics(:u) == htSay '"{\em " - APPLY(function dbSayItems,u) + apply(function dbSayItems,u) htSay '"}" dbSayItems(countOrPrefix,singular,plural,:options) == diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot index b5bcf197..9ce5ab3f 100644 --- a/src/interp/c-util.boot +++ b/src/interp/c-util.boot @@ -174,7 +174,7 @@ devaluateDeeply x == --CONTINUE() == continue() continue() == FIN comp($x,$m,$f) -LEVEL(:l) == APPLY('level,l) +LEVEL(:l) == apply('level,l) level(:l) == null l => same() l is [n] and integer? n => displayComp ($level:= n) diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot index 939442d8..4886ea55 100644 --- a/src/interp/cattable.boot +++ b/src/interp/cattable.boot @@ -296,7 +296,7 @@ mkCategoryExtensionAlistBasic cform == --category:= eval cform category := -- changed by RSS on 7/29/87 macrop cop => eval cform - APPLY(cop, rest cform) + apply(cop, rest cform) extendsList:= [[x,:'T] for x in category.4.0] for [cat,pred,:.] in category.4.1 repeat newList := getCategoryExtensionAlist0 cat diff --git a/src/interp/cparse.boot b/src/interp/cparse.boot index 6c3c1ec4..6f13f2dd 100644 --- a/src/interp/cparse.boot +++ b/src/interp/cparse.boot @@ -128,7 +128,7 @@ npParenthesized f== npParenthesize (open,close,f)== a:=$stok npEqKey open => - APPLY(f,nil) and (npEqKey close or npMissingMate(close,a))=> true + apply(f,nil) and (npEqKey close or npMissingMate(close,a))=> true npEqKey close => npPush [] npMissingMate(close,a) false @@ -137,7 +137,7 @@ npEnclosed(open,close,fn,f)== a:=$stok npEqKey open => npEqKey close => npPush FUNCALL(fn,a,pfTuple pfListOf []) - APPLY(f,nil) and (npEqKey close or npMissingMate(close,a))=> + apply(f,nil) and (npEqKey close or npMissingMate(close,a))=> npPush FUNCALL (fn,a,pfEnSequence npPop1()) false false @@ -164,19 +164,19 @@ npPileBracketed f== if npEqKey "SETTAB" then if npEqKey "BACKTAB" then npPush pfNothing() -- never happens - else if APPLY(f,nil) and (npEqKey "BACKTAB" or npMissing "backtab") + else if apply(f,nil) and (npEqKey "BACKTAB" or npMissing "backtab") then npPush pfPile npPop1() else false else false npListofFun(f,h,g)== - if APPLY(f,nil) + if apply(f,nil) then - if APPLY(h,nil) and (APPLY(f,nil) or npTrap()) + if apply(h,nil) and (apply(f,nil) or npTrap()) then a:=$stack $stack:=nil - while APPLY(h,nil) and (APPLY(f,nil) or npTrap()) repeat 0 + while apply(h,nil) and (apply(f,nil) or npTrap()) repeat 0 $stack := [nreverse $stack,:a] npPush FUNCALL(g, [npPop3(),npPop2(),:npPop1()]) else @@ -184,15 +184,15 @@ npListofFun(f,h,g)== else false npList(f,str1,g)== -- always produces a list, g is applied to it - if APPLY(f,nil) + if apply(f,nil) then if npEqKey str1 and (npEqKey "BACKSET" or true) - and (APPLY(f,nil) or npTrap()) + and (apply(f,nil) or npTrap()) then a:=$stack $stack:=nil while npEqKey str1 and (npEqKey "BACKSET" or true) and - (APPLY(f,nil) or npTrap()) repeat 0 + (apply(f,nil) or npTrap()) repeat 0 $stack := [nreverse $stack,:a] npPush FUNCALL(g, [npPop3(),npPop2(),:npPop1()]) else @@ -232,16 +232,16 @@ npPC(f) == -- s must transform the head of the stack npAnyNo s== - while APPLY(s,nil) repeat 0 + while apply(s,nil) repeat 0 true npAndOr(keyword,p,f)== - npEqKey keyword and (APPLY(p,nil) or npTrap()) + npEqKey keyword and (apply(p,nil) or npTrap()) and npPush FUNCALL(f, npPop1()) npRightAssoc(o,p)== a:=npState() - if APPLY(p,nil) + if apply(p,nil) then while npInfGeneric o and (npRightAssoc(o,p) or (npPush pfApplication(npPop2(),npPop1());false)) repeat @@ -255,10 +255,10 @@ npRightAssoc(o,p)== -- p o p o = (p o p) o npLeftAssoc(operations,parser)== - if APPLY(parser,nil) + if apply(parser,nil) then while npInfGeneric(operations) - and (APPLY(parser,nil) or + and (apply(parser,nil) or (npPush pfApplication(npPop2(),npPop1());false)) repeat npPush pfInfApplication(npPop2(),npPop2(),npPop1()) @@ -305,18 +305,18 @@ npConditional f== then if npEqKey "SETTAB" then if npEqKey "THEN" - then (APPLY(f,nil) or npTrap()) and npElse(f) + then (apply(f,nil) or npTrap()) and npElse(f) and npEqKey "BACKTAB" else npMissing "then" else if npEqKey "THEN" - then (APPLY(f,nil) or npTrap()) and npElse(f) + then (apply(f,nil) or npTrap()) and npElse(f) else npMissing "then" else false npElse(f)== a:=npState() if npBacksetElse() - then (APPLY(f,nil) or npTrap()) and + then (apply(f,nil) or npTrap()) and npPush pfIf(npPop3(),npPop2(),npPop1()) else npRestore a @@ -418,7 +418,7 @@ npPrefixColon()== npEqPeek "COLON" and -- silly -npEncAp(f)== APPLY(f,nil) and npAnyNo function npEncl +npEncAp(f)== apply(f,nil) and npAnyNo function npEncl and npFromdom() @@ -437,7 +437,7 @@ npFromdom1 c== npPrimary()== npPrimary1() or npPrimary2() -npDotted f== APPLY(f,nil) and npAnyNo function npSelector +npDotted f== apply(f,nil) and npAnyNo function npSelector npSelector()== npEqKey "DOT" and (npPrimary() or npTrap()) and @@ -562,10 +562,10 @@ npExpress()== npPush pfCollect (npPop2(),pfListOf npPop1()) or true) npZeroOrMore f== - APPLY(f,nil)=> + apply(f,nil)=> a:=$stack $stack:=nil - while APPLY(f,nil) repeat 0 + while apply(f,nil) repeat 0 $stack := [nreverse $stack,:a] npPush [npPop2(),:npPop1()] npPush nil @@ -606,10 +606,10 @@ npStatement()== npBackTrack(p1,p2,p3)== a:=npState() - APPLY(p1,nil) => + apply(p1,nil) => npEqPeek p2 => npRestore a - APPLY(p3,nil) or npTrap() + apply(p3,nil) or npTrap() true false @@ -965,7 +965,7 @@ npListAndRecover(f)== done:=false c:=$inputStream while not done repeat - found:=CATCH("TRAPPOINT",APPLY(f,nil)) + found:=CATCH("TRAPPOINT",apply(f,nil)) if found="TRAPPED" then $inputStream:=c diff --git a/src/interp/cstream.boot b/src/interp/cstream.boot index 0e176c0a..b6a3d311 100644 --- a/src/interp/cstream.boot +++ b/src/interp/cstream.boot @@ -42,7 +42,7 @@ npNull x== StreamNull x StreamNull x== null x or x is ["nullstream",:.] => true while x is ["nonnullstream",:.] repeat - st:=APPLY(second x,CDDR x) + st:=apply(second x,CDDR x) x.first := first st x.rest := rest st x is ["nullstream",:.] @@ -89,7 +89,7 @@ next(f,s)==Delay(function next1,[f,s]) next1(:z)== [f,s]:=z StreamNull s=> StreamNil - h:= APPLY(f, [s]) + h:= apply(f, [s]) incAppend(car h,next(f,cdr h)) nextown(f,g,s)==Delay(function nextown1,[f,g,s]) @@ -107,8 +107,8 @@ nextown2(f,g,e,x) == spadcall1(g)== [impl, :env] := g - APPLY(impl, [env]) + apply(impl, [env]) spadcall2(f,args) == [impl, :env] := f - APPLY(impl, [args, env]) + apply(impl, [args, env]) diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot index 8eb93631..b464093f 100644 --- a/src/interp/fortcall.boot +++ b/src/interp/fortcall.boot @@ -571,12 +571,12 @@ prepareResults(results,args,dummies,values,decls) == LISTP(type) and first(type)="character" => MAKE_-STRING(1) LISTP(type) and first(type) in ["complex","double complex"] => makeVector( makeList( - 2*APPLY('_*,[getVal(tt,argNames,actual) for tt in rest(type)]),_ + 2*apply('_*,[getVal(tt,argNames,actual) for tt in rest(type)]),_ if first(type)="complex" then shortZero else longZero),_ if first(type)="complex" then "%SingleFloat" else "%DoubleFloat" ) LISTP type => makeVector(_ makeList( - APPLY('_*,[getVal(tt,argNames,actual) for tt in rest(type)]),_ + apply('_*,[getVal(tt,argNames,actual) for tt in rest(type)]),_ defaultValue(first type,argNames,actual)),_ checkForBoolean lispType first(type) ) type = "integer" => 0 diff --git a/src/interp/g-timer.boot b/src/interp/g-timer.boot index 1e737c68..025f1050 100644 --- a/src/interp/g-timer.boot +++ b/src/interp/g-timer.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2009, Gabriel Dos Reis. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -102,8 +102,8 @@ normalizeStatAndStringify t == INTP t => K := 1024 M := K*K - t > 9*M => CONCAT(STRINGIMAGE QUOTIENT(t + 512*K,M), '"M") - t > 9*K => CONCAT(STRINGIMAGE QUOTIENT(t + 512,K), '"K") + t > 9*M => strconc(STRINGIMAGE QUOTIENT(t + 512*K,M), '"M") + t > 9*K => strconc(STRINGIMAGE QUOTIENT(t + 512,K), '"K") STRINGIMAGE t STRINGIMAGE t diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot index b7cdb90d..000dedfa 100644 --- a/src/interp/ht-util.boot +++ b/src/interp/ht-util.boot @@ -348,7 +348,7 @@ htInputStrings strings == if htpLabelErrorMsg($curPage, stringName) then iht ['"\centerline{{\em ", htpLabelErrorMsg($curPage, stringName), '"}}"] - mess2 := CONCAT(mess2, bcSadFaces()) + mess2 := strconc(mess2, bcSadFaces()) htpSetLabelErrorMsg($curPage, stringName, nil) iht '"\item " bcIssueHt mess1 @@ -405,7 +405,7 @@ htMakeTemplates(templateList, numLabels) == [[substLabel(i, template) for template in templateList] for i in 1..numLabels] where substLabel(i, template) == cons? template => - INTERN CONCAT(first template, PRINC_-TO_-STRING i, rest template) + INTERN strconc(first template, PRINC_-TO_-STRING i, rest template) template templateParts template == @@ -419,7 +419,7 @@ htMakeDoneButton(message, func) == if message = '"Continue" then bchtMakeButton('"\lispdownlink", "\ContinueBitmap", func) else - bchtMakeButton('"\lispdownlink",CONCAT('"\box{", message, '"}"), func) + bchtMakeButton('"\lispdownlink",strconc('"\box{", message, '"}"), func) bcHt '"} " htProcessDoneButton [label , func] == @@ -430,7 +430,7 @@ htProcessDoneButton [label , func] == else if label = '"Push to enter names" then htMakeButton('"\lispdownlink",'"\ControlBitmap{ClickToSet}", func) else - htMakeButton('"\lispdownlink", CONCAT('"\box{", label, '"}"), func) + htMakeButton('"\lispdownlink", strconc('"\box{", label, '"}"), func) iht '"} " @@ -449,7 +449,7 @@ bchtMakeButton(htCommand, message, func) == htProcessDoitButton [label, command, func] == fun := mkCurryFun(func, [command]) iht '"\newline\vspace{1}\centerline{" - htMakeButton('"\lispcommand", CONCAT('"\box{", label, '"}"), fun) + htMakeButton('"\lispcommand", strconc('"\box{", label, '"}"), fun) iht '"} " iht '"\vspace{2}{Select \ \UpButton{} \ to go back one page.}" iht '"\newline{Select \ \ExitButton{QuitPage} \ to remove this window.}" @@ -520,8 +520,8 @@ checkCondition(s1, string, condList) == condErrorMsg type == typeString := form2String type - if cons? typeString then typeString := APPLY(function CONCAT, typeString) - CONCAT('"Error: Could not make your input into a ", typeString) + if cons? typeString then typeString := apply(function strconc, typeString) + strconc('"Error: Could not make your input into a ", typeString) parseAndEval string == $InteractiveMode :fluid := true @@ -546,29 +546,29 @@ parseAndEval1 string == nil makeSpadCommand(:l) == - opForm := CONCAT(first l, '"(") + opForm := strconc(first l, '"(") lastArg := last l l := rest l argList := nil for arg in l while arg ~= lastArg repeat - argList := [CONCAT(arg, '", "), :argList] + argList := [strconc(arg, '", "), :argList] argList := nreverse [lastArg, :argList] - CONCAT(opForm, APPLY(function CONCAT, argList), '")") + strconc(opForm, apply(function strconc, argList), '")") htMakeInputList stringList == -- makes an input form for constructing a list lastArg := last stringList argList := nil for arg in stringList while arg ~= lastArg repeat - argList := [CONCAT(arg, '", "), :argList] + argList := [strconc(arg, '", "), :argList] argList := nreverse [lastArg, :argList] - bracketString APPLY(function CONCAT, argList) + bracketString apply(function strconc, argList) -- predefined filter strings -bracketString string == CONCAT('"[",string,'"]") +bracketString string == strconc('"[",string,'"]") -quoteString string == CONCAT('"_"", string, '"_"") +quoteString string == strconc('"_"", string, '"_"") $funnyQuote := char 127 $funnyBacks := char 128 diff --git a/src/interp/htcheck.boot b/src/interp/htcheck.boot index 67de7673..c548fcbb 100644 --- a/src/interp/htcheck.boot +++ b/src/interp/htcheck.boot @@ -85,7 +85,7 @@ $primitiveHtCommands := '( buildHtMacroTable() == $htMacroTable := MAKE_-HASHTABLE 'UEQUAL - fn := CONCAT(systemRootDirectory(), '"/share/hypertex/pages/util.ht") + fn := strconc(systemRootDirectory(), '"/share/hypertex/pages/util.ht") if PROBE_-FILE(fn) then instream := MAKE_-INSTREAM fn while not EOFP instream repeat diff --git a/src/interp/htsetvar.boot b/src/interp/htsetvar.boot index f788a852..9cf6a8e8 100644 --- a/src/interp/htsetvar.boot +++ b/src/interp/htsetvar.boot @@ -208,7 +208,7 @@ htSetvarDoneButton(message, func) == if message = '"Select to Set Value" or message = '"Select to Set Values" then bchtMakeButton('"\lisplink",'"\ControlBitmap{ClickToSet}", func) else - bchtMakeButton('"\lisplink",CONCAT('"\fbox{", message, '"}"), func) + bchtMakeButton('"\lisplink",strconc('"\fbox{", message, '"}"), func) bcHt '"} " 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" diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index e96590c7..67fde10e 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -411,7 +411,7 @@ obj2String o == o = ")" => '")" o = "(" => '"(" STRINGIMAGE o - APPLY('STRCONC,[obj2String o' for o' in o]) + apply('STRCONC,[obj2String o' for o' in o]) APP(u,x,y,d) == atom u => appChar(atom2String u,x,y,d) @@ -1589,18 +1589,18 @@ outputNumber(start,linelength,num) == linelength:=linelength-1 while SIZE(num) > linelength repeat if $collectOutput then - $outputLines := [CONCAT(blnks, SUBSTRING(num,0,linelength),under), + $outputLines := [strconc(blnks, SUBSTRING(num,0,linelength),under), :$outputLines] else sayALGEBRA [blnks, SUBSTRING(num,0,linelength),under] num := SUBSTRING(num,linelength,NIL) if firsttime then - blnks:=CONCAT(blnks,'" ") + blnks:=strconc(blnks,'" ") linelength:=linelength-1 firsttime:=NIL if $collectOutput then - $outputLines := [CONCAT(blnks, num), :$outputLines] + $outputLines := [strconc(blnks, num), :$outputLines] else sayALGEBRA [blnks, num] @@ -1609,13 +1609,13 @@ outputString(start,linelength,str) == else blnks := '"" while SIZE(str) > linelength repeat if $collectOutput then - $outputLines := [CONCAT(blnks, SUBSTRING(str,0,linelength)), + $outputLines := [strconc(blnks, SUBSTRING(str,0,linelength)), :$outputLines] else sayALGEBRA [blnks, SUBSTRING(str,0,linelength)] str := SUBSTRING(str,linelength,NIL) if $collectOutput then - $outputLines := [CONCAT(blnks, str), :$outputLines] + $outputLines := [strconc(blnks, str), :$outputLines] else sayALGEBRA [blnks, str] @@ -2460,8 +2460,8 @@ altSuperSubApp(u, x, y, di) == sublist := everyNth(u := rest u, 2) suplist := everyNth(IFCDR u, 2) - ysub := y - 1 - APPLY('MAX, [ab, :[superspan s for s in sublist]]) - ysup := y + 1 + APPLY('MAX, [ar, :[subspan s for s in sublist]]) + ysub := y - 1 - apply('MAX, [ab, :[superspan s for s in sublist]]) + ysup := y + 1 + apply('MAX, [ar, :[subspan s for s in sublist]]) for sub in sublist for sup in suplist repeat wsub := WIDTH sub wsup := WIDTH sup diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot index 55a507cf..bb0833ba 100644 --- a/src/interp/i-syscmd.boot +++ b/src/interp/i-syscmd.boot @@ -142,7 +142,7 @@ unAbbreviateKeyword x == x' :=selectOptionLC(x,$SYSCOMMANDS,'commandErrorIfAmbiguous) if not x' then x' := 'system - SETQ(LINE, CONCAT('")system ", SUBSTRING(LINE, 1, #LINE-1))) + SETQ(LINE, strconc('")system ", SUBSTRING(LINE, 1, #LINE-1))) $currentLine := LINE selectOption(x',commandsForUserLevel $systemCommands, 'commandUserLevelError) @@ -2605,7 +2605,7 @@ spool filename == TERPRI() resetHighlight() PROBE_-FILE STRING first filename => - systemError CONCAT('"file ", STRING first filename, '" already exists") + systemError strconc('"file ", STRING first filename, '" already exists") DRIBBLE STRING first filename SETQ(_*TRACE_-OUTPUT_*,_*STANDARD_-OUTPUT_*) TERPRI() @@ -2828,7 +2828,7 @@ removeUndoLines u == --called by writeInputLines s1 = '")redo" => 0 s2 ~= '"" => undoCount PARSE_-INTEGER s2 -1 - y.first := CONCAT('">",code,STRINGIMAGE n) + y.first := strconc('">",code,STRINGIMAGE n) nil $IOindex := $IOindex + 1 --referenced by undoCount acc := nil @@ -3096,7 +3096,7 @@ processSynonyms() == else opt := '" " if (SIZE synstr) > (SIZE fun) then for i in (SIZE fun)..(SIZE synstr) repeat - fun := CONCAT (fun, '" ") + fun := strconc (fun, '" ") -- $currentLine := STRCONC(fill,RPLACSTR(line, 1, SIZE synstr, fun),opt) cl := STRCONC(fill,RPLACSTR(line, 1, SIZE synstr, fun),opt) SETQ(LINE,cl) @@ -3115,7 +3115,7 @@ tabsToBlanks s == s doSystemCommand string == - string := CONCAT('")", EXPAND_-TABS string) + string := strconc('")", EXPAND_-TABS string) LINE: fluid := string processSynonyms() string := LINE @@ -3162,7 +3162,7 @@ handleNoParseCommands(unab, string) == copyright )) => sayKeyedMsg("S2IV0005", NIL) nil - funName := INTERN CONCAT('"np",STRING unab) + funName := INTERN strconc('"np",STRING unab) FUNCALL(funName, SUBSEQ(string, spaceIndex+1)) diff --git a/src/interp/i-toplev.boot b/src/interp/i-toplev.boot index fd2a5695..cc0a6e03 100644 --- a/src/interp/i-toplev.boot +++ b/src/interp/i-toplev.boot @@ -89,7 +89,7 @@ start(:l) == SETQ($IOindex,1) if $displayStartMsgs then sayKeyedMsg("S2IZ0053",['"history"]) initHist() - if functionp 'addtopath then addtopath CONCAT(systemRootDirectory(),'"bin") + if functionp 'addtopath then addtopath strconc(systemRootDirectory(),'"bin") if null(l) then if $displayStartMsgs then sayKeyedMsg("S2IZ0053",[namestring ['_.axiom,'input]]) @@ -267,12 +267,12 @@ msgText(key, args) == msg := segmentKeyedMsg getKeyedMsg key msg := substituteSegmentedMsg(msg,args) msg := flowSegmentedMsg(msg,$LINELENGTH,$MARGIN) - APPLY(function CONCAT, [STRINGIMAGE x for x in CDAR msg]) + apply(function strconc, [STRINGIMAGE x for x in CDAR msg]) justifyMyType(t) == len := #t len > $LINELENGTH => t - CONCAT(fillerSpaces($LINELENGTH-len), t) + strconc(fillerSpaces($LINELENGTH-len), t) typeTimePrin x == $highlightDelta: local:= 0 diff --git a/src/interp/i-util.boot b/src/interp/i-util.boot index 708f07d5..4762fccb 100644 --- a/src/interp/i-util.boot +++ b/src/interp/i-util.boot @@ -135,7 +135,7 @@ Undef(:u) == if $reportBottomUpFlag then sayMessage concat ['" Retrospective determination of slot",'%b, slot,'%d,'"of",'%b,:prefix2String domain,'%d] - APPLY(first ELT(domain',slot),[:u'',rest ELT(domain',slot)]) + apply(first ELT(domain',slot),[:u'',rest ELT(domain',slot)]) throwKeyedMsg("S2IF0008",[formatOpSignature(op,sig),domain]) makeInitialModemapFrame() == diff --git a/src/interp/incl.boot b/src/interp/incl.boot index 33bce836..538ed37f 100644 --- a/src/interp/incl.boot +++ b/src/interp/incl.boot @@ -198,7 +198,7 @@ incLine1(eb, str,str1, gno, lno, ufo) == ln := lnCreate(eb,str,gno,lno,ufo) [[ln,:1],:str1] xlSkip(eb, str, lno, ufo) == - str := CONCAT('"-- Omitting:", str) + str := strconc('"-- Omitting:", str) [incLine(eb, str, -1, lno, ufo), [NIL, "none"]] xlMsg(eb, str, lno, ufo, mess) == @@ -290,7 +290,7 @@ incLude1 (:z) == info.2 = '"other" => Skipping? state => [xlSkip(eb,str,lno,ufos.0), :Rest s] - [xlOK1(eb, str,CONCAT('")command",str), lno, ufos.0), + [xlOK1(eb, str,strconc('")command",str), lno, ufos.0), :Rest s] info.2 = '"say" => @@ -423,7 +423,7 @@ inclmsgConStill n == inclmsgFinSkipped() == ['S2CI0008, []] inclmsgIfSyntax(ufo,found,context) == - found := CONCAT('")", found) + found := strconc('")", found) ['S2CI0009, [%id found, %id context, %origin ufo]] inclmsgNoSuchFile fn == ['S2CI0010, [%fname fn]] diff --git a/src/interp/int-top.boot b/src/interp/int-top.boot index f08302ce..ebef2d83 100644 --- a/src/interp/int-top.boot +++ b/src/interp/int-top.boot @@ -163,7 +163,7 @@ intloopReadConsole(b, n)== c := ncloopCommand(d,n) not $leanMode and printPrompt() intloopReadConsole('"", c) - a:=CONCAT(b,a) + a:=strconc(b,a) ncloopEscaped a => intloopReadConsole(SUBSEQ(a, 0, (LENGTH a) - 1),n) c := intloopProcessString(a, n) not $leanMode and printPrompt() @@ -330,7 +330,7 @@ ncloopPrintLines lines == ncloopIncFileName string== fn := incFileName string not fn => - WRITE_-LINE (CONCAT(string, '" not found")) + WRITE_-LINE (strconc(string, '" not found")) [] fn @@ -410,7 +410,7 @@ ncConversationPhase(fn, args) == $ncMsgList: local := [] $convPhase: local := 'NoPhase - UNWIND_-PROTECT( APPLY(fn, args), wrapup(carrier) ) where + UNWIND_-PROTECT( apply(fn, args), wrapup(carrier) ) where wrapup(carrier) == for m in $ncMsgList repeat ncPutQ(carrier, 'messages, [m, :ncEltQ(carrier, 'messages)]) diff --git a/src/interp/interop.boot b/src/interp/interop.boot index bf0e614b..27095576 100644 --- a/src/interp/interop.boot +++ b/src/interp/interop.boot @@ -118,7 +118,7 @@ runOldAxiomFunctor(:allArgs) == [:args,env] := allArgs getConstructorKindFromDB env = "category" => [$oldAxiomPreCategoryDispatch,: [env, :args]] - dom:=APPLY(env, args) + dom:=apply(env, args) makeOldAxiomDispatchDomain dom makeLazyOldAxiomDispatchDomain domform == @@ -283,8 +283,8 @@ instantiate domenv == -- fn := SYMBOL_-FUNCTION functor -- SETF(SYMBOL_-FUNCTION functor, ofn) -- PUT(functor, 'instantiate, fn) --- domvec := APPLY(fn, args) - domvec := APPLY(functor, args) +-- domvec := apply(fn, args) + domvec := apply(functor, args) oldDom.first := $oldAxiomDomainDispatch oldDom.rest := [second oldDom,: domvec] oldDom diff --git a/src/interp/intfile.boot b/src/interp/intfile.boot index 31af759b..fdd5e519 100644 --- a/src/interp/intfile.boot +++ b/src/interp/intfile.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2008, Gabriel Dos Reis. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -38,7 +38,7 @@ namespace BOOT shoeInternFile(fn)== a:=shoeInputFile fn if null a - then WRITE_-LINE (CONCAT(fn,'" not found"),$ErrorStream) + then WRITE_-LINE (strconc(fn,'" not found"),$ErrorStream) else shoeIntern incRgen a shoeIntern (s)== @@ -58,7 +58,7 @@ shoeStrings (stream)== then ['"",stream] else [h,t]:=shoeStrings(cdr stream) - [CONCAT(a,h),t] + [strconc(a,h),t] --fetchKeyedMsg(key,b)== GET(key,"MSGS") --shoeInternFile '"/usr/local/scratchpad/cur/doc/msgs/co-eng.msgs" diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot index fe967093..94d1bdd1 100644 --- a/src/interp/lisplib.boot +++ b/src/interp/lisplib.boot @@ -139,7 +139,7 @@ findModule cname == m := getConstructorModuleFromDB cname or return nil existingFile? m => m strap := algebraBootstrapDir() => - m := CONCAT(strap,PATHNAME_-NAME m,'".",$faslType) + m := strconc(strap,PATHNAME_-NAME m,'".",$faslType) existingFile? m => m systemError ['"missing module for ",:bright cname] systemError ['"missing module for ",:bright cname] diff --git a/src/interp/macex.boot b/src/interp/macex.boot index f3966cc5..72287f85 100644 --- a/src/interp/macex.boot +++ b/src/interp/macex.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2008, Gabriel Dos Reis. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -182,7 +182,7 @@ mac0InfiniteExpansion(posn, body, active) == got := mac0GetName b not got => '"???" [sy,st] := got - st = 'mlambda => CONCAT(PNAME sy, '"(...)") + st = 'mlambda => strconc(PNAME sy, '"(...)") PNAME sy ncSoftError (posn, 'S2CM0005, _ [ [:[n,'"==>"] for n in reverse rnames], fname, %pform body ] ) diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot index de7c61ea..52d06d14 100644 --- a/src/interp/msgdb.boot +++ b/src/interp/msgdb.boot @@ -184,7 +184,7 @@ substituteSegmentedMsg(msg,args) == -- Note 'f processing must come first. if MEMQ(char 'f,q) then arg := - cons? arg => APPLY(first arg, rest arg) + cons? arg => apply(first arg, rest arg) arg if MEMQ(char 'm,q) then arg := [['"%m",:arg]] if MEMQ(char 's,q) then arg := [['"%s",:arg]] diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot index b07b0107..2f198e1d 100644 --- a/src/interp/newfort.boot +++ b/src/interp/newfort.boot @@ -717,7 +717,7 @@ fortFormatCharacterTypes(names) == genuineArrays := [u,:genuineArrays] for u in sortedByLength repeat fortFormatTypes1(mkCharName car u, [STRINGIMAGE(s) for s in cdr(u)]) where - mkCharName v == CONCAT("CHARACTER*(",STRINGIMAGE v,")") + mkCharName v == strconc("CHARACTER*(",STRINGIMAGE v,")") if (not null genuineArrays) then fortFormatTypes1('"CHARACTER",mkParameterList2 genuineArrays) where mkParameterList2 l == diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot index 607884cf..e684d18d 100644 --- a/src/interp/nrunfast.boot +++ b/src/interp/nrunfast.boot @@ -111,10 +111,10 @@ evalSlotDomain(u,dollar) == apply('Record,[[":",tag,evalSlotDomain(dom,dollar)] for [.,tag,dom] in argl]) u is ['Union,:argl] and first argl is ['_:,.,.] => - APPLY('Union,[['_:,tag,evalSlotDomain(dom,dollar)] + apply('Union,[['_:,tag,evalSlotDomain(dom,dollar)] for [.,tag,dom] in argl]) u is ["Enumeration",:.] => eval u - u is [op,:argl] => APPLY(op,[evalSlotDomain(x,dollar) for x in argl]) + u is [op,:argl] => apply(op,[evalSlotDomain(x,dollar) for x in argl]) systemErrorHere '"evalSlotDomain" --======================================================= @@ -123,7 +123,7 @@ evalSlotDomain(u,dollar) == newGoGet(:l) == [:arglist,env] := l slot := replaceGoGetSlot env - APPLY(first slot,[:arglist,rest slot]) --SPADCALL it! + apply(first slot,[:arglist,rest slot]) --SPADCALL it! replaceGoGetSlot env == [thisDomain,index,:op] := env diff --git a/src/interp/nrungo.boot b/src/interp/nrungo.boot index ad16cbd2..9fb108ce 100644 --- a/src/interp/nrungo.boot +++ b/src/interp/nrungo.boot @@ -123,7 +123,7 @@ goGet(:l) == if cons? dollar then dollar := NRTevalDomain dollar fn:= basicLookup(op,sig,lookupDomain,dollar) fn = nil => keyedSystemError("S2NR0001",[op,sig,lookupDomain.0]) - val:= APPLY(first fn,[:arglist,rest fn]) + val:= apply(first fn,[:arglist,rest fn]) setShellEntry(thisDomain,index,fn) val diff --git a/src/interp/pathname.boot b/src/interp/pathname.boot index 3b0bca5c..5a526fad 100644 --- a/src/interp/pathname.boot +++ b/src/interp/pathname.boot @@ -51,7 +51,7 @@ pathname p == pathname? p => p atom p => PATHNAME p if #p>2 then p:=[p.0,p.1] - PATHNAME APPLY(FUNCTION MAKE_-FILENAME, p) + PATHNAME apply(FUNCTION MAKE_-FILENAME, p) namestring p == null p => nil diff --git a/src/interp/profile.boot b/src/interp/profile.boot index 54b122ed..e7511eda 100644 --- a/src/interp/profile.boot +++ b/src/interp/profile.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007, Gabriel Dos Reis. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -39,7 +39,7 @@ namespace BOOT $profileAlist := nil profileWrite() == --called from finalizeLisplib - outStream := MAKE_-OUTSTREAM CONCAT(LIBSTREAM_-DIRNAME $libFile,'"/info") + outStream := MAKE_-OUTSTREAM strconc(LIBSTREAM_-DIRNAME $libFile,'"/info") SETQ(_*PRINT_-PRETTY_*, true) PRINT_-FULL(profileTran $profileAlist,outStream) SHUT outStream diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot index ddb0f5f8..1b6c4050 100644 --- a/src/interp/pspad1.boot +++ b/src/interp/pspad1.boot @@ -106,7 +106,7 @@ fragmentsToLine fragments == lispStringList2String x == null x => '"" atom x => STRINGIMAGE x - rest x => APPLY(function STRCONC,MAPCAR(function lispStringList2String,x)) + rest x => apply(function STRCONC,MAPCAR(function lispStringList2String,x)) lispStringList2String first x --% routines for buffer and margin adjustment diff --git a/src/interp/ptrees.boot b/src/interp/ptrees.boot index ffcb4e92..b152d326 100644 --- a/src/interp/ptrees.boot +++ b/src/interp/ptrees.boot @@ -60,7 +60,7 @@ structure %Ast == --% SPECIAL NODES pfListOf x == pfTree('listOf,x) pfListOf? x == pfAbSynOp?(x,'listOf) -pfAppend list == APPLY(function append,list) +pfAppend list == apply(function append,list) pfNothing () == pfTree('nothing, []) pfNothing? form == pfAbSynOp?(form, 'nothing) diff --git a/src/interp/scan.boot b/src/interp/scan.boot index 8438212f..b4990d55 100644 --- a/src/interp/scan.boot +++ b/src/interp/scan.boot @@ -348,9 +348,9 @@ lfinteger x== -- then ["id",INTERN x] -- else ["integer",x] -lfrinteger (r,x)==["integer",CONCAT (r,CONCAT('"r",x))] ---lfrfloat(a,w,v)==["rfloat",CONCAT(a,'"r.",v)] -lffloat(a,w,e)==["float",CONCAT(a,'".",w,'"e",e)] +lfrinteger (r,x)==["integer",strconc (r,strconc('"r",x))] +--lfrfloat(a,w,v)==["rfloat",strconc(a,'"r.",v)] +lffloat(a,w,e)==["float",strconc(a,'".",w,'"e",e)] lfstring x==if #x=1 then ["char",x] else ["string",x] lfcomment x== ["comment", x] lfnegcomment x== ["negcomment", x] @@ -505,11 +505,11 @@ scanS()== a:=scanEsc() -- case of end of line when false b:=if a then - str:=CONCAT(str,scanTransform($ln.$n)) + str:=strconc(str,scanTransform($ln.$n)) $n:=$n+1 scanS() else scanS() - CONCAT(str,b) + strconc(str,b) scanTransform x==x --idChar? x== scanLetter x or DIGITP x or x in '(_? _%) @@ -552,7 +552,7 @@ scanW(b)== -- starts pointing to first char if idChar?($ln.$n) then scanW(b) else [b,'""] - [bb.0 or b,CONCAT(str,bb.1)] + [bb.0 or b,strconc(str,bb.1)] scanWord(esp) == aaa:=scanW(false) @@ -582,7 +582,7 @@ spleI1(dig,zro) == $n:=$n+1 a:=scanEsc() bb:=spleI1(dig,zro)-- escape, anyno spaces are ignored - CONCAT(str,bb) + strconc(str,bb) scanCheckRadix(a,w)== r := PARSE_-INTEGER a @@ -634,7 +634,7 @@ scanNumber() == --$n:=$n+1 v:=spleI1(function rdigit?,true) scanCheckRadix(a,v) - scanExponent(CONCAT(a,'"r",w),v) + scanExponent(strconc(a,'"r",w),v) else lfrinteger(a,w) scanExponent(a,w)== @@ -668,7 +668,7 @@ scanExponent(a,w)== then e:=spleI(function digit?) lffloat(a,w, - (if c1=MINUSCOMMENT then CONCAT('"-",e)else e)) + (if c1=MINUSCOMMENT then strconc('"-",e)else e)) else $n:=n lffloat(a,w,'"0") diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot index 1e6771d0..e19630d5 100644 --- a/src/interp/sys-driver.boot +++ b/src/interp/sys-driver.boot @@ -101,7 +101,7 @@ systemDatabaseDirectory() == loadExposureGroupData() == LOAD('"./exposed", KEYWORD::VERBOSE,false, KEYWORD::IF_-DOES_-NOT_-EXIST,nil) => "done" - LOAD(CONCAT(systemRootDirectory(),'"algebra/exposed"), + LOAD(strconc(systemRootDirectory(),'"algebra/exposed"), KEYWORD::VERBOSE,false,KEYWORD::IF_-DOES_-NOT_-EXIST,nil) => "done" "failed" @@ -242,7 +242,7 @@ initializeGlobalState() == -- 7. Etc. if have_to and functionp 'addtopath then - addtopath CONCAT(systemRootDirectory(),'"bin") + addtopath strconc(systemRootDirectory(),'"bin") -- Take off diff --git a/src/interp/sys-os.boot b/src/interp/sys-os.boot index 9ace7b71..dd7dd33c 100644 --- a/src/interp/sys-os.boot +++ b/src/interp/sys-os.boot @@ -1,4 +1,4 @@ --- Copyright (C) 2007-2009 Gabriel Dos Reis. +-- Copyright (C) 2007-2010 Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -187,7 +187,7 @@ import oa__system: string -> int for runCommand ++ run a program with specified arguments runProgram(prog,args) == )if %hasFeature KEYWORD::GCL - SYSTEM::SYSTEM(CONCAT/[prog,:[:['" ",a] for a in args]]) + SYSTEM::SYSTEM(strconc/[prog,:[:['" ",a] for a in args]]) )elseif %hasFeature KEYWORD::CLISP EXT::RUN_-PROGRAM(prog,KEYWORD::ARGUMENTS,args) )elseif %hasFeature KEYWORD::SBCL diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot index 7fc81299..949e8016 100644 --- a/src/interp/sys-utility.boot +++ b/src/interp/sys-utility.boot @@ -226,7 +226,7 @@ checkMkdir path == ++ return the pathname to the system module designated by `m'. getSystemModulePath m == - CONCAT(systemRootDirectory(),'"algebra/",m,'".",$faslType) + strconc(systemRootDirectory(),'"algebra/",m,'".",$faslType) ++ load module in `path' that supposedly will define the function ++ indicated by `name'. diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot index d3a43e8f..82b789d9 100644 --- a/src/interp/wi1.boot +++ b/src/interp/wi1.boot @@ -1039,7 +1039,7 @@ compBoolean(p,pWas,m,Einit) == op := opOf p [p',m,E]:= fop := LASSOC(op,'((and . compAnd) (or . compOr) (not . compNot))) => - APPLY(fop,[p,pWas,m,Einit]) or return nil + apply(fop,[p,pWas,m,Einit]) or return nil T := comp(p,m,Einit) or return nil markAny('compBoolean,pWas,T) [p',m,getSuccessEnvironment(markKillAll p,E), |