Changeset 15065

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.

Location:

trunk/abcl/contrib/jss

Files:

• invoke.lisp (modified) (1 diff)
• javaparser-tests.asd (added)
• javaparser.asd (modified) (1 diff)
• javaparser.lisp (modified) (1 diff)
• jss-tests.asd (modified) (1 diff)
• t (added)
• t/javaparser.lisp (added)
• t/jss-tests.lisp (moved) (moved from trunk/abcl/contrib/jss/jss-tests.lisp) (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))
 

trunk/abcl/contrib/jss/javaparser.asd

@@ -1 @@
-(asdf:defsystem :javaparser
+(defsystem javaparser
   :description "https://github.com/javaparser/javaparser"
-  :serial t
-  :components ((:mvn "com.github.javaparser/javaparser-core/3.0.1")
-         (:file "javaparser")
-         (:file "read-sharp-quote-expression")))
+  :defsystem-depends-on (abcl-asdf)
+  :components
+  ((:module jar
+            :components ((:mvn "com.github.javaparser/javaparser-core/3.0.1")))
+   (:module source :depends-on (jar)
+            :pathname ""
+            :serial t
+            :components ((:file "javaparser")
+                         (:file "read-sharp-quote-expression"))))
+  :perform (asdf:test-op (op c)
+                         (asdf:test-system :javaparser-tests)))
+
+

trunk/abcl/contrib/jss/javaparser.lisp

@@ -63 +63 @@
     symbol))
 
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defun read-invoke/javaparser (stream char arg) 
+    (if (eql arg 1)
+        (if (ignore-errors (jclass "com.github.javaparser.ParseStart")) ;; chosen randomly, TODO memoize
+            (read-sharp-java-expression stream)
+            ;; Deal with possiblity of not loading jar
+            (error "Cannot load javaparser code needed for the #1 macro"))
+  (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)))))))))
+  (set-dispatch-macro-character #\# #\" 'read-invoke/javaparser))
 
 

trunk/abcl/contrib/jss/jss-tests.asd

@@ -6 +6 @@
                prove)
   :components ((:module tests
-                        :pathname "" 
+                        :pathname "t" 
                         :components ((:test-file "jss-tests"))))
   :perform (asdf:test-op (op c)

trunk/abcl/contrib/jss/t/jss-tests.lisp

@@ -60 +60 @@
 (finalize)
 
-(plan 1)
-
-(in-package :jss)
-(defparameter expanded '(let ((jss::this jss::*object-for-this*))
-      (jcall "getLoaded"
-       (jcall "load"
-        (jcall "make"
-         (jcall "intercept"
-          (jcall "method"
-           (jcall "subclass"
-            (new '|ByteBuddy|)
-            (find-java-class '|Object|)
-            t)
-           (jstatic "named"
-              '|ElementMatchers|
-              "toString"))
-          (jstatic "value"
-             '|FixedValue|
-             "Hello World!")))
-        (jcall "getClassLoader"
-         (jcall "getClass" jss::this))))))
-
-(defparameter source '#1"new ByteBuddy().subclass(Object.class,t)
-   .method(ElementMatchers.named("toString"))
-   .intercept(FixedValue.value("Hello World!"))
-   .make()
-   .load(getClass().getClassLoader())
-   .getLoaded()" )
-
-(in-package :jss-test)
-
-(is jss::source
-    jss::expanded)
-
-(finalize)