Changeset 15065 for trunk/abcl/contrib/jss/invoke.lisp

Timestamp:

06/09/17 08:50:52 (6 years ago)

Author:

Mark Evenson

Message:

Refactor JAVAPARSER dependencies out of JSS

JAVAPARSER needs ABCL-ASDF to load its Maven artifact, but ABCL-ASDF
needs JSS. Therefore we refactor these dependencies into the ASDF
infrastructure rather than dealing with CL:REQUIRE, which isn't going
to work anyways unless there is another mechanism to load Maven
artifacts.

The JAVAPARSER system is not working due to dependency on the missing
symbols CL-USER::REPLACE-ALL and CL-USER::TREE-REPLACE, but that was
the case before this patch as Alan mistakenly didn't include it in his
submitted patch series.

File:

• trunk/abcl/contrib/jss/invoke.lisp (modified) (1 diff)

trunk/abcl/contrib/jss/invoke.lisp

@@ -206 +206 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defun read-invoke (stream char arg) 
-    (if (eql arg 1)
-  (progn (require 'javaparser)
-         (read-sharp-java-expression stream))
-  (progn
-    (unread-char char stream)
-    (let ((name (read stream)))
-      (if (or (find #\. name) (find #\{ name))
-    (jss-transform-to-field name)
-    (let ((object-var (gensym))
-          (args-var (gensym)))
-      `(lambda (,object-var &rest ,args-var) 
-         (invoke-restargs ,name  ,object-var ,args-var ,(eql arg 0)))))))))
+    (unread-char char stream)
+    (let ((name (read stream)))
+      (if (or (find #\. name) (find #\{ name))
+          (jss-transform-to-field name)
+          (let ((object-var (gensym))
+                (args-var (gensym)))
+            `(lambda (,object-var &rest ,args-var) 
+               (invoke-restargs ,name  ,object-var ,args-var ,(eql arg 0)))))))
   (set-dispatch-macro-character #\# #\" 'read-invoke))