Changeset 15362

Timestamp:

08/06/20 16:03:13 (3 years ago)

Author:

Mark Evenson

Message:

Refined serialization of local functions and closures (still doesn't work for compiled closures)

Location:

trunk/abcl

Files:

• .gitignore (modified) (1 diff)
• src/org/armedbear/lisp/ArgumentListProcessor.java (modified) (1 diff)
• src/org/armedbear/lisp/Primitives.java (modified) (3 diffs)

trunk/abcl/.gitignore

@@ -5 +5 @@
 ext
 scratch
+.idea/
+*.iml
+target/
 \#*\#
 \.\#*

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

@@ -806 +806 @@
    * - AuxParam
    * */
-  public static abstract class Param {
+  public static abstract class Param implements Serializable {
       
       /** Assigns values to be bound to the correcsponding variables to the

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

@@ -37 +37 @@
 import static org.armedbear.lisp.Lisp.*;
 
+import java.io.Serializable;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -3720 +3721 @@
 
     // ### block
+    private static class BlockMarker extends LispObject implements Serializable {}
+
     private static final SpecialOperator BLOCK = new sf_block();
     private static final class sf_block extends SpecialOperator {
@@ -3736 +3739 @@
             LispObject body = ((Cons)args).cdr();
             Environment ext = new Environment(env);
-            final LispObject block = new LispObject();
+            final LispObject block = new BlockMarker();
             ext.addBlock(tag, block);
             LispObject result = NIL;