diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-10-13 07:32:30 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-10-13 07:32:30 +0000 |
| commit | c85375e527a7e0341ec5e717b3f50d6b5fa25d48 (patch) | |
| tree | 1f32aadbdd191ae57f56ac46de46111a49b4be1f /src/interp/i-analy.boot | |
| parent | a619487f9feb4a530244171b94decfccce57af8b (diff) | |
| download | open-axiom-c85375e527a7e0341ec5e717b3f50d6b5fa25d48.tar.gz | |
Don't step over Common Lisp MAP.
* interp/i-analy.boot (bottomUp): Change MAP to %Map.
(isEltable): Likewise.
* interp/i-coerce.boot (retract): Likewise.
* interp/i-eval.boot (getArgValue): Likewise.
* interp/i-funsel.boot (selectLocalMms): Likewise.
* interp/i-intern.boot (getValueFromEnvironment): Likewise.
* interp/i-map.boot (mkAuxiliaryName): Likewise.
(augmentMap): Likewise.
(displayMap): Likewise.
(putBodyInEnd): Likewise.
(expandRecursiveBody): Likewise.
* interp/i-output.boot (outputTran): Likewise.
* interp/i-spec1.boot (declare): Likewise.
* interp/i-syscmd.boot (displayMacro): Likewise.
* interp/i-toplev.boot (interpret2): Likewise.
* interp/patches.lisp (MAP): Remove.
* interp/trace.boot (isUncompiledMap): Likewise.
Diffstat (limited to 'src/interp/i-analy.boot')
| -rw-r--r-- | src/interp/i-analy.boot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot index cbf3e34a..39b4bf2e 100644 --- a/src/interp/i-analy.boot +++ b/src/interp/i-analy.boot @@ -241,7 +241,7 @@ bottomUp t == -- see if we are calling a declared user map -- if so, push down the declared types as targets on the args - if opVal and (objVal opVal is ['MAP,:.]) and + if opVal and (objVal opVal is ["%Map",:.]) and (getMode op is ['Mapping,:ms]) and (nargs + 1= #ms) then for m in rest ms for x in argl repeat putTarget(x,m) @@ -832,7 +832,7 @@ isEltable(op,argl,numArgs) == ZEROP numArgs => true not(m := objMode(v)) => nil m is ['Mapping, :.] => nil - objVal(v) is ['MAP, :mapDef] and numMapArgs(mapDef) > 0 => nil + objVal(v) is ["%Map",:mapDef] and numMapArgs(mapDef) > 0 => nil true m := getMode op => ZEROP numArgs => true |