diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-11-29 00:23:58 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-11-29 00:23:58 +0000 |
| commit | e8ad2f9f2b60fe586d02c8681c5d85de4ef89b18 (patch) | |
| tree | 21fd5ef9a98d9d5426e64db52783eb7f0ef20735 /src/interp/nruncomp.boot | |
| parent | ed6a80eccdb35946a69d5324886cae784e65e943 (diff) | |
| download | open-axiom-e8ad2f9f2b60fe586d02c8681c5d85de4ef89b18.tar.gz | |
* interp/nruncomp.boot (buildFunctor): Remov reference to $NRTvec.
* interp/nrunfast.boot ($NRTvec): Don't define.
Diffstat (limited to 'src/interp/nruncomp.boot')
| -rw-r--r-- | src/interp/nruncomp.boot | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index 4ecf54e8..cefd53d8 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -443,9 +443,7 @@ buildFunctor($definition is [name,:args],sig,code,$locals,$e) == domainShell := newShell ($NRTbase + $NRTdeltaLength) for i in 0..4 repeat domainShell.i := $domainShell.i --we will clobber elements; copy since $domainShell may be a cached vector - $template := - $NRTvec = true => newShell ($NRTbase + $NRTdeltaLength) - nil + $template := newShell ($NRTbase + $NRTdeltaLength) $catvecList:= [domainShell,:[emptyVector for u in CADR domainShell.4]] $catNames := ['$] -- for DescendCode -- to be changed below for slot 4 $SetFunctions:= newShell SIZE domainShell @@ -461,21 +459,18 @@ buildFunctor($definition is [name,:args],sig,code,$locals,$e) == makePredicateBitVector [:ASSOCRIGHT $condAlist,:$NRTslot1PredicateList] storeOperationCode:= DescendCode(code,true,nil,first $catNames) - outsideFunctionCode:= NRTaddDeltaCode() + NRTaddDeltaCode() storeOperationCode:= NRTputInLocalReferences storeOperationCode - if $NRTvec = true then - NRTdescendCodeTran(storeOperationCode,nil) --side effects storeOperationCode + NRTdescendCodeTran(storeOperationCode,nil) --side effects storeOperationCode codePart2:= - $NRTvec = true => - argStuffCode := - [[$setelt,'$,i,v] for i in $NRTbase.. for v in $FormalMapVariableList - for arg in rest $definition] - if MEMQ($NRTaddForm,$locals) then - addargname := $FormalMapVariableList.(POSN1($NRTaddForm,$locals)) - argStuffCode := [[$setelt,'$,5,addargname],:argStuffCode] - [['stuffDomainSlots,'$],:argStuffCode, - :predBitVectorCode2,storeOperationCode] - [:outsideFunctionCode,storeOperationCode] + argStuffCode := + [[$setelt,'$,i,v] for i in $NRTbase.. for v in $FormalMapVariableList + for arg in rest $definition] + if MEMQ($NRTaddForm,$locals) then + addargname := $FormalMapVariableList.(POSN1($NRTaddForm,$locals)) + argStuffCode := [[$setelt,'$,5,addargname],:argStuffCode] + [['stuffDomainSlots,'$],:argStuffCode, + :predBitVectorCode2,storeOperationCode] $CheckVectorList := NRTcheckVector domainShell --CODE: part 1 |