* interp/c-util.boot: Use APPLY, not APPLX.

	* interp/clam.boot: Likewise.
	* interp/i-output.boot: Likewise.
	* interp/slam.boot: Likewise.
	* interp/vmlisp.lisp (APPLX): Remove.

6 files changed, 16 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6ca2d147..2c7c9ce6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2012-05-02  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
+	* interp/c-util.boot: Use APPLY, not APPLX.
+	* interp/clam.boot: Likewise.
+	* interp/i-output.boot: Likewise.
+	* interp/slam.boot: Likewise.
+	* interp/vmlisp.lisp (APPLX): Remove.
+
+2012-05-02  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
 	* interp/c-util.boot (backendCompileSPADSLAM): Do not devaluate
 	argument list.  Tidy.
 
diff --git a/src/interp/c-util.boot b/src/interp/c-util.boot
index 8942b72b..ae89bf04 100644
--- a/src/interp/c-util.boot
+++ b/src/interp/c-util.boot
@@ -1520,7 +1520,7 @@ backendCompileSLAM(name,args,body) ==
   u :=                          -- body of the stub function
     null args => [nil,[auxfn]]
     null rest args => [[g1],[auxfn,g1]]
-    [g1,["APPLX", ["FUNCTION",auxfn], g1]]
+    [g1,["APPLY", ["FUNCTION",auxfn], g1]]
   arg := first u
   app := second u
   codePart1 :=                  -- look up the value if it is already there
diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index f1f88374..4f1969c9 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -1,6 +1,6 @@
 -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
 -- All rights reserved.
--- Copyright (C) 2007-2011, Gabriel Dos Reis.
+-- Copyright (C) 2007-2012, Gabriel Dos Reis.
 -- All rights reserved.
 --
 -- Redistribution and use in source and binary forms, with or without
@@ -102,7 +102,7 @@ compClam(op,argl,body,$clamList) ==
   g1:= gensym()  --argument or argument list
   [arg,computeValue] :=
     argl is [.] => [[g1],[auxfn,g1]]  --g1 is a parameter
-    [g1,['APPLX,['function,auxfn],g1]]          --g1 is a parameter list
+    [g1,['APPLY,['function,auxfn],g1]]          --g1 is a parameter list
   cacheName:= mkCacheName op
   if $reportCounts then
     hitCounter:= makeSymbol strconc(op,'";hit")
@@ -291,7 +291,7 @@ compHashGlobal(op,argl,body,cacheName,eqEtc,countFl) ==
     application:=
       null argl => [auxfn]
       argl is [.] => [auxfn,g1]  --g1 is a parameter
-      ['APPLX,['function,auxfn],g1]          --g1 is a parameter list
+      ['APPLY,['function,auxfn],g1]          --g1 is a parameter list
     [g1,['consForHashLookup,MKQ op,g1],application]
   g2 := gensym()  --value computed by calling function
   returnFoundValue:=
diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot
index 2ec7b3b1..84377c5e 100644
--- a/src/interp/i-output.boot
+++ b/src/interp/i-output.boot
@@ -1953,7 +1953,7 @@ subspan u ==
    CAAR u isnt [.,:.]        and_
    not integer? CAAR u    and_
    GETL(CAAR u, 'SUBSPAN)    )    =>
-   APPLX(GETL(CAAR u, 'SUBSPAN), [u])
+   apply(GETL(CAAR u, 'SUBSPAN), [u])
   MAX(subspan first u, subspan rest u)
 
 agggsub u == subspan rest u
@@ -1965,7 +1965,7 @@ superspan u ==
    CAAR u isnt [.,:.]          and_
    not integer? CAAR u      and_
    GETL(CAAR u, 'SUPERSPAN)    )    =>
-   APPLX(GETL(CAAR u, 'SUPERSPAN), [u])
+   apply(GETL(CAAR u, 'SUPERSPAN), [u])
   MAX(superspan first u, superspan rest u)
 
 agggsuper u == superspan rest u
diff --git a/src/interp/slam.boot b/src/interp/slam.boot
index 159be089..f3f278e7 100644
--- a/src/interp/slam.boot
+++ b/src/interp/slam.boot
@@ -167,7 +167,7 @@ reportFunctionCompilation(op,nam,argl,body,isRecursive) ==
   [arg,computeValue] :=
     null argl => [nil,[auxfn]]
     argl is [.] => [[g1, 'envArg],[auxfn,g1, 'envArg]]  --g1 is a parameter
-    [g1,['APPLX,MKQ auxfn,g1]]          --g1 is a parameter list
+    [g1,['APPLY,MKQ auxfn,g1]]          --g1 is a parameter list
   cacheName := mkCacheName nam
   g2:= gensym()  --length of cache or arg-value pair
   g3:= gensym()  --value computed by calling function
@@ -214,7 +214,7 @@ reportFunctionCacheAll(op,nam,argl,body) ==
   [arg,computeValue] :=
     null argl => [['envArg],[auxfn, 'envArg]]
     argl is [.] => [[g1, 'envArg],[auxfn,g1, 'envArg]]  --g1 is a parameter
-    [g1,["APPLX",MKQ auxfn,g1]]          --g1 is a parameter list
+    [g1,["APPLY",MKQ auxfn,g1]]          --g1 is a parameter list
   if null argl then g1:=nil
   cacheName:= mkCacheName nam
   g2:= gensym()  --value computed by calling function
diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp
index 4c35ef41..16c4266a 100644
--- a/src/interp/vmlisp.lisp
+++ b/src/interp/vmlisp.lisp
@@ -66,9 +66,6 @@
 
 ;; DEFMACROS
 
-(defmacro applx (&rest args)
- `(apply ,@args))
-
 (defmacro closedfn (form)
  `(function ,form))