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

Dotty enum parsing #7

Open

samuelchassot wants to merge 6 commits into scalameta:dotty-enum from samuelchassot:ast-dev

samuelchassot commented Nov 13, 2018

This add new structure to the AST to support Dotty Enum and add methods to the Parser to parse them.

Collaborator

allanrenucci commented Nov 13, 2018

The PR should target the dotty-enum branch

samuelchassot changed the base branch from master to dotty-enum

November 13, 2018 18:16

Author

samuelchassot commented Nov 13, 2018

Oops I changed that

allanrenucci requested changes

View reviewed changes

Collaborator

allanrenucci left a comment •

edited

Formatting need some love. Things that I have seen in this PR:

x : Int no space after x
identifier{ missing space before {
}else missing space before else
weird indentation
redundant new lines before closing }. E.g:
```
def foo = {
  ...
  bar

}
```

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/trees/shared/src/main/scala/scala/meta/Trees.scala Outdated Show resolved Hide resolved

scalameta/trees/shared/src/main/scala/scala/meta/Trees.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Show resolved Hide resolved

tests/shared/src/test/scala/scala/meta/tests/DottyEnumTests.scala Outdated Show resolved Hide resolved

tests/shared/src/test/scala/scala/meta/tests/DottyEnumTests.scala Outdated Show resolved Hide resolved

tests/shared/src/test/scala/scala/meta/tests/DottyEnumTests.scala Outdated Show resolved Hide resolved

samuelchassot force-pushed the ast-dev branch 2 times, most recently from 4b5ed09 to 559b5b1 Compare

November 20, 2018 16:53

allanrenucci requested changes

View reviewed changes

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

tests/shared/src/test/scala/scala/meta/tests/prettyprinters/DottyEnumSyntacticSuite.scala Outdated Show resolved Hide resolved

tests/shared/src/test/scala/scala/meta/tests/prettyprinters/DottyEnumSyntacticSuite.scala Outdated Show resolved Hide resolved

tests/shared/src/test/scala/scala/meta/tests/prettyprinters/DottyEnumSyntacticSuite.scala Show resolved Hide resolved

scalameta/trees/shared/src/main/scala/scala/meta/internal/prettyprinters/TreeSyntax.scala Outdated Show resolved Hide resolved

scalameta/trees/shared/src/main/scala/scala/meta/internal/prettyprinters/TreeSyntax.scala Outdated Show resolved Hide resolved

scalameta/trees/shared/src/main/scala/scala/meta/internal/prettyprinters/TreeSyntax.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

allanrenucci requested changes

View reviewed changes

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

samuelchassot force-pushed the ast-dev branch from ecbf6b1 to 82eb27b Compare

November 27, 2018 08:40

allanrenucci requested changes

View reviewed changes

build.sbt Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

scalameta/parsers/shared/src/main/scala/scala/meta/internal/parsers/ScalametaParser.scala Outdated Show resolved Hide resolved

tests/shared/src/test/scala/scala/meta/tests/parsers/DottyEnumSuite.scala Outdated Show resolved Hide resolved

allanrenucci reviewed

View reviewed changes

Collaborator

allanrenucci left a comment

Oups! Forgot to submit a comment from my previous review

tests/shared/src/test/scala/scala/meta/tests/parsers/DottyEnumSuite.scala Show resolved Hide resolved

allanrenucci approved these changes

View reviewed changes

Collaborator

allanrenucci left a comment

LGTM. @olafurpg Do you want to have a look?

scalameta/trees/shared/src/main/scala/scala/meta/internal/prettyprinters/TreeSyntax.scala Outdated Show resolved Hide resolved

build.sbt Outdated Show resolved Hide resolved


          Add AST structure and parsing methods to parse Dotty Enum

7fc9ad3

This commit add new AST structures to represent Enum, and Enum.Case. It adds methods in ScalametaParser.scala to parse Enum too.

samuelchassot force-pushed the ast-dev branch from 2627eeb to 7fc9ad3 Compare

November 28, 2018 17:12

samuelchassot added 5 commits

December 4, 2018 11:11


          removes dialect from pretty printing

97eee96


          add a checkPos test

27356d4


          Remove checkPos test in DottyEnumSuite

3d60558


          Remove test with undesirable behaviour

15b70d5

Test in TreeToken that expected different tokens when called with different Dialect. That is no more expected.


          Remove commented lines

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment