Changeset 11856 for trunk/abcl/src/org/armedbear/lisp/scripting/lisp/abcl-script.lisp

Timestamp:

05/11/09 21:12:17 (14 years ago)

Author:

astalla

Message:

• loading:

added a new primitive sys::load-returning-last-result which behaves like
load but returns the last value produced instead of T

• JSR-223:
  • used the new load-returning-last-result to evaluate both interpreted and compiled code for consistency (with a caveat, see the wiki page on JSR-223)
  • bindings established through ScriptContext? are now declared special
  • compilation using the runtime compiler has been removed due to inconsistencies with evaluation and file-based compilation
  • updated the example as suggested on the ML to show both modes of getting the AbclScriptEngine?

File:

• trunk/abcl/src/org/armedbear/lisp/scripting/lisp/abcl-script.lisp (modified) (4 diffs)

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

@@ -52 +52 @@
       bindings)))
 
+(defun generate-special-declarations (bindings)
+  (let ((*package* (find-package :abcl-script-user)))
+    `(declare (special
+         ,@(mapcar (lambda (binding) (read-from-string (car binding)))
+       bindings)))))
+
 (defun generate-java-bindings (bindings-list actual-bindings java-bindings)
   (loop :for binding  :in actual-bindings
@@ -73 +79 @@
        (eval `(let (,@,actual-global-bindings)
     (let (,@,actual-engine-bindings)
+      ,(generate-special-declarations ,global-bindings)
+      ,(generate-special-declarations ,engine-bindings)
       (prog1
           (progn ,@,body)
@@ -88 +96 @@
         code-string script-context)
   (eval-in-script-context (global-bindings engine-bindings stdin stdout script-context)
-    (read-from-string
-     (concatenate 'string "(" code-string ")"))))
+    `((with-input-from-string (str ,code-string)
+  (sys::load-returning-last-result str)))))
 
 (defun eval-compiled-script (global-bindings engine-bindings stdin stdout
@@ -97 +105 @@
 
 (defun compile-script (code-string)
-  (if *compile-using-temp-files*
-      (let* ((tmp-file (jstatic (jmethod "java.io.File" "createTempFile" "java.lang.String" "java.lang.String")
-        nil "abcl-src-file-" ".lisp"))
-       (tmp-file-path (jcall (jmethod "java.io.File" "getAbsolutePath") tmp-file)))
-  (jcall (jmethod "java.io.File" "deleteOnExit") tmp-file) ;to be really-really-really sure...
-  (unwind-protect
-       (progn
-         (with-open-file (stream tmp-file-path :direction :output)
-     (princ "(in-package :abcl-script-user)" stream)
-     (princ code-string stream)
-     (finish-output stream))
-         (let ((compiled-file (compile-file tmp-file-path)))
-     (jcall (jmethod "java.io.File" "deleteOnExit")
-      (jnew (jconstructor "java.io.File" "java.lang.String")
-            (namestring compiled-file)))
-     (lambda ()
-       (let ((*package* (find-package :abcl-script-user)))
-         (load compiled-file :verbose t :print t)))))
-    (delete-file tmp-file-path)))
-      (eval 
-       `(compile
-   nil
-   (lambda ()
-     ,@(let ((*package* (find-package :abcl-script-user)))
-         (read-from-string
-    (concatenate 'string "(" code-string " cl:t)")))))))) ;return T in conformity of what LOAD does.
+  (let* ((tmp-file (jstatic (jmethod "java.io.File" "createTempFile" "java.lang.String" "java.lang.String")
+          nil "abcl-src-file-" ".lisp"))
+   (tmp-file-path (jcall (jmethod "java.io.File" "getAbsolutePath") tmp-file)))
+    (jcall (jmethod "java.io.File" "deleteOnExit") tmp-file) ;to be really-really-really sure...
+    (unwind-protect
+   (progn
+     (with-open-file (stream tmp-file-path :direction :output)
+       (princ "(in-package :abcl-script-user)" stream)
+       (princ code-string stream)
+       (finish-output stream))
+     (let ((compiled-file (compile-file tmp-file-path)))
+       (jcall (jmethod "java.io.File" "deleteOnExit")
+        (jnew (jconstructor "java.io.File" "java.lang.String")
+        (namestring compiled-file)))
+       (lambda ()
+         (let ((*package* (find-package :abcl-script-user)))
+     (sys::load-returning-last-result compiled-file)))))
+      (delete-file tmp-file-path))))
 
 ;;Java interface implementation - TODO