diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-08-16 06:35:55 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-08-16 06:35:55 +0000 |
| commit | 32bff5d4d40370d186e954ee90f31e7c2b20b50a (patch) | |
| tree | 5bc3e872c7d64990184d80bd7697836d37d1fc23 /src/interp/nruncomp.boot | |
| parent | db462564430f0d9eb4daa70a191d10e6bb5af528 (diff) | |
| download | open-axiom-32bff5d4d40370d186e954ee90f31e7c2b20b50a.tar.gz | |
* interp/modemap.boot (addModemap0): Don't special-case
CategoryDefaults.
* interp/define.boot (processFunctor): Fold into caller. Remove.
* interp/clam.boot (recordInstantiation1): Do not special case
CategoryDefaults and RepeatedSquaring.
* interp/functor.boot (DescendCode): Lose last argument, for it is
always $. Adjust body. Adjust caller.
* interp/nruncomp.boot (buildFunctor): $catNames should not be a
fluid variable. Rename to viewNames.
Diffstat (limited to 'src/interp/nruncomp.boot')
| -rw-r--r-- | src/interp/nruncomp.boot | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index ff071ab4..fcd0ea1f 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -473,7 +473,6 @@ buildFunctor($definition is [name,:args],sig,code,$locals,$e) == $GENNO: local:= 0 --bound in compDefineFunctor1, then as parameter here $catvecList: local := nil --list of vectors v1..vn for each view $hasCategoryAlist: local := nil --list of GENSYMs bound to (HasCategory ..) items - $catNames: local := nil --list of names n1..nn for each view $catsig: local := nil --target category (used in ProcessCond) $SetFunctions: local := nil --copy of p view with preds telling when fnct defined $ConstantAssignments: local := nil --code for creation of constants @@ -501,21 +500,21 @@ buildFunctor($definition is [name,:args],sig,code,$locals,$e) == for i in 0..4 repeat vectorRef(domainShell,i) := vectorRef($domainShell,i) --we will clobber elements; copy since $domainShell may be a cached vector - $template := newShell ($NRTbase + $NRTdeltaLength) - $catvecList:= [domainShell,:[emptyVector for u in second domainShell.4]] - $catNames := ['$] -- for DescendCode -- to be changed below for slot 4 - $SetFunctions:= newShell # domainShell - $catNames:= ['$,:[genvar() for u in rest catvecListMaker]] - domname:='dv_$ + $template := newShell($NRTbase + $NRTdeltaLength) + $SetFunctions := newShell # domainShell + $catvecList := [domainShell,:[emptyVector for u in second domainShell.4]] + -- list of names n1..nn for each view + viewNames := ['$,:[genvar() for u in rest catvecListMaker]] + domname := 'dv_$ -- Do this now to create predicate vector; then DescendCode can refer -- to predicate vector if it can [$uncondAlist,:$condAlist] := --bound in compDefineFunctor1 - NRTsetVector4Part1($catNames,catvecListMaker,condCats) + NRTsetVector4Part1(viewNames,catvecListMaker,condCats) [$NRTslot1PredicateList,predBitVectorCode1,:predBitVectorCode2] := makePredicateBitVector [:ASSOCRIGHT $condAlist,:$NRTslot1PredicateList] - storeOperationCode:= DescendCode(code,true,nil,first $catNames) + storeOperationCode := DescendCode(code,true,nil) NRTaddDeltaCode() storeOperationCode:= NRTputInLocalReferences storeOperationCode NRTdescendCodeTran(storeOperationCode,nil) --side effects storeOperationCode |