review fix: Manage generics from Interface in shadow mode #1914

surli · 2018-03-15T10:51:36Z

Fix #1906

…dow mode

monperrus · 2018-03-15T17:49:08Z

LGTM!

pvojtechovsky · 2018-03-15T19:46:53Z

I have tried/tested this code with #1907 and there is still some problem. I have improved the test now so the problem is reproducible here.
Anyway many thanks @surli for this PR it is on good way and it lets me continue with other PRs.

surli · 2018-03-16T09:04:32Z

I have tried/tested this code with #1907 and there is still some problem

Great, thank you, I was not quite confident on my changes ;)

pvojtechovsky · 2018-03-17T12:41:54Z

This wrong code is generated by this PR

public abstract interface CtField<T extends java.lang.Object> 
   extends spoon.reflect.code.CtRHSReceiver<A> , 
    spoon.reflect.declaration.CtShadowable , 
   spoon.reflect.declaration.CtTypeMember , 
    spoon.reflect.declaration.CtVariable<T> { ... }

The problem is
CtRHSReceiver<A>
while it should be
CtRHSReceiver<T>

I have extended the test to check that situation

pvojtechovsky · 2018-03-19T19:30:02Z

There is some problem with qualified names of interfaces. I have added failing test. For example CtExpression looks like this:

public abstract interface CtExpression<T extends java.lang.Object> extends spoon.reflect.code.CtCodeElement , spoon.reflect.declaration.spoon.reflect.declaration.CtTypedElement<T> , spoon.template.spoon.template.TemplateParameter<T> {

where
spoon.reflect.declaration.spoon.reflect.declaration.CtTypedElement
should be
spoon.reflect.declaration.CtTypedElement

pvojtechovsky · 2018-03-21T18:08:25Z

I have found two more problems:

CtTypeReference#getSuperInterfaces() returns correctly initialized CtTypeReferences with actual type arguments, but these CtTypeReferences has no parent CtType, so actual type arguments cannot be resolved well. I fixed that problem with last commit
CtType#getSuperClass() returns CtTypeReferences without actual type arguments. I have added the failing test. Could you please fix it?

pvojtechovsky · 2018-03-22T19:49:24Z

Next problem is with bounding type of actual type arguments of references of parameter types and return types of methods. See failing test.

I am not sure whether it belongs to this PR. May be we merge this one and fix the problem reproduced by last test case in next PR ... but may be it is quite related ... it is up to you, to decide ;-)

By the way, I am really not sure that current behavior of non shadow type (from sources) checked by first part of the test is wanted (see comments in test). For me the shadow class behaves more correct ... but the change would probably destroy many things... hard to estimate...

surli · 2018-03-23T10:21:58Z

For me it should be fixed in this PR: we are trying here to align the behaviour between elements coming from sources and shadow elements, and obviously concerning the generic types, shadow classes are currently badly supported.

Now I don't agree with your comment on the last test:

//is it really correct to have bounding type T?
//There should be NO bounding type - may be a special AST node?

You were talking about the type A of setAssignment with this signature:

public <C extends CtRHSReceiver<A>> C setAssignment(CtExpression<A> assignment)

and A is defined above on the class signature:

public class CtAssignmentImpl<T, A extends T> extends CtStatementImpl implements CtAssignment<T, A>

so for me it shoud really use the bounding type T which should itself be bounding only by object.
Moreover, we normally use the same bounding definition as coming from JDT for source-coming elements, so the definition should be right.

tdurieux · 2018-03-23T11:39:17Z

src/main/java/spoon/support/visitor/java/JavaReflectionVisitorImpl.java

@@ -43,9 +43,9 @@ public void visitPackage(Package aPackage) {
 			clazz.getPackage();
 		}
 		if (clazz.getSuperclass() != null) {


is it ok that the check is not on getGenericSuperclass?

Yeah I certainly should change that one for safety.

…arameters. Avoid infinite loop when resolving them.

surli · 2018-05-18T11:06:19Z

Thanks @pvojtechovsky to take back this one. Sorry I'm a lot busy elsewhere these days :-/

monperrus · 2018-05-21T18:46:02Z

we have a conflict here. rebase?

Conflicts: src/test/java/spoon/test/enums/EnumsTest.java

pvojtechovsky · 2018-05-22T06:15:35Z

Merge done, but we should review it after #1998, which is contained in this PR too ... so another merge will be needed

spoon-bot · 2018-05-22T09:27:03Z

API changes: 19 (Detected by Revapi)

Old API: fr.inria.gforge.spoon:spoon-core:jar:6.3.0-20180522.082726-80 / New API: fr.inria.gforge.spoon:spoon-core:jar:6.3.0-SNAPSHOT

	The number of parameters of the method have changed.
Old	method RtMethod#(Class, String, Class, Type, .Array, .Array, .Array, .Array, int, .Array, .Array, boolean, boolean)
New	method RtMethod#(Class, Method, String, Class, Type, .Array, .Array, .Array, .Array, int, .Array, .Array, boolean, boolean)
Breaking	binary: breaking,

	The number of parameters of the method have changed.
Old	method ExecutableRuntimeBuilderContext#(CtConstructor)
New	method ExecutableRuntimeBuilderContext#(Executable, CtConstructor)
Breaking	binary: breaking,

	The number of parameters of the method have changed.
Old	method ExecutableRuntimeBuilderContext#(CtMethod)
New	method ExecutableRuntimeBuilderContext#(Executable, CtMethod)
Breaking	binary: breaking,

	The number of parameters of the method have changed.
Old	method TypeRuntimeBuilderContext#(CtType)
New	method TypeRuntimeBuilderContext#(Type, CtType)
Breaking	binary: breaking,

	The number of parameters of the method have changed.
Old	method TypeReferenceRuntimeBuilderContext#(CtTypeReference)
New	method TypeReferenceRuntimeBuilderContext#(Type, CtTypeReference)
Breaking	binary: breaking,

	Method was removed.
Old	method AbstractRuntimeBuilderContext#addArrayReference(CtArrayTypeReference)
New	none
Breaking	binary: breaking,

	Method was removed.
Old	method AnnotationRuntimeBuilderContext#addClassReference(CtTypeReference)
New	none
Breaking	binary: breaking,

	Method was removed.
Old	method AbstractRuntimeBuilderContext#addInterfaceReference(CtTypeReference)
New	none
Breaking	binary: breaking,

	Method was removed.
Old	method AbstractRuntimeBuilderContext#addTypeName(CtTypeReference)
New	none
Breaking	binary: breaking,

	Method was added to an interface.
Old	none
New	method RuntimeBuilderContext#addTypeReference(CtRole, CtTypeReference)
Breaking	binary: non_breaking,

	Method was added to an interface.
Old	none
New	method RuntimeBuilderContext#getTypeParameter(GenericDeclaration, String)
Breaking	binary: non_breaking,

	The number of parameters of the method have changed.
Old	method JavaReflectionTreeBuilder#visitArrayReference(Class)
New	method JavaReflectionTreeBuilder#visitArrayReference(CtRole, Type)
Breaking	binary: breaking,

	Method was removed.
Old	method JavaReflectionTreeBuilder#visitClassReference(Class)
New	none
Breaking	binary: breaking,

	Method was removed.
Old	method JavaReflectionTreeBuilder#visitInterfaceReference(Class)
New	none
Breaking	binary: breaking,

	Method was removed.
Old	method JavaReflectionTreeBuilder#visitMethod(RtMethod)
New	none
Breaking	binary: breaking,

	Method was removed.
Old	method JavaReflectionTreeBuilder#visitType(ParameterizedType)
New	none
Breaking	binary: breaking,

	Method was removed.
Old	method JavaReflectionTreeBuilder#visitType(Type)
New	none
Breaking	binary: breaking,

	Method was removed.
Old	method JavaReflectionTreeBuilder#visitType(WildcardType)
New	none
Breaking	binary: breaking,

	The number of parameters of the method have changed.
Old	method JavaReflectionTreeBuilder#visitTypeParameterReference(TypeVariable)
New	method JavaReflectionTreeBuilder#visitTypeParameterReference(CtRole, TypeVariable)
Breaking	binary: breaking,

monperrus · 2018-05-22T15:06:59Z

#1998 merged. rebase here?

tdurieux · 2018-05-22T15:08:34Z

It already been done.

monperrus · 2018-05-23T08:26:28Z

awesome collaborative work, thanks to all!

tdurieux · 2018-05-23T08:29:49Z

This would be a nice reflection library!

pvojtechovsky and others added 2 commits March 15, 2018 11:19

test: superInterface on shadow type miss actual type arguments

2bead30

Provide a first mechanism to manage generic in interfaces even in sha…

45f01a5

…dow mode

surli changed the title ~~WiP fix: Manage generics from Interface in shadow mode~~ review fix: Manage generics from Interface in shadow mode Mar 15, 2018

improve test

9634fe2

surli added 4 commits March 16, 2018 15:12

Fix last assert

05ad69d

Try to fix TypeParameter resolution

5a9e5f7

Fix last erroring test

5298e3a

Fix checkstyle

b6f01aa

pvojtechovsky and others added 4 commits March 17, 2018 13:47

improve test

abee610

Change the visitor to manage generic interfaces directly

7fe0735

Fix some tests

602fb25

test qualified names of superinterfaces

7aebb87

surli and others added 3 commits March 20, 2018 10:33

Fix qualified name

f154c96

test: parent of CtTypeReference is initialized, check getSuperClass

2727805

fix parent of CtTypeReferences.getSuperInterfaces()

ab54f46

surli and others added 5 commits March 22, 2018 11:07

Manage superClass: first fix

e8b0154

Merge remote-tracking branch 'inria/master' into fix-superiface-args

737569c

Fix documentation

f6c463c

test bound type of act type args of type references

9a950a6

added comments

1f55f22

tdurieux reviewed Mar 23, 2018

View reviewed changes

Improve JavaReflectionVisitor to manage a cache of visited generics p…

674bf52

…arameters. Avoid infinite loop when resolving them.

pvojtechovsky added 12 commits May 18, 2018 19:30

Merge remote-tracking branch 'origin/master' into fix-superiface-args

aeab784

up

9f77ac4

ignore implicit Enum constructor, ignore synthetic fields

b66acca

fix: setModifiers(Collections.emptySet()) resets modifiers now

0f80026

enum value is always public static final, ignore synthetic typemembers

6a37d65

fix handling of upper bound of WildcardType

e390048

fix: actual type arguments on array type reference

a3aa771

feat: EqualsVisitor can report which attribute is not equal

1e47c9f

fix and ignore differences in modifiers

2fc84bb

fix: visibility of enum values

10c7e4f

handle static interface methods with body well

9a60870

fixes

f48be3b

pvojtechovsky changed the title ~~WIP fix: Manage generics from Interface in shadow mode~~ review fix: Manage generics from Interface in shadow mode May 20, 2018

pvojtechovsky changed the title ~~review fix: Manage generics from Interface in shadow mode~~ review2 fix: Manage generics from Interface in shadow mode May 20, 2018

Merge remote-tracking branch 'origin/master' into fix-superiface-args

de9a7a4

Conflicts: src/test/java/spoon/test/enums/EnumsTest.java

pvojtechovsky changed the title ~~review2 fix: Manage generics from Interface in shadow mode~~ review fix: Manage generics from Interface in shadow mode May 22, 2018

pvojtechovsky changed the title ~~review fix: Manage generics from Interface in shadow mode~~ review2 fix: Manage generics from Interface in shadow mode May 22, 2018

Merge remote-tracking branch 'origin/master' into fix-superiface-args

ce156d5

pvojtechovsky changed the title ~~review2 fix: Manage generics from Interface in shadow mode~~ review fix: Manage generics from Interface in shadow mode May 22, 2018

monperrus merged commit cb870d1 into INRIA:master May 23, 2018

surli mentioned this pull request Jun 25, 2018

Spoon 7.0.0 is released! #2041

Closed

I-Al-Istannen mentioned this pull request Aug 3, 2021

wip: fix: keep implicit modifiers in reflective proxies #4075

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

review fix: Manage generics from Interface in shadow mode #1914

review fix: Manage generics from Interface in shadow mode #1914

surli commented Mar 15, 2018

monperrus commented Mar 15, 2018

pvojtechovsky commented Mar 15, 2018 •

edited

Loading

surli commented Mar 16, 2018

pvojtechovsky commented Mar 17, 2018

pvojtechovsky commented Mar 19, 2018

pvojtechovsky commented Mar 21, 2018

pvojtechovsky commented Mar 22, 2018

surli commented Mar 23, 2018

tdurieux Mar 23, 2018

surli Mar 23, 2018

surli commented May 18, 2018

monperrus commented May 21, 2018

pvojtechovsky commented May 22, 2018

spoon-bot commented May 22, 2018

monperrus commented May 22, 2018

tdurieux commented May 22, 2018

monperrus commented May 23, 2018

tdurieux commented May 23, 2018

review fix: Manage generics from Interface in shadow mode #1914

review fix: Manage generics from Interface in shadow mode #1914

Conversation

surli commented Mar 15, 2018

monperrus commented Mar 15, 2018

pvojtechovsky commented Mar 15, 2018 • edited Loading

surli commented Mar 16, 2018

pvojtechovsky commented Mar 17, 2018

pvojtechovsky commented Mar 19, 2018

pvojtechovsky commented Mar 21, 2018

pvojtechovsky commented Mar 22, 2018

surli commented Mar 23, 2018

tdurieux Mar 23, 2018

Choose a reason for hiding this comment

surli Mar 23, 2018

Choose a reason for hiding this comment

surli commented May 18, 2018

monperrus commented May 21, 2018

pvojtechovsky commented May 22, 2018

spoon-bot commented May 22, 2018

monperrus commented May 22, 2018

tdurieux commented May 22, 2018

monperrus commented May 23, 2018

tdurieux commented May 23, 2018

pvojtechovsky commented Mar 15, 2018 •

edited

Loading