Skip to content
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

Add formatter for the parse AST #534

Draft
wants to merge 44 commits into
base: master
Choose a base branch
from
Draft

Add formatter for the parse AST #534

Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
ae39a16
First version of reformatting
LaurenzV Nov 16, 2024
050ee55
Don't translate macros when reformatting
LaurenzV Nov 16, 2024
4132201
Refine expressions further
LaurenzV Nov 17, 2024
d8ba5de
Update comment
LaurenzV Nov 17, 2024
70d8807
Fix spacing
LaurenzV Nov 17, 2024
5bce197
Change PForAll
LaurenzV Nov 18, 2024
0306969
more
LaurenzV Nov 18, 2024
a88381a
Tweak formatting of let and if statements
LaurenzV Nov 19, 2024
f5486d4
First version of better trivia fetching
LaurenzV Nov 19, 2024
6ca5629
More broken now but still more progress
LaurenzV Nov 19, 2024
c0dcc05
Make reformatter context implicit
LaurenzV Nov 19, 2024
a52fd1a
Remove unused method
LaurenzV Nov 19, 2024
97bbbb3
roll back to looking back for trivia
LaurenzV Nov 19, 2024
78b093e
Fix issue with missing indent after comment
LaurenzV Nov 20, 2024
693e4b2
Everything works as initially
LaurenzV Nov 20, 2024
6b8ba0c
Simplify code a bit
LaurenzV Nov 20, 2024
bab37c4
next attempt
LaurenzV Nov 20, 2024
bfa47c3
Good progress towards better formatting!
LaurenzV Nov 20, 2024
897ef7d
Fix spacing in pre and post conditions
LaurenzV Nov 20, 2024
d60a8fb
Improve showBody method
LaurenzV Nov 21, 2024
f597f95
more
LaurenzV Nov 21, 2024
b28be42
Create ReformatterPrettyPrinterBase
LaurenzV Nov 21, 2024
f5ab56f
More progress
LaurenzV Nov 22, 2024
9c5fab1
more progress towards new reformatter
LaurenzV Nov 22, 2024
3bc78f9
First seeminly working prototype
LaurenzV Nov 22, 2024
7fb4b7d
First working version, more or less back to where we started
LaurenzV Nov 22, 2024
9534798
Add short circuit
LaurenzV Nov 22, 2024
72752e6
Add hack for decreases keyword
LaurenzV Nov 22, 2024
08bab9c
Only reformat on leaf nodes
LaurenzV Nov 24, 2024
7c603b9
Fix trailing whitespaces
LaurenzV Nov 24, 2024
a48fda1
Fix whitespace bug
LaurenzV Nov 24, 2024
1b2093c
Add a couple of tests for reformatting
LaurenzV Nov 25, 2024
0f0d9aa
Remove POther
LaurenzV Nov 27, 2024
be38ee5
Add a test case for not working snippets
LaurenzV Nov 27, 2024
9e459c9
Add some license headers
LaurenzV Nov 27, 2024
d54f98f
Remove parseResult variable
LaurenzV Nov 27, 2024
f9768f7
Whitespaces and other small changes
LaurenzV Nov 27, 2024
4654f5b
Rearrange some imports
LaurenzV Nov 27, 2024
bd1abc0
Rename trivia to PTrivia
LaurenzV Nov 27, 2024
a1631ae
Remove LeftLineIndent
LaurenzV Nov 27, 2024
3fbb0d1
Readd newlines
LaurenzV Nov 27, 2024
1b179e3
Add some comments and improve code formatting
LaurenzV Nov 27, 2024
59d6729
Add another case for showAny
LaurenzV Nov 28, 2024
5ff8aa8
Fix whitespaces and imports
LaurenzV Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion silver
Open in desktop
Submodule silver updated 20 files
+1 −2 src/main/scala/viper/silver/ast/pretty/PrettyPrinter.scala
+1 −1 src/main/scala/viper/silver/cfg/CfgTest.scala
+1 −0 src/main/scala/viper/silver/frontend/Frontend.scala
+26 −0 src/main/scala/viper/silver/frontend/ReformatterAstProvider.scala
+4 −2 src/main/scala/viper/silver/frontend/SilFrontend.scala
+35 −6 src/main/scala/viper/silver/parser/FastParser.scala
+2 −2 src/main/scala/viper/silver/parser/MacroExpander.scala
+401 −56 src/main/scala/viper/silver/parser/ParseAst.scala
+42 −0 src/main/scala/viper/silver/parser/ParseAstKeyword.scala
+413 −0 src/main/scala/viper/silver/parser/ReformatPrettyPrinter.scala
+6 −3 src/main/scala/viper/silver/plugin/ParserPluginTemplate.scala
+29 −0 src/main/scala/viper/silver/plugin/standard/adt/AdtPASTExtension.scala
+4 −0 src/main/scala/viper/silver/plugin/standard/predicateinstance/PredicateInstancePASTExtension.scala
+3 −0 src/main/scala/viper/silver/plugin/standard/refute/RefutePASTExtension.scala
+3 −0 src/main/scala/viper/silver/plugin/standard/smoke/UnreachablePASTExtension.scala
+11 −1 src/main/scala/viper/silver/plugin/standard/termination/TerminationPASTExtension.scala
+1 −1 src/main/scala/viper/silver/plugin/standard/termination/TerminationPlugin.scala
+5 −5 src/test/scala/ASTTransformationTests.scala
+1 −1 src/test/scala/PluginTests.scala
+2 −2 src/test/scala/SemanticAnalysisTests.scala