You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2021/04/01 04:30:44 UTC
[groovy] 07/10: GROOVY-9993: Field and a property with the same
name: clarification of boundary cases (ignore @CompileStatic on properties
- never used, just transferred to accessor methods for a split property)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit dede59548c359db4b1bfdf6ee1c22e74c01da1bd
Author: Paul King <pa...@asert.com.au>
AuthorDate: Tue Mar 30 21:04:54 2021 +1000
GROOVY-9993: Field and a property with the same name: clarification of boundary cases (ignore @CompileStatic on properties - never used, just transferred to accessor methods for a split property)
---
.../java/org/codehaus/groovy/transform/StaticTypesTransformation.java | 3 ++-
.../org/codehaus/groovy/transform/sc/StaticCompileTransformation.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/transform/StaticTypesTransformation.java b/src/main/java/org/codehaus/groovy/transform/StaticTypesTransformation.java
index 74e958a..4a722d1 100644
--- a/src/main/java/org/codehaus/groovy/transform/StaticTypesTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/StaticTypesTransformation.java
@@ -24,6 +24,7 @@ import org.codehaus.groovy.ast.AnnotatedNode;
import org.codehaus.groovy.ast.AnnotationNode;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.MethodNode;
+import org.codehaus.groovy.ast.PropertyNode;
import org.codehaus.groovy.ast.expr.ConstantExpression;
import org.codehaus.groovy.ast.expr.Expression;
import org.codehaus.groovy.ast.expr.ListExpression;
@@ -69,7 +70,7 @@ public class StaticTypesTransformation implements ASTTransformation, Compilation
visitor.setMethodsToBeVisited(Collections.singleton(methodNode));
visitor.initialize();
visitor.visitMethod(methodNode);
- } else {
+ } else if (!(node instanceof PropertyNode)) {
source.addError(new SyntaxException(STATIC_ERROR_PREFIX + "Unimplemented node type",
node.getLineNumber(), node.getColumnNumber(), node.getLastLineNumber(), node.getLastColumnNumber()));
}
diff --git a/src/main/java/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java b/src/main/java/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java
index b2857f3..3488739 100644
--- a/src/main/java/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/sc/StaticCompileTransformation.java
@@ -23,6 +23,7 @@ import org.codehaus.groovy.ast.AnnotatedNode;
import org.codehaus.groovy.ast.AnnotationNode;
import org.codehaus.groovy.ast.ClassNode;
import org.codehaus.groovy.ast.MethodNode;
+import org.codehaus.groovy.ast.PropertyNode;
import org.codehaus.groovy.ast.expr.Expression;
import org.codehaus.groovy.classgen.asm.WriterControllerFactory;
import org.codehaus.groovy.classgen.asm.sc.StaticTypesWriterControllerFactoryImpl;
@@ -78,7 +79,7 @@ public class StaticCompileTransformation extends StaticTypesTransformation {
visitor.setMethodsToBeVisited(Collections.singleton(methodNode));
visitor.initialize();
visitor.visitMethod(methodNode);
- } else {
+ } else if (!(target instanceof PropertyNode)) {
source.addError(new SyntaxException(STATIC_ERROR_PREFIX + "Unimplemented node type", target));
}
if (visitor != null) {