diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-08-25 19:23:54 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-08-25 19:23:54 +0000 |
| commit | 635d8e32c29f94a2e4813e36a75bdfba167e8ac1 (patch) | |
| tree | 48d7673e043a60f0e6d949924b6f4a8cf7cfd7d9 /src/interp/define.boot | |
| parent | cd5a921db34f465d1dc8fbd2061d9077f64434cf (diff) | |
| download | open-axiom-635d8e32c29f94a2e4813e36a75bdfba167e8ac1.tar.gz | |
* interp/compiler.boot (compHasFormat): Take environment
argument. Adjust callers.
* interp/define.boot (NRTmakeCategoryAlist): Likewise.
* interp/functor.boot (ProcessCond): Likewise.
* interp/lisplib.boot (NRTgenFinalAttributeAlist): Likewise.
(predicateBitIndex): Likewise.
(predicateBitRef): Likewise.
(makePredicateBitVector): Likewise.
(transHasCode): Likewise.
Diffstat (limited to 'src/interp/define.boot')
| -rw-r--r-- | src/interp/define.boot | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/interp/define.boot b/src/interp/define.boot index f4675b08..ef251ab9 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -360,8 +360,8 @@ getInfovecCode() == ['LIST, MKQ makeDomainTemplate $template, MKQ makeCompactDirect $NRTslot1Info, - MKQ NRTgenFinalAttributeAlist(), - NRTmakeCategoryAlist(), + MKQ NRTgenFinalAttributeAlist $e, + NRTmakeCategoryAlist $e, MKQ $lookupFunction] --======================================================================= @@ -425,7 +425,7 @@ makeCompactDirect1(op,items) == n is [p,:.] => p --the rest is linenumber of function definition n predCode := - s is [pred,:.] => predicateBitIndex pred + s is [pred,:.] => predicateBitIndex(pred,$e) 0 --> drop items which are not present (predCode = -1) predCode = -1 => return nil @@ -480,7 +480,7 @@ depthAssoc x == getCatAncestors x == [CAAR y for y in parentsOf opOf x] -NRTmakeCategoryAlist() == +NRTmakeCategoryAlist e == $depthAssocCache: local := hashTable 'EQ $catAncestorAlist: local := nil pcAlist := [:[[x,:"T"] for x in $uncondAlist],:$condAlist] @@ -488,7 +488,7 @@ NRTmakeCategoryAlist() == opcAlist := reverse! SORTBY(function NRTcatCompare,pcAlist) newPairlis := [[5 + i,:b] for [.,:b] in $pairlis for i in 1..] slot1 := [[a,:k] for [a,:b] in applySubst($pairlis,opcAlist) - | (k := predicateBitIndex b) ~= -1] + | (k := predicateBitIndex(b,e)) ~= -1] slot0 := [hasDefaultPackage opOf a for [a,:b] in slot1] sixEtc := [5 + i for i in 1..#$pairlis] formals := ASSOCRIGHT $pairlis |