Changeset 15066 for trunk/abcl/contrib/jss/javaparser.lisp

Timestamp:

06/09/17 19:26:28 (6 years ago)

Author:

Mark Evenson

Message:

Further fixes for JSS

JAVAPARSER now "stacks" its macro definition on the existing one it
inherits from JSS.

Refactor all tests to just pollute CL-USER where necessary (strictly
speaking it shouldn't be necessary as all PROVE tests should be able
to use lexical bindings.

Document existence of Java field access via SHARPSIGN-QUOTATION_MARK,
e.g.

(#"{java.lang.System}.{fileSeparator}")

and the new Java DSL

(asdf:make :javaparser)
(#"'#1"new ByteBuddy?()

.subclass(Object.class,t)
.method(ElementMatchers?.named("toString"))
.intercept(FixedValue?.value("Hello World!"))
.make()
.load(getClass().getClassLoader())
.getLoaded()"

File:

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

trunk/abcl/contrib/jss/javaparser.lisp

@@ -66 +66 @@
   (defun read-invoke/javaparser (stream char arg) 
     (if (eql arg 1)
-        (if (ignore-errors (jclass "com.github.javaparser.ParseStart")) ;; chosen randomly, TODO memoize
+
+        (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)))))))))
+        (read-invoke stream char arg)))
   (set-dispatch-macro-character #\# #\" 'read-invoke/javaparser))