getField->getName Must be a change from updated javaparser. No idea h…

…ow this worked with the patch I submitted
easye · Apr 11, 2022 · e0bfbad · e0bfbad
1 parent 933fbb1
commit e0bfbad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/contrib/jss/javaparser.lisp b/contrib/jss/javaparser.lisp
@@ -67,6 +67,10 @@
   (let ((symbol (intern (#"getIdentifier" node))))
     symbol))
 
+(def-java-read NameExpr javaparser ()
+  (let ((symbol (intern (#"getIdentifier" (#"getName" node)))))
+    symbol))
+
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defun read-invoke/javaparser (stream char arg) 
     (if (eql arg 1)

diff --git a/contrib/jss/read-sharp-quote-expression.lisp b/contrib/jss/read-sharp-quote-expression.lisp
@@ -74,8 +74,8 @@
 (def-java-read FieldAccessExpr sharp-quote-expression-reader ()
   (let ((scope (process-node obj (#"getScope" node))))
     (if (and (symbolp scope) (upper-case-p (char (string scope) 0)))
-        `(get-java-field ',(process-node obj (#"getScope" node)) ,(#"getIdentifier" (#"getField" node)) t)
-        `(get-java-field ,(maybe-class (process-node obj (#"getScope" node))) ,(#"getIdentifier" (#"getField" node)) t))))
+        `(get-java-field ',(process-node obj (#"getScope" node)) ,(#"getIdentifier" (#"getName" node)) t)
+        `(get-java-field ,(maybe-class (process-node obj (#"getScope" node))) ,(#"getIdentifier" (#"getName" node)) t))))
 
 (def-java-read ArrayAccessExpr sharp-quote-expression-reader ()
   (let ((index (process-node obj (#"getIndex" node))))