Skip to content

[java] Improve statement grammar#2164

Merged
oowekyala merged 4 commits into
pmd:java-grammarfrom
oowekyala:grammar-new-statements
Jan 6, 2020
Merged

[java] Improve statement grammar#2164
oowekyala merged 4 commits into
pmd:java-grammarfrom
oowekyala:grammar-new-statements

Conversation

@oowekyala

@oowekyala oowekyala commented Dec 15, 2019 •
edited
Loading

Copy link
Copy Markdown
Member

This is a bunch of statement-related improvements. I left out switch statement improvements for another PR. Most of this is already described on the wiki or on TODOs in code.

Changelog

  • Turn ASTStatement into an interface
  • Remove BlockStatement
  • Introduce LocalClassDeclStatement
  • Introduce EmptyDeclaration (in preparation for future PR about declarations)
  • Replace StatementExpression with ExpressionStatement
  • Extract ForeachStatement from ForStatement
  • Rename node ASTCatchStatement -> ASTCatchClause
  • Rename node ASTFinallyStatement -> ASTFinallyClause

API

  • Rename method getGuardExpressionNode() -> getCondition() on the following nodes:
    • WhileStmt,
    • DoStmt,
    • ForStmt,
    • IfStmt,
    • AssertStmt
  • Rename ASTTryStatement#getCatchStatements() -> getCatchClauses()
  • Make ASTYieldStatement not a TypeNode
  • Remove ASTTryStatement#hasFinally()
  • Add a lot of documentation and usability methods

TODO on master

  • Introduce getCondition to replace getGuardExpressionNode
  • Deprecate ASTYieldStatement#getType[Definition]
  • Deprecate ASTTryStatement#hasFinally()

@oowekyala
Turn Statement into an interface
b03e233 
Remove BlockStatement
Introduce LocalClassDeclStatement
Introduce EmptyDeclaration (in preparation for PR about declarations)
Replace StatementExpression with ExpressionStatement

Make YieldStatement, ExplicitConstructorInvocation implement ASTStatement

Extract ForeachStatement from ForStatement

Rename
(ASTWhileStmt,
 ASTDoStmt,
 ASTForStmt,
 ASTIfStmt,
 ASTAssertStmt)#getGuardExpressionNode() -> getCondition()

Rename ASTCatchStatement -> ASTCatchClause
Rename ASTFinallyStatement -> ASTFinallyClause
Rename ASTTryStatement#getCatchStatements() -> getCatchClauses()

Make ASTYieldStatement not a TypeNode

Remove ASTTryStatement#hasFinally()

Add (ASTThrowStatement,  ASTYieldStatement, ASTReturnStatement)#getExpression()
Add ASTTryStatement#getBody()
@oowekyala
Merge branch 'java-grammar' into grammar-new-statements
5cc235d
@oowekyala oowekyala added the in:ast About the AST structure or API, the parsing step label Dec 15, 2019
@oowekyala oowekyala added this to the 7.0.0 milestone Dec 15, 2019
@ghost

ghost commented Dec 15, 2019

Copy link
Copy Markdown
1 Message
📖 No java rules are changed!

Generated by 🚫 Danger

@oowekyala oowekyala changed the title [core] Improve statements [java] Improve statement grammar Dec 15, 2019
@oowekyala oowekyala mentioned this pull request Dec 26, 2019
Merged
adangel added a commit that referenced this pull request Jan 5, 2020
@adangel
Merge branch 'pr-2190'
a0d0a22 
[java] Deprecations for statements PR

Prerequisite for #2164 for PMD 7.0.0
@oowekyala oowekyala merged commit 2da8628 into pmd:java-grammar Jan 6, 2020
@oowekyala oowekyala deleted the grammar-new-statements branch January 6, 2020 02:06
This was referenced Jan 16, 2023
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

in:ast About the AST structure or API, the parsing step

Projects

None yet

Milestone

7.0.0

Development

Successfully merging this pull request may close these issues.

1 participant

@oowekyala