[armedbear-cvs] r11726 - trunk/abcl/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Fri Apr  3 17:52:58 2009
New Revision: 11726

Log:
Fix class dependency issue. The current code
works on Sun, however with this change we should
work on GCJ and other JVMs too.

Patch by: Douglas Miles (logicmoo at gmail dot com)


Modified:
   trunk/abcl/src/org/armedbear/lisp/Lisp.java
   trunk/abcl/src/org/armedbear/lisp/Nil.java

Modified: trunk/abcl/src/org/armedbear/lisp/Lisp.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Lisp.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Lisp.java	Fri Apr  3 17:52:58 2009
@@ -78,9 +78,7 @@
     Packages.createPackage("JAVA");
 
   // ### nil
-  // Constructing NIL forces the Symbol class to be loaded (since Nil extends
-  // Symbol).
-  public static final LispObject NIL = new Nil(PACKAGE_CL);
+  public static final LispObject NIL = Nil.NIL;
 
   // We need NIL before we can call usePackage().
   static

Modified: trunk/abcl/src/org/armedbear/lisp/Nil.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/Nil.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/Nil.java	Fri Apr  3 17:52:58 2009
@@ -35,6 +35,8 @@
 
 public final class Nil extends Symbol
 {
+    final static Nil NIL = new Nil(PACKAGE_CL);
+
     public Nil(Package pkg)
     {
         super("NIL", pkg);