diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-05-19 01:22:11 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-05-19 01:22:11 +0000 |
| commit | af7a143e3a13e932e243165814fa40424507dae0 (patch) | |
| tree | b0b22dedd5754449a9565049f3b4552f4ae2c71f /src/interp/interop.boot | |
| parent | 43e465553496af8449014857fdd95386b6e8fd66 (diff) | |
| download | open-axiom-af7a143e3a13e932e243165814fa40424507dae0.tar.gz | |
* interp/buildom.boot (lookupInDomainVector): Establish a new
binding for $lookupDefaults.
Diffstat (limited to 'src/interp/interop.boot')
| -rw-r--r-- | src/interp/interop.boot | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/interp/interop.boot b/src/interp/interop.boot index 1586697a..bae1c4d3 100644 --- a/src/interp/interop.boot +++ b/src/interp/interop.boot @@ -428,13 +428,13 @@ opIsHasCat op == -- (u := lookupInDomainVector(op,sig,domvec,domvec)) => u oldCompLookup(op, sig, domvec, dollar) == - $lookupDefaults:local := nil + $lookupDefaults: local := false u := lookupInDomainVector(op,sig,domvec,dollar) => u $lookupDefaults := true lookupInDomainVector(op,sig,domvec,dollar) oldCompLookupNoDefaults(op, sig, domvec, dollar) == - $lookupDefaults:local := nil + $lookupDefaults: local := false lookupInDomainVector(op,sig,domvec,dollar) hashNewLookupInTable(op,sig,dollar,[domain,opvec],flag) == @@ -448,7 +448,7 @@ hashNewLookupInTable(op,sig,dollar,[domain,opvec],flag) == if hashCode? sig and scalarEq?(sig, hashPercent) then sig := hashType('(Mapping $), hashPercent) dollar = nil => systemError() - $lookupDefaults = true => + $lookupDefaults => hashNewLookupInCategories(op,sig,domain,dollar) --lookup first in my cats or newLookupInAddChain(op,sig,domain,dollar) --fast path when called from newGoGet @@ -526,8 +526,8 @@ hashNewLookupInCategories(op,sig,dom,dollar) == # catVec = 0 => nil --early exit if no categories integer? KDR catVec.0 => newLookupInCategories1(op,sig,dom,dollar) --old style - $lookupDefaults : local := nil - if $monitorNewWorld = true then sayBrightly concat('"----->", + $lookupDefaults : local := false + if $monitorNewWorld then sayBrightly concat('"----->", form2String devaluate dom,'"-----> searching default packages for ",op) predvec := domainPredicates dom packageVec := first slot4 @@ -576,7 +576,7 @@ hashNewLookupInCategories(op,sig,dom,dollar) == package nil null success => - if $monitorNewWorld = true then + if $monitorNewWorld then sayBrightlyNT '" not in: " pp (packageForm and devaluate package or entry) nil @@ -588,10 +588,10 @@ hashNewLookupInCategories(op,sig,dom,dollar) == if $monitorNewWorld then sayLooking1('"Looking at instantiated package ",package) res := basicLookup(op,sig,package,dollar) => - if $monitorNewWorld = true then + if $monitorNewWorld then sayBrightly '"candidate default package succeeds" return res - if $monitorNewWorld = true then + if $monitorNewWorld then sayBrightly '"candidate fails -- continuing to search categories" nil |