Support pattern matching on constants #3641
Merged
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
hubertp
requested review from
jdunkerley,
radeusgd,
4e6 and
JaroslavTulach
as code owners
radeusgd
approved these changes
Aug 10, 2022
.../runtime/src/main/java/org/enso/interpreter/node/controlflow/caseexpr/LiteralBranchNode.java
Outdated
Show resolved
Hide resolved
JaroslavTulach
approved these changes
Aug 11, 2022
| Object state, | ||
| Text target, | ||
| @Cached("build()") ToJavaStringNode toJavaStringNode) { | ||
| if (textProfile.profile(literal.equals(toJavaStringNode.execute(target)))) |
There was a problem hiding this comment.
Converting Text to String just to do equals? I guess we could benefit from a switch to TruffleStrings then and use EqualsNode which would compare the values without converting to String.
There was a problem hiding this comment.
Yeah, this is the only ugly part in this PR, I admit.
Thanks for the suggestion, I wasn't entirely sure what is the proper way to deal with this.
There was a problem hiding this comment.
On the other hand, we use similar technique already with ExpectStringNode, ExpectTextNode (and ToJavaStringNode) in various places.
There was a problem hiding this comment.
So I think that with a comparison of normalized strings this is no longer an option.
.../runtime/src/main/java/org/enso/interpreter/node/controlflow/caseexpr/LiteralBranchNode.java
Outdated
Show resolved
Hide resolved
engine/runtime/src/test/scala/org/enso/compiler/test/codegen/AstToIrTest.scala
Show resolved
Hide resolved
4e6
approved these changes
Aug 11, 2022
radeusgd
reviewed
Aug 11, 2022
hubertp
force-pushed
the
wip/hubert/pattern-matching-constants-182743559
branch
from
b12eaf3 to
2c8c8bb
Compare
This change adds support for matching on constants by: 1) extending parser to allow literals in patterns 2) generate branch node for literals
Added tests for matching on literals that are deeply nested. Turned out the initial setup was wrong but was able to reuse the existing logic. Addressed the first of the comments in PR
Split LiteralBranchNode into comparing strings and numeric values. That way we can ensure that LHS is a String and avoid casting.
hubertp
force-pushed
the
wip/hubert/pattern-matching-constants-182743559
branch
from
2c8c8bb to
275b43f
Compare
hubertp
force-pushed
the
wip/hubert/pattern-matching-constants-182743559
branch
from
cf00ecc to
abeccec
Compare
mergify
bot
deleted the
wip/hubert/pattern-matching-constants-182743559
branch
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.
Pull Request Description
This change adds support for matching on constants by:
Related to https://www.pivotaltracker.com/story/show/182743559
Checklist
Please include the following checklist in your PR:
Scala,
Java,
and
Rust
style guides.
./run ide buildand./run ide watch.