diff options
Diffstat (limited to 'src/interp/br-op1.boot')
| -rw-r--r-- | src/interp/br-op1.boot | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot index e3f17e52..eb827bd1 100644 --- a/src/interp/br-op1.boot +++ b/src/interp/br-op1.boot @@ -366,14 +366,14 @@ dbGatherData(htPage,opAlist,which,key) == nil newEntry := u := assoc(entry,data) => --key seen before? look on DATA - RPLACA(CDR u,second u or exposeFlag)--yes, expose if any 1 is exposed + RPLACA(rest u,second u or exposeFlag)--yes, expose if any 1 is exposed u data := [y := [entry,exposeFlag,:tail],:data] y --no, create new entry in DATA if member(key,'(origins conditions)) then r := CDDR newEntry if atom r then r := nil --clear out possible 'ASCONST - RPLACD(CDR newEntry, --store op/sigs under key if needed + RPLACD(rest newEntry, --store op/sigs under key if needed insert([dbMakeSignature(op,item),exposeFlag,:tail],r)) if member(key,'(origins conditions)) then for entry in data repeat --sort list of entries (after the 2nd) @@ -381,7 +381,7 @@ dbGatherData(htPage,opAlist,which,key) == tail := atom tail => tail listSort(function LEXLESSEQP,tail) - RPLACD(CDR entry,tail) + RPLACD(rest entry,tail) data := listSort(function LEXLESSEQP,data) data @@ -414,12 +414,12 @@ dbGatherDataImplementation(htPage,opAlist) == while u repeat key := CDDAR u --implementor entries := - [[CAR u,true],:[u and [CAR u,true] while key = CDDAR (u := rest u)]] + [[first u,true],:[u and [first u,true] while key = CDDAR (u := rest u)]] alist := [[key,gn key,:entries],:alist] NREVERSE alist gn key == atom key => true - isExposedConstructor CAR key + isExposedConstructor first key dbSelectData(htPage,opAlist,key) == branch := htpProperty(htPage,'branch) @@ -435,10 +435,10 @@ dbSelectData(htPage,opAlist,key) == dbReduceOpAlist(opAlist,data,branch) == branch = 'signatures => dbReduceBySignature(opAlist,CAAR data,CADAR data) - branch = 'origins => dbReduceBySelection(opAlist,CAR data,function third) - branch = 'conditions => dbReduceBySelection(opAlist,CAR data,function second) + branch = 'origins => dbReduceBySelection(opAlist,first data,function third) + branch = 'conditions => dbReduceBySelection(opAlist,first data,function second) branch = 'implementation => dbReduceByOpSignature(opAlist,CDDR data) - branch = 'parameters => dbReduceByForm(opAlist,CAR data) + branch = 'parameters => dbReduceByForm(opAlist,first data) systemError ['"Unexpected branch: ",branch] dbReduceByOpSignature(opAlist,datalist) == @@ -524,7 +524,7 @@ dbShowOpAllDomains(htPage,opAlist,which) == domOriginAlist := nil --list of domain origins for [op,:items] in opAlist repeat for [.,predicate,origin,:.] in items repeat - conname := CAR origin + conname := first origin getConstructorKindFromDB conname = "category" => pred := simpOrDumb(predicate,LASSQ(conname,catOriginAlist) or true) catOriginAlist := insertAlist(conname,pred,catOriginAlist) @@ -562,7 +562,7 @@ dbShowOpConditions(htPage,opAlist,which,data) == dbGatherThenShow(htPage,opAlist,which,data,nil,nil,function bcPred) dbShowKind conform == - conname := CAR conform + conname := first conform kind := getConstructorKindFromDB conname kind = "domain" => (s := PNAME conname).(MAXINDEX s) = '_& => '"default package" @@ -735,7 +735,7 @@ reduceOpAlistForDomain(opAlist,domform,conform) == for pair in opAlist repeat RPLACD(pair,[test for item in rest pair | test]) where test() == [head,:tail] := item - CAR tail = true => item + first tail = true => item pred := simpHasPred SUBLISLIS(form1,form2,QCAR tail) null pred => false RPLACD(item,[pred]) @@ -852,7 +852,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 := CAR tail) => return ($value := pred) + null atom (pred := first tail) => return ($value := pred) 'skip u := tail is [.,origin,:.] and origin => @@ -863,7 +863,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 CDR docCode then harhar(op) --> +-- if null FIXP rest docCode then harhar(op) --> if null doc and which = '"attribute" then doc := getRegistry(op,sig) RPLACD(tail,[origin,isExposedConstructor opOf origin,:docCode]) $value => return $value @@ -931,7 +931,7 @@ getDomainOpTable(dom,fromIfTrue,:options) == $predEvalAlist : local := nil $returnNowhereFromGoGet: local := true domname := dom.0 - conname := CAR domname + conname := first domname abb := getConstructorAbbreviation conname opAlist := getOperationAlistFromLisplib conname "append"/[REMDUP [[op1,:fn] for [sig,slot,pred,key,:.] in u @@ -954,7 +954,7 @@ getDomainOpTable(dom,fromIfTrue,:options) == f = 'nowhere => 'nowhere --see replaceGoGetSlot f = 'makeSpadConstant => 'constant f = function IDENTITY => 'constant - f = 'newGoGet => substitute('_$,domname,devaluate CAR r) + f = 'newGoGet => substitute('_$,domname,devaluate first r) null VECP r => systemError devaluateList r substitute('_$,domname,devaluate r) 'nowhere |