diff options
Diffstat (limited to 'src/interp/br-op1.boot')
| -rw-r--r-- | src/interp/br-op1.boot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot index 169175ba..a7520da8 100644 --- a/src/interp/br-op1.boot +++ b/src/interp/br-op1.boot @@ -818,12 +818,12 @@ dbExpandOpAlistIfNecessary(htPage,opAlist,which,needOrigins?,condition?) == --Case 1: Already expanded; just cons it onto ACC null string? line => --already expanded if condition? then --this could have been expanded at a lower level - if null atom (pred := second line) then value := pred + if cons? (pred := second line) then value := pred acc := [line,:acc] --this one is already expanded; record it anyway --Case 2: unexpanded; expand it then cons it onto ACC [name,nargs,xflag,sigs,conname,pred,comments] := dbParts(line,7,1) predicate := ncParseFromString pred - if condition? and null atom predicate then value := predicate + if condition? and cons? predicate then value := predicate sig := ncParseFromString sigs --is (Mapping,:.) if which = '"operation" then if sig isnt ['Mapping,:.] @@ -853,7 +853,7 @@ dbExpandOpAlistIfNecessary(htPage,opAlist,which,needOrigins?,condition?) == for [op,:alist] in opAlist repeat for [sig,:tail] in alist repeat condition? => --the only purpose here is to find a non-trivial pred - null atom (pred := first tail) => return ($value := pred) + cons? (pred := first tail) => return ($value := pred) 'skip u := tail is [.,origin,:.] and origin => @@ -864,7 +864,7 @@ dbExpandOpAlistIfNecessary(htPage,opAlist,which,needOrigins?,condition?) == dbGetDocTable(op,sig,docTable,which,nil) origin := IFCAR u or origin docCode := IFCDR u --> (doc . code) --- if null FIXP rest docCode then harhar(op) --> +-- if not FIXP rest docCode then harhar(op) --> if null doc and which = '"attribute" then doc := getRegistry(op,sig) tail.rest := [origin,isExposedConstructor opOf origin,:docCode] $value => return $value @@ -949,14 +949,14 @@ getDomainOpTable(dom,fromIfTrue,:options) == info := null predValue => 1 -- signifies not exported - null fromIfTrue => nil + not fromIfTrue => nil cell := compiledLookup(op,sig1,dom) => [f,:r] := cell f = 'nowhere => 'nowhere --see replaceGoGetSlot f = 'makeSpadConstant => 'constant f = function IDENTITY => 'constant f = 'newGoGet => substitute('_$,domname,devaluate first r) - null VECP r => systemError devaluateList r + not VECP r => systemError devaluateList r substitute('_$,domname,devaluate r) 'nowhere [sig1,:info] |