* interp/sys-utility.boot (eval): Define here.

	* interp/br-con.boot: Use it.
	* interp/br-op1.boot: Likewise.
	* interp/br-saturn.boot: Likewise.
	* interp/cattable.boot: Likewise.
	* interp/ht-util.boot: Likewise.
	* interp/htsetvar.boot: Likewise.
	* interp/i-funsel.boot: Likewise.
	* interp/i-syscmd.boot: Likewise.
	* interp/interop.boot: Likewise.
	* interp/server.boot: Likewise.
	* interp/showimp.boot: Likewise.
	* interp/trace.boot: Likewise.
	* interp/sys-macros.lisp (eval): Move to sys-utility.boot.

16 files changed, 59 insertions, 38 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5836068b..a3c91b02 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,22 @@
 2010-05-27  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* interp/sys-utility.boot (eval): Define here.
+	* interp/br-con.boot: Use it.
+	* interp/br-op1.boot: Likewise.
+	* interp/br-saturn.boot: Likewise.
+	* interp/cattable.boot: Likewise.
+	* interp/ht-util.boot: Likewise.
+	* interp/htsetvar.boot: Likewise.
+	* interp/i-funsel.boot: Likewise.
+	* interp/i-syscmd.boot: Likewise.
+	* interp/interop.boot: Likewise.
+	* interp/server.boot: Likewise.
+	* interp/showimp.boot: Likewise.
+	* interp/trace.boot: Likewise.
+	* interp/sys-macros.lisp (eval): Move to sys-utility.boot.
+
+2010-05-27  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* interp/sys-macros.lisp (eval): Expand opcodes before calling EVAL.
 	* interp/slam.boot (reportFunctionCompilation): Tidy.  Take extra
 	care when generating code that access global variables.
diff --git a/src/interp/br-con.boot b/src/interp/br-con.boot
index 188998f3..bf412deb 100644
--- a/src/interp/br-con.boot
+++ b/src/interp/br-con.boot
@@ -371,7 +371,7 @@ ksPage(htPage,junk) ==
   if domname then
     htpSetProperty(htPage,'domname,domname)
     htpSetProperty(htPage,'heading,heading)
-  domain  := (kind = '"category" => nil; EVAL domname)
+  domain  := (kind = '"category" => nil; eval domname)
   conform:= htpProperty(htPage,'conform)
   page := htInitPageNoScroll(htCopyProplist htPage,
                              ['"Search order for ",:heading])
@@ -397,7 +397,7 @@ dbSearchOrder(conform,domname,$domain) ==  --domain = nil or set to live domain
     test() ==
       pred := simpCatPredicate
         p:=SUBLISLIS(rest conform,$FormalMapVariableList,kTestPred catpredvec.i)
-        $domain => EVAL p
+        $domain => eval p
         p
       if domname and CONTAINED('$,pred) then pred := substitute(domname,'$,pred)
 --    which = '"attribute" => pred    --all categories
@@ -415,7 +415,7 @@ kcPage(htPage,junk) ==
   [kind,name,nargs,xpart,sig,args,abbrev,comments] := htpProperty(htPage,'parts)
   domname         := kDomainName(htPage,kind,name,nargs)
   domname is ['error,:.] => errorPage(htPage,domname)
---  domain          := (kind = '"category" => nil; EVAL domname)
+--  domain          := (kind = '"category" => nil; eval domname)
   conform := htpProperty(htPage,'conform)
   conname := opOf conform
   heading :=
diff --git a/src/interp/br-op1.boot b/src/interp/br-op1.boot
index 143782b8..7291dd8a 100644
--- a/src/interp/br-op1.boot
+++ b/src/interp/br-op1.boot
@@ -390,7 +390,7 @@ dbGatherDataImplementation(htPage,opAlist) ==
 --  where entry has form ((op sig . implementor) . stuff)
   conform := htpProperty(htPage,'conform)
   domainForm  := htpProperty(htPage,'domname)
-  dom     := EVAL domainForm
+  dom     := eval domainForm
   which   := '"operation"
   [nam,:$domainArgs] := domainForm
   $predicateList: local := getConstructorPredicatesFromDB nam
diff --git a/src/interp/br-saturn.boot b/src/interp/br-saturn.boot
index 8112eb99..72256e19 100644
--- a/src/interp/br-saturn.boot
+++ b/src/interp/br-saturn.boot
@@ -94,7 +94,7 @@ off()==
 --  $saturn =>
 --    saturnEvalToFile(x, fn)
 --    runCommand  '"cat /tmp/sat.text"
---  EVAL x
+--  eval x
 
 
 --=======================================================================
diff --git a/src/interp/cattable.boot b/src/interp/cattable.boot
index 44a51267..efd01af1 100644
--- a/src/interp/cattable.boot
+++ b/src/interp/cattable.boot
@@ -115,7 +115,7 @@ simpHasPred(pred,:options) == main where
     pred in '(T etc) => pred
     null pred => nil
     pred
-  simpDevaluate a == EVAL substitute('QUOTE,'devaluate,a)
+  simpDevaluate a == eval substitute('QUOTE,'devaluate,a)
   simpHas(pred,a,b) ==
     b is ['ATTRIBUTE,attr] => simpHasAttribute(pred,a,attr)
     b is ['SIGNATURE,op,sig] => simpHasSignature(pred,a,op,sig)
@@ -158,13 +158,13 @@ simpHasAttribute(pred,conform,attr) ==  --eval w/o loading
 
 simpCatHasAttribute(domform,attr) ==
   conform := getConstructorForm opOf domform
-  catval :=  EVAL mkEvalable conform
+  catval :=  eval mkEvalable conform
   if atom KDR attr then attr := IFCAR attr
   pred :=
     u := LASSOC(attr,catval . 2) => first u
     return false                            --exit: not there
   pred = true => true
-  EVAL SUBLISLIS(rest domform,rest conform,pred)
+  eval SUBLISLIS(rest domform,rest conform,pred)
 
 hasIdent pred ==
   pred is [op,:r] =>
diff --git a/src/interp/ht-util.boot b/src/interp/ht-util.boot
index 35b44baf..a6907b8c 100644
--- a/src/interp/ht-util.boot
+++ b/src/interp/ht-util.boot
@@ -298,7 +298,7 @@ mkCurryFun(fun, val) ==
   name := GENTEMP()
   code :=
     ['DEFUN, name, '(arg), ['APPLY, MKQ fun, ['CONS, 'arg, MKQ val]]]
-  EVAL code
+  eval code
   name
 
 htRadioButtons [groupName, :buttons] ==
diff --git a/src/interp/htsetvar.boot b/src/interp/htsetvar.boot
index 1806ab76..8a768ebe 100644
--- a/src/interp/htsetvar.boot
+++ b/src/interp/htsetvar.boot
@@ -128,7 +128,7 @@ htSetLiterals(htPage,name,message,variable,values,functionToCall) ==
   links := [[strconc('"",STRINGIMAGE opt), '"\newline\tab{3}", functionToCall, opt] for opt in values]
   htMakePage [['bcLispLinks, :links]]
   bcHt ["\indent{0}\newline\vspace{1} The current setting is: {\em ",
-        translateTrueFalse2YesNo EVAL variable, '"} "]
+        translateTrueFalse2YesNo eval variable, '"} "]
   htShowPage()
 
 htSetLiteral(htPage, val) ==
@@ -193,7 +193,7 @@ htShowFunctionPageContinued(htPage) ==
   page := htInitPage(mkSetTitle(), htpPropertyList htPage)
   bcHt ['"\centerline{Set {\em ", setData.setName, '"}}\newline"]
   bcHt ['"{\em Description: } ", setData.setLabel, '"\newline\vspace{1} "]
-  currentValue := EVAL variable
+  currentValue := eval variable
   htMakePage
     [ ['domainConditions, ['Satisfies,'S,checker]],
       ['text,:phrase],
diff --git a/src/interp/i-funsel.boot b/src/interp/i-funsel.boot
index 1828ee27..7cde4ce2 100644
--- a/src/interp/i-funsel.boot
+++ b/src/interp/i-funsel.boot
@@ -1240,7 +1240,7 @@ replaceSharpCalls t ==
 doReplaceSharpCalls t ==
   atom t => t
   t is ['_#, l] => #l
-  t is ['construct,: l] => EVAL ['LIST,:l]
+  t is ['construct,: l] => eval ['LIST,:l]
   [first t,:[ doReplaceSharpCalls u for u in rest t]]
 
 noSharpCallsHere t ==
diff --git a/src/interp/i-syscmd.boot b/src/interp/i-syscmd.boot
index 77e4b866..fbc8fde0 100644
--- a/src/interp/i-syscmd.boot
+++ b/src/interp/i-syscmd.boot
@@ -2168,7 +2168,7 @@ dewritify ob ==
                 type = 'BPI =>
                     oname := ob.2
                     f :=
-                        INTP oname => EVAL GENSYMMER oname
+                        INTP oname => eval GENSYMMER oname
                         SYMBOL_-FUNCTION oname
                     not COMPILED_-FUNCTION_-P f =>
                         error '"A required BPI does not exist."
@@ -2184,7 +2184,7 @@ dewritify ob ==
                         HPUT(nob, dewritifyInner k, dewritifyInner e)
                     nob
                 type = 'DEVALUATED =>
-                    nob := EVAL dewritifyInner ob.2
+                    nob := eval dewritifyInner ob.2
                     HPUT($seen, ob, nob)
                     HPUT($seen, nob, nob)
                     nob
@@ -3169,7 +3169,7 @@ handleNoParseCommands(unab, string) ==
 npboot str ==
   sex := string2BootTree str
   FORMAT(true, '"~&~S~%", sex)
-  $ans := EVAL sex
+  $ans := eval sex
   FORMAT(true, '"~&Value = ~S~%", $ans)
 
 stripLisp str ==
@@ -3184,7 +3184,7 @@ stripLisp str ==
 
 
 nplisp str ==
-  $ans := EVAL READ_-FROM_-STRING str
+  $ans := eval READ_-FROM_-STRING str
   FORMAT(true, '"~&Value = ~S~%", $ans)
 
 npsystem(unab, str) ==
diff --git a/src/interp/interop.boot b/src/interp/interop.boot
index 5ecd28f0..1ca2f5a4 100644
--- a/src/interp/interop.boot
+++ b/src/interp/interop.boot
@@ -191,7 +191,7 @@ oldAxiomPreCategoryParents(catform,dom) ==
   parents := parentsOf opOf catform
   PROGV(vars, vals,
     LIST2VEC
-      [EVAL quoteCatOp cat for [cat,:pred] in parents | EVAL pred])
+      [eval quoteCatOp cat for [cat,:pred] in parents | eval pred])
 
 quoteCatOp cat == 
    atom cat => MKQ cat
diff --git a/src/interp/msg.boot b/src/interp/msg.boot
index 4ef144e7..60ab5725 100644
--- a/src/interp/msg.boot
+++ b/src/interp/msg.boot
@@ -494,7 +494,7 @@ setMsgCatlessAttr(msg,attr) ==
 whichCat attr ==
     found := 'catless
     for cat in $attrCats repeat
-        if ListMember? (attr,EVAL cat) then
+        if ListMember? (attr,eval cat) then
           found := cat
           return found
     found
diff --git a/src/interp/server.boot b/src/interp/server.boot
index 8173def3..17e884e9 100644
--- a/src/interp/server.boot
+++ b/src/interp/server.boot
@@ -158,6 +158,6 @@ parseAndEvalStr1 string ==
 protectedEVAL x ==
   error := true
   val := NIL
-  UNWIND_-PROTECT((val := EVAL x; error := NIL),
+  UNWIND_-PROTECT((val := eval x; error := NIL),
                    error => (resetStackLimits(); sendHTErrorSignal()))
   val
diff --git a/src/interp/showimp.boot b/src/interp/showimp.boot
index 7dfe9c18..06ab08b0 100644
--- a/src/interp/showimp.boot
+++ b/src/interp/showimp.boot
@@ -142,7 +142,7 @@ getExtensionsOfDomain domain ==
   u := getDomainExtensionsOfDomain domain
   cats := getCategoriesOfDomain domain
   for x in u repeat
-    cats := union(cats,getCategoriesOfDomain EVAL x)
+    cats := union(cats,getCategoriesOfDomain eval x)
   [:u,:cats]
 
 getDomainExtensionsOfDomain domain ==
@@ -150,7 +150,7 @@ getDomainExtensionsOfDomain domain ==
   d := domain
   while (u := devaluateSlotDomain(5,d)) repeat
     acc := [u,:acc]
-    d := EVAL u
+    d := eval u
   acc
 
 devaluateSlotDomain(u,dollar) ==
diff --git a/src/interp/sys-macros.lisp b/src/interp/sys-macros.lisp
index 34ad5fcc..0979262e 100644
--- a/src/interp/sys-macros.lisp
+++ b/src/interp/sys-macros.lisp
@@ -1,6 +1,6 @@
 ;; Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 ;; All rights reserved.
-;; Copyright (C) 2007-2009, Gabriel Dos Reis.
+;; Copyright (C) 2007-2010, Gabriel Dos Reis.
 ;; All rights reserved.
 ;;
 ;; Redistribution and use in source and binary forms, with or without
@@ -370,9 +370,6 @@
     `(let ((,gi ,fn)) 
        (the (values t) (funcall (car ,gi) ,@args (cdr ,gi))))))
 
-(defmacro |eval| (form)
-  `(EVAL (|expandToVMForm| ,form)))
-
 ;; 
 ;; -*- Arithmetics -*-
 ;; 
diff --git a/src/interp/sys-utility.boot b/src/interp/sys-utility.boot
index 3a3bda71..e3e99724 100644
--- a/src/interp/sys-utility.boot
+++ b/src/interp/sys-utility.boot
@@ -38,8 +38,15 @@ import vmlisp
 namespace BOOT
 
 module sys_-utility where
+  eval: %Thing -> %Thing
   probleReadableFile : %String -> %Maybe %String
 
+
+++ Evaluate an OpenAxiom VM form.  Eventually, this function is
+++ to be provided as a builtin by a OpenAxiom target machine.
+eval x ==
+  EVAL expandToVMForm x
+
 --%
 $COMBLOCKLIST := nil
 
@@ -256,15 +263,15 @@ bitior(x,y) ==
 ++ compile a function definition, augmenting the current
 ++ evaluation environement with the result of the compilation.
 COMPILE_-DEFUN(name,body) ==
-  EVAL body
+  eval body
   COMPILE name
 
 ++ Augment the current evaluation environment with a function definition.
 EVAL_-DEFUN(name,body) ==
-  EVAL MACROEXPANDALL body
+  eval MACROEXPANDALL body
 
 PRINT_-AND_-EVAL_-DEFUN(name,body) ==
-  EVAL body
+  eval body
   PRINT_-DEFUN(name,body)
 
 
diff --git a/src/interp/trace.boot b/src/interp/trace.boot
index b36127e8..ebb04541 100644
--- a/src/interp/trace.boot
+++ b/src/interp/trace.boot
@@ -208,7 +208,7 @@ getTraceOption (x is [key,:l]) ==
     ["of",:[hn y for y in l]] where
       hn x ==
         atom x and not upperCase? STRINGIMAGE(x).0 =>
-          isDomainOrPackage EVAL x => x
+          isDomainOrPackage eval x => x
           stackTraceOptionError ["S2IT0013",[x]]
         g:= domainToGenvar x => g
         stackTraceOptionError ["S2IT0013",[x]]
@@ -245,19 +245,19 @@ ptimers() ==
   null _/TIMERLIST => sayBrightly '"   no functions are timed"
   for timer in _/TIMERLIST repeat
     sayBrightly ["  ",:bright timer,'_:,'" ",
-      EVAL(INTERN strconc(timer,'"_,TIMER")) / float $timerTicksPerSecond,'" sec."]
+      eval(INTERN strconc(timer,'"_,TIMER")) / float $timerTicksPerSecond,'" sec."]
 
 pspacers() ==
   null _/SPACELIST => sayBrightly '"   no functions have space monitored"
   for spacer in _/SPACELIST repeat
     sayBrightly ["  ",:bright spacer,'_:,'" ",
-      EVAL INTERN strconc(spacer,'"_,SPACE"),'" bytes"]
+      eval INTERN strconc(spacer,'"_,SPACE"),'" bytes"]
 
 pcounters() ==
   null _/COUNTLIST => sayBrightly '"   no functions are being counted"
   for k in _/COUNTLIST repeat
     sayBrightly ["  ",:bright k,'_:,'" ",
-      EVAL INTERN strconc(k,'"_,COUNT"),'" times"]
+      eval INTERN strconc(k,'"_,COUNT"),'" times"]
 
 transOnlyOption l ==
   l is [n,:y] =>
@@ -730,7 +730,7 @@ traceReply() ==
     atom x =>
       isFunctor x => addTraceItem x
       (IS__GENVAR x =>
-        addTraceItem EVAL x; functionList:= [x,:functionList])
+        addTraceItem eval x; functionList:= [x,:functionList])
     userError '"bad argument to trace"
   functionList:= "append"/[[rassocSub(x,$mapSubNameAlist),'" "]
     for x in functionList | not isSubForRedundantMapName x]
@@ -780,8 +780,8 @@ _?t() ==
     TERPRI()
 
 tracelet(fn,vars) ==
-  if GENSYMP fn and stupidIsSpadFunction EVAL fn then
-    fn := EVAL fn
+  if GENSYMP fn and stupidIsSpadFunction eval fn then
+    fn := eval fn
     if COMPILED_-FUNCTION_-P fn then fn:=BPINAME fn
   fn = 'Undef => nil
   vars:=
@@ -800,8 +800,8 @@ tracelet(fn,vars) ==
 breaklet(fn,vars) ==
                        --vars is "all" or a list of variables
   --$letAssoc ==> (.. (=fn .. (BREAK . all))) OR (.. (=fn .. (BREAK . vl)))
-  if GENSYMP fn and stupidIsSpadFunction EVAL fn then
-    fn := EVAL fn
+  if GENSYMP fn and stupidIsSpadFunction eval fn then
+    fn := eval fn
     if COMPILED_-FUNCTION_-P fn then fn:= BPINAME fn
   fn = "Undef" => nil
   fnEntry:= LASSOC(fn,$letAssoc)
@@ -826,7 +826,7 @@ stupidIsSpadFunction fn ==
 
 break msg ==
   condition:= MONITOR_,EVALTRAN(_/BREAKCONDITION,nil)
-  EVAL condition =>
+  eval condition =>
     sayBrightly msg
     INTERRUPT()