diff options
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/interp/nruncomp.boot | 4 | ||||
| -rw-r--r-- | src/interp/wi2.boot | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 86ae0c33..2d8bb7b5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,13 @@ 2008-11-29 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/nruncomp.boot (deltaTran): Don't check for $NRTaddForm + againg; it was already checked by NRTassocIndex. + (genDeltaEntry): Likewise. + (NRTgetLocalIndex): Likewise. + * interp/wi2.boot (genDeltaExntry): Likewise. + +2008-11-29 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/define.boot (mustInstantiate): Fix thinko introduced by earlier tweaks. (mkExplicitCategoryFunction): Likewise. diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot index 6a4329c3..a5f356f0 100644 --- a/src/interp/nruncomp.boot +++ b/src/interp/nruncomp.boot @@ -104,7 +104,6 @@ deltaTran(item,compItem) == -- so we need only encode dc. -- gdr 2008-11-28. dcCode := dc = '$ => 0 - dc = $NRTaddForm => 5 NRTassocIndex dc or keyedSystemError("S2NR0004",[dc]) kindFlag:= (kind = 'CONST => 'CONST; nil) [sig,dcCode,op,:kindFlag] @@ -202,7 +201,7 @@ genDeltaEntry opMmPair == if not atom dc then dc := substitute("$$",'$,dc) opModemapPair := [op,[dc,:[NRTgetLocalIndex x for x in nsig]],["T",cform]] -- force pred to T - if null NRTassocIndex dc and dc ^= $NRTaddForm and + if null NRTassocIndex dc and (member(dc,$functorLocalParameters) or not atom dc) then --create "domain" entry to $NRTdeltaList $NRTdeltaList:= [['domain,NRTaddInner dc,:dc],:$NRTdeltaList] @@ -236,7 +235,6 @@ NRTassocIndex x == NRTgetLocalIndex: %Form -> %Short NRTgetLocalIndex item == k := NRTassocIndex item => k - item = $NRTaddForm => 5 item = "$" => 0 item = "$$" => 2 value:= diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot index 3537836c..78870d66 100644 --- a/src/interp/wi2.boot +++ b/src/interp/wi2.boot @@ -730,7 +730,7 @@ genDeltaEntry opMmPair == -- cform := substitute('$,dc,cform) opModemapPair := [op,[dc,:[genDeltaSig x for x in sig]],['T,cform]] -- force pred to T - if null NRTassocIndex dc and dc ^= $NRTaddForm and + if null NRTassocIndex dc and (member(dc,$functorLocalParameters) or null atom dc) then --create "domain" entry to $NRTdeltaList $NRTdeltaList:= [['domain,NRTaddInner dc,:dc],:$NRTdeltaList] |