From af7a143e3a13e932e243165814fa40424507dae0 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Thu, 19 May 2011 01:22:11 +0000 Subject: * interp/buildom.boot (lookupInDomainVector): Establish a new binding for $lookupDefaults. --- src/ChangeLog | 5 +++++ src/interp/buildom.boot | 8 +++----- src/interp/c-util.boot | 2 +- src/interp/cattable.boot | 2 +- src/interp/clam.boot | 12 ++++++------ src/interp/compiler.boot | 10 +++++----- src/interp/define.boot | 8 ++++---- src/interp/format.boot | 4 ++-- src/interp/g-util.boot | 4 ++-- src/interp/i-eval.boot | 4 ++-- src/interp/i-special.boot | 2 +- src/interp/i-syscmd.boot | 2 +- src/interp/i-toplev.boot | 4 ++-- src/interp/interop.boot | 16 ++++++++-------- src/interp/modemap.boot | 10 +++++----- src/interp/newfort.boot | 2 +- src/interp/nruncomp.boot | 4 ++-- src/interp/nrunfast.boot | 24 ++++++++++++------------ src/interp/postpar.boot | 2 +- 19 files changed, 64 insertions(+), 61 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 2be3f121..96f5842b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-05-18 Gabriel Dos Reis + + * interp/buildom.boot (lookupInDomainVector): Establish a new + binding for $lookupDefaults. + 2011-05-18 Gabriel Dos Reis * interp/buildom.boot (mkEnumerationFunList): Include enum diff --git a/src/interp/buildom.boot b/src/interp/buildom.boot index a1e0db1a..2e4a535c 100644 --- a/src/interp/buildom.boot +++ b/src/interp/buildom.boot @@ -170,11 +170,9 @@ lookupInDomain(op,sig,addFormDomain,dollar,index) == ++ (either in category packages or add-chains) is controlled ++ by `useDefaults'. lookupInDomainAndDefaults(op,sig,domain,dollar,useDefaults) == - savedLookupDefaults := $lookupDefaults - $lookupDefaults := useDefaults - fun := lookupInDomainVector(op,sig,domain,dollar) - $lookupDefaults := savedLookupDefaults - fun + $lookupDefaults: local := useDefaults + lookupInDomainVector(op,sig,domain,dollar) + basicLookup(op,sig,domain,dollar) == item := domain.1 diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot index 4a972ca1..f1af92ec 100644 --- a/src/interp/c-util.boot +++ b/src/interp/c-util.boot @@ -325,7 +325,7 @@ displayWarning(l,stream) == displayComp level == $bright:= " << " $dim:= " >> " - if $insideCapsuleFunctionIfTrue=true then + if $insideCapsuleFunctionIfTrue then sayBrightly ['"error in function",:bright $op,'"%l"] --mathprint removeZeroOne mkErrorExpr level pp removeZeroOne mkErrorExpr level diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot index 3e35fdb4..87d469db 100644 --- a/src/interp/cattable.boot +++ b/src/interp/cattable.boot @@ -478,7 +478,7 @@ updateCategoryTableForDomain(cname,category) == [cname,:domainEntry]:= addDomainToTable(cname,category) for [a,:b] in encodeCategoryAlist(cname,domainEntry) repeat tableValue(_*HASCATEGORY_-HASH_*,[cname,:a]) := b - $doNotCompressHashTableIfTrue = true => _*HASCATEGORY_-HASH_* + $doNotCompressHashTableIfTrue => _*HASCATEGORY_-HASH_* -- compressHashTable _*HASCATEGORY_-HASH_* clearCategoryTable($cname) == diff --git a/src/interp/clam.boot b/src/interp/clam.boot index 4e75d57a..daf29e79 100644 --- a/src/interp/clam.boot +++ b/src/interp/clam.boot @@ -104,7 +104,7 @@ compClam(op,argl,body,$clamList) == argl is [.] => [[g1],[auxfn,g1]] --g1 is a parameter [g1,['APPLX,['function,auxfn],g1]] --g1 is a parameter list cacheName:= mkCacheName op - if $reportCounts=true then + if $reportCounts then hitCounter:= INTERNL(op,'";hit") callCounter:= INTERNL(op,'";calls") setDynamicBinding(hitCounter,0) @@ -203,7 +203,7 @@ compHash(op,argl,body,cacheNameOrNil,eqEtc,countFl) == key:= (cacheNameOrNil => ['devaluateList,g1] ; g1) [g1,key,['APPLY,['function,auxfn],g1]] --g1 is a parameter list cacheName:= cacheNameOrNil or mkCacheName op - if $reportCounts=true then + if $reportCounts then hitCounter:= INTERNL(op,'";hit") callCounter:= INTERNL(op,'";calls") setDynamicBinding(hitCounter,0) @@ -525,7 +525,7 @@ addToConstructorCache(op,args,value) == haddProp(ht,op,prop,val) == --presently, ht always = $ConstructorCache statRecordInstantiationEvent() - if $reportInstantiations = true or $reportEachInstantiation = true then + if $reportInstantiations or $reportEachInstantiation then startTimingProcess 'debug recordInstantiation(op,prop,false) stopTimingProcess 'debug @@ -546,7 +546,7 @@ recordInstantiation(op,prop,dropIfTrue) == recordInstantiation1(op,prop,dropIfTrue) == op in '(CategoryDefaults RepeatedSquaring) => nil--ignore defaults for now - if $reportEachInstantiation = true then + if $reportEachInstantiation then trailer:= (dropIfTrue => '" dropped"; '" instantiated") if $insideCoerceInteractive= true then $instantCoerceCount:= 1+$instantCoerceCount @@ -554,7 +554,7 @@ recordInstantiation1(op,prop,dropIfTrue) == $instantCanCoerceCount:= 1+$instantCanCoerceCount xtra:= ['" for ",outputDomainConstructor m1,'"-->",outputDomainConstructor m2] - if $insideEvalMmCondIfTrue = true and null dropIfTrue then + if $insideEvalMmCondIfTrue and not dropIfTrue then $instantMmCondCount:= $instantMmCondCount + 1 typeTimePrin ["CONCAT",outputDomainConstructor [op,:prop],trailer,:xtra] null $reportInstantiations => nil @@ -616,7 +616,7 @@ listTruncate(l,n) == n := n - 1 u := rest u if cons? u then - if cons? rest u and $reportInstantiations = true then + if cons? rest u and $reportInstantiations then recordInstantiation($op,CAADR u,true) u.rest := nil l diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot index df460c2c..b1899ee8 100644 --- a/src/interp/compiler.boot +++ b/src/interp/compiler.boot @@ -192,7 +192,7 @@ comp3(x,m,$e) == getmode(op,e) is ["Mapping",:ml] and (u:= applyMapping(x,m,e,ml)) => u op is ":" => compColon(x,m,e) op is "::" => compCoerce(x,m,e) - not ($insideCompTypeOf=true) and stringPrefix?('"TypeOf",PNAME op) => + not $insideCompTypeOf and stringPrefix?('"TypeOf",PNAME op) => compTypeOf(x,m,e) t:= compExpression(x,m,e) t is [x',m',e'] and not listMember?(m',getDomainsInScope e') => @@ -425,7 +425,7 @@ compSymbol(s,m,e) == [s,v.mode,e] --s has been SETQd m' := getmode(s,e) => if not symbolMember?(s,$formalArgList) and not symbolMember?(s,$FormalMapVariableList) and - not isFunction(s,e) and null ($compForModeIfTrue=true) then errorRef s + not isFunction(s,e) and not $compForModeIfTrue then errorRef s [s,m',e] --s is a declared argument symbolMember?(s,$FormalMapVariableList) => stackMessage('"no mode found for %1b",[s]) @@ -820,7 +820,7 @@ setqSingle(id,val,m,E) == (T:= comp(val,$EmptyMode,E)) and getmode(T.mode,E) => assignError(val,T.mode,id,m'') T':= [x,m',e']:= coerce(T,m) or return nil - if $profileCompiler = true then + if $profileCompiler then not IDENTP id => nil key := symbolMember?(id,$form.args) => "arguments" @@ -1539,7 +1539,7 @@ maybeSpliceMode m == compColon: (%Form,%Mode,%Env) -> %Maybe %Triple compColon([":",f,t],m,e) == - $insideExpressionIfTrue=true => compColonInside(f,m,e,t) + $insideExpressionIfTrue => compColonInside(f,m,e,t) --if inside an expression, ":" means to convert to m "on faith" $lhsOfColon: local:= f t:= @@ -1698,7 +1698,7 @@ coerceHard(T,m) == modeEqual(m'',m') => [T.expr,m,T.env] string? T.expr and T.expr=m => [T.expr,m,$e] isCategoryForm(m,$e) => - $bootStrapMode = true => [T.expr,m,$e] + $bootStrapMode => [T.expr,m,$e] extendsCategoryForm(T.expr,T.mode,m) => [T.expr,m,$e] coerceExtraHard(T,m) (m' is "$" and m = $functorForm) or (m' = $functorForm and m = "$") => diff --git a/src/interp/define.boot b/src/interp/define.boot index 2c5bc83b..6bbe42e1 100644 --- a/src/interp/define.boot +++ b/src/interp/define.boot @@ -1040,7 +1040,7 @@ compDefineFunctor1(df is ['DEF,form,signature,nils,body], ++ Subroutine of compDefineFunctor1. Called to generate backend code ++ for a functor definition. compFunctorBody(body,m,e,parForm) == - $bootStrapMode = true => + $bootStrapMode => [bootStrapError($functorForm, _/EDITFILE),m,e] clearCapsuleDirectory() -- start collecting capsule functions. T:= compOrCroak(body,m,e) @@ -1527,7 +1527,7 @@ compile u == if not $insideCapsuleFunctionIfTrue then optimizedBody else putInLocalDomainReferences optimizedBody - $doNotCompileJustPrint=true => (PRETTYPRINT stuffToCompile; op') + $doNotCompileJustPrint => (PRETTYPRINT stuffToCompile; op') $macroIfTrue => constructMacro stuffToCompile -- Let the backend know about this function's type @@ -1644,7 +1644,7 @@ registerInlinableDomain(x,e) == nil compAdd(['add,$addForm,capsule],m,e) == - $bootStrapMode = true => + $bootStrapMode => if $addForm is ["%Comma",:.] then code := nil else [code,m,e]:= comp($addForm,m,e) [['%when, _ @@ -1675,7 +1675,7 @@ compTuple2Record u == ['Record,:[[":",i,x] for i in 1.. for x in u.args]] compCapsule(['CAPSULE,:itemList],m,e) == - $bootStrapMode = true => + $bootStrapMode => [bootStrapError($functorForm, _/EDITFILE),m,e] $insideExpressionIfTrue: local:= false $useRepresentationHack := true diff --git a/src/interp/format.boot b/src/interp/format.boot index d5602c53..0821333e 100644 --- a/src/interp/format.boot +++ b/src/interp/format.boot @@ -480,8 +480,8 @@ formDecl2String(left,right) == formJoin1(op,u) == if op = 'Join then [:argl,last] := u else (argl := nil; last := [op,:u]) last is [id,.,:r] and id in '(mkCategory CATEGORY) => - $abbreviateJoin = true => concat(formJoin2 argl,'"%b",'"with",'"%d",'"...") - $permitWhere = true => + $abbreviateJoin => concat(formJoin2 argl,'"%b",'"with",'"%d",'"...") + $permitWhere => opList:= formatJoinKey(r,id) $whereList:= concat($whereList,"%l",$declVar,": ", formJoin2 argl,'"%b",'"with",'"%d","%i",opList,"%u") diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot index 4b912926..27f870ce 100644 --- a/src/interp/g-util.boot +++ b/src/interp/g-util.boot @@ -231,7 +231,7 @@ get0(x,prop,e) == get1(x,prop,e) == --this is the old get cons? x => get(x.op,prop,e) - prop="modemap" and $insideCapsuleFunctionIfTrue=true => + prop="modemap" and $insideCapsuleFunctionIfTrue => symbolLassoc("modemap",getProplist(x,$CapsuleModemapFrame)) or get2(x,prop) LASSOC(prop,getProplist(x,e)) or get2(x,prop) @@ -258,7 +258,7 @@ put(x,prop,val,e) == --e must never be $CapsuleModemapFrame cons? x => put(first x,prop,val,e) newProplist := augProplistOf(x,prop,val,e) - prop="modemap" and $insideCapsuleFunctionIfTrue=true => + prop="modemap" and $insideCapsuleFunctionIfTrue => SAY ["**** modemap PUT on CapsuleModemapFrame: ",val] $CapsuleModemapFrame:= addBinding(x,augProplistOf(x,"modemap",val,$CapsuleModemapFrame), diff --git a/src/interp/i-eval.boot b/src/interp/i-eval.boot index 9d848d27..6eb520b2 100644 --- a/src/interp/i-eval.boot +++ b/src/interp/i-eval.boot @@ -263,7 +263,7 @@ evalForm(op,opName,argl,mmS) == sameObject?(bpi,function Undef) => sayKeyedMsg("S2IE0009",[opName,formatSignature rest sig,first sig]) nil - if $NRTmonitorIfTrue = true then + if $NRTmonitorIfTrue then sayBrightlyNT ['"Applying ",first fun0,'" to:"] pp [devaluateDeeply x for x in form] $: local := domain @@ -346,7 +346,7 @@ getArgValueComp(arg,type,cond) == evalFormMkValue(op,form,tm) == val := object(form,tm) - if $NRTmonitorIfTrue = true then + if $NRTmonitorIfTrue then sayBrightlyNT ['"Value of ",op.0,'" ===> "] pp objValUnwrap val putValue(op,val) diff --git a/src/interp/i-special.boot b/src/interp/i-special.boot index b7d42e30..9d513364 100644 --- a/src/interp/i-special.boot +++ b/src/interp/i-special.boot @@ -2087,7 +2087,7 @@ uppretend t == -----------------------Compiler for Interpreter--------------------------------- NRTcompileEvalForm(opName,sigTail,dcVector) == u := NRTcompiledLookup(opName,sigTail,dcVector) - not ($insideCompileBodyIfTrue = true) => MKQ u + not $insideCompileBodyIfTrue => MKQ u k := NRTgetMinivectorIndex(u,opName,sigTail,dcVector) ['ELT,"$$$",k] --$$$ denotes minivector diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot index bcae78dd..5f7b0b1c 100644 --- a/src/interp/i-syscmd.boot +++ b/src/interp/i-syscmd.boot @@ -2098,7 +2098,7 @@ unwritable? ob == -- READTABLEs cannot presently be transformed back. writifyComplain s == - $writifyComplained = true => nil + $writifyComplained => nil $writifyComplained := true sayKeyedMsg("S2IH0027",[s]) diff --git a/src/interp/i-toplev.boot b/src/interp/i-toplev.boot index 50b372ce..fc7d4cf2 100644 --- a/src/interp/i-toplev.boot +++ b/src/interp/i-toplev.boot @@ -154,7 +154,7 @@ processInteractive(form, posnForm) == object := processInteractive1(form, posnForm) --object := ERRORSET(['processInteractive1,LIST('QUOTE,form),['QUOTE,posnForm]],'t,'t) if not($ProcessInteractiveValue) then - if $reportInstantiations = true then + if $reportInstantiations then reportInstantiations() CLRHASH $instantRecord writeHistModesAndValues() @@ -203,7 +203,7 @@ recordAndPrint(x,md) == if $printStorageIfTrue then printStorage() if $printStatisticsSummaryIfTrue then printStatisticsSummary() if integer? $HTCompanionWindowID then mkCompanionPage md - $mkTestFlag = true => recordAndPrintTest md + $mkTestFlag => recordAndPrintTest md $runTestFlag => $mkTestOutputType := md 'done 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 diff --git a/src/interp/modemap.boot b/src/interp/modemap.boot index 38c00d28..e58b315e 100644 --- a/src/interp/modemap.boot +++ b/src/interp/modemap.boot @@ -113,7 +113,7 @@ insertModemap(new,mmList) == addModemap(op,mc,sig,pred,fn,$e) == $InteractiveMode => $e if knownInfo pred then pred:=true - $insideCapsuleFunctionIfTrue=true => + $insideCapsuleFunctionIfTrue => $CapsuleModemapFrame := addModemap0(op,mc,sig,pred,fn,$CapsuleModemapFrame) $e @@ -122,7 +122,7 @@ addModemap(op,mc,sig,pred,fn,$e) == addModemapKnown(op,mc,sig,pred,fn,$e) == -- if knownInfo pred then pred:=true -- that line is handled elsewhere - $insideCapsuleFunctionIfTrue=true => + $insideCapsuleFunctionIfTrue => $CapsuleModemapFrame := addModemap0(op,mc,sig,pred,fn,$CapsuleModemapFrame) $e @@ -143,7 +143,7 @@ addEltModemap(op,mc,sig,pred,fn,e) == op='elt and sig is [:lt,sel] => string? sel => id:= makeSymbol sel - if $insideCapsuleFunctionIfTrue=true + if $insideCapsuleFunctionIfTrue then $e:= makeLiteral(id,$e) else e:= makeLiteral(id,e) addModemap1(op,mc,[:lt,id],pred,fn,e) @@ -152,7 +152,7 @@ addEltModemap(op,mc,sig,pred,fn,e) == op='setelt and sig is [:lt,sel,v] => string? sel => id:= makeSymbol sel - if $insideCapsuleFunctionIfTrue=true + if $insideCapsuleFunctionIfTrue then $e:= makeLiteral(id,$e) else e:= makeLiteral(id,e) addModemap1(op,mc,[:lt,id,v],pred,fn,e) @@ -364,7 +364,7 @@ addConstructorModemaps(name,form is [functorName,:.],e) == -- getDomainsInScope e == - $insideCapsuleFunctionIfTrue=true => $CapsuleDomainsInScope + $insideCapsuleFunctionIfTrue => $CapsuleDomainsInScope get("$DomainsInScope","special",e) putDomainsInScope(x,e) == diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot index bc6f2bd8..b3753f39 100644 --- a/src/interp/newfort.boot +++ b/src/interp/newfort.boot @@ -784,7 +784,7 @@ fortPre1 e == -- strip the '%' character off objects like %pi etc.. null e => nil integer?(e) => - $fortInts2Floats = true => + $fortInts2Floats => e >= 0 => fix2FortranFloat(e) ['"-", fix2FortranFloat(-e)] e diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index b4105dbd..7dcde37c 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -160,7 +160,7 @@ needToQuoteFlags?(sig,env) == IDENTP t and null get(t,"value",e) optDeltaEntry(op,sig,dc,eltOrConst) == - $killOptimizeIfTrue = true => nil + $killOptimizeIfTrue => nil -- references to modemaps from current domain are folded in a later -- stage of the compilation process. dc is '$ => nil @@ -195,7 +195,7 @@ genDeltaEntry(opMmPair,e) == --called from compApplyModemap --$NRTdeltaLength=0.. always equals length of $NRTdeltaList [op,[dc,:sig],[.,cform:=[eltOrConst,.,nsig]]] := opMmPair - if $profileCompiler = true then profileRecord(dc,op,sig) + if $profileCompiler then profileRecord(dc,op,sig) eltOrConst is 'XLAM => cform if eltOrConst is 'Subsumed then eltOrConst := 'ELT if atom dc then diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot index a470cdbb..745d8cae 100644 --- a/src/interp/nrunfast.boot +++ b/src/interp/nrunfast.boot @@ -144,7 +144,7 @@ replaceGoGetSlot env == '" wants",'"%l",'" "),op,sig,goGetDomain) slot := basicLookup(op,sig,goGetDomain,goGetDomain) slot = nil => - $returnNowhereFromGoGet = true => + $returnNowhereFromGoGet => ['nowhere,:goGetDomain] --see newGetDomainOpTable sayBrightly concat('"Function: ",formatOpSignature(op,sig), '" is missing from domain: ",form2String goGetDomain.0) @@ -168,7 +168,7 @@ lookupIncomplete(op,sig,dollar,env) == newLookupInTable(op,sig,dollar,[domain,opvec],flag) == dollar = nil => systemError() - $lookupDefaults = true => + $lookupDefaults => newLookupInCategories(op,sig,domain,dollar) --lookup first in my cats or newLookupInAddChain(op,sig,domain,dollar) --fast path when called from newGoGet @@ -273,8 +273,8 @@ newLookupInCategories(op,sig,dom,dollar) == # catVec = 0 => nil --early exit if no categories integer? KDR canonicalForm catVec => 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 @@ -323,7 +323,7 @@ newLookupInCategories(op,sig,dom,dollar) == package nil success = nil => - if $monitorNewWorld = true then + if $monitorNewWorld then sayBrightlyNT '" not in: " pp (packageForm and devaluate package or entry) nil @@ -335,10 +335,10 @@ newLookupInCategories(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 @@ -349,8 +349,8 @@ nrunNumArgCheck(num,bytevec,start,finish) == nrunNumArgCheck(num,bytevec,start,finish) newLookupInCategories1(op,sig,dom,dollar) == - $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 slot4 := domainRef(dom,4) @@ -396,7 +396,7 @@ newLookupInCategories1(op,sig,dom,dollar) == package nil not success => - if $monitorNewWorld = true then + if $monitorNewWorld then sayBrightlyNT '" not in: " pp (packageForm and devaluate package or entry) nil @@ -408,10 +408,10 @@ newLookupInCategories1(op,sig,dom,dollar) == if $monitorNewWorld then sayLooking1('"Looking at instantiated package ",package) res := lookupInDomainVector(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 diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot index 736baa83..7f78ed47 100644 --- a/src/interp/postpar.boot +++ b/src/interp/postpar.boot @@ -204,7 +204,7 @@ postCategory u == --RDJ: ugh_ please -- someone take away need for PROGN as soon as possible null l => u op := - $insidePostCategoryIfTrue = true => "PROGN" + $insidePostCategoryIfTrue => "PROGN" "CATEGORY" [op,:[fn x for x in l]] where fn x == $insidePostCategoryIfTrue: local := true -- cgit v1.2.3