Skip to content

Various refactorings #12938

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

Jump to bottom
Merged
merged 12 commits into from
Jul 5, 2021
Merged

Various refactorings #12938

merged 12 commits into from
Jul 5, 2021

Conversation

odersky
Copy link
Contributor

@odersky odersky commented Jun 25, 2021 •
edited
Loading

Main changes:

  • Introduce a class InferredType for type trees that were inferred
  • Refactor overly long typeSig method in Namer
  • Improve expected types for dependent functions
  • Make dependency collection work for lazy vals
  • Fix printing of function type trees

odersky added 10 commits June 25, 2021 12:13
@odersky
Rename TypeVarBinder --> InferredTypeTree
32b8d51 
# Conflicts:
#	compiler/src/dotty/tools/dotc/typer/RefineTypes.scala
@odersky
Pull out inferredResultType into separate method
1ee3c51 
 - that way we avoid an overly long valOrDefDefSig

# Conflicts:
#	compiler/src/dotty/tools/dotc/typer/Namer.scala
@odersky
Re-infer inferred types of ValDefs and DefDefs
2f4a3d4 
# Conflicts:
#	compiler/src/dotty/tools/dotc/Compiler.scala
#	compiler/src/dotty/tools/dotc/typer/RefineTypes.scala
@odersky
Improve expected types for dependent functions
1ceafdf
@odersky
Add InferredTypeTree to Trees.Instance
5893a72 
# Conflicts:
#	compiler/src/dotty/tools/dotc/typer/RefineTypes.scala
@odersky
Mark inferred closure parameters as InferredTypeTrees
85b331d 
# Conflicts:
#	compiler/src/dotty/tools/dotc/typer/Typer.scala
@odersky
Mark type ascriptions added in ensureNoLocalRefs as inferred
ea4e06a 
# Conflicts:
#	compiler/src/dotty/tools/dotc/typer/RefineTypes.scala
@odersky
Add functionality to SimpleIdentitySet
82a2898
@odersky
Make Dependency collection work for lazy vals
ddb9c01
@odersky
Fix printing of function type trees
e8bc462
@odersky odersky mentioned this pull request Jun 26, 2021
Closed
@odersky
Typer refactorings
5688adc 
Pull out calculations of expected types for returns
and of types of Super references
@odersky odersky marked this pull request as ready for review June 27, 2021 14:41
@odersky odersky mentioned this pull request Jun 28, 2021
Merged
@odersky odersky requested a review from bishabosha June 28, 2021 15:27
bishabosha
bishabosha approved these changes Jul 1, 2021
View reviewed changes
Copy link
Member

@bishabosha bishabosha left a comment

Choose a reason for hiding this comment

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

LGTM

@bishabosha bishabosha merged commit 9fc286b into scala:master Jul 5, 2021
@bishabosha bishabosha deleted the refactorings branch July 5, 2021 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bishabosha bishabosha bishabosha approved these changes

Assignees

@bishabosha bishabosha

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@odersky @bishabosha