Skip to content
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

Add mini-phase to fix constructors for enums extending java.lang.Enum #6602

Merged
merged 13 commits into from
Jun 5, 2019
Merged

Add mini-phase to fix constructors for enums extending java.lang.Enum #6602

merged 13 commits into from
Jun 5, 2019

Conversation

odersky
Copy link
Contributor

@odersky odersky commented Jun 4, 2019

No description provided.

@odersky odersky requested a review from anatoliykmetyuk June 4, 2019 19:52
odersky added 9 commits June 5, 2019 00:32
@odersky
Hijack java.lang.Enum constructor in Definitions
747f927
@odersky
Miniphase for adding constructor parameters to Java enums
6d59b1c 
Miniphase for adding constructor parameters if a Scala enum extends
a Java enum.
@odersky
Also print unique ids for symbols with meaningless names
4c800e2
@odersky
Check that Java sub-enums do not have parameterized enum cases
ff6b5d4
@odersky
Don't pass dummy arguments to java.lang.Enum when parsing Java
39e1374 
Since java.lang.Enum now pretends ot have an empty constructor, Java
trees should not pass any arguments to it either.
@odersky
Revert special handling of java.lang.Enum's companion object
bfb1e1f 
Unlike Object, which is the other class we fiddle with, java.lang.Enum
really has a companion object. So we should leave it as it is.
@odersky
Fix run test
ed35468
@odersky
Make java.lang.Enum a Permanent symbol
1197d96 
This avoids extensive special casing in Denotations#updateValidity
@odersky
Make TastyFormat recognize Enum as a modifier tag.
94e40ae
@odersky odersky force-pushed the add-enum-constrs branch from ce9daa9 to 94e40ae Compare June 4, 2019 22:33
@odersky
Copy link
Contributor Author

odersky commented Jun 5, 2019 •
edited
Loading

We still get a failure in the community build which is probably unrelated to this PR (the main build fails as well).

EDIT: It is related to this PR. It seems we cannot force java.lang.Enum in Definitions, that's what causes the NPE.

odersky added 3 commits June 5, 2019 12:15
@odersky
Make sure all modifier tags are recognized as such
86d931a
@odersky
Use scala.compat.JEnum instead of java.lang.Enum
eee13a3 
Use scala.compat.JEnum instead of java.lang.Enum to publish a Scala enum
as a Java enum. This avoids having to hijack java.lang.Enums constructor.
The latter leads to problems when compiling the standard 2.13 standard library.
@odersky
Don't pass dummy arguments to java.lang.Enum when parsing Java
a8474fd 
Since java.lang.Enum now pretends ot have an empty constructor, Java
trees should not pass any arguments to it either. (reverted from commit 39e1374)
@odersky odersky removed their assignment Jun 5, 2019
@anatoliykmetyuk anatoliykmetyuk merged commit 9116ecb into scala:master Jun 5, 2019
@anatoliykmetyuk anatoliykmetyuk deleted the add-enum-constrs branch June 5, 2019 12:43
@biboudis biboudis mentioned this pull request Jun 6, 2019
Merged
@biboudis biboudis added this to the 0.16 Tech Preview milestone Jun 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anatoliykmetyuk anatoliykmetyuk anatoliykmetyuk approved these changes

Assignees

@anatoliykmetyuk anatoliykmetyuk

Labels
None yet
Projects
None yet
Milestone
0.16 Tech Preview
Development

Successfully merging this pull request may close these issues.
3 participants
@odersky @anatoliykmetyuk @biboudis