diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-11-04 09:26:47 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-11-04 09:26:47 +0000 |
| commit | efcc23cd44ee9578ecfc9a1a02e7a403e3565129 (patch) | |
| tree | bcd45883508d9c91c9433f55738a323c6448ea5e /src/interp/nruncomp.boot | |
| parent | 41564143f03fc7ef7fa3a464c2a7df3744e83359 (diff) | |
| download | open-axiom-efcc23cd44ee9578ecfc9a1a02e7a403e3565129.tar.gz | |
* interp/functor.boot (compCategories): Take second parameter as
environment. Adjust callers.
(compCategories1): Likewise.
(NewbFVectorCopy): Remove as deadcode.
(worthlessCode): Tidy.
(DescendCode): Take additional environment parameter. Adjust callers.
* interp/define.boot (isMacro): Simplify.
(wrapDomainSub): Remove. Adjust callers.
* algebra/Makefile.in (strap-2/%.$(FASLEXT)): Fix typo.
Diffstat (limited to 'src/interp/nruncomp.boot')
| -rw-r--r-- | src/interp/nruncomp.boot | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index 39fd59f9..2375b8d7 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -489,7 +489,7 @@ buildFunctor(db,sig,code,$locals,$e) == [$catsig,:argsig] := sig catvecListMaker := removeDuplicates [comp($catsig,$EmptyMode,$e).expr, - :[compCategories u for [u,:.] in categoryAncestors $domainShell]] + :[compCategories(u,$e) for [u,:.] in categoryAncestors $domainShell]] condCats := InvestigateConditions([$catsig,:rest catvecListMaker],$e) -- a list, one %for each element of catvecListMaker -- indicating under what conditions this @@ -515,7 +515,7 @@ buildFunctor(db,sig,code,$locals,$e) == [$NRTslot1PredicateList,predBitVectorCode1,:predBitVectorCode2] := makePredicateBitVector(db,[:ASSOCRIGHT $condAlist,:$NRTslot1PredicateList],$e) - storeOperationCode := DescendCode(db,code,true,nil) + storeOperationCode := DescendCode(db,code,true,nil,$e) NRTaddDeltaCode db storeOperationCode := NRTputInLocalReferences storeOperationCode NRTdescendCodeTran(db,storeOperationCode,nil) --side effects storeOperationCode |