aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2008-07-05 15:40:51 +0000
committerdos-reis <gdr@axiomatics.org>2008-07-05 15:40:51 +0000
commit9c7ba258ef164671df6e357867d218cec3f7ce05 (patch)
treec331bc617d21c22807d8ff678725f25eee940ca7 /src
parent415433683b1755b161092170b6b39c381c96c850 (diff)
downloadopen-axiom-9c7ba258ef164671df6e357867d218cec3f7ce05.tar.gz
* interp/nruncomp.boot (NRTassocIndex): Document.
(NRTgetLocalIndexClear): Remove. (NRTgetLocalIndex1): Lose second unused argument; move body to NRTgetLocalIndex. * interp/define.boot (doIt): Call NRTgetLocalIndex, not NRTgetLocalIndexClear. * interp/wi2.boot (NRTgetLocalIndex): Rename from NRTgetLocalIndex1.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog10
-rw-r--r--src/interp/define.boot2
-rw-r--r--src/interp/nruncomp.boot18
-rw-r--r--src/interp/wi2.boot4
4 files changed, 25 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fdfd0d57..053947ca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2008-07-05 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * interp/nruncomp.boot (NRTassocIndex): Document.
+ (NRTgetLocalIndexClear): Remove.
+ (NRTgetLocalIndex1): Lose second unused argument; move body to
+ NRTgetLocalIndex.
+ * interp/define.boot (doIt): Call NRTgetLocalIndex, not
+ NRTgetLocalIndexClear.
+ * interp/wi2.boot (NRTgetLocalIndex): Rename from NRTgetLocalIndex1.
+
2008-07-04 Gabriel Dos Reis <gdr@cs.tamu.edu>
* interp/compiler.boot (compFormMatch): Tidy.
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 789ff2c8..55ea350a 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -1368,7 +1368,7 @@ doIt(item,$predl) ==
RPLACA(item,"setShellEntry")
rhsCode:=
rhs'
- RPLACD(item,['$,NRTgetLocalIndexClear lhs,rhsCode])
+ RPLACD(item,['$,NRTgetLocalIndex lhs,rhsCode])
RPLACA(item,first code)
RPLACD(item,rest code)
item is [":",a,t] => [.,.,$e]:= compOrCroak(item,$EmptyMode,$e)
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index 9e7572db..496e66a5 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -218,6 +218,11 @@ genDeltaSpecialSig x ==
x is [":",y,z] => [":",y,NRTgetLocalIndex z]
NRTgetLocalIndex x
+++ Return the slot number (within the template vector of the functor
+++ being compiled) of the domain or value referenced by the form `x'.
+++ Otherwise, return nil this is the first time `x' is referenced, or
+++ if `x' designates neither a domain nor a value (e.g. a modemap).
+NRTassocIndex: %Form -> %Maybe %Short
NRTassocIndex x == --returns index of "domain" entry x in al
NULL x => x
x = $NRTaddForm => 5
@@ -226,11 +231,8 @@ NRTassocIndex x == --returns index of "domain" entry x in al
$NRTbase + $NRTdeltaLength - k
nil
-NRTgetLocalIndexClear item == NRTgetLocalIndex1(item,true)
-
-NRTgetLocalIndex item == NRTgetLocalIndex1(item,false)
-
-NRTgetLocalIndex1(item,killBindingIfTrue) ==
+NRTgetLocalIndex: %Form -> %Short
+NRTgetLocalIndex item ==
k := NRTassocIndex item => k
item = $NRTaddForm => 5
item = "$" => 0
@@ -242,12 +244,16 @@ NRTgetLocalIndex1(item,killBindingIfTrue) ==
atom item and null value => --give slots to atoms
$NRTdeltaList:= [['domain,NRTaddInner item,:value],:$NRTdeltaList]
$NRTdeltaListComp:=[item,:$NRTdeltaListComp]
+ index := $NRTbase + $NRTdeltaLength -- slot number to return
$NRTdeltaLength := $NRTdeltaLength+1
- $NRTbase + $NRTdeltaLength - 1
+ index
-- when assigning slot to flag values, we don't really want to
-- compile them. Rather, we want to record them as if they were atoms.
flag := isQuasiquote item
$NRTdeltaList:= [['domain, NRTaddInner item,:value], :$NRTdeltaList]
+ -- remember the item's place in the `delta list' and its slot number
+ -- before the recursive call to the compiler, as that might generate
+ -- more references that would extend the `delta list'.
saveNRTdeltaListComp:= $NRTdeltaListComp:=[nil,:$NRTdeltaListComp]
saveIndex := $NRTbase + $NRTdeltaLength
$NRTdeltaLength := $NRTdeltaLength+1
diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot
index 35dcf1e7..ec25e771 100644
--- a/src/interp/wi2.boot
+++ b/src/interp/wi2.boot
@@ -678,7 +678,7 @@ compMapCond''(cexpr,dc) ==
--======================================================================
-- From nruncomp.boot
--======================================================================
-NRTgetLocalIndex1(item,killBindingIfTrue) ==
+NRTgetLocalIndex item ==
k := NRTassocIndex item => k
item = $NRTaddForm => 5
item = '$ => 0
@@ -1165,7 +1165,7 @@ doItLet1 item ==
code is ['LET,:.] =>
rhsCode:= rhs'
op := "setShellEntry"
- wiReplaceNode(item,[op,'$,NRTgetLocalIndexClear lhs,rhsCode], 16)
+ wiReplaceNode(item,[op,'$,NRTgetLocalIndex lhs,rhsCode], 16)
wiReplaceNode(item, code, 18)
rhsOfLetIsDomainForm code ==