Refactor $.compilation_unit, optimize grammar
#269
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
|
I've tested the hypothesis: this change makes it straightforward to allow top-level expressions (while still passing all test suites) |
susliko
force-pushed
the
refactor-compilation-unit
branch
from
cfc5fe7 to
4b2cbc2
Compare
Summary ------- `$.compilation_unit` is now a sequence of top-level stats separated by `$.semicolon` This change has two effects: - Grammar optimization: - ~10% faster generation time - lower number of parser states ([before](https://gist.github.com/susliko/f950b997a98c54bbfd88969a949346fd), [after](https://gist.github.com/susliko/236a85dce46219c5868c494d7f5cf629)) - parser size reduction from 43M to 36M - It seems to me, that handling `$._automatic_semicolon` on the top level is a prerequisite to support top-level expressions (tree-sitter#198) and leading infix operators (tree-sitter#141)
susliko
commented
May 29, 2023
| @@ -3,9 +3,9 @@ | |||
| # This is an integration test to generally check the quality of parsing. | |||
|
|
|||
| SCALA_SCALA_LIBRARY_EXPECTED=95 | |||
| SCALA_SCALA_COMPILER_EXPECTED=87 | |||
| SCALA_SCALA_COMPILER_EXPECTED=86 | |||
There was a problem hiding this comment.
There's a degradation in a single file:
StdAttachments.scala#L214 5 ms (ERROR [213, 13] - [214, 5]), which is minimized to
package x
trait A {
self: A =>
import a._
}
trait B {
self: B =>
class A()
val x = 1
}It seams feasible to me to investigate the issue individually after this PR gets merged
eed3si9n
approved these changes
May 30, 2023
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.
Summary
$.compilation_unitis now a sequence of top-level statements separated by$.semicolonThis change has two effects:
$._automatic_semicolonon the top level is a prerequisite to support top-level expressions (Top-level expressions cannot be parsed #198) and leading infix operators (Leading infix operator (infix_expression across multiple lines) #141)