* interp/br-data.boot: Change NRTEVAL to %eval.

	* interp/c-util.boot: Likewise.
	* interp/define.boot: Likewise.
	* interp/nruncomp.boot: Likewise.
	* interp/nrunfast.boot: Likewise.
	* interp/showimp.boot: Likewise.

7 files changed, 20 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 96edf51f..8045deef 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2011-11-11  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* interp/br-data.boot: Change NRTEVAL to %eval.
+	* interp/c-util.boot: Likewise.
+	* interp/define.boot: Likewise.
+	* interp/nruncomp.boot: Likewise.
+	* interp/nrunfast.boot: Likewise.
+	* interp/showimp.boot: Likewise.
+
+2011-11-11  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* interp/c-util.boot (dbByteList): New accessor macro.
 	* interp/define.boot ($byteVec): Remove.
 	(getInfovecCode): Do not bind it.
diff --git a/src/interp/br-data.boot b/src/interp/br-data.boot
index 0837c709..d4d41461 100644
--- a/src/interp/br-data.boot
+++ b/src/interp/br-data.boot
@@ -469,7 +469,7 @@ getImports conname == --called by mkUsersHashTable
               and not (op in '(Mapping Union Record Enumeration CONS QUOTE local))
     doImport(x,template) ==
       x is [op,:args] =>
-        op = 'QUOTE or op = 'NRTEVAL => first args
+        op = 'QUOTE or op = '%eval => first args
         op = 'local => first args
         op = 'Record =>
           ['Record,:[[":",second y,doImport(third y,template)] for y in args]]
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index a5369444..7b3c0bdc 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -1817,7 +1817,7 @@ expandFormTemplate(shell,args,slot) ==
   slot isnt [.,:.] => slot
   slot is ["local",parm] and (n := isFormal parm) => 
     args.n   -- FIXME: we should probably expand with dual signature
-  slot is ["NRTEVAL",val] => val
+  slot is ['%eval,val] => val
   slot is ['QUOTE,val] => 
     string? val => val
     slot
diff --git a/src/interp/define.boot b/src/interp/define.boot
index d3c56105..b02bde6d 100644
--- a/src/interp/define.boot
+++ b/src/interp/define.boot
@@ -628,7 +628,7 @@ expandType(lazyt,template,domform) ==
 expandTypeArgs(u,template,domform) ==
   u is '$ => u
   integer? u => expandType(vectorRef(template,u),template,domform)
-  u is [.,y] and u.op in '(NRTEVAL QUOTE) => y
+  u is [.,y] and u.op in '(%eval QUOTE) => y
   u isnt [.,:.] => u
   expandType(u,template,domform)
 
diff --git a/src/interp/nruncomp.boot b/src/interp/nruncomp.boot
index e67fb6da..52e073f2 100644
--- a/src/interp/nruncomp.boot
+++ b/src/interp/nruncomp.boot
@@ -123,7 +123,7 @@ NRTencode(x,y) == encode(x,y,true) where encode(x,compForm,firstTime) ==
       [op,:[encode(y,z,false) for y in x.args for z in compForm.args]]
     -- enumeration constants are like field names, they do not need
     -- to be encoded.
-    ["NRTEVAL",NRTreplaceAllLocalReferences copyTree simplifyVMForm compForm]
+    ['%eval,NRTreplaceAllLocalReferences copyTree simplifyVMForm compForm]
   symbolMember?(x,$formalArgList) =>
     v := $FormalMapVariableList.(symbolPosition(x,$formalArgList))
     firstTime => ["local",v]
@@ -131,7 +131,7 @@ NRTencode(x,y) == encode(x,y,true) where encode(x,compForm,firstTime) ==
   x is "$" => x
   x is "$$" => x
   compForm is [.,:.] =>
-    ["NRTEVAL",NRTreplaceAllLocalReferences copyTree simplifyVMForm compForm]
+    ['%eval,NRTreplaceAllLocalReferences copyTree simplifyVMForm compForm]
   quote compForm
 
 --------------FUNCTIONS CALLED DURING CAPSULE FUNCTION COMPILATION-------------
diff --git a/src/interp/nrunfast.boot b/src/interp/nrunfast.boot
index 91c2560c..10b86a5f 100644
--- a/src/interp/nrunfast.boot
+++ b/src/interp/nrunfast.boot
@@ -102,7 +102,7 @@ evalSlotDomain(u,dollar) ==
            lazyDomainSet(y,dollar,u)        --new style has lazyt
       y
     y
-  u is ['NRTEVAL,y] => eval y
+  u is ['%eval,y] => eval y
   u is ['QUOTE,y] => y
   u is [":",tag,dom] => [":",tag,evalSlotDomain(dom,dollar)]
   u is ["Enumeration",:.] => eval u
@@ -371,7 +371,7 @@ lazyMatchArg2(s,a,dollar,domain,typeFlag) ==
     ident? s and symbolName s = a
   a isnt [.,:.] =>  a = s
   op := a.op
-  op is 'NRTEVAL => s = nrtEval(second a,domain)
+  op is '%eval => s = nrtEval(second a,domain)
   op is 'QUOTE => s = second a
   lazyMatch(s,a,dollar,domain)
   --above line is temporarily necessary until system is compiled 8/15/90
@@ -481,7 +481,7 @@ newExpandLocalTypeArgs(u,dollar,domain,typeFlag) ==
   integer? u =>
      typeFlag => newExpandTypeSlot(u, dollar,domain)
      domainRef(domain,u)
-  u is ['NRTEVAL,y] => nrtEval(y,domain)
+  u is ['%eval,y] => nrtEval(y,domain)
   u is ['QUOTE,y] => y
   u is "$$" => canonicalForm domain
   u isnt [.,:.] => u   --can be first, rest, etc.
diff --git a/src/interp/showimp.boot b/src/interp/showimp.boot
index de90aadc..000154f4 100644
--- a/src/interp/showimp.boot
+++ b/src/interp/showimp.boot
@@ -154,7 +154,7 @@ getDomainExtensionsOfDomain domain ==
 devaluateSlotDomain(u,dollar) ==
   u = '$ => devaluate dollar
   integer? u and vector? (y := dollar.u) => devaluate y
-  u is ['NRTEVAL,y] => MKQ eval y
+  u is ['%eval,y] => MKQ eval y
   u is ['QUOTE,y] => u
   u is [op,:argl] => [op,:[devaluateSlotDomain(x,dollar) for x in argl]]
   devaluate evalSlotDomain(u,dollar)
@@ -247,7 +247,7 @@ formatLazyDomainForm(dom,x) ==
   x = 0 => ["$"]
   integer? x => formatLazyDomain(dom,dom.x)
   x isnt [.,:.] => x
-  x is ['NRTEVAL,y] => (y isnt [.,:.] => [y]; y)
+  x is ['%eval,y] => (y isnt [.,:.] => [y]; y)
   [first x,:[formatLazyDomainForm(dom,y) for y in rest x]]
  
 
@@ -322,7 +322,7 @@ formatSlotDomain x ==
     null val => [strconc('"#",toString (x  - 5))]
     formatSlotDomain val
   x isnt [.,:.] => x
-  x is ['NRTEVAL,y] => (y isnt [.,:.] => [y]; y)
+  x is ['%eval,y] => (y isnt [.,:.] => [y]; y)
   [first x,:[formatSlotDomain y for y in rest x]]
  
 --=======================================================================