From e0bfbadd9d72a710b329ad8e7bab9ba48e6aeea3 Mon Sep 17 00:00:00 2001 From: Alan Ruttenberg Date: Sun, 10 Apr 2022 23:12:16 -0400 Subject: [PATCH] getField->getName Must be a change from updated javaparser. No idea how this worked with the patch I submitted --- contrib/jss/javaparser.lisp | 4 ++++ contrib/jss/read-sharp-quote-expression.lisp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/contrib/jss/javaparser.lisp b/contrib/jss/javaparser.lisp index ccdc315d8..22cd02f6e 100644 --- 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 index 494eff580..a673daf9c 100644 --- 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))))