Changeset 15360

Timestamp:

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

Author:

Mark Evenson

Message:

Serialization of top-level, named functions.

Location:

trunk/abcl

Files:

• build.xml (modified) (1 diff)
• src/org/armedbear/lisp/Function.java (modified) (2 diffs)
• src/org/armedbear/lisp/Pathname.java (modified) (2 diffs)
• test/src/org/armedbear/lisp/serialization (added)
• test/src/org/armedbear/lisp/serialization/SerializationTest.java (added)

trunk/abcl/build.xml

@@ -1060 +1060 @@
         <arg value="org.armedbear.lisp.SeekableStringWriterTest"/>
         <arg value="org.armedbear.lisp.UtilitiesTest"/>
+        <arg value="org.armedbear.lisp.serialization.SerializationTest"/>
     <!-- currently hangs(!) the running process
         <arg value="org.armedbear.lisp.util.HttpHeadTest"/>

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

@@ -34 +34 @@
 package org.armedbear.lisp;
 
+import java.io.NotSerializableException;
+import java.io.Serializable;
+
 import static org.armedbear.lisp.Lisp.*;
 
-public abstract class Function extends Operator
-{
+public abstract class Function extends Operator implements Serializable {
     private LispObject propertyList = NIL;
     private int callCount;
@@ -386 +388 @@
         ++hotCount;
     }
+
+    //Serialization
+    public static class SerializedNamedFunction implements Serializable {
+        private final Symbol name;
+        public SerializedNamedFunction(Symbol name) {
+            this.name = name;
+        }
+
+        public Object readResolve() {
+            return name.getSymbolFunctionOrDie();
+        }
+    }
+
+    public Object writeReplace() throws NotSerializableException {
+        LispObject lambdaName = getLambdaName();
+        if(lambdaName instanceof Symbol && lambdaName.getSymbolFunction() == this) {
+            return new SerializedNamedFunction((Symbol) lambdaName);
+        } else {
+            throw new NotSerializableException(getClass().getName());
+        }
+    }
 }

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

@@ -35 +35 @@
 import static org.armedbear.lisp.Lisp.*;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.FileInputStream;
+import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -51 +48 @@
 import java.util.zip.ZipInputStream;
 
-public class Pathname extends LispObject {
+public class Pathname extends LispObject implements Serializable {
 
     /** The path component separator used by internally generated