Skip to content

ast: Simplification (and maybe fix) in ctypeInheritanceCall #6822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fridis wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

ast: Simplification (and maybe fix) in ctypeInheritanceCall #6822

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/dev/flang/ast/AbstractFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,12 +800,13 @@ && outer().isCotype()
Call cotypeInheritanceCall(SourcePosition p, List<AbstractType> typeParameters, Resolution res, AbstractFeature that, Expr target)
{
var o = outer();
var oc = o == null || o.isUniverse() ? Universe.instance
: target instanceof AbstractCall ac && !ac.isCallToOuterRef() && ! ac.calledFeature().isField()
? ac.cotypeInheritanceCall(res, that)
: o.cotypeInheritanceCall(p, new List<>(o.selfType(),
o.genericsAsActuals().map(that::rebaseTypeForCotype)),
res, that, null);
var oc = o == null || o.isUniverse()
? Universe.instance
: target instanceof AbstractCall ac && ac.calledFeature().isConstructor()
Copy link
Copy Markdown
Member

@michaellilltokiwa michaellilltokiwa Mar 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about choices? Maybe even:

Suggested change
: target instanceof AbstractCall ac && ac.calledFeature().isConstructor()
: target instanceof AbstractCall ac && ac.calledFeature().definesType()

Copy link
Copy Markdown
Member Author

@fridis fridis Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A choice should not be called, so this should be equivalent in the case of no reported errors.

? ac.cotypeInheritanceCall(res, that)
: o.cotypeInheritanceCall(p, new List<>(o.selfType(),
o.genericsAsActuals().map(that::rebaseTypeForCotype)),
res, that, null);

var tf = res.cotype(this);
return new Call(p,
Expand Down
Loading