From 3754c6cdee8dd5edb423aae713089ecd328e443c Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Wed, 12 Dec 2007 21:56:59 +0000
Subject: 	* define.boot (compDefineFunctor1): Don't set $NRTbase here. 
 * nruncomp.boot ($NRTbase):  Define as a constant. 	* setq.lisp: Don't set
 it.

---
 src/interp/ChangeLog     | 6 ++++++
 src/interp/define.boot   | 1 -
 src/interp/nruncomp.boot | 7 +++++++
 src/interp/setq.lisp     | 1 -
 src/interp/wi2.boot      | 1 -
 5 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 04457b46..0582ae0d 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-12  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* define.boot (compDefineFunctor1): Don't set $NRTbase here.
+	* nruncomp.boot ($NRTbase):  Define as a constant.
+	* setq.lisp: Don't set it.
+	
 2007-12-12  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* buildom.boot: Use $OutputForm instead of $Expression
diff --git a/src/interp/define.boot b/src/interp/define.boot
index 8430610e..945b4cc4 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -392,7 +392,6 @@ compDefineFunctor1(df is ['DEF,form,signature,$functorSpecialCases,body],
     $NRTattributeAlist: local := NRTgenInitialAttributeAlist attributeList
     $NRTslot1Info: local  --set in NRTmakeSlot1 called by NRTbuildFunctor
        --this is used below to set $lisplibSlot1 global
-    $NRTbase: local := 6 -- equals length of $domainShell
     $NRTaddForm: local := nil   -- see compAdd; NRTmakeSlot1
     $NRTdeltaList: local := nil --list of misc. elts used in compiled fncts
     $NRTdeltaListComp: local := nil --list of COMP-ed forms for $NRTdeltaList
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index b732ece8..8321baf2 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -36,6 +36,13 @@ import '"c-util"
 import '"simpbool"
 )package "BOOT"
 
+
+++ The base index for encoding items into a functor template 
+++ (e.g. domainShell).  This is also the minimum length that a
+++ template could possibly have.
+$NRTbase ==
+  6
+
 ++
 $devaluateList := []
 $functorLocalParameters := []
diff --git a/src/interp/setq.lisp b/src/interp/setq.lisp
index 9eeda885..8ea2c57a 100644
--- a/src/interp/setq.lisp
+++ b/src/interp/setq.lisp
@@ -177,7 +177,6 @@
 (SETQ |$NRTflag| T)
 (SETQ |$NRTaddForm| NIL)
 (SETQ |$NRTdeltaList| NIL)
-(SETQ |$NRTbase| 0)
 (SETQ |$NRTdeltaLength| 0)
 (SETQ |$NRTopt| NIL) ;; turns off buggy code
 (SETQ |$Slot1DataBase| NIL)
diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot
index 29c5e1d8..45fa17f3 100644
--- a/src/interp/wi2.boot
+++ b/src/interp/wi2.boot
@@ -123,7 +123,6 @@ compDefineFunctor1(df, m,$e,$prefix,$formalArgList) ==
     $NRTattributeAlist: local := NRTgenInitialAttributeAlist attributeList
     $NRTslot1Info: local  --set in NRTmakeSlot1 called by NRTbuildFunctor
        --this is used below to set $lisplibSlot1 global
-    $NRTbase: local := 6 -- equals length of $domainShell
     $NRTaddForm: local := nil   -- see compAdd; NRTmakeSlot1
     $NRTdeltaList: local := nil --list of misc. elts used in compiled fncts
     $NRTdeltaListComp: local := nil --list of COMP-ed forms for $NRTdeltaList
-- 
cgit v1.2.3