From 1b555159f3f2687fb937a12cec30383a440e9f5a Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Mon, 27 Feb 2012 06:40:47 +0000
Subject: 	* interp/nruncomp.boot (markOperation): New. 
 (optDeltaEntry): Implement better patch for last change. 	*
 interp/compiler.boot (compFormWithModemap): Undo last change.

---
 src/interp/compiler.boot | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/interp/compiler.boot')

diff --git a/src/interp/compiler.boot b/src/interp/compiler.boot
index 5692bc63..9605b35b 100644
--- a/src/interp/compiler.boot
+++ b/src/interp/compiler.boot
@@ -217,8 +217,7 @@ emitLocalCallInsn(op,args,e) ==
 
 applyMapping([op,:argl],m,e,ml) ==
   #argl ~= #ml-1 => nil
-  isCategoryForm(first ml,e) =>
-                                --is op a functor?
+  isCategoryForm(first ml,e) => --is op a functor?
     pairlis := pairList($FormalMapVariableList,argl)
     ml' := applySubst(pairlis,ml)
     argl' :=
@@ -616,12 +615,12 @@ compFormWithModemap(form,m,e,modemap) ==
   T :=
     [x',target,e'] where
       x':=
-        args := [t.expr for t in Tl]
+        form' := [f,:[t.expr for t in Tl]]
         target = $Category or isCategoryForm(target,e) =>
           -- Constructor instantiations are direct calls
-          ident? f and constructorDB f ~= nil => [f,:args]
+          ident? f and constructorDB f ~= nil => form'
           -- Otherwise, this is an indirect call
-          ['%call,f,:args]
+          ['%call,:form']
         -- try to deal with new-style Unions where we know the conditions
         op = "elt" and f is ['XLAM,:.] and ident?(z := first argl) and
           (c := get(z,'condition,e)) and
@@ -630,9 +629,7 @@ compFormWithModemap(form,m,e,modemap) ==
                 -- first is a full tag, as placed by getInverseEnvironment
                 -- second is what getSuccessEnvironment will place there
                 ['%tail,z]
-        -- Mark atomic implementations as external
-        f isnt [.,:.] => ['%call,['%external,f],:args]
-        ['%call,f,:args]
+        ['%call,:form']
       e':=
         Tl ~= nil => last(Tl).env
         e
-- 
cgit v1.2.3