From e72ded0c7d7fdf5da10fe57f806fde5314cf79c5 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sat, 10 Jul 2010 13:33:13 +0000 Subject: * interp/functor.boot (setVector4): Remove. Deadcode. (setVector4Onecat): Likewise. (setVector4part3): Likewise. * interp/nruncomp.boot (NRTsetVector4): Likewise. (NRTsetVector4Part2): Likewise. (mergeAppend): Likewise. * interp/define.boot (compDefineFunctor1): Remove assignment to unused $lisplibCategoriesExtented. * interp/lisplib.boot (compDefineLisplib): Likewise. * interp/wi1.boot (compDefineLisplib): Likewise. * interp/wi2.boot (compDefineFunctor1): Likewise. --- src/interp/nruncomp.boot | 48 ++---------------------------------------------- 1 file changed, 2 insertions(+), 46 deletions(-) (limited to 'src/interp/nruncomp.boot') diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index e9165588..11519ea2 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -516,12 +516,12 @@ NRTcheckVector domainShell == for i in $NRTbase..MAXINDEX domainShell repeat --Vector elements can be one of -- (a) T -- item was marked --- (b) NIL -- item is a domain; will be filled in by setVector4part3 +-- (b) NIL -- ??? -- (c) categoryForm-- it was a domain view; now irrelevant -- (d) op-signature-- store missing function info in $CheckVectorList v := domainShell.i v=true => nil --item is marked; ignore - v=nil => nil --a domain, which setVector4part3 will fill in + v=nil => nil atom v => systemErrorHere '"CheckVector" atom first v => nil --category form; ignore assoc(first v,alist) => nil @@ -530,29 +530,6 @@ NRTcheckVector domainShell == mkDomainCatName id == INTERN strconc(id,";CAT") -NRTsetVector4(siglist,formlist,condlist) == - $uncondList: local := nil - $condList: local := nil - $count: local := 0 - for sig in reverse siglist for form in reverse formlist - for cond in reverse condlist repeat - NRTsetVector4a(sig,form,cond) - - $lisplibCategoriesExtended:= [$uncondList,:$condList] - code := ['mapConsDB,MKQ reverse removeDuplicates $uncondList] - if $condList then - localVariable := gensym() - code := [["%LET",localVariable,code]] - for [pred,list] in $condList repeat - code := - [['COND,[pred,["%LET",localVariable, - ['mergeAppend,['mapConsDB,MKQ list],localVariable]]]], - :code] - code := ['PROGN,:nreverse [['NREVERSE,localVariable],:code]] - g := gensym() - [$setelt,'$,4,['PROG2,["%LET",g,code], - ['VECTOR,['catList2catPackageList,g],g]]] - NRTsetVector4Part1(siglist,formlist,condlist) == $uncondList: local := nil $condList: local := nil @@ -577,27 +554,6 @@ reverseCondlist cl == u.rest := [x,:rest u] alist -NRTsetVector4Part2(uncondList,condList) == - $lisplibCategoriesExtended:= [uncondList,:condList] - code := ['mapConsDB,MKQ reverse removeDuplicates uncondList] - if condList then - localVariable := gensym() - code := [["%LET",localVariable,code]] - for [pred,list] in condList repeat - code := - [['COND,[predicateBitRef SUBLIS($pairlis,pred),["%LET",localVariable, - ['mergeAppend,['mapConsDB,MKQ list],localVariable]]]], - :code] - code := ['PROGN,:nreverse [['NREVERSE,localVariable],:code]] - g := gensym() - [$setelt,'$,4,['PROG2,["%LET",g,code], - ['VECTOR,['catList2catPackageList,g],g]]] - -mergeAppend(l1,l2) == - atom l1 => l2 - member(first l1,l2) => mergeAppend(rest l1, l2) - [first l1, :mergeAppend(rest l1, l2)] - catList2catPackageList u == --converts ((Set) (Module R) ...) to ((Set& $) (Module& $ R)...) [fn x for x in u] where -- cgit v1.2.3