Changeset 12713

Timestamp:

05/20/10 17:58:13 (13 years ago)

Author:

astalla

Message:

Serialization support for some Lisp types.
For symbols and packages, only the "identity" is serialized, i.e. package name + symbol name.
For packages, it is expected that a package of the same name exists "at the other side".
For symbols, the deserialized symbol is interned in its home package.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• AbstractArray.java (modified) (1 diff)
• Cons.java (modified) (1 diff)
• LispInteger.java (modified) (1 diff)
• Nil.java (modified) (1 diff)
• Package.java (modified) (2 diffs)
• Symbol.java (modified) (3 diffs)

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

@@ -36 +36 @@
 import static org.armedbear.lisp.Lisp.*;
 
-public abstract class AbstractArray extends LispObject
+public abstract class AbstractArray extends LispObject implements java.io.Serializable
 {
     @Override

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

@@ -36 +36 @@
 import static org.armedbear.lisp.Lisp.*;
 
-public final class Cons extends LispObject
+public final class Cons extends LispObject implements java.io.Serializable
 {
   public LispObject car;

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

@@ -37 +37 @@
  * Fixnum and Bignum
  */
-public class LispInteger extends LispObject
+public class LispInteger extends LispObject implements java.io.Serializable
 {
 

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

@@ -165 +165 @@
         return "NIL";
     }
+
+    public Object readResolve() throws java.io.ObjectStreamException {
+       return NIL;
+    }
+
 }

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

@@ -41 +41 @@
 import java.util.List;
 
-public final class Package extends LispObject
+public final class Package extends LispObject implements java.io.Serializable
 {
     private String name;
-    private SimpleString lispName;
-
-    private LispObject propertyList;
-
-    private final SymbolHashTable internalSymbols = new SymbolHashTable(16);
-    private final SymbolHashTable externalSymbols = new SymbolHashTable(16);
-
-    private HashMap<String,Symbol> shadowingSymbols;
-    private ArrayList<String> nicknames;
-    private LispObject useList = null;
-    private ArrayList<Package> usedByList = null;
+    private transient SimpleString lispName;
+
+    private transient LispObject propertyList;
+
+    private transient final SymbolHashTable internalSymbols = new SymbolHashTable(16);
+    private transient final SymbolHashTable externalSymbols = new SymbolHashTable(16);
+
+    private transient HashMap<String,Symbol> shadowingSymbols;
+    private transient ArrayList<String> nicknames;
+    private transient LispObject useList = null;
+    private transient ArrayList<Package> usedByList = null;
 
     // Anonymous package.
@@ -849 +849 @@
             return unreadableString("PACKAGE");
     }
+
+    public Object readResolve() throws java.io.ObjectStreamException {
+  Package pkg = Packages.findPackage(name);
+  if(pkg != null) {
+      return pkg;
+  } else {
+      return error(new PackageError(name + " is not the name of a package."));
+  }
+    }
 }

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

@@ -36 +36 @@
 import static org.armedbear.lisp.Lisp.*;
 
-public class Symbol extends LispObject
+public class Symbol extends LispObject implements java.io.Serializable
 {
   // Bit flags.
@@ -56 +56 @@
    * used to find the index in the LispThread.specials array
    */
-  int specialIndex = LispThread.UNASSIGNED_SPECIAL_INDEX;
+  transient int specialIndex = LispThread.UNASSIGNED_SPECIAL_INDEX;
   private LispObject pkg; // Either a package object or NIL.
-  private LispObject value;
-  private LispObject function;
-  private LispObject propertyList;
+  private transient LispObject value;
+  private transient LispObject function;
+  private transient LispObject propertyList;
   private int flags;
 
@@ -908 +908 @@
       function.incrementHotCount();
   }
+
+    public Object readResolve() throws java.io.ObjectStreamException {
+  if(pkg instanceof Package) {
+      Symbol s = ((Package) pkg).intern(name.getStringValue());
+      return s;
+  } else {
+      return this;
+  }
+    }