Rename BlockDeclarationSectionNode to LocalDeclarationSectionNode

cirras · cirras · commit 917b975e903b · 2023-11-13T17:33:04.000+11:00
diff --git a/delphi-checks/src/main/java/au/com/integradev/delphi/checks/TooManyVariablesCheck.java b/delphi-checks/src/main/java/au/com/integradev/delphi/checks/TooManyVariablesCheck.java
@@ -21,7 +21,7 @@
 import java.util.List;
 import org.sonar.check.Rule;
 import org.sonar.check.RuleProperty;
-import org.sonar.plugins.communitydelphi.api.ast.BlockDeclarationSectionNode;
+import org.sonar.plugins.communitydelphi.api.ast.LocalDeclarationSectionNode;
 import org.sonar.plugins.communitydelphi.api.ast.RoutineImplementationNode;
 import org.sonar.plugins.communitydelphi.api.ast.VarDeclarationNode;
 import org.sonar.plugins.communitydelphi.api.ast.VarSectionNode;
@@ -55,7 +55,7 @@ public DelphiCheckContext visit(RoutineImplementationNode routine, DelphiCheckCo
 
   private static int countVariableDeclarations(RoutineImplementationNode routine) {
     int count = 0;
-    BlockDeclarationSectionNode declSection = routine.getDeclarationSection();
+    LocalDeclarationSectionNode declSection = routine.getDeclarationSection();
     if (declSection != null) {
       List<VarSectionNode> varSections = declSection.findChildrenOfType(VarSectionNode.class);
       for (VarSectionNode varSection : varSections) {
diff --git a/delphi-checks/src/main/java/au/com/integradev/delphi/checks/VariableInitializationCheck.java b/delphi-checks/src/main/java/au/com/integradev/delphi/checks/VariableInitializationCheck.java
@@ -29,7 +29,6 @@
 import org.sonar.check.Rule;
 import org.sonar.plugins.communitydelphi.api.ast.ArgumentListNode;
 import org.sonar.plugins.communitydelphi.api.ast.AssignmentStatementNode;
-import org.sonar.plugins.communitydelphi.api.ast.BlockDeclarationSectionNode;
 import org.sonar.plugins.communitydelphi.api.ast.CommonDelphiNode;
 import org.sonar.plugins.communitydelphi.api.ast.CompoundStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.ConstStatementNode;
@@ -38,6 +37,7 @@
 import org.sonar.plugins.communitydelphi.api.ast.ForLoopVarNode;
 import org.sonar.plugins.communitydelphi.api.ast.ForLoopVarReferenceNode;
 import org.sonar.plugins.communitydelphi.api.ast.ForStatementNode;
+import org.sonar.plugins.communitydelphi.api.ast.LocalDeclarationSectionNode;
 import org.sonar.plugins.communitydelphi.api.ast.NameDeclarationNode;
 import org.sonar.plugins.communitydelphi.api.ast.NameReferenceNode;
 import org.sonar.plugins.communitydelphi.api.ast.Node;
@@ -94,7 +94,7 @@ private void visitRoutine(RoutineImplementationNode routine, DelphiCheckContext
   }
 
   private void collectNestedRoutines(RoutineImplementationNode routine) {
-    BlockDeclarationSectionNode declarationSection = routine.getDeclarationSection();
+    LocalDeclarationSectionNode declarationSection = routine.getDeclarationSection();
     if (declarationSection == null) {
       return;
     }
@@ -105,7 +105,7 @@ private void collectNestedRoutines(RoutineImplementationNode routine) {
   }
 
   private void collectDeclarationsFromVarSections(RoutineImplementationNode routine) {
-    BlockDeclarationSectionNode declarationSection = routine.getDeclarationSection();
+    LocalDeclarationSectionNode declarationSection = routine.getDeclarationSection();
     if (declarationSection == null) {
       return;
     }
diff --git a/delphi-frontend/src/main/antlr3/au/com/integradev/delphi/antlr/Delphi.g b/delphi-frontend/src/main/antlr3/au/com/integradev/delphi/antlr/Delphi.g
@@ -194,9 +194,9 @@ unitInFileImport             : qualifiedNameDeclaration ('in' textLiteral)?
 //----------------------------------------------------------------------------
 // Declarations
 //----------------------------------------------------------------------------
-block                        : blockDeclSection? blockBody
+block                        : localDeclSection? blockBody
                              ;
-blockDeclSection             : declSection+ -> ^(TkBlockDeclSection<BlockDeclarationSectionNodeImpl> declSection+)
+localDeclSection             : declSection+ -> ^(TkLocalDeclarations<LocalDeclarationSectionNodeImpl> declSection+)
                              ;
 blockBody                    : compoundStatement
                              | assemblerStatement
@@ -1105,7 +1105,7 @@ TkGuid                  : 'INTERFACE_GUID'
                         ;
 TkClassParents          : 'CLASS_PARENTS'
                         ;
-TkBlockDeclSection      : 'BLOCK_DECL_SECTION'
+TkLocalDeclarations     : 'LOCAL_DECLARATIONS'
                         ;
 TkCaseItem              : 'CASE_ITEM'
                         ;
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/LocalDeclarationSectionNodeImpl.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/LocalDeclarationSectionNodeImpl.java
@@ -20,15 +20,15 @@
 
 import au.com.integradev.delphi.antlr.ast.visitors.DelphiParserVisitor;
 import org.antlr.runtime.Token;
-import org.sonar.plugins.communitydelphi.api.ast.BlockDeclarationSectionNode;
+import org.sonar.plugins.communitydelphi.api.ast.LocalDeclarationSectionNode;
 
-public final class BlockDeclarationSectionNodeImpl extends DelphiNodeImpl
-    implements BlockDeclarationSectionNode {
-  public BlockDeclarationSectionNodeImpl(Token token) {
+public final class LocalDeclarationSectionNodeImpl extends DelphiNodeImpl
+    implements LocalDeclarationSectionNode {
+  public LocalDeclarationSectionNodeImpl(Token token) {
     super(token);
   }
 
-  public BlockDeclarationSectionNodeImpl(int tokenType) {
+  public LocalDeclarationSectionNodeImpl(int tokenType) {
     super(tokenType);
   }
 
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/RoutineBodyNodeImpl.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/RoutineBodyNodeImpl.java
@@ -21,13 +21,13 @@
 import au.com.integradev.delphi.antlr.ast.visitors.DelphiParserVisitor;
 import org.antlr.runtime.Token;
 import org.sonar.plugins.communitydelphi.api.ast.AsmStatementNode;
-import org.sonar.plugins.communitydelphi.api.ast.BlockDeclarationSectionNode;
 import org.sonar.plugins.communitydelphi.api.ast.CompoundStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.DelphiNode;
+import org.sonar.plugins.communitydelphi.api.ast.LocalDeclarationSectionNode;
 import org.sonar.plugins.communitydelphi.api.ast.RoutineBodyNode;
 
 public final class RoutineBodyNodeImpl extends DelphiNodeImpl implements RoutineBodyNode {
-  private BlockDeclarationSectionNode declarationSection;
+  private LocalDeclarationSectionNode declarationSection;
   private DelphiNode block;
   private CompoundStatementNode statementBlock;
   private AsmStatementNode asmBlock;
@@ -47,13 +47,13 @@ public <T> T accept(DelphiParserVisitor<T> visitor, T data) {
 
   @Override
   public boolean hasDeclarationSection() {
-    return getChild(0) instanceof BlockDeclarationSectionNode;
+    return getChild(0) instanceof LocalDeclarationSectionNode;
   }
 
   @Override
-  public BlockDeclarationSectionNode getDeclarationSection() {
+  public LocalDeclarationSectionNode getDeclarationSection() {
     if (declarationSection == null && hasDeclarationSection()) {
-      declarationSection = (BlockDeclarationSectionNode) getChild(0);
+      declarationSection = (LocalDeclarationSectionNode) getChild(0);
     }
     return declarationSection;
   }
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/RoutineImplementationNodeImpl.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/RoutineImplementationNodeImpl.java
@@ -24,9 +24,9 @@
 import javax.annotation.Nullable;
 import org.antlr.runtime.Token;
 import org.sonar.plugins.communitydelphi.api.ast.AsmStatementNode;
-import org.sonar.plugins.communitydelphi.api.ast.BlockDeclarationSectionNode;
 import org.sonar.plugins.communitydelphi.api.ast.CompoundStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.DelphiNode;
+import org.sonar.plugins.communitydelphi.api.ast.LocalDeclarationSectionNode;
 import org.sonar.plugins.communitydelphi.api.ast.NameReferenceNode;
 import org.sonar.plugins.communitydelphi.api.ast.RoutineBodyNode;
 import org.sonar.plugins.communitydelphi.api.ast.RoutineImplementationNode;
@@ -57,7 +57,7 @@ public RoutineBodyNode getRoutineBody() {
 
   @Override
   @Nullable
-  public BlockDeclarationSectionNode getDeclarationSection() {
+  public LocalDeclarationSectionNode getDeclarationSection() {
     return fromBody(RoutineBodyNode::getDeclarationSection);
   }
 
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/visitors/DelphiParserVisitor.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/visitors/DelphiParserVisitor.java
@@ -36,7 +36,6 @@
 import org.sonar.plugins.communitydelphi.api.ast.AttributeListNode;
 import org.sonar.plugins.communitydelphi.api.ast.AttributeNode;
 import org.sonar.plugins.communitydelphi.api.ast.BinaryExpressionNode;
-import org.sonar.plugins.communitydelphi.api.ast.BlockDeclarationSectionNode;
 import org.sonar.plugins.communitydelphi.api.ast.CaseItemStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.CaseStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.ClassHelperTypeNode;
@@ -87,6 +86,7 @@
 import org.sonar.plugins.communitydelphi.api.ast.InterfaceTypeNode;
 import org.sonar.plugins.communitydelphi.api.ast.LabelStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.LibraryDeclarationNode;
+import org.sonar.plugins.communitydelphi.api.ast.LocalDeclarationSectionNode;
 import org.sonar.plugins.communitydelphi.api.ast.MethodResolutionClauseNode;
 import org.sonar.plugins.communitydelphi.api.ast.NameDeclarationListNode;
 import org.sonar.plugins.communitydelphi.api.ast.NameDeclarationNode;
@@ -191,7 +191,7 @@ default T visit(ArrayIndicesNode node, T data) {
     return visit((DelphiNode) node, data);
   }
 
-  default T visit(BlockDeclarationSectionNode node, T data) {
+  default T visit(LocalDeclarationSectionNode node, T data) {
     return visit((DelphiNode) node, data);
   }
 
diff --git a/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/ast/LocalDeclarationSectionNode.java b/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/ast/LocalDeclarationSectionNode.java
@@ -18,4 +18,4 @@
  */
 package org.sonar.plugins.communitydelphi.api.ast;
 
-public interface BlockDeclarationSectionNode extends DelphiNode {}
+public interface LocalDeclarationSectionNode extends DelphiNode {}
diff --git a/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/ast/RoutineBodyNode.java b/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/ast/RoutineBodyNode.java
@@ -21,7 +21,7 @@
 public interface RoutineBodyNode extends DelphiNode {
   boolean hasDeclarationSection();
 
-  BlockDeclarationSectionNode getDeclarationSection();
+  LocalDeclarationSectionNode getDeclarationSection();
 
   boolean hasStatementBlock();
 
diff --git a/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/ast/RoutineImplementationNode.java b/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/ast/RoutineImplementationNode.java
@@ -25,7 +25,7 @@ public interface RoutineImplementationNode extends RoutineNode {
   RoutineBodyNode getRoutineBody();
 
   @Nullable
-  BlockDeclarationSectionNode getDeclarationSection();
+  LocalDeclarationSectionNode getDeclarationSection();
 
   @Nullable
   DelphiNode getBlock();

Original file line number	Diff line number	Diff line change
`@@ -194,9 +194,9 @@ unitInFileImport : qualifiedNameDeclaration ('in' textLiteral)?`
`194`	`194`	`//----------------------------------------------------------------------------`
`195`	`195`	`// Declarations`
`196`	`196`	`//----------------------------------------------------------------------------`
`197`		`-block : blockDeclSection? blockBody`
	`197`	`+block : localDeclSection? blockBody`
`198`	`198`	`;`
`199`		`-blockDeclSection : declSection+ -> ^(TkBlockDeclSection<BlockDeclarationSectionNodeImpl> declSection+)`
	`199`	`+localDeclSection : declSection+ -> ^(TkLocalDeclarations<LocalDeclarationSectionNodeImpl> declSection+)`
`200`	`200`	`;`
`201`	`201`	`blockBody : compoundStatement`
`202`	`202`	`\| assemblerStatement`
`@@ -1105,7 +1105,7 @@ TkGuid : 'INTERFACE_GUID'`
`1105`	`1105`	`;`
`1106`	`1106`	`TkClassParents : 'CLASS_PARENTS'`
`1107`	`1107`	`;`
`1108`		`-TkBlockDeclSection : 'BLOCK_DECL_SECTION'`
	`1108`	`+TkLocalDeclarations : 'LOCAL_DECLARATIONS'`
`1109`	`1109`	`;`
`1110`	`1110`	`TkCaseItem : 'CASE_ITEM'`
`1111`	`1111`	`;`