Changeset 11618

Timestamp:

02/02/09 22:40:56 (14 years ago)

Author:

astalla

Message:

Added support for a configuration file in the CLASSPATH for ABCL when
loaded through JSR-223.

Location:

trunk/abcl/src/org/armedbear/lisp/scripting

Files:

• AbclScriptEngine.java (modified) (2 diffs)
• lisp/abcl-script.lisp (modified) (2 diffs)
• lisp/config.lisp (added)
• lisp/packages.lisp (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngine.java

@@ -28 +28 @@
 import java.math.BigInteger;
 import java.util.Map;
-
-import javax.script.AbstractScriptEngine;
-import javax.script.Bindings;
-import javax.script.Compilable;
-import javax.script.CompiledScript;
-import javax.script.Invocable;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineFactory;
-import javax.script.ScriptException;
-import javax.script.SimpleBindings;
-
-import org.armedbear.lisp.Bignum;
-import org.armedbear.lisp.ConditionThrowable;
-import org.armedbear.lisp.Cons;
-import org.armedbear.lisp.DoubleFloat;
-import org.armedbear.lisp.Fixnum;
-import org.armedbear.lisp.Function;
-import org.armedbear.lisp.Interpreter;
-import org.armedbear.lisp.JavaObject;
-import org.armedbear.lisp.Keyword;
-import org.armedbear.lisp.Lisp;
-import org.armedbear.lisp.LispCharacter;
-import org.armedbear.lisp.LispObject;
-import org.armedbear.lisp.LispThread;
-import org.armedbear.lisp.SimpleString;
-import org.armedbear.lisp.SimpleVector;
-import org.armedbear.lisp.SingleFloat;
-import org.armedbear.lisp.Stream;
-import org.armedbear.lisp.Symbol;
+import java.util.Properties;
+
+import javax.script.*;
+
+import org.armedbear.lisp.*;
 import org.armedbear.lisp.scripting.util.ReaderInputStream;
 import org.armedbear.lisp.scripting.util.WriterOutputStream;
@@ -69 +44 @@
   private Function compileScript;
   private Function evalCompiledScript;
-
-  public AbclScriptEngine(Interpreter interpreter, boolean enableThrowingDebugger) {
-    
-    this.interpreter = interpreter;
-    Interpreter.initializeLisp();
-    final LispThread thread = LispThread.currentThread();
-    this.nonThrowingDebugHook = Symbol.DEBUGGER_HOOK.getSymbolValue();
+  private boolean configured = false;
+
+  public AbclScriptEngine(boolean enableThrowingDebugger) {
+    this();
     if (enableThrowingDebugger) {
       try {
-        installThrowingDebuggerHook(thread);
+        installThrowingDebuggerHook(LispThread.currentThread());
       } catch (ConditionThrowable e) {
         throw new InternalError("Can't set throwing debugger hook!");
       }
     }
+  }
+
+  public AbclScriptEngine() {
+    interpreter = Interpreter.createInstance();
+    interpreter.initializeLisp();
+    this.nonThrowingDebugHook = Symbol.DEBUGGER_HOOK.getSymbolValue();
     try {
       loadFromClasspath("/org/armedbear/lisp/scripting/lisp/packages.lisp");
       loadFromClasspath("/org/armedbear/lisp/scripting/lisp/abcl-script.lisp");
+      loadFromClasspath("/org/armedbear/lisp/scripting/lisp/config.lisp");
+      if(getClass().getResource("/abcl-script-config.lisp") != null) {
+          System.out.println("ABCL: loading configuration from " + getClass().getResource("/abcl-script-config.lisp"));
+          loadFromClasspath("/abcl-script-config.lisp");
+      }
+      interpreter.eval("(abcl-script:configure-abcl)");
       evalScript = (Function) this.findSymbol("EVAL-SCRIPT", "ABCL-SCRIPT").getSymbolFunction();
       compileScript = (Function) this.findSymbol("COMPILE-SCRIPT", "ABCL-SCRIPT").getSymbolFunction();
       evalCompiledScript = (Function) this.findSymbol("EVAL-COMPILED-SCRIPT", "ABCL-SCRIPT").getSymbolFunction();
     } catch (ConditionThrowable e) {
-      throw new Error(e);
-    }
-  }
-
-  public AbclScriptEngine(Interpreter interpreter) {
-    this(interpreter, false);
-  }
-
-  public AbclScriptEngine(boolean enableThrowingDebugger) {
-    this(Interpreter.createInstance(), enableThrowingDebugger);
-  }
-
-  public AbclScriptEngine() {
-    this(Interpreter.createInstance(), true);
-  }
-
+      throw new RuntimeException(e);
+    }
+  }
+  
+  public boolean isConfigured() {
+    return configured;
+  }
+  
   public Interpreter getInterpreter() {
     return interpreter;

trunk/abcl/src/org/armedbear/lisp/scripting/lisp/abcl-script.lisp

@@ -16 +16 @@
 ;;; along with this program; if not, write to the Free Software
 ;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+;;;
+;;; As a special exception, the copyright holders of this library give you
+;;; permission to link this library with independent modules to produce an
+;;; executable, regardless of the license terms of these independent
+;;; modules, and to copy and distribute the resulting executable under
+;;; terms of your choice, provided that you also meet, for each linked
+;;; independent module, the terms and conditions of the license of that
+;;; module.  An independent module is a module which is not derived from
+;;; or based on this library.  If you modify this library, you may extend
+;;; this exception to your version of the library, but you are not
+;;; obligated to do so.  If you do not wish to do so, delete this
+;;; exception statement from your version.
 
 (in-package :abcl-script)
@@ -109 +121 @@
    interface
    (jmake-proxy interface implementation lisp-this)))
+
+;Let's load it so asdf package is already defined when loading config.lisp
+(require 'asdf)

trunk/abcl/src/org/armedbear/lisp/scripting/lisp/packages.lisp

@@ -16 +16 @@
 ;;; along with this program; if not, write to the Free Software
 ;;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+;;;
+;;; As a special exception, the copyright holders of this library give you
+;;; permission to link this library with independent modules to produce an
+;;; executable, regardless of the license terms of these independent
+;;; modules, and to copy and distribute the resulting executable under
+;;; terms of your choice, provided that you also meet, for each linked
+;;; independent module, the terms and conditions of the license of that
+;;; module.  An independent module is a module which is not derived from
+;;; or based on this library.  If you modify this library, you may extend
+;;; this exception to your version of the library, but you are not
+;;; obligated to do so.  If you do not wish to do so, delete this
+;;; exception statement from your version.
 
 (defpackage :abcl-script
   (:use :cl :java)
-  (:export #:eval-script
-     #:compile-script
-     #:eval-compiled-script
-     #:define-java-interface-implementation
-     #:find-java-interface-implementation
-     #:register-java-interface-implementation
-     #:remove-java-interface-implementation))
-  
+  (:export 
+   #:*abcl-debug*
+   #:eval-script
+   #:compile-script
+   #:*compile-using-temp-files*
+   #:configure-abcl
+   #:eval-compiled-script
+   #:define-java-interface-implementation
+   #:find-java-interface-implementation
+   #:register-java-interface-implementation
+   #:remove-java-interface-implementation
+   #:+standard-debugger-hook+
+   #:*swank-dir*
+   #:*swank-port*
+   #:*use-throwing-debugger*))
+
 (defpackage :abcl-script-user
   (:use :cl :ext :java :abcl-script))