Skip to content

Re-introduce java.lang.Enum constructor hijack. #6624

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.

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

Merged
merged 1 commit into from
Jun 6, 2019

Conversation

odersky
Copy link
Contributor

@odersky odersky commented Jun 6, 2019

But this time do it lazily, by installing a special completer.

Copy link
Member

@dottybot dottybot left a comment

Choose a reason for hiding this comment

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

Hello, and thank you for opening this PR! 🎉

All contributors have signed the CLA, thank you! ❤️

Commit Messages

We want to keep history, but for that to actually be useful we have
some rules on how to format our commit messages (relevant xkcd).

Please stick to these guidelines for commit messages:

  1. Separate subject from body with a blank line
  2. When fixing an issue, start your commit message with Fix #<ISSUE-NBR>:
  3. Limit the subject line to 72 characters
  4. Capitalize the subject line
  5. Do not end the subject line with a period
  6. Use the imperative mood in the subject line ("Add" instead of "Added")
  7. Wrap the body at 80 characters
  8. Use the body to explain what and why vs. how

adapted from https://chris.beams.io/posts/git-commit

Have an awesome day! ☀️

But this time do it lazily, by installing a special completer.
@@ -614,6 +614,33 @@ class Definitions {
JavaSerializableClass.typeRef
else
ctx.requiredClassRef("scala.Serializable")

@threadUnsafe lazy val JavaEnumClass: ClassSymbol = {
val cls = ctx.requiredClass("java.lang.Enum")
Copy link
Member

Choose a reason for hiding this comment

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

ping @sjrd, this might interact with Scala.js reimplementation of Enum: https://github.com/scala-js/scala-js/blob/master/javalanglib/src/main/scala/java/lang/Enum.scala

Copy link
Member

Choose a reason for hiding this comment

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

Also it'd be nice to add a comment explaining why this hijacking is necessary.

Copy link
Member

Choose a reason for hiding this comment

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

Hum, it's unclear how that would interact with the Scala.js implementation, indeed. However, that's not an immediate problem, because for now Dotty.js reuses the binaries of java.lang.Enum.sjsir from Scala.js for scalac.

Worse come to worst, we would hard-code the .sjsir of java.lang.Enum in the distant future where we can actually compile Scala.js' standard library with Dotty.js.

@odersky
Copy link
Contributor Author

odersky commented Jun 6, 2019

@anatoliykmetyuk Please rebase your changes to enums on top of this.

@anatoliykmetyuk anatoliykmetyuk merged commit e2818f0 into scala:master Jun 6, 2019
@anatoliykmetyuk anatoliykmetyuk deleted the fix-java-enums branch June 6, 2019 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants