Handle Kotlin's statements and their frequent sugar #472
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
…"do" statements # Conflicts: # plugins/kotlin/src/main/java/org/vineflower/kotlin/stat/KDoStatement.java # plugins/kotlin/testData/results/pkg/TestForRange.dec # plugins/kotlin/testData/results/pkg/TestFunVarargs.dec # plugins/kotlin/testData/results/pkg/TestNonInlineLambda.dec
I should look into this more and see why it's seemingly quite inconsistent
…ny ways they're used
This existed prior to the rebase, but something went amiss and I'm not quite sure what
This also fixes a potential issue where `repeat` would be generated despite counting down
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.
This introduces large improvements to the structure of Kotlin decompilation. It gets rid of most (all?) incorrectly formatted labels, breaks, and continues, and it provides some support for
whenstatements (those which compile to tableswitch and lookupswitch instructions).This does make a couple small changes to the main Vineflower source.
It adds an additional getter in
SwitchHeadExprent:vineflower/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchHeadExprent.java
Lines 145 to 147 in ab201e0
It also makes a visibility change in
ExprProcessor(privatetopublic):vineflower/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
Line 817 in ab201e0
All other changes are Kotlin-specific.