Changeset 11883

Timestamp:

05/16/09 17:59:40 (14 years ago)

Author:

ehuelsmann

Message:

Remove CompiledClosure?;
Rename ClosureTemplateFunction? to CompiledClosure?,
as it is no longer a template: it holds the closure context.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• CompiledClosure.java (moved) (moved from trunk/abcl/src/org/armedbear/lisp/ClosureTemplateFunction.java) (5 diffs)
• Lisp.java (modified) (1 diff)
• Primitives.java (modified) (1 diff)
• compiler-pass2.lisp (modified) (7 diffs)

trunk/abcl/src/org/armedbear/lisp/CompiledClosure.java

@@ -1 +1 @@
 /*
- * ClosureTemplateFunction.java
+ * CompiledClosure.java
  *
  * Copyright (C) 2004-2005 Peter Graves
@@ -34 +34 @@
 package org.armedbear.lisp;
 
-public class ClosureTemplateFunction extends Closure
+public class CompiledClosure extends Closure
         implements Cloneable
 {
@@ -40 +40 @@
   public ClosureBinding[] ctx;
 
-  public ClosureTemplateFunction(LispObject lambdaList)
+  public CompiledClosure(LispObject lambdaList)
     throws ConditionThrowable
   {
@@ -46 +46 @@
   }
 
-  final public ClosureTemplateFunction setContext(ClosureBinding[] context)
+  final public CompiledClosure setContext(ClosureBinding[] context)
   {
     ctx = context;
@@ -52 +52 @@
   }
 
-  final public ClosureTemplateFunction dup()
-  {
-      ClosureTemplateFunction result = null;
+  final public CompiledClosure dup()
+  {
+      CompiledClosure result = null;
       try {
-    result = (ClosureTemplateFunction)super.clone();
+    result = (CompiledClosure)super.clone();
       } catch (CloneNotSupportedException e) {
       }

trunk/abcl/src/org/armedbear/lisp/Lisp.java

@@ -1190 +1190 @@
     throws ConditionThrowable
   {
-    return ((ClosureTemplateFunction)template).dup().setContext(context);
+    return ((CompiledClosure)template).dup().setContext(context);
   }
 

trunk/abcl/src/org/armedbear/lisp/Primitives.java

@@ -2438 +2438 @@
             value2 = T;
             LispObject name = ((CompiledClosure)arg).getLambdaName();
-            value3 = name != null ? name : NIL;
-          }
-        else if (arg instanceof ClosureTemplateFunction)
-          {
-            value1 = NIL;
-            value2 = T;
-            LispObject name = ((ClosureTemplateFunction)arg).getLambdaName();
             value3 = name != null ? name : NIL;
           }

trunk/abcl/src/org/armedbear/lisp/compiler-pass2.lisp

@@ -241 +241 @@
 (defconstant +lisp-return-class+ "org/armedbear/lisp/Return")
 (defconstant +lisp-go-class+ "org/armedbear/lisp/Go")
-(defconstant +lisp-ctf-class+ "org/armedbear/lisp/ClosureTemplateFunction")
+(defconstant +lisp-compiled-closure-class+ "org/armedbear/lisp/CompiledClosure")
 (defconstant +lisp-compiled-function-class+ "org/armedbear/lisp/CompiledFunction")
 (defconstant +lisp-primitive-class+ "org/armedbear/lisp/Primitive")
@@ -1817 +1817 @@
            (emit-constructor-lambda-list args)
            (emit-invokespecial-init super (lisp-object-arg-types 2)))
-          ((equal super +lisp-ctf-class+)
+          ((equal super +lisp-compiled-closure-class+)
            (emit-constructor-lambda-list args)
            (emit-invokespecial-init super (lisp-object-arg-types 1)))
@@ -3037 +3037 @@
                                         ; Stack: template-function
              (when *closure-variables*
-               (emit 'checkcast +lisp-ctf-class+)
+               (emit 'checkcast +lisp-compiled-closure-class+)
                (duplicate-closure-array compiland)
                (emit-invokestatic +lisp-class+ "makeCompiledClosure"
@@ -4857 +4857 @@
       (dformat t "(compiland-closure-register parent) = ~S~%"
          (compiland-closure-register parent))
-      (emit 'checkcast +lisp-ctf-class+)
+      (emit 'checkcast +lisp-compiled-closure-class+)
       (duplicate-closure-array parent)
       (emit-invokestatic +lisp-class+ "makeCompiledClosure"
@@ -5017 +5017 @@
 
                (when (compiland-closure-register *current-compiland*)
-                 (emit 'checkcast +lisp-ctf-class+)
+                 (emit 'checkcast +lisp-compiled-closure-class+)
                  (duplicate-closure-array *current-compiland*)
                  (emit-invokestatic +lisp-class+ "makeCompiledClosure"
@@ -8052 +8052 @@
         (progn
           (aload 0)
-          (emit 'getfield +lisp-ctf-class+ "ctx"
+          (emit 'getfield +lisp-compiled-closure-class+ "ctx"
                 +closure-binding-array+)
           (when local-closure-vars
@@ -8216 +8216 @@
                        (setf (method-descriptor-index execute-method)
                              (pool-name (method-descriptor execute-method)))
-                       +lisp-ctf-class+)
+                       +lisp-compiled-closure-class+)
                      (if *hairy-arglist-p*
                          +lisp-compiled-function-class+