fe: infer result type of redef via redefined feature
#4023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
michaellilltokiwa
force-pushed
the
infer_result_type_via_redefined
branch
from
74701ea to
3b3216c
Compare
fridis
requested changes
Nov 5, 2024
Comment on lines
+34
to
+35
| say c.b | ||
| say c.d |
There was a problem hiding this comment.
Suggested change
| say c.b | |
| say c.d | |
| say c.b | |
| say c.d | |
| say (type_of c.b) | |
| say (type_of c.d) |
| a is | ||
| b option String => "String" | ||
| d => option "String" | ||
| # NYI: UNDER DEVELOPEMENT result type with generic argument / this type |
There was a problem hiding this comment.
Would be good to add examples that do not work yet to this comment.
| { | ||
| AbstractType t = null; | ||
| var it = redefines().iterator(); | ||
| while(t == null && it.hasNext()) |
There was a problem hiding this comment.
Suggested change
| while(t == null && it.hasNext()) | |
| while (t == null && it.hasNext()) |
| { | ||
| t = f.returnType().functionReturnType(); | ||
| } | ||
| else if (!redefines().isEmpty()) |
| { | ||
| var redefined = it.next(); | ||
| if (!(_returnType instanceof FunctionReturnType) | ||
| && !redefines().isEmpty() |
| @@ -2183,7 +2183,16 @@ else if (_impl.typeInferable()) | |||
| { | |||
| if (CHECKS) check | |||
| (!state().atLeast(State.TYPES_INFERENCED)); | |||
| result = _impl.inferredType(res, this, urgent); | |||
| var t = resultTypeFromRedefined(res); | |||
| // NYI: UNDER DEVELOPMENT: handle types that contain generic arguments / this types. | |||
There was a problem hiding this comment.
What is missing here is a call to handDownNonOpen(res, t, featureThatIsRedefined), then the generics and this types should be adjusted accordingly.
Comment on lines
+2085
to
+2097
| /** | ||
| * Does this type contain a generic argument? | ||
| * | ||
| * @return | ||
| */ | ||
| public boolean containsGenericArgument() | ||
| { | ||
| return isGenericArgument() | ||
| || !isGenericArgument() && (generics().stream().anyMatch(g -> g.containsGenericArgument()) || | ||
| outer() != null && outer().containsGenericArgument()); | ||
| } | ||
|
|
||
|
|
Comment on lines
+2240
to
+2243
| && redefined instanceof Feature f | ||
| && f.returnType() instanceof FunctionReturnType) | ||
| { | ||
| t = f.returnType().functionReturnType(); |
There was a problem hiding this comment.
I think it would be better to use the code in the else branch in this case as well, i.e., resolveTypes and resultTypeIfPresent.
| # ----------------------------------------------------------------------- | ||
|
|
||
| infer_result_type_via_redefined => | ||
|
|
There was a problem hiding this comment.
I am missing some test cases:
- redefining two or more inherited features with equal types
- redefining result types
aandbasvoid - redefining
a.f unit,b.f void,c.f Stringinshould IMHO work.a is f unit => b is f => do c is f => "hi" d : a, b, c is redef f => panic "bla" - negative tests
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Does not work yet if result type contains a generic argument or this type.