You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by em...@apache.org on 2022/09/10 15:52:58 UTC
[groovy] branch GROOVY_4_0_X updated: added notes
This is an automated email from the ASF dual-hosted git repository.
emilles pushed a commit to branch GROOVY_4_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
new 09b3c2f4ec added notes
09b3c2f4ec is described below
commit 09b3c2f4ec1b3ee7334fbaa494641a5f55cf87ff
Author: Eric Milles <er...@thomsonreuters.com>
AuthorDate: Sat Sep 10 10:02:56 2022 -0500
added notes
---
.../java/org/codehaus/groovy/classgen/AsmClassGenerator.java | 8 ++++----
.../groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy | 4 +++-
.../asm/sc/FieldsAndPropertiesStaticCompileTest.groovy | 10 ----------
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
index 8f1b2b50a9..5d5c35c1cf 100644
--- a/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
+++ b/src/main/java/org/codehaus/groovy/classgen/AsmClassGenerator.java
@@ -1170,14 +1170,14 @@ public class AsmClassGenerator extends ClassGenerator {
if (isThisOrSuper(objectExpression)) return true; //GROOVY-8693
if (objectExpression instanceof ClassExpression) return false;
+ // GROOVY-9195, GROOVY-9288: uniform treatment for "foo.bar" and "foo.with { bar }" using TypeChooser (not getType())
ClassNode objectExpressionType = controller.getTypeChooser().resolveType(objectExpression, controller.getClassNode());
- if (isObjectType(objectExpressionType)) objectExpressionType = objectExpression.getType();
- if (isOrImplements(objectExpressionType, ClassHelper.MAP_TYPE)) return false; // GROOVY-8074
- return implementsGroovyObject(objectExpressionType); // GROOVY-9195, GROOVY-9288, et al.
+ return implementsGroovyObject(objectExpressionType) // GROOVY-10540
+ && !isOrImplements(objectExpressionType, ClassHelper.MAP_TYPE); // GROOVY-5517, GROOVY-8074
}
private static boolean implementsGroovyObject(final ClassNode cn) {
- return cn.isDerivedFromGroovyObject() || (!cn.isInterface() && cn.getCompileUnit() != null);
+ return cn.isDerivedFromGroovyObject() || (cn.getCompileUnit() != null && !cn.isInterface());
}
@Override
diff --git a/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy b/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy
index 29c7bedb47..888c342958 100644
--- a/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy
+++ b/src/test/groovy/transform/stc/FieldsAndPropertiesSTCTest.groovy
@@ -584,12 +584,14 @@ class FieldsAndPropertiesSTCTest extends StaticTypeCheckingTestCase {
public static int version = 666
}
def map = new C()
- map['foo'] = 123
+ map.foo = 123
def value = map.foo
assert value == 123
map['foo'] = 4.5
value = map['foo']
assert value == 4.5
+ value = map.version
+ assert value == null
assert C.version == 666
'''
}
diff --git a/src/test/org/codehaus/groovy/classgen/asm/sc/FieldsAndPropertiesStaticCompileTest.groovy b/src/test/org/codehaus/groovy/classgen/asm/sc/FieldsAndPropertiesStaticCompileTest.groovy
index 440821cd7e..749d788942 100644
--- a/src/test/org/codehaus/groovy/classgen/asm/sc/FieldsAndPropertiesStaticCompileTest.groovy
+++ b/src/test/org/codehaus/groovy/classgen/asm/sc/FieldsAndPropertiesStaticCompileTest.groovy
@@ -22,16 +22,6 @@ import groovy.transform.stc.FieldsAndPropertiesSTCTest
final class FieldsAndPropertiesStaticCompileTest extends FieldsAndPropertiesSTCTest implements StaticCompilationTestSupport {
- void testGetAtFromStaticMap() {
- assertScript '''
- class Foo {
- public static Map CLASSES = [:]
- }
- String foo = 'key'
- Foo.CLASSES[foo]
- '''
- }
-
// GROOVY-5561
void testShouldNotThrowAccessForbidden() {
assertScript '''