diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-09-26 18:43:36 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-09-26 18:43:36 +0000 |
| commit | 1ea145d58ec94029d4f6e30a6f854f728154ad8c (patch) | |
| tree | 676f0e73479516d288c33dcc3156029b71554d75 /src/interp | |
| parent | feb9d8d42ee30dbdad5184b654e3de461c06e7e7 (diff) | |
| download | open-axiom-1ea145d58ec94029d4f6e30a6f854f728154ad8c.tar.gz | |
More cleanup
Diffstat (limited to 'src/interp')
54 files changed, 217 insertions, 217 deletions
diff --git a/src/interp/as.boot b/src/interp/as.boot index a4abbcc5..7b36f74a 100644 --- a/src/interp/as.boot +++ b/src/interp/as.boot @@ -95,7 +95,7 @@ asyParents(conform) == -- x := SUBLISLIS(IFCDR conform,formalParams,x) -- x := SUBST('Type,'Object,x) acc := [:explodeIfs x,:acc] - NREVERSE acc + nreverse acc asySubstMapping u == u is [op,:r] => @@ -294,7 +294,7 @@ asGetModemaps(opAlist,oform,kind,modemap) == pred' := MKPF([pred,:catPredList],'AND) mm := [[dc,:sig],[pred']] acc := [[op,:interactiveModemapForm mm],:acc] - NREVERSE acc + nreverse acc asIsCategoryForm m == m = "BasicType" or getConstructorKindFromDB opOf m = "category" @@ -608,7 +608,7 @@ asytranCategory(form,levels,predlist,local?) == HPUT(catTable,id,[asyWrap(record,predlist),:HGET(catTable,id)]) catList := [asyWrap(dform,predlist),:catList] keys := listSort(function GLESSEQP,HKEYS catTable) - right1 := NREVERSE catList + right1 := nreverse catList right2 := [[key,:HGET(catTable,key)] for key in keys] right := right2 => [:right1,['Exports,:right2]] @@ -867,9 +867,9 @@ asyTypeJoin r == $predlist : local := nil for x in r repeat asyTypeJoinPart(x,$predlist) catpart := - $opStack => ['CATEGORY,$kind,:asyTypeJoinStack REVERSE $opStack] + $opStack => ['CATEGORY,$kind,:asyTypeJoinStack reverse $opStack] nil - conpart := asyTypeJoinStack REVERSE $conStack + conpart := asyTypeJoinStack reverse $conStack conpart => catpart => ['Join,:conpart,catpart] rest conpart => ['Join,:conpart] @@ -962,7 +962,7 @@ asyCATEGORY x == cats := "append"/[asyCattran c for c in cats] [a, na] := asyFindAttrs cats cats := na - attribs := APPEND(attribs, a) + attribs := append(attribs, a) attribs := [['ATTRIBUTE, x] for x in attribs] exportPart := [:exportPart,:attribs] joins or cats or attribs => diff --git a/src/interp/ax.boot b/src/interp/ax.boot index 80af0206..d4e8d87a 100644 --- a/src/interp/ax.boot +++ b/src/interp/ax.boot @@ -68,7 +68,7 @@ makeAxFile(filename, constructors) == if $defaultFlag then axForms := [['Foreign, ['Declare, 'dummyDefault, 'Exit], 'Lisp], :axForms] - axForms := APPEND(axDoLiterals(), axForms) + axForms := append(axDoLiterals(), axForms) axForm := ['Sequence, _ ['Import, [], 'AxiomLib], ['Import, [], 'Boolean], :axForms] st := MAKE_-OUTSTREAM(filename) @@ -88,7 +88,7 @@ makeAxExportForm(filename, constructors) == if $defaultFlag then axForms := [['Foreign, ['Declare, 'dummyDefault, 'Exit], 'Lisp], :axForms] - axForms := APPEND(axDoLiterals(), axForms) + axForms := append(axDoLiterals(), axForms) axForm := ['Sequence, _ ['Import, [], 'AxiomLib], ['Import, [], 'Boolean], :axForms] axForm @@ -127,7 +127,7 @@ modemapToAx(modemap) == -- if not(b is ['Sequence,:withseq]) then withseq := [b] -- cosigs := rest getDualSignatureFromDB constructor -- exportargs := [['Export, [], arg, []] for arg in args for p in cosigs | p] --- resultType := ['With,a,['Sequence,:APPEND(exportargs, withseq)]] +-- resultType := ['With,a,['Sequence,:append(exportargs, withseq)]] consdef := ['Define, ['Declare, conscat, ['Apply, "->", optcomma argdecls, 'Category]], ['Lambda, argdecls, 'Category, ['Label, conscat, resultType]]] @@ -143,7 +143,7 @@ modemapToAx(modemap) == -- if not(b is ['Sequence,:withseq]) then withseq := [b] -- cosigs := rest getDualSignatureFromDB constructor -- exportargs := [['Export, [], arg, []] for arg in args for p in cosigs | p] --- resultType := ['With,a,['Sequence,:APPEND(exportargs, withseq)]] +-- resultType := ['With,a,['Sequence,:append(exportargs, withseq)]] ['Export, ['Declare, constructor, ['Apply, "->", optcomma argdecls, resultType]],[],[]] optcomma [op,:args] == @@ -194,7 +194,7 @@ axFormatType(typeform) == lastcat is ['CATEGORY,type,:ops] => ['With, [], makeTypeSequence( - APPEND([axFormatType c for c in cats], + append([axFormatType c for c in cats], [axFormatOp op for op in ops]))] ['With, [], makeTypeSequence([axFormatType c for c in rest typeform])] typeform is ['CATEGORY, type, :ops] => diff --git a/src/interp/bc-matrix.boot b/src/interp/bc-matrix.boot index 2ee2caaf..134799bb 100644 --- a/src/interp/bc-matrix.boot +++ b/src/interp/bc-matrix.boot @@ -148,7 +148,7 @@ bcMatrixGen htPage == STRCONC('"matrix([[",formula,'" for ",colVar,'" in 1..", STRINGIMAGE ncols,'"] for ",rowVar,'" in 1..",STRINGIMAGE nrows,'"])") mat := htpProperty(htPage,'matrix) => - mat := REVERSE mat + mat := reverse mat k := -1 matform := [[mat.(k := k + 1).1 for j in 0..(ncols-1)] for i in 0..(nrows-1)] diff --git a/src/interp/bc-solve.boot b/src/interp/bc-solve.boot index 1a8a5d21..73487edc 100644 --- a/src/interp/bc-solve.boot +++ b/src/interp/bc-solve.boot @@ -267,7 +267,7 @@ bcLinearSolveMatrix1 htPage == ("Not zero:" "the system is not homogeneous" bcLinearSolveMatrixInhomo nothomo))) htShowPage() -bcLinearExtractMatrix htPage == REVERSE htpInputAreaAlist htPage +bcLinearExtractMatrix htPage == reverse htpInputAreaAlist htPage bcLinearSolveMatrixInhomo(htPage,junk) == nrows := htpProperty(htPage,'nrows) @@ -301,7 +301,7 @@ bcLinearSolveMatrixHomo(htPage,key) == bcLinearMatrixGen(htPage,'homo) bcLinearMatrixGen(htPage,key) == matform := bcMatrixGen htPage key = 'homo => bcFinish('"nullSpace",matform) - vector := [x.1 for x in REVERSE htpInputAreaAlist htPage] + vector := [x.1 for x in reverse htpInputAreaAlist htPage] vecform := bcVectorGen vector form := bcMkFunction('"solve",matform,[vecform]) bcGen diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot index 93c91f7a..53a0e927 100644 --- a/src/interp/br-con.boot +++ b/src/interp/br-con.boot @@ -1017,7 +1017,7 @@ dbConsExposureMessage() == -- kind = 'domain => doms := [x,:doms] -- kind = 'package => paks:= [x,:paks] -- defs := [x,:defs] --- lists := [NREVERSE cats,NREVERSE doms,NREVERSE paks,NREVERSE defs] +-- lists := [nreverse cats,nreverse doms,nreverse paks,nreverse defs] -- htBeginMenu(2) -- htSayStandard '"\indent{1}" -- kinds := +/[1 for x in lists | #x > 0] diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot index cd7d955d..9ab84687 100644 --- a/src/interp/br-data.boot +++ b/src/interp/br-data.boot @@ -268,7 +268,7 @@ dbReadComments(n) == x.(j := j + 1) = char '_- and x.(j := j + 1) = char '_- repeat xtralines := [SUBSTRING(x,j + 1,nil),:xtralines] SHUT instream - STRCONC(line, "STRCONC"/NREVERSE xtralines) + STRCONC(line, "STRCONC"/nreverse xtralines) dbSplitLibdb() == instream := MAKE_-INSTREAM '"olibdb.text" @@ -510,7 +510,7 @@ getParentsFor(cname,formalParams,constructorCategory) == x := SUBLISLIS(IFCDR constructorForm,formalParams,x) x := substitute('Type,'Object,x) acc := [:explodeIfs x,:acc] - NREVERSE acc + nreverse acc $parentsCache := nil @@ -536,7 +536,7 @@ getParentsForDomain domname == --called by parentsOf sublisFormal(IFCDR getConstructorForm domname,x,$TriangleVariableList) sublisFormal(IFCDR getConstructorForm domname,x) acc := [:explodeIfs x,:acc] - NREVERSE acc + nreverse acc explodeIfs x == main where --called by getParents, getParentsForDomain main() == @@ -623,7 +623,7 @@ computeAncestorsOf(conform,domform) == acc := nil for op in listSort(function GLESSEQP,HKEYS $if) repeat for pair in HGET($if,op) repeat acc := [pair,:acc] - NREVERSE acc + nreverse acc ancestorsRecur(conform,domform,pred,firstTime?) == --called by ancestorsOf op := opOf conform @@ -694,7 +694,7 @@ transKCatAlist(conform,domname,s) == main where null match? => 'skip npred := sublisFormal(KDR leftForm,pred) acc := [[leftForm,:npred],:acc] - NREVERSE acc + nreverse acc --conform has no arguments so each pair has form [con,:pred] for pair in s repeat leftForm := getConstructorForm first pair or systemError nil @@ -717,7 +717,7 @@ transKCatAlist(conform,domname,s) == main where ['hasArgs,:subargs] npred := quickAnd(hpred,npred) acc := [[leftForm,:npred],:acc] - NREVERSE acc + nreverse acc for pair in s repeat --pair has form [con,:pred] leftForm := getConstructorForm first pair RPLACA(pair,leftForm) @@ -742,7 +742,7 @@ sublisFormal(args,exp,:options) == main where while null atom y repeat acc := [sublisFormal1(args,QCAR y,n),:acc] y := QCDR y - r := NREVERSE acc + r := nreverse acc if y then nd := LASTNODE r RPLACD(nd,sublisFormal1(args,y,n)) diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot index 4dbb9742..d5fdebaa 100644 --- a/src/interp/br-op1.boot +++ b/src/interp/br-op1.boot @@ -125,7 +125,7 @@ dbShowOp1(htPage,opAlist,which,key) == acc := nil for x in items | x.3 repeat acc:= [x,:acc] null acc => nil - [op,:NREVERSE acc] + [op,:nreverse acc] $conformsAreDomains : local := htpProperty(htPage,'domname) opCount := opAlistCount(opAlist, which) branch := @@ -351,7 +351,7 @@ dbGatherData(htPage,opAlist,which,key) == exposureFlag => op [op,nil] acc := [node,:acc] - NREVERSE acc + nreverse acc data := nil dbExpandOpAlistIfNecessary(htPage,opAlist,which,key in '(origins documentation),false) --create data, a list of the form ((entry,exposeFlag,:entries)...) @@ -406,8 +406,8 @@ dbGatherDataImplementation(htPage,opAlist) == key = 'nowhere => nowheres := [x,:nowheres] key = 'constant =>constants := [x,:constants] others := [x,:others] --add chain domains go here - fn [nowheres,constants,domexports,SORTBY('CDDR,NREVERSE others),SORTBY('CDDR, - NREVERSE defexports),SORTBY('CDDR,NREVERSE unexports)] where + fn [nowheres,constants,domexports,SORTBY('CDDR,nreverse others),SORTBY('CDDR, + nreverse defexports),SORTBY('CDDR,nreverse unexports)] where fn l == alist := nil for u in l repeat @@ -416,7 +416,7 @@ dbGatherDataImplementation(htPage,opAlist) == entries := [[first u,true],:[u and [first u,true] while key = CDDAR (u := rest u)]] alist := [[key,gn key,:entries],:alist] - NREVERSE alist + nreverse alist gn key == atom key => true isExposedConstructor first key @@ -449,8 +449,8 @@ dbReduceByOpSignature(opAlist,datalist) == for [op,:alist] in opAlist | MEMQ(op,ops) repeat entryList := [entry for (entry := [sig,:.]) in alist | test] where test() == or/[x for x in datalist | x is [[=op,=sig,:.],:.]] - entryList => acc := [[op,:NREVERSE entryList],:acc] - NREVERSE acc + entryList => acc := [[op,:nreverse entryList],:acc] + nreverse acc dbReduceBySignature(opAlist,op,sig) == --reduces opAlist to one with a fixed op and sig @@ -461,14 +461,14 @@ dbReduceByForm(opAlist,form) == for [op,:alist] in opAlist repeat items := [x for x in alist | dbContrivedForm(op,x) = form] => acc := [[op,:items],:acc] - NREVERSE acc + nreverse acc dbReduceBySelection(opAlist,key,fn) == acc := nil for [op,:alist] in opAlist repeat items := [x for x in alist | FUNCALL(fn,x) = key] => acc := [[op,:items],:acc] - NREVERSE acc + nreverse acc dbContrivedForm(op,[sig,:.]) == $which = '"attribute" => [op,sig] @@ -753,8 +753,8 @@ dbShowOperationLines(which,linelist) == --branch in with lines pile := [x] while (lines := rest lines) and name = dbName (x := first lines) repeat pile := [x,:pile] - opAlist := [[name,:NREVERSE pile],:opAlist] - opAlist := listSort(function LEXLESSEQP,NREVERSE opAlist) + opAlist := [[name,:nreverse pile],:opAlist] + opAlist := listSort(function LEXLESSEQP,nreverse opAlist) if which = '"operation" then htpSetProperty(htPage,'opAlist,opAlist) else htpSetProperty(htPage,'attrAlist,opAlist) @@ -833,7 +833,7 @@ dbExpandOpAlistIfNecessary(htPage,opAlist,which,needOrigins?,condition?) == exposeFlag := dbExposed?(line,char 'o) acc := [[sig,predicate,origin,exposeFlag,comments],:acc] --always store the fruits of our labor: - RPLACD(pair,NREVERSE acc) --at least partially expand it + RPLACD(pair,nreverse acc) --at least partially expand it condition? and value => return value --early exit value => value condition? => nil diff --git a/src/interp/br-op2.boot b/src/interp/br-op2.boot index 925e1109..7ace60c7 100644 --- a/src/interp/br-op2.boot +++ b/src/interp/br-op2.boot @@ -261,7 +261,7 @@ whoUsesOperation(htPage,which,key) == --see dbPresentOps for [op,:alist] in opAlist repeat for [sig,:.] in alist repeat opl := [[op,:SUBLISLIS($FormalMapVariableList,rest conform,sig)],:opl] - opl := NREVERSE opl + opl := nreverse opl u := whoUses(opl,conform) prefix := pluralSay(#u,'"constructor uses",'"constructors use") suffix := @@ -378,7 +378,7 @@ koOps(conform,domname,:options) == main where -- for x in relatives repeat -- or/[y for y in CDAR x | isSharpVar y] => 'skip -- acc := [x,:acc] --- relatives := NREVERSE acc +-- relatives := nreverse acc -- for (pair := [pakform,:.]) in relatives repeat -- $packageItem := sublisFormal(rest conform,pair) -- ours := merge(fn(pakform,nil),ours) @@ -431,7 +431,7 @@ kFormatSlotDomain x == fn formatSlotDomain x where fn x == koCatOps(conform,domname) == conname := opOf conform - oplist := REVERSE getConstructorOperationsFromDB conname + oplist := reverse getConstructorOperationsFromDB conname oplist := sublisFormal(IFCDR domname or IFCDR conform ,oplist) --check below for INTEGERP key to avoid subsumed signatures [[zeroOneConvert op,:nalist] for [op,:alist] in oplist | nalist := koCatOps1(alist)] @@ -525,7 +525,7 @@ koaPageFilterByCategory1(htPage,i) == newOpAlist := insertAlist(op,newEntry,newOpAlist) falist := nil for [op,:alist] in newOpAlist repeat - falist := [[op,:NREVERSE alist],:falist] + falist := [[op,:nreverse alist],:falist] htpSetProperty(htPage,'fromcat,['" from category {\sf ",form2HtString ancestor,'"}"]) dbShowOperationsFromConform(htPage,which,falist) diff --git a/src/interp/br-prof.boot b/src/interp/br-prof.boot index 02ce10ee..32979507 100644 --- a/src/interp/br-prof.boot +++ b/src/interp/br-prof.boot @@ -86,7 +86,7 @@ dbShowInfoOp(htPage,op,sig,alist) == SUBLISLIS(IFCDR conform,TAKE(#faTypes,$FormalMapVariableList),faTypes) conform := htpProperty(htPage,'conform) conname := opOf conform ---argTypes := REVERSE ASSOCRIGHT LASSOC('arguments,alist) +--argTypes := reverse ASSOCRIGHT LASSOC('arguments,alist) --sig := or/[sig for [sig,:.] in LASSOC(op,opAlist) | rest sig = argTypes] ops := escapeSpecialChars STRINGIMAGE zeroOneConvert op oppart := ['"{\em ", ops, '"}"] diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot index 19a97e23..a8841075 100644 --- a/src/interp/br-saturn.boot +++ b/src/interp/br-saturn.boot @@ -885,7 +885,7 @@ dbShowConsKinds cAlist == kind = 'domain => doms := [x,:doms] kind = 'package => paks := [x,:paks] defs := [x,:defs] - lists := [NREVERSE cats,NREVERSE doms,NREVERSE paks,NREVERSE defs] + lists := [nreverse cats,nreverse doms,nreverse paks,nreverse defs] htBeginMenu 'description htSayStandard '"\indent{1}" kinds := +/[1 for x in lists | #x > 0] diff --git a/src/interp/br-search.boot b/src/interp/br-search.boot index a7f8cd2a..d796eec9 100644 --- a/src/interp/br-search.boot +++ b/src/interp/br-search.boot @@ -227,12 +227,12 @@ grepSplit(lines,doc?) == kind = char '_- => 'skip --for now systemError 'kind if doc? then CLOSE instream2 - [['"attribute",:NREVERSE atts], - ['"operation",:NREVERSE ops], - ['"category",:NREVERSE cats], - ['"domain",:NREVERSE doms], - ['"package",:NREVERSE paks] --- ['"default_ package",:NREVERSE defs] -- drop defaults + [['"attribute",:nreverse atts], + ['"operation",:nreverse ops], + ['"category",:nreverse cats], + ['"domain",:nreverse doms], + ['"package",:nreverse paks] +-- ['"default_ package",:nreverse defs] -- drop defaults ] mkUpDownPattern s == recurse(s,0,#s) where @@ -268,7 +268,7 @@ mkGrepPattern1(x,:options) == --called by mkGrepPattern (and grepConstructName?) if not ('w in $options) then if first res ~= '"" then res := ['"`",:res] else if res is [.,p,:r] and p = $wild1 then res := r - "STRCONC"/NREVERSE res + "STRCONC"/nreverse res remUnderscores s == (k := charPosition(char $charUnderscore,s,0)) < MAXINDEX s => STRCONC(SUBSTRING(s,0,k),'"[",s.(k + 1),'"]", @@ -1003,8 +1003,8 @@ dbUnpatchLines lines == --concatenate long lines together, skip blank lines line.0 = dash and line.1 = dash => [STRCONC(first acc,SUBSTRING(line,2,nil)),:rest acc] [line,:acc] - -- following call to NREVERSE needed to keep lines properly sorted - NREVERSE acc ------> added by BMT 12/95 + -- following call to nreverse needed to keep lines properly sorted + nreverse acc ------> added by BMT 12/95 diff --git a/src/interp/br-util.boot b/src/interp/br-util.boot index f50af492..068ad421 100644 --- a/src/interp/br-util.boot +++ b/src/interp/br-util.boot @@ -457,7 +457,7 @@ splitConTable cons == null pred => 'skip pred = 'T or pred is ['hasArgs,:.] => uncond := [pair,:uncond] cond := [pair,:cond] - [NREVERSE uncond,:NREVERSE cond] + [nreverse uncond,:nreverse cond] bcNameTable(u,fn,:option) == --option if * prefix htSay '"\newline" diff --git a/src/interp/buildom.boot b/src/interp/buildom.boot index 34e16794..65beaa4c 100644 --- a/src/interp/buildom.boot +++ b/src/interp/buildom.boot @@ -44,7 +44,7 @@ import sys_-macros namespace BOOT $noCategoryDomains == '(Mode SubDomain) -$nonLisplibDomains == APPEND($DomainNames,$noCategoryDomains) +$nonLisplibDomains == append($DomainNames,$noCategoryDomains) ++ Category ancestors for Record, Union, Mapping, and Enumeration domains. $commonCategoryAncestors == diff --git a/src/interp/c-doc.boot b/src/interp/c-doc.boot index cf42a4ad..37c50535 100644 --- a/src/interp/c-doc.boot +++ b/src/interp/c-doc.boot @@ -211,7 +211,7 @@ transDoc(conname,doclist) == --$exposeFlag and not isExposedConstructor conname => nil --skip over unexposed constructors when checking system files $x: local := nil - rlist := REVERSE doclist + rlist := reverse doclist for [$x,:lines] in rlist repeat $attribute? : local := $x is [.,[key]] and key = 'attribute null lines => @@ -249,7 +249,7 @@ transDoc(conname,doclist) == transformAndRecheckComments('constructor,v or u) transformAndRecheckComments($x,u) acc := [[$x,longline],:acc] --processor assumes a list of lines - NREVERSE acc + nreverse acc checkExtractItemList l == --items are separated by commas or end of line acc := nil --l is list of remaining lines @@ -259,7 +259,7 @@ checkExtractItemList l == --items are separated by commas or end of line k <= m => return nil acc := [first l,:acc] l := rest l - "STRCONC"/[x for x in NREVERSE acc] + "STRCONC"/[x for x in nreverse acc] ++ Translate '%' in signature to '%%' for proper printing. escapePercent x == @@ -344,7 +344,7 @@ checkTexht u == x := IFCAR (u := rest u) --forget right brace: move to next char acc := [x,:acc] u := rest u - NREVERSE acc + nreverse acc checkRecordHash u == while u repeat @@ -448,7 +448,7 @@ checkGetStringBeforeRightBrace u == acc := nil while u repeat x := first u - x = $charRbrace => return "STRCONC"/(NREVERSE acc) + x = $charRbrace => return "STRCONC"/(nreverse acc) acc := [x,:acc] u := rest u @@ -462,7 +462,7 @@ checkGetStringBeforeRightBrace u == -- if x = '"\spadcommand" then x := '"\spadpaste" -- acc := [x,:acc] -- u := rest u --- NREVERSE acc +-- nreverse acc -- -- checkTranVerbatimMiddle u == -- (y := IFCAR (v := IFCDR u)) = $charLbrace and @@ -502,7 +502,7 @@ checkGetStringBeforeRightBrace u == -- if x = '"\spadcommand" then x := '"\spadpaste" -- acc := [x,:acc] -- u := rest u --- NREVERSE acc +-- nreverse acc appendOver [head,:tail] == acc := LASTNODE head @@ -518,7 +518,7 @@ checkRemoveComments lines == line := checkTrimCommented first lines if firstNonBlankPosition line >= 0 then acc := [line,:acc] lines := rest lines - NREVERSE acc + nreverse acc ++ return the part of `line' that is not a comment. A comment ++ is introduced by a leading percent character (%), or a double @@ -558,7 +558,7 @@ checkAddMacros u == y := LASSOC(x,$HTmacs) => [:y,:acc] [x,:acc] u := rest u - NREVERSE acc + nreverse acc checkComments(nameSig,lines) == main where main() == @@ -659,7 +659,7 @@ checkGetArgs u == while (k := charPosition($charComma,u,i + 1)) < m repeat acc := [trimString SUBSTRING(u,i + 1,k - i - 1),:acc] i := k - NREVERSE [SUBSTRING(u,i + 1,m - i - 1),:acc] + nreverse [SUBSTRING(u,i + 1,m - i - 1),:acc] checkGetMargin lines == while lines repeat @@ -743,7 +743,7 @@ checkExtract(header,lines) == (i := charPosition(char '_ ,line,k+1)) < j => 'skip --blank before colon return nil acc := [line,:acc] - NREVERSE acc + nreverse acc checkFixCommonProblem u == acc := nil @@ -756,7 +756,7 @@ checkFixCommonProblem u == u := rest rest u acc := [x,:acc] u := rest u - NREVERSE acc + nreverse acc checkDecorate u == count := 0 -- number of enclosing opening braces @@ -827,7 +827,7 @@ checkDecorate u == [$charRbrace,x,$charLbrace,'"\spad",:acc] [checkAddBackSlashes x,:acc] u := rest u - NREVERSE acc + nreverse acc hasNoVowels x == max := MAXINDEX x @@ -890,10 +890,10 @@ checkIeEg u == x = '"\begin{verbatim}" => verbatim := true [x, :acc] - z := checkIeEgfun x => [:NREVERSE z,:acc] + z := checkIeEgfun x => [:nreverse z,:acc] [x,:acc] u := rest u - NREVERSE acc + nreverse acc checkIeEgfun x == CHARP x => nil @@ -920,10 +920,10 @@ checkSplit2Words u == x = '"\begin{verbatim}" => verbatim := true [x, :acc] - z := checkSplitBrace x => [:NREVERSE z,:acc] + z := checkSplitBrace x => [:nreverse z,:acc] [x,:acc] u := rest u - NREVERSE acc + nreverse acc checkSplitBrace x == CHARP x => [x] @@ -1015,7 +1015,7 @@ checkBalance u == checkDocError ['"Missing left ",checkSayBracket open] u := rest u if stack then - for x in NREVERSE stack repeat + for x in nreverse stack repeat checkDocError ['"Missing right ",checkSayBracket x] u diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot index bfb80379..0214a1af 100644 --- a/src/interp/c-util.boot +++ b/src/interp/c-util.boot @@ -183,7 +183,7 @@ down() == displayComp ($level:= $level+1) displaySemanticErrors() == n:= #($semanticErrorStack:= REMDUP $semanticErrorStack) n=0 => nil - l:= NREVERSE $semanticErrorStack + l:= nreverse $semanticErrorStack $semanticErrorStack:= nil sayBrightly bright '" Semantic Errors:" displaySemanticError(l,$OutputStream) @@ -198,7 +198,7 @@ displayWarnings() == n:= #($warningStack:= REMDUP $warningStack) n=0 => nil sayBrightly bright '" Warnings:" - l := NREVERSE $warningStack + l := nreverse $warningStack displayWarning(l,$OutputStream) $warningStack:= nil sayBrightly '" " @@ -434,8 +434,8 @@ TrimCF() == uold:= rest u unew:= nil for v in uold repeat if not ASSQ(first v,unew) then unew:= [v,:unew] - new:= [[first u,:NREVERSE unew],:new] - $CategoryFrame:= [[NREVERSE new]] + new:= [[first u,:nreverse unew],:new] + $CategoryFrame:= [[nreverse new]] nil --% diff --git a/src/interp/clam.boot b/src/interp/clam.boot index b5ba0338..8789e6aa 100644 --- a/src/interp/clam.boot +++ b/src/interp/clam.boot @@ -365,7 +365,7 @@ clearCategoryCache catName == setDynamicBinding(cacheName,nil) displayHashtable x == - l:= NREVERSE SORTBY('CAR,[[opOf HGET(x,key),key] for key in HKEYS x]) + l:= nreverse SORTBY('CAR,[[opOf HGET(x,key),key] for key in HKEYS x]) for [a,b] in l repeat sayBrightlyNT ['%b,a,'%d] pp b @@ -388,7 +388,7 @@ reportCircularCacheStats(fn,n) == TERPRI() displayCacheFrequency al == - al := NREVERSE SORTBY('CAR,al) + al := nreverse SORTBY('CAR,al) sayBrightlyNT " #hits/#occurrences: " for [a,:b] in al repeat sayBrightlyNT [a,"/",b," "] TERPRI() @@ -579,7 +579,7 @@ reportInstantiations() == sayBrightly ['"# instantiated/# dropped/domain name", "%l",'"------------------------------------"] nTotal:= mTotal:= rTotal := nForms:= 0 - for [n,m,form] in NREVERSE SORTBY('CADDR,conList) repeat + for [n,m,form] in nreverse SORTBY('CADDR,conList) repeat nTotal:= nTotal+n; mTotal:= mTotal+m if n > 1 then rTotal:= rTotal + n-1 nForms:= nForms + 1 @@ -678,7 +678,7 @@ globalHashtableStats(x,sortFn) == argList1:= [constructor2ConstructorForm x for x in argList] reportList:= [[n,key,argList1],:reportList] sayBrightly ["%b"," USE NAME ARGS","%d"] - for [n,fn,args] in NREVERSE SORTBY(sortFn,reportList) repeat + for [n,fn,args] in nreverse SORTBY(sortFn,reportList) repeat sayBrightlyNT [:rightJustifyString(n,6)," ",fn,": "] pp args diff --git a/src/interp/clammed.boot b/src/interp/clammed.boot index ad2856ac..b985ab6b 100644 --- a/src/interp/clammed.boot +++ b/src/interp/clammed.boot @@ -133,7 +133,7 @@ selectMms1(op,tar,args1,args2,$Coerce) == -- NEW COMPILER COMPATIBILITY ON op = "^" or op = "**" => - APPEND(selectMms2("**",tar,args1,args2,$Coerce), + append(selectMms2("**",tar,args1,args2,$Coerce), selectMms2("^",tar,args1,args2,$Coerce)) -- NEW COMPILER COMPATIBILITY OFF diff --git a/src/interp/cparse.boot b/src/interp/cparse.boot index cf7856c2..9e1c1237 100644 --- a/src/interp/cparse.boot +++ b/src/interp/cparse.boot @@ -175,7 +175,7 @@ npListofFun(f,h,g)== a:=$stack $stack:=nil while APPLY(h,nil) and (APPLY(f,nil) or npTrap()) repeat 0 - $stack:=cons(NREVERSE $stack,a) + $stack:=cons(nreverse $stack,a) npPush FUNCALL(g, [npPop3(),npPop2(),:npPop1()]) else true @@ -191,7 +191,7 @@ npList(f,str1,g)== -- always produces a list, g is applied to it $stack:=nil while npEqKey str1 and (npEqKey "BACKSET" or true) and (APPLY(f,nil) or npTrap()) repeat 0 - $stack:=cons(NREVERSE $stack,a) + $stack:=cons(nreverse $stack,a) npPush FUNCALL(g, [npPop3(),npPop2(),:npPop1()]) else npPush FUNCALL(g, [npPop1()]) @@ -564,7 +564,7 @@ npZeroOrMore f== a:=$stack $stack:=nil while APPLY(f,nil) repeat 0 - $stack:=cons(NREVERSE $stack,a) + $stack:=cons(nreverse $stack,a) npPush cons(npPop2(),npPop1()) npPush nil true @@ -990,7 +990,7 @@ npListAndRecover(f)== c:=$inputStream b:=cons(npPop1(),b) $stack:=a - npPush NREVERSE b + npPush nreverse b npMoveTo n== if null $inputStream diff --git a/src/interp/database.boot b/src/interp/database.boot index 1ff0b711..10340aab 100644 --- a/src/interp/database.boot +++ b/src/interp/database.boot @@ -440,7 +440,7 @@ modemapPattern(mmPattern,sig) == patvars := rest patvars mmpat := [patvar,:mmpat] patternAlist := [[patvar,:x],:patternAlist] - [NREVERSE mmpat,patternAlist,partial,patvars] + [nreverse mmpat,patternAlist,partial,patvars] substVars(pred,patternAlist,patternVarList) == --make pattern variable substitutions @@ -465,9 +465,9 @@ fixUpPredicate(predClause, domainPreds, partial, sig) == -- single predicate [predicate, fn, :skip] := predClause if first predicate = "AND" then - predicates := APPEND(domainPreds,rest predicate) + predicates := append(domainPreds,rest predicate) else if predicate ~= MKQ "T" ---was->then predicates:= REVERSE [predicate, :domainPreds] +--was->then predicates:= reverse [predicate, :domainPreds] then predicates:= [predicate, :domainPreds] else predicates := domainPreds or [predicate] if #predicates > 1 then diff --git a/src/interp/define.boot b/src/interp/define.boot index caac81ea..f3da40b5 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -953,7 +953,7 @@ orderByDependency(vl,dl) == dl':= [setDifference(d,newl) for x in vl for d in dl | member(x,vl')] vl:= vl' dl:= dl' - REMDUP NREVERSE orderedVarList --ordered so ith is indep. of jth if i < j + REMDUP nreverse orderedVarList --ordered so ith is indep. of jth if i < j compDefineCapsuleFunction(df is ['DEF,form,signature,specialCases,body], m,$e,$prefix,$formalArgList) == @@ -1557,8 +1557,8 @@ doItIf(item is [.,p,x,y],$predl,$e) == ans:=[["%LET",gv,u],:ans] nils:=[gv,:nils] n:=n+1 - $functorLocalParameters:=[:oldFLP,:NREVERSE nils] - NREVERSE ans + $functorLocalParameters:=[:oldFLP,:nreverse nils] + nreverse ans --compSingleCapsuleIf(x,predl,e,$functorLocalParameters) == -- compSingleCapsuleItem(x,predl,e) diff --git a/src/interp/format.boot b/src/interp/format.boot index d7618244..4c598244 100644 --- a/src/interp/format.boot +++ b/src/interp/format.boot @@ -105,7 +105,7 @@ canRemoveIsDomain? pred == findSubstitutionOrder? alist == fn(alist,nil) where -- returns NIL or an appropriate substituion order fn(alist,res) == - null alist => NREVERSE res + null alist => nreverse res choice := or/[x for (x:=[a,:b]) in alist | null containedRight(a,alist)] => fn(delete(choice,alist),[choice,:res]) nil diff --git a/src/interp/fortcall.boot b/src/interp/fortcall.boot index 0f11e0ae..1cd9a62e 100644 --- a/src/interp/fortcall.boot +++ b/src/interp/fortcall.boot @@ -463,10 +463,10 @@ spadify(l,results,decls,names,actual) == for c in 0..(SECOND(dims) - 1) repeat offset := 2*(c*first(dims)+r) innerEls := [CONS(ELT(fort,offset),ELT(fort,offset+1)),:innerEls] - els := [makeVector(NREVERSE innerEls,nil),:els] + els := [makeVector(nreverse innerEls,nil),:els] else error ['"Can't cope with complex output dimensions higher than 2"] - spadForms := [makeResultRecord(name,ty,makeVector(NREVERSE els,nil)), + spadForms := [makeResultRecord(name,ty,makeVector(nreverse els,nil)), :spadForms] -- Result is a Boolean vector or array LISTP(ty) and first(ty)="logical" and #ty=2 => @@ -481,10 +481,10 @@ spadify(l,results,decls,names,actual) == innerEls := nil for c in 0..(SECOND(dims) - 1) repeat innerEls := [int2Bool ELT(fort,c*first(dims)+r),:innerEls] - els := [NREVERSE innerEls,:els] + els := [nreverse innerEls,:els] else error ['"Can't cope with logical output dimensions higher than 2"] - spadForms := [makeResultRecord(name,ty,NREVERSE els), :spadForms] + spadForms := [makeResultRecord(name,ty,nreverse els), :spadForms] -- Result is a vector or array VECTORP fort => dims := [getVal(u,names,actual) for u in rest ty] @@ -499,7 +499,7 @@ spadify(l,results,decls,names,actual) == innerEls := nil for c in 0..(SECOND(dims) - 1) repeat innerEls := [ELT(fort,c*first(dims)+r),:innerEls] - els := [makeVector(NREVERSE innerEls,nil),:els] + els := [makeVector(nreverse innerEls,nil),:els] else if #dims=3 then iDim := first(dims) jDim := SECOND dims @@ -511,11 +511,11 @@ spadify(l,results,decls,names,actual) == for p in 0..(kDim - 1) repeat offset := p*jDim + c*kDim + r innerEls := [ELT(fort,offset),:innerEls] - middleEls := [makeVector(NREVERSE innerEls,nil),:middleEls] - els := [makeVector(NREVERSE middleEls,nil),:els] + middleEls := [makeVector(nreverse innerEls,nil),:middleEls] + els := [makeVector(nreverse middleEls,nil),:els] else error ['"Can't cope with output dimensions higher than 3"] - if not MEMQ(0,dims) then els := makeVector(NREVERSE els,nil) + if not MEMQ(0,dims) then els := makeVector(nreverse els,nil) spadForms := [makeResultRecord(name,ty,els), :spadForms] -- Result is a Boolean Scalar atom fort and ty="logical" => @@ -524,7 +524,7 @@ spadify(l,results,decls,names,actual) == atom fort => spadForms := [makeResultRecord(name,ty,fort),:spadForms] error ['"Unrecognised output format: ",fort] - NREVERSE spadForms + nreverse spadForms lispType u == -- Return the lisp type equivalent to the given Fortran type. @@ -588,7 +588,7 @@ prepareResults(results,args,dummies,values,decls) == type = "complex" => makeVector([shortZero,shortZero],"%SingleFloat") type = "double complex" => makeVector([longZero,longZero],"%DoubleFloat") error ['"Unrecognised Fortran type: ",type] - NREVERSE data + nreverse data -- TTT this is dead code now -- transposeVector(u,type) == @@ -605,7 +605,7 @@ prepareResults(results,args,dummies,values,decls) == -- else -- for j in 0..cols repeat for i in 0..rows repeat -- els := [ELT(ELT(u,i),j),:els] --- makeVector(NREVERSE els,type) +-- makeVector(nreverse els,type) writeData(tmpFile,indata) == diff --git a/src/interp/functor.boot b/src/interp/functor.boot index e7db218f..f023faab 100644 --- a/src/interp/functor.boot +++ b/src/interp/functor.boot @@ -421,7 +421,7 @@ setVector4(catNames,catsig,conditions) == for ["%LET",name,cond,:.] in $getDomainCode repeat $HackSlot4:=MSUSBT(name,cond,$HackSlot4) code := ["setShellEntry",'$,4,'TrueDomain] - code:=['(%LET TrueDomain (NREVERSE TrueDomain)),:$HackSlot4,code] + code:=['(%LET TrueDomain (nreverse TrueDomain)),:$HackSlot4,code] code:= [: [setVector4Onecat(u,v,w) @@ -591,7 +591,7 @@ DescendCode(code,flag,viewAssoc,EnvToPass) == code is ['PROGN,:codelist] => ['PROGN,: --Two REVERSEs leave original order, but ensure last guy wins - NREVERSE [v for u in REVERSE codelist | + nreverse [v for u in reverse codelist | (v:= DescendCode(u,flag,viewAssoc,EnvToPass))~=nil]] code is ['COND,:condlist] => c:= [[u2:= ProcessCond first u,:q] for u in condlist] where q() == @@ -611,7 +611,7 @@ DescendCode(code,flag,viewAssoc,EnvToPass) == while (c and (LAST c is [c1] or LAST c is [c1,[]]) and (c1 = '(QUOTE T) or c1 is ['HasAttribute,:.])) repeat --strip out some worthless junk at the end - c:=NREVERSE rest NREVERSE c + c:=nreverse rest nreverse c null c => '(LIST) ['COND,:c] code is ["%LET",name,body,:.] => diff --git a/src/interp/g-boot.boot b/src/interp/g-boot.boot index 9ec302a7..6a6c1a0e 100644 --- a/src/interp/g-boot.boot +++ b/src/interp/g-boot.boot @@ -116,13 +116,13 @@ removeEXITFromCOND c == length1? cl => cond is ["EXIT",:.] => z := CONS(QCDR cond,z) z := CONS(cl,z) - cl' := REVERSE cl + cl' := reverse cl lastSE := QCAR cl' ATOM lastSE => z := CONS(cl,z) lastSE is ["EXIT",:.] => - z := CONS(REVERSE CONS(second lastSE,rest cl'),z) + z := CONS(reverse CONS(second lastSE,rest cl'),z) z := CONS(cl,z) - CONS('COND,NREVERSE z) + CONS('COND,nreverse z) flattenCOND body == -- transforms nested COND clauses to flat ones, if possible @@ -161,11 +161,11 @@ bootCOND c == fcls := bootPushEXITintoCONDclause fcls ncls := fcls is [''T,['COND,:mcls]] => - APPEND(REVERSE mcls,ncls) + append(reverse mcls,ncls) fcls is [''T,['PROGN,:mcls]] => CONS([''T,:mcls],ncls) CONS(fcls,ncls) - ['COND,:REVERSE ncls] + ['COND,:reverse ncls] bootPushEXITintoCONDclause e == e isnt [''T,['EXIT,['COND,:cls]]] => e @@ -176,7 +176,7 @@ bootPushEXITintoCONDclause e == r is [['EXIT,:.]] => CONS(cl,ncls) r is [r1] => CONS([p,['EXIT,r1]],ncls) CONS([p,['EXIT,bootTran ['PROGN,:r]]],ncls) - [''T,['COND,:NREVERSE ncls]] + [''T,['COND,:nreverse ncls]] --% SEQ and PROGN @@ -214,11 +214,11 @@ bootAbsorbSEQsAndPROGNs e == [x] while lcl is ['EXIT,f] repeat lcl := f - lcl is ['PROGN,:pcls] => APPEND(g,pcls) - lcl is ['COND,[''T,:pcls]] => APPEND(g,pcls) + lcl is ['PROGN,:pcls] => append(g,pcls) + lcl is ['COND,[''T,:pcls]] => append(g,pcls) lcl is ['COND,[pred,['EXIT,h]]] => - APPEND(g,[['COND,[pred,h]]]) - APPEND(g,[lcl]) + append(g,[['COND,[pred,h]]]) + append(g,[lcl]) bootSEQ e == e := ['SEQ,:mergeCONDsWithEXITs bootAbsorbSEQsAndPROGNs rest e] @@ -257,7 +257,7 @@ defLET1(lhs,rhs) == IDENTP rhs and not CONTAINED(rhs,lhs) => rhs' := defLET2(lhs,rhs) EQCAR(rhs',$LET) => MKPROGN [rhs',rhs] - rhs' is ["PROGN",:.] => APPEND(rhs',[rhs]) + rhs' is ["PROGN",:.] => append(rhs',[rhs]) if IDENTP first rhs' then rhs' := CONS(rhs',NIL) MKPROGN [:rhs',rhs] rhs is [=$LET,:.] and IDENTP(name := second rhs) => @@ -295,7 +295,7 @@ defLET2(lhs,rhs) == [:l1,defLetForm(var2,addCARorCDR('CDR,rhs))] l2 := defLET2(var2,addCARorCDR('CDR,rhs)) if CONSP l2 and ATOM first l2 then l2 := cons(l2,nil) - APPEND(l1,l2) + append(l1,l2) lhs is ['APPEND,var1,var2] => patrev := defISReverse(var2,var1) rev := ['REVERSE,rhs] @@ -305,7 +305,7 @@ defLET2(lhs,rhs) == if CONSP l2 and ATOM first l2 then l2 := cons(l2,nil) var1 = "." => [[$LET,g,rev],:l2] last l2 is [=$LET, =var1, val1] => - [[$LET,g,rev],:REVERSE rest REVERSE l2, + [[$LET,g,rev],:reverse rest reverse l2, defLetForm(var1,['NREVERSE,val1])] [[$LET,g,rev],:l2,defLetForm(var1,['NREVERSE,var1])] lhs is ['EQUAL,var1] => diff --git a/src/interp/ht-root.boot b/src/interp/ht-root.boot index b8340902..7fbff9dd 100644 --- a/src/interp/ht-root.boot +++ b/src/interp/ht-root.boot @@ -67,7 +67,7 @@ htSystemVariables() == main where $levels : local := '(compiler development interpreter) $heading : local := nil while classlevel ~= first $levels repeat $levels := rest $levels - table := NREVERSE fn($setOptions,nil,true) + table := nreverse fn($setOptions,nil,true) htInitPage('"System Variables",nil) htSay '"\beginmenu" lastHeading := nil @@ -191,8 +191,8 @@ gatherGlossLines(results,defstream) == (j := charPosition($tick,x,1)) and (nextPointer := SUBSTRING(x,0,j)) and (nextPointer = pointer) repeat xtralines := [SUBSTRING(x,j + 1,nil),:xtralines] - acc := [STRCONC(keyAndTick,def, "STRCONC"/NREVERSE xtralines),:acc] - REVERSE acc + acc := [STRCONC(keyAndTick,def, "STRCONC"/nreverse xtralines),:acc] + reverse acc htGlossSearch(htPage,junk) == htGloss htpLabelInputString(htPage,'filter) @@ -209,8 +209,8 @@ htGreekSearch(filter) == for x in names repeat superMatch?(filter,PNAME x) => matches := [x,:matches] nonmatches := [x,:nonmatches] - matches := NREVERSE matches - nonmatches := NREVERSE nonmatches + matches := nreverse matches + nonmatches := nreverse nonmatches htInitPage('"Greek Names",nil) null matches => htInitPage(['"Greek names matching search string {\em ",ss,'"}"],nil) @@ -242,8 +242,8 @@ htTextSearch(filter) == for x in lines repeat superMatch?(filter,x) => matches := [x,:matches] nonmatches := [x,:nonmatches] - matches := NREVERSE matches - nonmatches := NREVERSE nonmatches + matches := nreverse matches + nonmatches := nreverse nonmatches htInitPage('"Text Matches",nil) null matches => htInitPage(['"Lines matching search string {\em ",s,'"}"],nil) @@ -280,7 +280,7 @@ htTutorialSearch pattern == mkUnixPattern s == u := mkUpDownPattern s - starPositions := REVERSE [i for i in 1..(-1 + MAXINDEX u) | u.i = $wild] + starPositions := reverse [i for i in 1..(-1 + MAXINDEX u) | u.i = $wild] for i in starPositions repeat u := STRCONC(SUBSTRING(u,0,i),'".*",SUBSTRING(u,i + 1,nil)) if u.0 ~= $wild then u := STRCONC('"[^a-zA-Z]",u) diff --git a/src/interp/htsetvar.boot b/src/interp/htsetvar.boot index 57e66688..7076e003 100644 --- a/src/interp/htsetvar.boot +++ b/src/interp/htsetvar.boot @@ -61,7 +61,7 @@ htShowSetTree(setTree) == tabset1 := STRINGIMAGE (maxWidth1) tabset2 := STRINGIMAGE (maxWidth2 + maxWidth1 - 1) htSay('"\tab{2}\newline Variable\tab{",STRINGIMAGE (maxWidth1 + QUOTIENT(maxWidth2,3)),'"}Description\tab{",STRINGIMAGE(maxWidth2 + maxWidth1 + 2),'"}Value\newline\beginitems ") - for setData in REVERSE okList repeat + for setData in reverse okList repeat htSay '"\item" label := STRCONC('"\menuitemstyle{",setData.setName,'"}") links := [label,[['text,'"\tab{",tabset1,'"}",setData.setLabel,'"\tab{",tabset2,'"}{\em ",htShowSetTreeValue setData,'"}"]], diff --git a/src/interp/i-coerce.boot b/src/interp/i-coerce.boot index 3765b4ba..f9bb6133 100644 --- a/src/interp/i-coerce.boot +++ b/src/interp/i-coerce.boot @@ -1230,13 +1230,13 @@ computeTTTranspositions(t1,t2) == towers := CONS(VEC2LIST tower,towers) towers := [reassembleTowerIntoType tower for tower in towers] if first(towers) ~= t2 then towers := cons(t2,towers) - NREVERSE towers + nreverse towers decomposeTypeIntoTower t == ATOM t => [t] d := deconstructT t NULL rest d => [t] - rd := REVERSE t + rd := reverse t [reverse QCDR rd,:decomposeTypeIntoTower QCAR rd] reassembleTowerIntoType tower == @@ -1267,7 +1267,7 @@ permuteToOrder(p,n,start) == p.stpos := p.x p.x := t stpos := x - APPEND(NREVERSE perms,permuteToOrder(p,n,start+1)) + append(nreverse perms,permuteToOrder(p,n,start+1)) coerceIntTest(t1,t2) == -- looks whether there exists a table entry or a coercion function diff --git a/src/interp/i-coerfn.boot b/src/interp/i-coerfn.boot index 80111088..4d2c3df5 100644 --- a/src/interp/i-coerfn.boot +++ b/src/interp/i-coerfn.boot @@ -899,7 +899,7 @@ genMpFromDmpTerm(u, oldlen) == Mp2P(u, source is [mp,vl, S], target is [p,R]) == u = '_$fromCoerceable_$ => canCoerce(S,target) S is ['Polynomial,.] => MpP2P(u,vl,S,R) - vl' := REVERSE MSORT vl + vl' := reverse MSORT vl -- if Mp2Mp fails, a THROW will occur u' := Mp2Mp(u,source,[mp,vl',S]) u' := translateMpVars2PVars (u',vl') diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot index 70b596d2..38f54ee4 100644 --- a/src/interp/i-funsel.boot +++ b/src/interp/i-funsel.boot @@ -891,7 +891,7 @@ findFunctionInCategory(op,dc,tar,args1,args2,$Coerce,$SubDom) == else maxargs := MAX(maxargs,1) impls := cons([b,nil,true,d],impls) impls := cons([b,d,true,d],impls) - impls := NREVERSE impls + impls := nreverse impls if maxargs ~= -1 then SL:= NIL for i in 1..maxargs repeat @@ -1032,8 +1032,8 @@ selectMmsGen(op,tar,args1,args2) == -- get top level constructor names for constructors with parameters conNames := nil - if op = 'reshape then args := APPEND(rest args1, rest args2) - else args := APPEND(args1,args2) + if op = 'reshape then args := append(rest args1, rest args2) + else args := append(args1,args2) if tar then args := [tar,:args] -- for common aggregates, use under domain also for a in REMDUP args repeat @@ -1057,7 +1057,7 @@ selectMmsGen(op,tar,args1,args2) == if haves then [havesExact,havesInexact] := exact?(haves,tar,args1) if $reportBottomUpFlag then - for mm in APPEND(havesExact,havesInexact) for i in 1.. repeat + for mm in append(havesExact,havesInexact) for i in 1.. repeat sayModemapWithNumber(mm,i) if havesExact then mmS := matchMms(havesExact,op,tar,args1,args2) @@ -1076,7 +1076,7 @@ selectMmsGen(op,tar,args1,args2) == if havenots then [havesNExact,havesNInexact] := exact?(havenots,tar,args1) if $reportBottomUpFlag then - for mm in APPEND(havesNExact,havesNInexact) for i in 1.. repeat + for mm in append(havesNExact,havesNInexact) for i in 1.. repeat sayModemapWithNumber(mm,i) if havesNExact then mmS := matchMms(havesNExact,op,tar,args1,args2) diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot index c9eec1fe..391aea3b 100644 --- a/src/interp/i-map.boot +++ b/src/interp/i-map.boot @@ -171,7 +171,7 @@ addMap(lhs,rhs,pred) == if x is ["SUCHTHAT",s,p] then (predList:= [p,:predList]; x:= s) x mkMapAlias(op,argl) - argPredList:= NREVERSE predList + argPredList:= nreverse predList finalPred := -- handle g(a,T)==a+T confusion between pred=T and T variable MKPF((pred and (pred ~= 'T) => [:argPredList,SUBLISNQ($sl,pred)]; argPredList),"and") @@ -272,7 +272,7 @@ mkMapAlias(op,argl) == $e:= putHist(op,"alias",newAlias,$e) mkAliasList l == fn(l,nil) where fn(l,acc) == - null l => NREVERSE acc + null l => nreverse acc not IDENTP first l or first l in acc => fn(rest l,[nil,:acc]) fn(rest l,[first l,:acc]) diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index b2e29cb8..2720a611 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -623,7 +623,7 @@ checkArgs(op,tail) == tail := [:rest term,:rest tail] head := [term,:head] tail := rest tail - REVERSE head + reverse head outputTranSEQ ['SEQ,:l,exitform] == if exitform is ['exit,.,a] then exitform := a @@ -1170,7 +1170,7 @@ maprinChk x == maprinRows matrixList == if not $collectOutput then TERPRI($algebraOutputStream) while matrixList repeat - y:=NREVERSE matrixList + y:=nreverse matrixList --Makes the matrices come out in order, since CONSed on backwards matrixList:=nil firstName := first first y @@ -2093,7 +2093,7 @@ slashWidth(u) == 1 + WIDTH second u + WIDTH second rest u longext(u, i, n) == - x := REVERSE u + x := reverse u y := first x u := remWidth(REVERSEWOC(CONS('" ", rest x))) charybdis(u, i, n) diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot index 33626e2e..6ba35132 100644 --- a/src/interp/i-syscmd.boot +++ b/src/interp/i-syscmd.boot @@ -101,7 +101,7 @@ initializeSystemCommands() == while l repeat $SYSCOMMANDS := CONS(CAAR l, $SYSCOMMANDS) l := rest l - $SYSCOMMANDS := NREVERSE $SYSCOMMANDS + $SYSCOMMANDS := nreverse $SYSCOMMANDS systemCommand [[op,:argl],:options] == $options: local:= options @@ -1048,7 +1048,7 @@ displayMacros names == imacs := getInterpMacroNames() pmacs := getParserMacroNames() macros := - null names => APPEND (imacs, pmacs) + null names => append (imacs, pmacs) names macros := REMDUP macros @@ -1703,7 +1703,7 @@ writeInputLines(fn,initial) == file := histInputFileName(fn) histFileErase file inp:= DEFIOSTREAM(['(MODE . OUTPUT),['FILE,:file]],255,0) - for x in removeUndoLines NREVERSE lineList repeat WRITE_-LINE(x,inp) + for x in removeUndoLines nreverse lineList repeat WRITE_-LINE(x,inp) -- see file "undo" for definition of removeUndoLines if fn ~= 'redo then sayKeyedMsg("S2IH0014",[namestring file]) SHUT inp @@ -2698,7 +2698,7 @@ diffAlist(new,old) == deltas := [[prop],:deltas] EQ(rest oldPropval,val) => 'skip deltas := [oldPropval,:deltas] - deltas => acc := [[name,:NREVERSE deltas],:acc] + deltas => acc := [[name,:nreverse deltas],:acc] acc := [[name,:[[prop] for [prop,:.] in proplist]],:acc] --record properties absent on new list (say, from a )cl all) for (oldPair := [name,:r]) in old repeat @@ -2710,7 +2710,7 @@ diffAlist(new,old) == -- (b) if the old world does not, record nothing -- (2) if the new world has a proplist for that variable, it has -- been handled by the first loop. - res := NREVERSE acc + res := nreverse acc if $reportUndo then reportUndo res res @@ -2803,7 +2803,7 @@ undoLocalModemapHack changeList == removeUndoLines u == --called by writeInputLines xtra := STRINGP $currentLine => [$currentLine] - REVERSE $currentLine + reverse $currentLine xtra := [x for x in xtra | not stringPrefix?('")history",x)] u := [:u, :xtra] not (or/[stringPrefix?('")undo",x) for x in u]) => u @@ -2831,7 +2831,7 @@ removeUndoLines u == --called by writeInputLines nil $IOindex := $IOindex + 1 --referenced by undoCount acc := nil - for y in tails NREVERSE u repeat + for y in tails nreverse u repeat (x := first y).0 = char '_> => code := x . 1 --code = a,b, or r n := PARSE_-INTEGER SUBSTRING(x,2,nil) --n = number of undo steps @@ -3041,7 +3041,7 @@ zsystemdevelopment1(l,im) == opt1 = 'from => fromopt := [['FROM,:optargs]] for [opt,:optargs] in $options repeat if null optargs then optargs := l - newopt := APPEND(optargs,fromopt) + newopt := append(optargs,fromopt) opt1 := selectOptionLC(opt,'(from),nil) opt1 = 'from => nil opt = "c" => _/D_,1 (newopt ,_/COMP(),NIL,NIL) diff --git a/src/interp/interop.boot b/src/interp/interop.boot index f54eff7e..42f1db42 100644 --- a/src/interp/interop.boot +++ b/src/interp/interop.boot @@ -268,7 +268,7 @@ orderedDefaults(conform,domform) == ancestors := ancestorsOf(conform,domform) for x in conList repeat for y in ancestors | x = CAAR y repeat acc := [y,:acc] - NREVERSE acc + nreverse acc instantiate domenv == -- following is a patch for a bug in runtime.as diff --git a/src/interp/mark.boot b/src/interp/mark.boot index ef5bdb64..803def69 100644 --- a/src/interp/mark.boot +++ b/src/interp/mark.boot @@ -598,7 +598,7 @@ markPath u == --u has nested structure: u0 < u1 < u2 ... part := first u $path := u u is [.] => 0 --means THE WHOLE THING - v := REVERSE markPath1 u + v := reverse markPath1 u -- pp '"======mark path======" -- foobar v -- pp v @@ -717,7 +717,7 @@ $hohum := false markSpliceInChanges body == -- pp '"before---->" -- pp $coerceList - $coerceList := REVERSE SORTBY('CDDR,$coerceList) + $coerceList := reverse SORTBY('CDDR,$coerceList) -- pp '"after----->" -- pp $coerceList $cl := $coerceList @@ -870,7 +870,7 @@ markFinish1() == $globalImportStack := delete($categoryNameForDollar,$globalImportStack) $commonImports : local := getCommonImports() globalImports := - REVERSE orderByContainment REMDUP [:$commonImports,:$globalImportStack] + reverse orderByContainment REMDUP [:$commonImports,:$globalImportStack] $finalImports: local := SETDIFFERENCE(globalImports,$globalDeclareStack) $capsuleStack := [mkNewCapsuleItem(freepart,imports,x) for freepart in $freeStack @@ -899,10 +899,10 @@ markFinish1() == nsig := $categoryPart => sig ['Type,:rest sig] - for x in REVERSE $abbreviationStack |not member(x,$abbreviationsAlreadyPrinted) repeat + for x in reverse $abbreviationStack |not member(x,$abbreviationsAlreadyPrinted) repeat markPrintAbbreviation x $abbreviationsAlreadyPrinted := insert(x,$abbreviationsAlreadyPrinted) - for x in REVERSE $globalMacroStack|not member(x,$macrosAlreadyPrinted) repeat + for x in reverse $globalMacroStack|not member(x,$macrosAlreadyPrinted) repeat $def := ['MDEF,first x,'(NIL),'(NIL),rest x] markPrint(true) $macrosAlreadyPrinted := insert(x,$macrosAlreadyPrinted) @@ -955,7 +955,7 @@ markRemImportsAndLeadingMacros(leadingMacros,body) == mkNewCapsuleItem(frees,i,x) == [originalDef,:ndef] := x - imports := REVERSE orderByContainment REMDUP SETDIFFERENCE(i,$finalImports) + imports := reverse orderByContainment REMDUP SETDIFFERENCE(i,$finalImports) importPart := [["import",d] for d in imports] nbody := ndef is ["%LET",.,x] => x @@ -1309,7 +1309,7 @@ moveLinesAfter(alist, lines) == (p := ASSOC(i, alist)) and STRINGP rest p => acc := [rest p, x, :acc] (p := lookupRight(i, alist)) and (first p) > i => RPLACD(p, x) acc := [x, :acc] - REVERSE acc + reverse acc lookupRight(x, al) == al is [p, :al] => @@ -1373,7 +1373,7 @@ mkCheck() == sayBrightlyNT '"old: " pp oldRes -reverseDown u == [REVERSE x for x in u] +reverseDown u == [reverse x for x in u] mkCheckRun() == for [x, :y] in REMDUP $badStack repeat @@ -1445,7 +1445,7 @@ combineDefinitions() == -- rplacaSubst(op, opName, def) $acc := [[form,:predl], :$acc] Xdeflist := [buildNewDefinition(op,sig,$acc),:Xdeflist] - REVERSE Xdeflist + reverse Xdeflist rplacaSubst(x, y, u) == (fn(x, y, u); u) where fn(x,y,u) == atom u => nil diff --git a/src/interp/match.boot b/src/interp/match.boot index 49e3ebab..3333f863 100644 --- a/src/interp/match.boot +++ b/src/interp/match.boot @@ -123,7 +123,7 @@ patternCheck pattern == main where acc := nil repeat k := charPosition(c,s,i) - k > n => return NREVERSE acc + k > n => return nreverse acc acc := [k,:acc] i := k + 1 equal(p,n,c) == diff --git a/src/interp/modemap.boot b/src/interp/modemap.boot index 8f7e1c27..e074381f 100644 --- a/src/interp/modemap.boot +++ b/src/interp/modemap.boot @@ -202,7 +202,7 @@ mergeModemap(entry is [[mc,:sig],[pred,:.],:.],modemapList,e) == return modemapList TruthP pred => mmtail:=rest mmtail --the thing we matched against is useless, by comparison - modemapList:= NCONC(NREVERSE newmm,[entry,:mmtail]) + modemapList:= NCONC(nreverse newmm,[entry,:mmtail]) entry:= nil return modemapList if entry then [:modemapList,entry] else modemapList diff --git a/src/interp/msgdb.boot b/src/interp/msgdb.boot index 064d1bd3..c2af8f3a 100644 --- a/src/interp/msgdb.boot +++ b/src/interp/msgdb.boot @@ -131,7 +131,7 @@ segmentedMsgPreprocess x == [t,:tail] := tail member(t, '(%ceoff "%ceoff" %rjoff "%rjoff")) => ok := NIL y := CONS(segmentedMsgPreprocess t,y) - head1 := [(center => '"%ce"; '"%rj"),:NREVERSE y] + head1 := [(center => '"%ce"; '"%rj"),:nreverse y] NULL tail => [head1] [head1,:segmentedMsgPreprocess tail] head1 := segmentedMsgPreprocess head @@ -166,11 +166,11 @@ substituteSegmentedMsg(msg,args) == -- x is a special case (n > 2) and (c = "%") and (x.1 = "k") => - l := NCONC(NREVERSE pkey SUBSTRING(x,2,NIL),l) + l := NCONC(nreverse pkey SUBSTRING(x,2,NIL),l) -- ?name gets replaced by '"Push PF10" or '"Type >b (enter)" (x.0 = char "?") and n > 1 and (v := pushOrTypeFuture(INTERN x,nil)) => - l := NCONC(NREVERSE v,l) + l := NCONC(nreverse v,l) -- x requires parameter substitution (x.0 = char "%") and (n > 1) and (DIGITP x.1) => @@ -208,10 +208,10 @@ substituteSegmentedMsg(msg,args) == l := CONSP(arg) => MEMQ(char 'y,q) or (first arg = '"%y") or ((LENGTH arg) = 1) => - APPEND(REVERSE arg, l) + append(reverse arg, l) head := first arg tail := rest arg - ['"%y",:APPEND(REVERSE tail, ['"%n",head,:l ]) ] + ['"%y",:append(reverse tail, ['"%n",head,:l ]) ] cons(arg,l) if MEMQ(char 'b,q) then l := cons('"%d",l) for ch in '(_. _, _! _: _; _?) repeat @@ -221,7 +221,7 @@ substituteSegmentedMsg(msg,args) == l := [fillerSpaces(DIG2FIX x.2, '" "),:l] --x is a plain word l := cons(x,l) - addBlanks NREVERSE l + addBlanks nreverse l addBlanks msg == -- adds proper blanks @@ -244,7 +244,7 @@ addBlanks msg == else msg1 := [y,blank,:msg1] x := y - NREVERSE msg1 + nreverse msg1 $msgdbPrims =='( %b %d %l %i %u %U %n %x %ce %rj "%U" "%b" "%d" "%l" "%i" "%u" "%U" "%n" "%x" "%ce" "%rj") @@ -775,7 +775,7 @@ brightPrintCenter(x,out == $OutputStream) == if member(first(x),'(%l "%l")) then ok := NIL else y := cons(first x, y) x := rest x - y := NREVERSE y + y := nreverse y wid := sayBrightlyLength y if wid < $LINELENGTH then f := DIVIDE($LINELENGTH - wid,2) @@ -822,7 +822,7 @@ brightPrintRightJustify(x, out == $OutputStream) == if member(first(x),'(%l "%l")) then ok := NIL else y := cons(first x, y) x := rest x - y := NREVERSE y + y := nreverse y wid := sayBrightlyLength y if wid < $LINELENGTH then y := CONS(fillerSpaces($LINELENGTH-wid,'" "),y) @@ -990,14 +990,14 @@ splitSayBrightly u == while u and (width:= width + sayWidth first u) < $LINELENGTH repeat segment:= [first u,:segment] u := rest u - null u => NREVERSE segment - segment => [:NREVERSE segment,"%l",:splitSayBrightly(u)] + null u => nreverse segment + segment => [:nreverse segment,"%l",:splitSayBrightly(u)] u splitSayBrightlyArgument u == atom u => nil while splitListSayBrightly u is [head,:u] repeat result:= [head,:result] - result => [:NREVERSE result,u] + result => [:nreverse result,u] [u] splitListSayBrightly u == diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot index c12f9e4d..2c150532 100644 --- a/src/interp/newfort.boot +++ b/src/interp/newfort.boot @@ -170,12 +170,12 @@ exp2FortOptimize e == atom e => [e] $fortranOptimizationLevel = 0 => e1 := exp2FortOptimizeArray e - NREVERSE [e1,:$exprStack] + nreverse [e1,:$exprStack] e := minimalise e for e1 in exp2FortOptimizeCS e repeat e2 := exp2FortOptimizeArray e1 $exprStack := [e2,:$exprStack] - NREVERSE $exprStack + nreverse $exprStack exp2FortOptimizeCS e == @@ -184,7 +184,7 @@ exp2FortOptimizeCS e == $fortCsExprStack : local := NIL $fortCsFuncStack : local := NIL f := exp2FortOptimizeCS1 e - NREVERSE [f,:$fortCsList] + nreverse [f,:$fortCsList] -- bug fix to beenHere -- Thu Nov 05 12:01:46 CUT 1992 , Author: TTT @@ -362,7 +362,7 @@ fortexp0 x == while p < 0 repeat [t,:f] := f l := [t,:l] - NREVERSE ['"...",:l] + nreverse ['"...",:l] ++ This formating routine is essentially used to print ++ values/expreions used to instantiate constructors. diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index b0159c7f..f74d2afb 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -84,8 +84,8 @@ NRTaddDeltaCode() == -- now must all have slot numbers, represented by (QUOTE <entry>) -- (6) constants, like 0 and 1, represented by (CONS .. ) form kvec := first $catvecList - for i in $NRTbase.. for item in REVERSE $NRTdeltaList - for compItem in REVERSE $NRTdeltaListComp + for i in $NRTbase.. for item in reverse $NRTdeltaList + for compItem in reverse $NRTdeltaListComp |null (s:=kvec.i) repeat $template.i:= deltaTran(item,compItem) $template.5 := @@ -537,7 +537,7 @@ NRTsetVector4(siglist,formlist,condlist) == NRTsetVector4a(sig,form,cond) $lisplibCategoriesExtended:= [$uncondList,:$condList] - code := ['mapConsDB,MKQ REVERSE REMDUP $uncondList] + code := ['mapConsDB,MKQ reverse REMDUP $uncondList] if $condList then localVariable := GENSYM() code := [["%LET",localVariable,code]] @@ -577,7 +577,7 @@ reverseCondlist cl == NRTsetVector4Part2(uncondList,condList) == $lisplibCategoriesExtended:= [uncondList,:condList] - code := ['mapConsDB,MKQ REVERSE REMDUP uncondList] + code := ['mapConsDB,MKQ reverse REMDUP uncondList] if condList then localVariable := GENSYM() code := [["%LET",localVariable,code]] @@ -607,11 +607,11 @@ NRTsetVector4a(sig,form,cond) == sig = '$ => domainList := [optimize COPY KAR comp(d,$EmptyMode,$e) or d for d in $domainShell.4.0] - $uncondList := APPEND(domainList,$uncondList) + $uncondList := append(domainList,$uncondList) if isCategoryForm(form,$e) then $uncondList := [form,:$uncondList] $uncondList evalform := eval mkEvalableCategoryForm form - cond = true => $uncondList := [form,:APPEND(evalform.4.0,$uncondList)] + cond = true => $uncondList := [form,:append(evalform.4.0,$uncondList)] $condList := [[cond,[form,:evalform.4.0]],:$condList] NRTmakeSlot1Info() == diff --git a/src/interp/nrungo.boot b/src/interp/nrungo.boot index fdc147bb..1fb22e93 100644 --- a/src/interp/nrungo.boot +++ b/src/interp/nrungo.boot @@ -401,7 +401,7 @@ NRTisRecurrenceRelation(op,body,minivectorName) == body:= generalTerm for [a,:b] in al repeat body:= substitute(b,a,body) - result:= [body,sharpArg,n-1,:NREVERSE [LASSOC(i,initList) or + result:= [body,sharpArg,n-1,:nreverse [LASSOC(i,initList) or systemErrorHere('"NRTisRecurrenceRelation") for i in minIndex..(n-1)]] diff --git a/src/interp/nrunopt.boot b/src/interp/nrunopt.boot index ca6dc01f..deecbd19 100644 --- a/src/interp/nrunopt.boot +++ b/src/interp/nrunopt.boot @@ -61,7 +61,7 @@ makeDomainTemplate vec == atom item => item null atom first item => makeGoGetSlot(item,index) item - $byteVec := "append"/NREVERSE $byteVec + $byteVec := "append"/nreverse $byteVec newVec makeGoGetSlot(item,index) == @@ -85,7 +85,7 @@ makeCompactDirect u == [nam,[addForm,:opList]] := u --pp opList d := [[op,y] for [op,:items] in opList | y := makeCompactDirect1(op,items)] - $byteVec := [:$byteVec,:"append"/NREVERSE $byteVecAcc] + $byteVec := [:$byteVec,:"append"/nreverse $byteVecAcc] LIST2VEC ("append"/d) makeCompactDirect1(op,items) == @@ -257,8 +257,8 @@ makePredicateBitVector pl == --called by buildFunctor for q in stripOutNonDollarPreds pred repeat firsts := insert(q,firsts) else firsts := insert(pred,firsts) - firstPl := SUBLIS($pairlis,NREVERSE orderByContainment firsts) - lastPl := SUBLIS($pairlis,NREVERSE orderByContainment lasts) + firstPl := SUBLIS($pairlis,nreverse orderByContainment firsts) + lastPl := SUBLIS($pairlis,nreverse orderByContainment lasts) firstCode:= ['buildPredVector,0,0,mungeAddGensyms(firstPl,$predGensymAlist)] lastCode := augmentPredCode(# firstPl,lastPl) @@ -326,7 +326,7 @@ orderByContainment pl == if y then max := x [max,:orderByContainment delete(max,pl)] -buildBitTable(:l) == fn(REVERSE l,0) where fn(l,n) == +buildBitTable(:l) == fn(reverse l,0) where fn(l,n) == null l => n n := n + n if QCAR l then n := n + 1 @@ -354,7 +354,7 @@ NRTmakeCategoryAlist() == $catAncestorAlist: local := NIL pcAlist := [:[[x,:"T"] for x in $uncondAlist],:$condAlist] $levelAlist: local := depthAssocList [CAAR x for x in pcAlist] - opcAlist := NREVERSE SORTBY(function NRTcatCompare,pcAlist) + opcAlist := nreverse SORTBY(function NRTcatCompare,pcAlist) newPairlis := [[5 + i,:b] for [.,:b] in $pairlis for i in 1..] slot1 := [[a,:k] for [a,:b] in SUBLIS($pairlis,opcAlist) | (k := predicateBitIndex b) ~= -1] @@ -391,7 +391,7 @@ hasDefaultPackage catname == --======================================================================= -- Generate Category Level Alist --======================================================================= -orderCatAnc x == NREVERSE ASSOCLEFT SORTBY('CDR,rest depthAssoc x) +orderCatAnc x == nreverse ASSOCLEFT SORTBY('CDR,rest depthAssoc x) depthAssocList u == u := delete('DomainSubstitutionMacro,u) --hack by RDJ 8/90 @@ -785,7 +785,7 @@ dcAll con == 'done dcOps conname == - for [op,:u] in REVERSE getOperationAlistFromLisplib conname repeat + for [op,:u] in reverse getOperationAlistFromLisplib conname repeat for [sig,slot,pred,key,:.] in u repeat suffix := atom pred => nil diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot index b6df42c9..82a35c56 100644 --- a/src/interp/postpar.boot +++ b/src/interp/postpar.boot @@ -61,7 +61,7 @@ postTransform y == u displayPreCompilationErrors() == - n:= #($postStack:= REMDUP NREVERSE $postStack) + n:= #($postStack:= REMDUP nreverse $postStack) n=0 => nil errors:= 1<n => '"errors" diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot index 380c6bae..1b251048 100644 --- a/src/interp/pspad1.boot +++ b/src/interp/pspad1.boot @@ -94,8 +94,8 @@ lisp2Boot x == $numberOfSpills:= 0 $lineLength:= 80 format x - formatOutput REVERSE $lineFragmentBuffer - [fragmentsToLine y for y in REVERSE $lineBuffer] + formatOutput reverse $lineFragmentBuffer + [fragmentsToLine y for y in reverse $lineBuffer] fragmentsToLine fragments == string:= lispStringList2String fragments @@ -112,7 +112,7 @@ lispStringList2String x == --% routines for buffer and margin adjustment formatOutput x == - for [currentColumn,start,end,stack] in REVERSE $commentsToPrint repeat + for [currentColumn,start,end,stack] in reverse $commentsToPrint repeat startY:= rest start for [loc,comment] in stack repeat commentY:= rest loc @@ -177,7 +177,7 @@ consBuffer item == not isSpecialBufferItem item and (n>columnsLeft or columnsLeft < 0) => $autoLine => --is true except within try - formatOutput REVERSE $lineFragmentBuffer + formatOutput reverse $lineFragmentBuffer $c:= REMAINDER($m+2*($numberOfSpills:= $numberOfSpills+1), $lineLength) $lineFragmentBuffer:= LIST nBlanks $c consBuffer item @@ -204,7 +204,7 @@ isCloseDelimiter item == EQ(item,")") or EQ(item,"]") or EQ(item,"}") newLine() == null $autoLine => nil $newLineWritten := true - formatOutput REVERSE $lineFragmentBuffer + formatOutput reverse $lineFragmentBuffer $lineFragmentBuffer:= LIST nBlanks $m $c:= $m @@ -214,7 +214,7 @@ optNewLine() == spillLine() == null $autoLine => nil - formatOutput REVERSE $lineFragmentBuffer + formatOutput reverse $lineFragmentBuffer $c:= $m+2*($numberOfSpills:= $numberOfSpills+1) $lineFragmentBuffer:= LIST nBlanks $c $c diff --git a/src/interp/pspad2.boot b/src/interp/pspad2.boot index 6078d610..1b3bd58a 100644 --- a/src/interp/pspad2.boot +++ b/src/interp/pspad2.boot @@ -46,7 +46,7 @@ formatDeftranForm(form,tlist) == if form is ['elt,a,b] then ----> a.b ====> apply(b,a) form := isTypeProbably? a => - atypeList := REVERSE atypeList + atypeList := reverse atypeList ["$$", b, a] ["apply",a, b] op := KAR form diff --git a/src/interp/ptrees.boot b/src/interp/ptrees.boot index 16fe4168..b31ef8c4 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/record.boot b/src/interp/record.boot index b16dbabe..123e07c0 100644 --- a/src/interp/record.boot +++ b/src/interp/record.boot @@ -117,7 +117,7 @@ testPrin(u,w) == --same as maPrin but lines are stored in $testOutputLineList $testOutputLineFlag: local := true $testOutputLineList: local := nil maPrin COPY u - res := REVERSE $testOutputLineList + res := reverse $testOutputLineList for x in res repeat sayBrightly x res @@ -130,7 +130,7 @@ hyperize(u,w) == $testOutputLineFlag: local := true $testOutputLineList: local := nil maPrin COPY u - res := REVERSE $testOutputLineList + res := reverse $testOutputLineList null res => '"" null rest res => first res "STRCONC"/[first res,:[STRCONC("\newline ",x) for x in rest res]] @@ -174,7 +174,7 @@ testInput2Output(lines,n) == evaluateLines lines null n => nil --return from reading trailing system commands typ := $mkTestOutputType - output := NREVERSE $mkTestOutputStack + output := nreverse $mkTestOutputStack [prefix2String typ,:output] evaluateLines lines == @@ -270,7 +270,7 @@ recordAndPrintTest md == --called by recordAndPrint [STRCONC(SUBSTRING(y,0,k),'" ",first u),:rest u] [y,:fn r] x - output := NREVERSE $mkTestOutputStack -- set by maPrin + output := nreverse $mkTestOutputStack -- set by maPrin PRINT(writify [input,prefix2String md,:output],$testStream) $mkTestInputStack := nil $mkTestOutputStack := nil diff --git a/src/interp/server.boot b/src/interp/server.boot index a80696d9..dbf79ac1 100644 --- a/src/interp/server.boot +++ b/src/interp/server.boot @@ -124,21 +124,21 @@ parseAndEvalToString str == $IOindex: local := nil v := CATCH($SpadReaderTag, CATCH($intTopLevel, parseAndEvalStr str)) v = 'restart => ['"error"] - NREVERSE $outputLines + nreverse $outputLines parseAndEvalToStringForHypertex str == $collectOutput:local := true $outputLines: local := nil v := CATCH($SpadReaderTag, CATCH($intTopLevel, parseAndEvalStr str)) v = 'restart => ['"error"] - NREVERSE $outputLines + nreverse $outputLines parseAndEvalToStringEqNum str == $collectOutput:local := true $outputLines: local := nil v := CATCH($SpadReaderTag, CATCH($intTopLevel, parseAndEvalStr str)) v = 'restart => ['"error"] - NREVERSE $outputLines + nreverse $outputLines parseAndInterpToString str == v := applyWithOutputToString('parseAndEvalStr, [str]) diff --git a/src/interp/sfsfun.boot b/src/interp/sfsfun.boot index 5090f0c5..5424f565 100644 --- a/src/interp/sfsfun.boot +++ b/src/interp/sfsfun.boot @@ -167,14 +167,14 @@ gammaRatapprox (x) == result gammaRatkernel(x) == - p := horner(REVERSE([3786.01050348257245475108,_ + p := horner(reverse([3786.01050348257245475108,_ 2077.45979389418732098416,_ 893.58180452374981423868,_ 222.1123961680117948396,_ 48.95434622790993805232,_ 6.12606745033608429879,_ .778079585613300575867]),x-2) - q := horner(REVERSE([3786.01050348257187258861,_ + q := horner(reverse([3786.01050348257187258861,_ 476.79386050368791516095,_ -867.23098753110299445707,_ 83.55005866791976957459,_ diff --git a/src/interp/slam.boot b/src/interp/slam.boot index 72a634c5..f458bcb4 100644 --- a/src/interp/slam.boot +++ b/src/interp/slam.boot @@ -182,7 +182,7 @@ compileRecurrenceRelation(op,nam,argl,junk,[body,sharpArg,n,:initCode]) == decomposeCode:= [["%LET",gIndex,["ELT",lastArg,0]],:[["%LET",g,["ELT",lastArg,i]] for g in gsList for i in 1..]] - gsRev:= REVERSE gsList + gsRev:= reverse gsList rotateCode:= [["%LET",p,q] for p in gsRev for q in [:rest gsRev,g]] advanceCode:= ["%LET",gIndex,['ADD1,gIndex]] diff --git a/src/interp/termrw.boot b/src/interp/termrw.boot index 937dcdf4..7d018dc5 100644 --- a/src/interp/termrw.boot +++ b/src/interp/termrw.boot @@ -110,7 +110,7 @@ mergeSubs(S1,S2) == null S2 => S1 S3 := [p for p in S2 | not ASSQ(first p, S1)] -- for p in S1 repeat S3:= augmentSub(first p,rest p,S3) - APPEND(S1,S3) + append(S1,S3) subCopy(t,SL) == -- t is any LISP structure, SL a substitution list for sharp variables diff --git a/src/interp/topics.boot b/src/interp/topics.boot index 5c3dcfc3..d37c8909 100644 --- a/src/interp/topics.boot +++ b/src/interp/topics.boot @@ -138,7 +138,7 @@ string2OpAlist s == k := 0 while (k := skipBlanks(s,k,m)) repeat acc := [INTERN SUBSTRING(s,k,-k + (k := charPosition(char '_ ,s,k + 1))),:acc] - acc := NREVERSE acc + acc := nreverse acc --now add defaults if u := getDefaultProps first acc then acc := [first acc,:u,:rest acc] acc diff --git a/src/interp/trace.boot b/src/interp/trace.boot index 2b874c2d..ead22c21 100644 --- a/src/interp/trace.boot +++ b/src/interp/trace.boot @@ -161,7 +161,7 @@ getTraceOptions options == [key,parms] := first $traceErrorStack throwKeyedMsg(key,['"",:parms]) throwListOfKeyedMsgs("S2IT0017",[# $traceErrorStack], - NREVERSE $traceErrorStack) + nreverse $traceErrorStack) optionList saveMapSig(funNames) == @@ -364,7 +364,7 @@ getMapSubNames(l) == subs:= nil for mapName in l repeat lmm:= get(mapName,'localModemap,$InteractiveFrame) => - subs:= APPEND([[mapName,:second mm] for mm in lmm],subs) + subs:= append([[mapName,:second mm] for mm in lmm],subs) union(subs,getPreviousMapSubNames UNIONQ(_/TRACENAMES, $lastUntraced)) @@ -397,7 +397,7 @@ augmentTraceNames(l,mapSubNames) == res:= nil for traceName in l repeat mml:= get(traceName,'localModemap,$InteractiveFrame) => - res:= APPEND([second mm for mm in mml],res) + res:= append([second mm for mm in mml],res) res:= [traceName,:res] res diff --git a/src/interp/wi1.boot b/src/interp/wi1.boot index 6e0ed234..b644eb2a 100644 --- a/src/interp/wi1.boot +++ b/src/interp/wi1.boot @@ -214,7 +214,7 @@ markWhereTran ["where",["DEF",form,sig,clist,body],:tail] == ntarget := ttype or target ndef := ['DEF,nform,[ntarget,:nargtypes],clist,body] result := - REVERSE macros is [:m,e] => + reverse macros is [:m,e] => mpart := m => ['SEQ,:m,['exit,1,e]] e diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot index c272fedc..3a4ef8b4 100644 --- a/src/interp/wi2.boot +++ b/src/interp/wi2.boot @@ -1054,8 +1054,8 @@ doItIf(item is [.,p,x,y],$predl,$e) == nils:=[gv,:nils] n:=n+1 - $functorLocalParameters:=[:oldFLP,:REVERSE nils] - REVERSE ans + $functorLocalParameters:=[:oldFLP,:reverse nils] + reverse ans oldFLP:=$functorLocalParameters if y~="%noBranch" then --> new <----------------------- |