From 1fd6a63bbce9234ba3b8efa12c9a91643f0a87a1 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Wed, 28 Dec 2011 04:03:36 +0000 Subject: * boot/tokens.boot: Do not rewrite drop and take. * boot/utility.boot (drop): Define and export. (take): Likewise. * interp/br-con.boot: Use take, not TAKE; use drop, not DROP. * interp/br-data.boot: Likewise. * interp/br-op1.boot: Likewise. * interp/br-saturn.boot: Likewise. * interp/c-doc.boot: Likewise. * interp/c-util.boot: Likewise. * interp/cattable.boot: Likewise. * interp/clammed.boot: Likewise. * interp/compiler.boot: Likewise. * interp/database.boot: Likewise. * interp/define.boot: Likewise. * interp/guess.boot: Likewise. * interp/htsetvar.boot: Likewise. * interp/i-analy.boot: Likewise. * interp/i-eval.boot: Likewise. * interp/i-funsel.boot: Likewise. * interp/i-map.boot: Likewise. * interp/i-output.boot: Likewise. * interp/i-special.boot: Likewise. * interp/i-syscmd.boot: Likewise. * interp/i-toplev.boot: Likewise. * interp/i-util.boot: Likewise. * interp/nruncomp.boot: Likewise. * interp/parse.boot: Likewise. * interp/record.boot: Likewise. * interp/setvars.boot: Likewise. * interp/slam.boot: Likewise. * interp/trace.boot: Likewise. * interp/word.boot: Likewise. * interp/macros.lisp (DROP): Remove. (TAKE): Likewise. --- src/interp/i-map.boot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/interp/i-map.boot') diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot index d654e787..2ee7de1c 100644 --- a/src/interp/i-map.boot +++ b/src/interp/i-map.boot @@ -302,7 +302,7 @@ makePattern(args,pred) == pred is ["=","#1",n] => n addPatternPred("#1",pred) u:= canMakeTuple(nargs,pred) => u - addPatternPred(["tuple",:TAKE(nargs,$FormalMapVariableList)],pred) + addPatternPred(["tuple",:take(nargs,$FormalMapVariableList)],pred) addPatternPred(arg,pred) == pred=true => arg @@ -375,7 +375,7 @@ putDependencies (op, dependencies) == putFlag ("$dependencies", newDependencies) clearDependencies(x,clearLocalModemapsIfTrue) == - $dependencies: local:= COPY getFlag "$dependencies" + $dependencies: local:= copyTree getFlag "$dependencies" clearDep1(x,nil,nil,$dependencies) clearDep1(x,toDoList,doneList,depList) == @@ -659,7 +659,7 @@ interpMap(opName,tar) == $mapName : local := opName $mapTarget : local := tar body:= get(opName,'mapBody,$e) - savedTimerStack := COPY $timedNameStack + savedTimerStack := copyTree $timedNameStack catchName := mapCatchName $mapName c := CATCH(catchName, interpret1(body,tar,nil)) -- $interpMapTag and $interpMapTag ~= mapCatchName $mapName => -- cgit v1.2.3