diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-10-29 15:24:15 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-10-29 15:24:15 +0000 |
| commit | 3cb1a587dfe4e2c84232aad18a4c695f8dabea96 (patch) | |
| tree | d2279623a74d523217ec5db35760bef723f69a5c /src/interp | |
| parent | 802ce3f7635ad4370303a959f7623509fded8528 (diff) | |
| download | open-axiom-3cb1a587dfe4e2c84232aad18a4c695f8dabea96.tar.gz | |
* interp/lisplib.boot (makePredicateBitVector): Take a DB argument.
Set dbPredicates.
(compConLib1): Set dbPredicates to nil.
(compDefineLisplib): Likewise.
(finalizeLisplib): Write dbPredicates.
* boot/tokens.boot (copyTree): Do not translate.
* boot/utility.boot (topyTree): Implement. Export.
Diffstat (limited to 'src/interp')
| -rw-r--r-- | src/interp/lisplib.boot | 12 | ||||
| -rw-r--r-- | src/interp/nruncomp.boot | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/interp/lisplib.boot b/src/interp/lisplib.boot index 639db319..8b76009d 100644 --- a/src/interp/lisplib.boot +++ b/src/interp/lisplib.boot @@ -97,7 +97,7 @@ makePrefixForm(u,op) == --======================================================================= -- Generate Slot 3 Predicate Vector --======================================================================= -makePredicateBitVector(pl,e) == --called by buildFunctor +makePredicateBitVector(db,pl,e) == --called by buildFunctor if $insideCategoryPackageIfTrue then pl := union(pl,$categoryPredicateList) $predGensymAlist := nil --bound by buildFunctor, used by optHas @@ -114,8 +114,8 @@ makePredicateBitVector(pl,e) == --called by buildFunctor firstCode:= ['buildPredVector,0,0,mungeAddGensyms(firstPl,$predGensymAlist)] lastCode := augmentPredCode(# firstPl,lastPl) - $lisplibPredicates := [:firstPl,:lastPl] --what is stored under 'predicates - [$lisplibPredicates,firstCode,:lastCode] --$pairlis set by compDefineFunctor1 + dbPredicates(db) := [:firstPl,:lastPl] --what is stored under 'predicates + [dbPredicates db,firstCode,:lastCode] --$pairlis set by compDefineFunctor1 augmentPredCode(n,lastPl) == ['%list,:pl] := mungeAddGensyms(lastPl,$predGensymAlist) @@ -386,7 +386,7 @@ compileConstructorLib(l,op,editFlag,traceFlag) == compConLib1(fun,infileOrNil,outfileOrNil,auxOp,editFlag,traceFlag) == $PrettyPrint: local := 'T - $lisplibPredicates: local := nil + dbPredicates(constructorDB fun) := nil $lisplibOperationAlist: local := nil $libFile: local := nil if cons? fun and null rest fun then fun:= first fun -- unwrap nullary @@ -405,7 +405,7 @@ compDefineLisplib(df:=["DEF",[op,:.],:.],m,e,prefix,fal,fn) == --fn= compDefineCategory1 OR compDefineFunctor1 sayMSG fillerSpaces(72,char "-") $op: local := op - $lisplibPredicates: local := nil -- set by makePredicateBitVector + dbPredicates(constructorDB op) := nil $lisplibOperationAlist: local := nil $libFile: local := nil -- $lisplibRelatedDomains: local := nil --from ++ Related Domains: see c-doc @@ -539,7 +539,7 @@ finalizeLisplib(ctor,libName) == writeSuperDomain(ctor,dbSuperDomain db,$libFile) writeCapsuleLevelDefinitions(ctor,dbCapsuleDefinitions db,$libFile) writeAttributes(ctor,dbAttributes db,$libFile) - writePredicates(ctor,$lisplibPredicates,$libFile) + writePredicates(ctor,dbPredicates db,$libFile) writeAbbreviation(db,$libFile) writePrincipals(ctor,dbPrincipals db,$libFile) writeAncestors(ctor,dbAncestors db,$libFile) diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index f4ac82b6..7bd5e7de 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -513,7 +513,7 @@ buildFunctor(db,sig,code,$locals,$e) == [$uncondAlist,:$condAlist] := --bound in compDefineFunctor1 NRTsetVector4Part1(viewNames,catvecListMaker,condCats) [$NRTslot1PredicateList,predBitVectorCode1,:predBitVectorCode2] := - makePredicateBitVector([:ASSOCRIGHT $condAlist,:$NRTslot1PredicateList],$e) + makePredicateBitVector(db,[:ASSOCRIGHT $condAlist,:$NRTslot1PredicateList],$e) storeOperationCode := DescendCode(db,code,true,nil) NRTaddDeltaCode() |