diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-05-09 21:57:33 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-05-09 21:57:33 +0000 |
| commit | f42883e3da3524177b4a8c6f42c8e7b1646a6265 (patch) | |
| tree | 7802320c3cab01a11aa32fd87bf8ea00f265fd80 /src/interp/mark.boot | |
| parent | 37bce222d153e4b7b0c086b9c717435f4cdd2c77 (diff) | |
| download | open-axiom-f42883e3da3524177b4a8c6f42c8e7b1646a6265.tar.gz | |
More cleanups
Diffstat (limited to 'src/interp/mark.boot')
| -rw-r--r-- | src/interp/mark.boot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/mark.boot b/src/interp/mark.boot index ce5c7b3a..6c0c26a2 100644 --- a/src/interp/mark.boot +++ b/src/interp/mark.boot @@ -388,7 +388,7 @@ markChanges(originalDef,T,sig) == markEncodeChanges(code,nil) frees := null $markFreeStack => nil - [['free,:mySort REMDUP $markFreeStack]] + [['free,:mySort removeDuplicates $markFreeStack]] noriginalBody := markSpliceInChanges originalBody nbody := augmentBodyByLoopDecls noriginalBody ndef := ['DEF,form,signature,[nil for x in form],nbody] @@ -870,7 +870,7 @@ markFinish1() == $globalImportStack := delete($categoryNameForDollar,$globalImportStack) $commonImports : local := getCommonImports() globalImports := - reverse orderByContainment REMDUP [:$commonImports,:$globalImportStack] + reverse orderByContainment removeDuplicates [:$commonImports,:$globalImportStack] $finalImports: local := SETDIFFERENCE(globalImports,$globalDeclareStack) $capsuleStack := [mkNewCapsuleItem(freepart,imports,x) for freepart in $freeStack @@ -955,7 +955,7 @@ markRemImportsAndLeadingMacros(leadingMacros,body) == mkNewCapsuleItem(frees,i,x) == [originalDef,:ndef] := x - imports := reverse orderByContainment REMDUP SETDIFFERENCE(i,$finalImports) + imports := reverse orderByContainment removeDuplicates SETDIFFERENCE(i,$finalImports) importPart := [["import",d] for d in imports] nbody := ndef is ["%LET",.,x] => x @@ -1362,7 +1362,7 @@ markGetPaths(x,y) == markPaths(x,y,[nil]) mkCheck() == - for [x, :y] in REMDUP $badStack repeat + for [x, :y] in removeDuplicates $badStack repeat pp '"!!-------------------------------!!" res := mkGetPaths(x, y) oldRes := markPaths(x, y, [nil]) @@ -1376,11 +1376,11 @@ mkCheck() == reverseDown u == [reverse x for x in u] mkCheckRun() == - for [x, :y] in REMDUP $badStack repeat + for [x, :y] in removeDuplicates $badStack repeat pp mkGetPaths(x,y) mkGetPaths(x,y) == - u := REMDUP mkPaths(x,y) => getLocationsOf(u,y,nil) + u := removeDuplicates mkPaths(x,y) => getLocationsOf(u,y,nil) nil mkPaths(x,y) == --x < y; find location s of x in y (initially s=nil) |