Changeset 14570

Timestamp:

07/22/13 13:21:06 (10 years ago)

Author:

Mark Evenson

Message:

Restore Packages.findPackage() API for obtaining the current package in Java.

Restore examples/java-to-lisp-1/MainAlternative.java to this use of
the API.

Fixes #324.

Location:

trunk/abcl

Files:

• examples/java-to-lisp-1/MainAlternative.java (modified) (2 diffs)
• src/org/armedbear/lisp/Package.java (modified) (1 diff)
• src/org/armedbear/lisp/Packages.java (modified) (1 diff)

trunk/abcl/examples/java-to-lisp-1/MainAlternative.java

@@ -20 +20 @@
  */
 
-import org.armedbear.lisp.*;
+import org.armedbear.lisp.Function;
+import org.armedbear.lisp.Interpreter;
+import org.armedbear.lisp.Package;
+import org.armedbear.lisp.Packages;
+import org.armedbear.lisp.Symbol;
 
 public class MainAlternative
@@ -37 +41 @@
     // the function is not in a separate package, thus the
     // correct package is CL-USER. Symbol names are
-    // upper case. Package needs the prefix, because java
-    // also has a class named Package.
-    org.armedbear.lisp.Package defaultPackage = 
-        org.armedbear.lisp.Package.findPackage("CL-USER");
-    Symbol sym = 
-        defaultPackage.findAccessibleSymbol("LISPFUNCTION");
+    // (usually) upper case. 
+    Package defaultPackage 
+                  = Packages.findPackage("CL-USER");
+    Symbol sym 
+                  = defaultPackage.findAccessibleSymbol("LISPFUNCTION");
     Function function = (Function) sym.getSymbolFunction();
     function.execute();

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

@@ -65 +65 @@
     private transient LispObject useList = null;
     private transient ArrayList<Package> usedByList = null;
-  private transient ConcurrentHashMap<String, Package> localNicknames;
+    private transient ConcurrentHashMap<String, Package> localNicknames;
 
     // Anonymous package.

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

@@ -87 +87 @@
   }
 
+  /** 
+      Returns the current package of the current LispThread.
+      
+      Intended to be used from Java code manipulating an Interpreter
+      instance.
+  */
+  public static final synchronized Package findPackage(String name) {
+    return getCurrentPackage().findPackage(name);
+  }
+    
   // Finds package named `name'.  Returns null if package doesn't exist.
   // Called by Package.findPackage after checking package-local package