Improve semantic analysis around label and goto statements

cirras · cirras · commit 3d44dcad7af3 · 2024-05-29T11:52:48.000+10:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **API:** `UsesClauseNode::getImports` method.
 - **API:** `InterfaceSectionNode::getUsesClause` method.
 - **API:** `ImplementationSectionNode::getUsesClause` method.
+- **API:** `LabelNameDeclaration` symbol declaration type.
+- **API:** `DelphiScope::getLabelDeclarations` method.
+- **API:** `LabelDeclarationNode` node type.
+- **API:** `LabelStatementNode::getNameReference` method.
+- **API:** `LabelStatementNode::getStatement` method.
+- **API:** `GotoStatementNode::getNameReference` method.
+
+### Changed
+
+- Improve semantic analysis around `label` and `goto` statements.
 
 ### Fixed
 
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
@@ -336,7 +336,7 @@ interfaceDecl                : constSection
                              | routineInterface
                              | attributeList
                              ;
-labelDeclSection             : LABEL (label (','!)?)+ ';'
+labelDeclSection             : LABEL<LabelDeclarationNodeImpl>^ labelNameDeclaration (',' labelNameDeclaration)* ';'
                              ;
 constSection                 : (CONST<ConstSectionNodeImpl>^ | RESOURCESTRING<ConstSectionNodeImpl>^) constDeclaration*
                              // constSection was changed at some point from "constDeclaration+" to "constDeclaration*" to cater to invalid includes
@@ -871,13 +871,14 @@ statementList                : delimitedStatements? -> ^(TkStatementList<Stateme
                              ;
 delimitedStatements          : (statement | ';')+
                              ;
-labelStatement               : label ':' statement? -> ^(TkLabelStatement<LabelStatementNodeImpl> label statement?)
+labelStatement               : {input.LA(2) == COLON}? => labelNameReference ':' statement?
+                             -> ^(TkLabelStatement<LabelStatementNodeImpl> labelNameReference ':' statement?)
                              ;
 assignmentStatement          : expression ':='<AssignmentStatementNodeImpl>^ expression
                              ;
 expressionStatement          : expression -> ^(TkExpressionStatement<ExpressionStatementNodeImpl> expression)
                              ;
-gotoStatement                : GOTO<GotoStatementNodeImpl>^ label
+gotoStatement                : GOTO<GotoStatementNodeImpl>^ labelNameReference
                              ;
 tryStatement                 : TRY<TryStatementNodeImpl>^ statementList (exceptBlock | finallyBlock) END
                              ;
@@ -998,9 +999,6 @@ keywords                     : (ABSOLUTE | ABSTRACT | AND | ALIGN | ARRAY | AS |
                              ;
 nameDeclarationList          : nameDeclaration (',' nameDeclaration)* -> ^(TkNameDeclarationList<NameDeclarationListNodeImpl> nameDeclaration (',' nameDeclaration)*)
                              ;
-label                        : ident
-                             | intNum
-                             ;
 nameDeclaration              : ident -> ^(TkNameDeclaration<SimpleNameDeclarationNodeImpl> ident)
                              ;
 genericNameDeclaration       : ident ('.' extendedIdent)* genericDefinition?
@@ -1026,6 +1024,15 @@ extendedNameReference        : extendedIdent genericArguments? ('.' extendedName
 extendedIdent                : ident
                              | keywords -> ^({changeTokenType(TkIdentifier)})
                              ;
+labelIdent                   : ident
+                             | TkIntNumber -> ^({changeTokenType(TkIdentifier)})
+                             | TkHexNumber -> ^({changeTokenType(TkIdentifier)})
+                             | TkBinaryNumber -> ^({changeTokenType(TkIdentifier)})
+                             ;
+labelNameDeclaration         : labelIdent -> ^(TkNameDeclaration<SimpleNameDeclarationNodeImpl> labelIdent)
+                             ;
+labelNameReference           : labelIdent -> ^(TkNameReference<NameReferenceNodeImpl> labelIdent)
+                             ;
 //----------------------------------------------------------------------------
 // Literals
 //----------------------------------------------------------------------------
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/GotoStatementNodeImpl.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/GotoStatementNodeImpl.java
@@ -21,6 +21,7 @@
 import au.com.integradev.delphi.antlr.ast.visitors.DelphiParserVisitor;
 import org.antlr.runtime.Token;
 import org.sonar.plugins.communitydelphi.api.ast.GotoStatementNode;
+import org.sonar.plugins.communitydelphi.api.ast.NameReferenceNode;
 
 public final class GotoStatementNodeImpl extends DelphiNodeImpl implements GotoStatementNode {
   public GotoStatementNodeImpl(Token token) {
@@ -31,4 +32,9 @@ public GotoStatementNodeImpl(Token token) {
   public <T> T accept(DelphiParserVisitor<T> visitor, T data) {
     return visitor.visit(this, data);
   }
+
+  @Override
+  public NameReferenceNode getNameReference() {
+    return (NameReferenceNode) getChild(0);
+  }
 }
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/LabelDeclarationNodeImpl.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/LabelDeclarationNodeImpl.java
@@ -0,0 +1,45 @@
+/*
+ * Sonar Delphi Plugin
+ * Copyright (C) 2024 Integrated Application Development
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+ */
+package au.com.integradev.delphi.antlr.ast.node;
+
+import au.com.integradev.delphi.antlr.ast.visitors.DelphiParserVisitor;
+import java.util.List;
+import org.antlr.runtime.Token;
+import org.sonar.plugins.communitydelphi.api.ast.LabelDeclarationNode;
+import org.sonar.plugins.communitydelphi.api.ast.NameDeclarationNode;
+
+public final class LabelDeclarationNodeImpl extends DelphiNodeImpl implements LabelDeclarationNode {
+  public LabelDeclarationNodeImpl(Token token) {
+    super(token);
+  }
+
+  public LabelDeclarationNodeImpl(int tokenType) {
+    super(tokenType);
+  }
+
+  @Override
+  public <T> T accept(DelphiParserVisitor<T> visitor, T data) {
+    return visitor.visit(this, data);
+  }
+
+  @Override
+  public List<NameDeclarationNode> getDeclarations() {
+    return findChildrenOfType(NameDeclarationNode.class);
+  }
+}
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/LabelStatementNodeImpl.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/LabelStatementNodeImpl.java
@@ -19,8 +19,11 @@
 package au.com.integradev.delphi.antlr.ast.node;
 
 import au.com.integradev.delphi.antlr.ast.visitors.DelphiParserVisitor;
+import javax.annotation.Nullable;
 import org.antlr.runtime.Token;
 import org.sonar.plugins.communitydelphi.api.ast.LabelStatementNode;
+import org.sonar.plugins.communitydelphi.api.ast.NameReferenceNode;
+import org.sonar.plugins.communitydelphi.api.ast.StatementNode;
 
 public final class LabelStatementNodeImpl extends DelphiNodeImpl implements LabelStatementNode {
   public LabelStatementNodeImpl(Token token) {
@@ -35,4 +38,15 @@ public LabelStatementNodeImpl(int tokenType) {
   public <T> T accept(DelphiParserVisitor<T> visitor, T data) {
     return visitor.visit(this, data);
   }
+
+  @Override
+  public NameReferenceNode getNameReference() {
+    return (NameReferenceNode) getChild(0);
+  }
+
+  @Override
+  @Nullable
+  public StatementNode getStatement() {
+    return (StatementNode) getChild(2);
+  }
 }
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/NameDeclarationNodeImpl.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/NameDeclarationNodeImpl.java
@@ -87,6 +87,7 @@ public enum DeclarationKind {
     IMPORT,
     INLINE_CONST,
     INLINE_VAR,
+    LABEL,
     LOOP_VAR,
     ROUTINE,
     PARAMETER,
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/SimpleNameDeclarationNodeImpl.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/SimpleNameDeclarationNodeImpl.java
@@ -19,6 +19,7 @@
 package au.com.integradev.delphi.antlr.ast.node;
 
 import au.com.integradev.delphi.antlr.ast.visitors.DelphiParserVisitor;
+import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import java.util.Objects;
 import org.antlr.runtime.Token;
@@ -29,17 +30,19 @@
 public final class SimpleNameDeclarationNodeImpl extends NameDeclarationNodeImpl
     implements SimpleNameDeclarationNode {
   private static final Map<Class<?>, DeclarationKind> PARENT_NODE_KIND_MAP =
-      Map.of(
-          ConstDeclarationNodeImpl.class, DeclarationKind.CONST,
-          ConstStatementNodeImpl.class, DeclarationKind.INLINE_CONST,
-          EnumElementNodeImpl.class, DeclarationKind.ENUM_ELEMENT,
-          ExceptItemNodeImpl.class, DeclarationKind.EXCEPT_ITEM,
-          ForLoopVarDeclarationNodeImpl.class, DeclarationKind.LOOP_VAR,
-          RoutineNameNodeImpl.class, DeclarationKind.ROUTINE,
-          PropertyNodeImpl.class, DeclarationKind.PROPERTY,
-          RecordVariantTagNodeImpl.class, DeclarationKind.RECORD_VARIANT_TAG,
-          TypeDeclarationNodeImpl.class, DeclarationKind.TYPE,
-          TypeParameterNodeImpl.class, DeclarationKind.TYPE_PARAMETER);
+      ImmutableMap.<Class<?>, DeclarationKind>builder()
+          .put(ConstDeclarationNodeImpl.class, DeclarationKind.CONST)
+          .put(ConstStatementNodeImpl.class, DeclarationKind.INLINE_CONST)
+          .put(EnumElementNodeImpl.class, DeclarationKind.ENUM_ELEMENT)
+          .put(ExceptItemNodeImpl.class, DeclarationKind.EXCEPT_ITEM)
+          .put(LabelDeclarationNodeImpl.class, DeclarationKind.LABEL)
+          .put(ForLoopVarDeclarationNodeImpl.class, DeclarationKind.LOOP_VAR)
+          .put(RoutineNameNodeImpl.class, DeclarationKind.ROUTINE)
+          .put(PropertyNodeImpl.class, DeclarationKind.PROPERTY)
+          .put(RecordVariantTagNodeImpl.class, DeclarationKind.RECORD_VARIANT_TAG)
+          .put(TypeDeclarationNodeImpl.class, DeclarationKind.TYPE)
+          .put(TypeParameterNodeImpl.class, DeclarationKind.TYPE_PARAMETER)
+          .build();
 
   private static final Map<Class<?>, DeclarationKind> GRANDPARENT_NODE_KIND_MAP =
       Map.of(
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
@@ -85,6 +85,7 @@
 import org.sonar.plugins.communitydelphi.api.ast.InterfaceGuidNode;
 import org.sonar.plugins.communitydelphi.api.ast.InterfaceSectionNode;
 import org.sonar.plugins.communitydelphi.api.ast.InterfaceTypeNode;
+import org.sonar.plugins.communitydelphi.api.ast.LabelDeclarationNode;
 import org.sonar.plugins.communitydelphi.api.ast.LabelStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.LibraryDeclarationNode;
 import org.sonar.plugins.communitydelphi.api.ast.LocalDeclarationSectionNode;
@@ -312,6 +313,10 @@ default T visit(InterfaceSectionNode node, T data) {
     return visit((DelphiNode) node, data);
   }
 
+  default T visit(LabelDeclarationNode node, T data) {
+    return visit((DelphiNode) node, data);
+  }
+
   default T visit(RoutineBodyNode node, T data) {
     return visit((DelphiNode) node, data);
   }
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/visitors/SymbolTableVisitor.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/visitors/SymbolTableVisitor.java
@@ -30,6 +30,7 @@
 import au.com.integradev.delphi.symbol.ImportResolutionHandler;
 import au.com.integradev.delphi.symbol.SymbolicNode;
 import au.com.integradev.delphi.symbol.declaration.EnumElementNameDeclarationImpl;
+import au.com.integradev.delphi.symbol.declaration.LabelNameDeclarationImpl;
 import au.com.integradev.delphi.symbol.declaration.NameDeclarationImpl;
 import au.com.integradev.delphi.symbol.declaration.PropertyNameDeclarationImpl;
 import au.com.integradev.delphi.symbol.declaration.RoutineNameDeclarationImpl;
@@ -87,10 +88,12 @@
 import org.sonar.plugins.communitydelphi.api.ast.FormalParameterNode.FormalParameterData;
 import org.sonar.plugins.communitydelphi.api.ast.GenericDefinitionNode;
 import org.sonar.plugins.communitydelphi.api.ast.GenericDefinitionNode.TypeParameter;
+import org.sonar.plugins.communitydelphi.api.ast.GotoStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.IfStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.ImplementationSectionNode;
 import org.sonar.plugins.communitydelphi.api.ast.InitializationSectionNode;
 import org.sonar.plugins.communitydelphi.api.ast.InterfaceSectionNode;
+import org.sonar.plugins.communitydelphi.api.ast.LabelDeclarationNode;
 import org.sonar.plugins.communitydelphi.api.ast.LabelStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.MethodResolutionClauseNode;
 import org.sonar.plugins.communitydelphi.api.ast.NameDeclarationNode;
@@ -354,6 +357,14 @@ public Data visit(ExceptItemNode node, Data data) {
     return visitScope(node, data);
   }
 
+  @Override
+  public Data visit(LabelDeclarationNode node, Data data) {
+    for (NameDeclarationNode declarationNode : node.getDeclarations()) {
+      data.addDeclaration(new LabelNameDeclarationImpl(declarationNode), declarationNode);
+    }
+    return DelphiParserVisitor.super.visit(node, data);
+  }
+
   @Override
   public Data visit(RoutineDeclarationNode node, Data data) {
     DeclarationScope scope = new DeclarationScopeImpl();
@@ -671,6 +682,7 @@ public Data visit(CaseItemStatementNode node, Data data) {
 
   @Override
   public Data visit(LabelStatementNode node, Data data) {
+    data.nameResolutionHelper.resolve(node.getNameReference());
     // Bizarre behavior:
     //   If a label is the first statement in a given scope (routine, local, etc.), then it
     //   doesn't get its own local scope!
@@ -778,6 +790,12 @@ public Data visit(AttributeNode node, Data data) {
     return data;
   }
 
+  @Override
+  public Data visit(GotoStatementNode node, Data data) {
+    data.nameResolutionHelper.resolve(node.getNameReference());
+    return data;
+  }
+
   @Override
   public Data visit(TypeSectionNode node, Data data) {
     DelphiParserVisitor.super.visit(node, data);
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/symbol/declaration/LabelNameDeclarationImpl.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/symbol/declaration/LabelNameDeclarationImpl.java
@@ -0,0 +1,28 @@
+/*
+ * Sonar Delphi Plugin
+ * Copyright (C) 2024 Integrated Application Development
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+ */
+package au.com.integradev.delphi.symbol.declaration;
+
+import org.sonar.plugins.communitydelphi.api.ast.NameDeclarationNode;
+import org.sonar.plugins.communitydelphi.api.symbol.declaration.LabelNameDeclaration;
+
+public class LabelNameDeclarationImpl extends NameDeclarationImpl implements LabelNameDeclaration {
+  public LabelNameDeclarationImpl(NameDeclarationNode node) {
+    super(node);
+  }
+}
diff --git a/delphi-frontend/src/main/java/au/com/integradev/delphi/symbol/scope/DelphiScopeImpl.java b/delphi-frontend/src/main/java/au/com/integradev/delphi/symbol/scope/DelphiScopeImpl.java
@@ -36,6 +36,7 @@
 import org.sonar.plugins.communitydelphi.api.symbol.Invocable;
 import org.sonar.plugins.communitydelphi.api.symbol.NameOccurrence;
 import org.sonar.plugins.communitydelphi.api.symbol.declaration.GenerifiableDeclaration;
+import org.sonar.plugins.communitydelphi.api.symbol.declaration.LabelNameDeclaration;
 import org.sonar.plugins.communitydelphi.api.symbol.declaration.NameDeclaration;
 import org.sonar.plugins.communitydelphi.api.symbol.declaration.PropertyNameDeclaration;
 import org.sonar.plugins.communitydelphi.api.symbol.declaration.RoutineDirective;
@@ -60,6 +61,7 @@ public class DelphiScopeImpl implements DelphiScope {
   private final Set<PropertyNameDeclaration> propertyDeclarations;
   private final Set<RoutineNameDeclaration> routineDeclarations;
   private final Set<VariableNameDeclaration> variableDeclarations;
+  private final Set<LabelNameDeclaration> labelDeclarations;
   private final Map<String, HelperType> helpersByType;
 
   private DelphiScope parent;
@@ -74,6 +76,7 @@ protected DelphiScopeImpl() {
     propertyDeclarations = new HashSet<>();
     routineDeclarations = new HashSet<>();
     variableDeclarations = new HashSet<>();
+    labelDeclarations = new HashSet<>();
     helpersByType = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
   }
 
@@ -105,6 +108,8 @@ private void addDeclarationByClass(NameDeclaration declaration) {
       typeDeclarations.add((TypeNameDeclaration) declaration);
     } else if (declaration instanceof UnitNameDeclaration) {
       unitDeclarations.add((UnitNameDeclaration) declaration);
+    } else if (declaration instanceof LabelNameDeclaration) {
+      labelDeclarations.add((LabelNameDeclaration) declaration);
     }
   }
 
@@ -413,4 +418,9 @@ public Set<RoutineNameDeclaration> getRoutineDeclarations() {
   public Set<VariableNameDeclaration> getVariableDeclarations() {
     return Collections.unmodifiableSet(variableDeclarations);
   }
+
+  @Override
+  public Set<LabelNameDeclaration> getLabelDeclarations() {
+    return Collections.unmodifiableSet(labelDeclarations);
+  }
 }
diff --git a/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/ast/GotoStatementNode.java b/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/ast/GotoStatementNode.java
@@ -18,4 +18,6 @@
  */
 package org.sonar.plugins.communitydelphi.api.ast;
 
-public interface GotoStatementNode extends StatementNode {}
+public interface GotoStatementNode extends StatementNode {
+  NameReferenceNode getNameReference();
+}
diff --git a/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/ast/LabelDeclarationNode.java b/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/ast/LabelDeclarationNode.java
@@ -0,0 +1,25 @@
+/*
+ * Sonar Delphi Plugin
+ * Copyright (C) 2024 Integrated Application Development
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+ */
+package org.sonar.plugins.communitydelphi.api.ast;
+
+import java.util.List;
+
+public interface LabelDeclarationNode extends DelphiNode {
+  List<NameDeclarationNode> getDeclarations();
+}
diff --git a/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/ast/LabelStatementNode.java b/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/ast/LabelStatementNode.java
diff --git a/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/symbol/declaration/LabelNameDeclaration.java b/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/symbol/declaration/LabelNameDeclaration.java
diff --git a/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/symbol/scope/DelphiScope.java b/delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/symbol/scope/DelphiScope.java
diff --git a/delphi-frontend/src/test/java/au/com/integradev/delphi/executor/DelphiSymbolTableExecutorTest.java b/delphi-frontend/src/test/java/au/com/integradev/delphi/executor/DelphiSymbolTableExecutorTest.java
diff --git a/delphi-frontend/src/test/java/au/com/integradev/delphi/symbol/scope/UnknownScopeImplTest.java b/delphi-frontend/src/test/java/au/com/integradev/delphi/symbol/scope/UnknownScopeImplTest.java
diff --git a/delphi-frontend/src/test/resources/au/com/integradev/delphi/symbol/Labels.pas b/delphi-frontend/src/test/resources/au/com/integradev/delphi/symbol/Labels.pas

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ interfaceDecl : constSection`
`336`	`336`	`\| routineInterface`
`337`	`337`	`\| attributeList`
`338`	`338`	`;`
`339`		`-labelDeclSection : LABEL (label (','!)?)+ ';'`
	`339`	`+labelDeclSection : LABEL<LabelDeclarationNodeImpl>^ labelNameDeclaration (',' labelNameDeclaration)* ';'`
`340`	`340`	`;`
`341`	`341`	`constSection : (CONST<ConstSectionNodeImpl>^ \| RESOURCESTRING<ConstSectionNodeImpl>^) constDeclaration*`
`342`	`342`	`// constSection was changed at some point from "constDeclaration+" to "constDeclaration*" to cater to invalid includes`
`@@ -871,13 +871,14 @@ statementList : delimitedStatements? -> ^(TkStatementList<Stateme`
`871`	`871`	`;`
`872`	`872`	`delimitedStatements : (statement \| ';')+`
`873`	`873`	`;`
`874`		`-labelStatement : label ':' statement? -> ^(TkLabelStatement<LabelStatementNodeImpl> label statement?)`
	`874`	`+labelStatement : {input.LA(2) == COLON}? => labelNameReference ':' statement?`
	`875`	`+ -> ^(TkLabelStatement<LabelStatementNodeImpl> labelNameReference ':' statement?)`
`875`	`876`	`;`
`876`	`877`	`assignmentStatement : expression ':='<AssignmentStatementNodeImpl>^ expression`
`877`	`878`	`;`
`878`	`879`	`expressionStatement : expression -> ^(TkExpressionStatement<ExpressionStatementNodeImpl> expression)`
`879`	`880`	`;`
`880`		`-gotoStatement : GOTO<GotoStatementNodeImpl>^ label`
	`881`	`+gotoStatement : GOTO<GotoStatementNodeImpl>^ labelNameReference`
`881`	`882`	`;`
`882`	`883`	`tryStatement : TRY<TryStatementNodeImpl>^ statementList (exceptBlock \| finallyBlock) END`
`883`	`884`	`;`
`@@ -998,9 +999,6 @@ keywords : (ABSOLUTE \| ABSTRACT \| AND \| ALIGN \| ARRAY \| AS \|`
`998`	`999`	`;`
`999`	`1000`	`nameDeclarationList : nameDeclaration (',' nameDeclaration)* -> ^(TkNameDeclarationList<NameDeclarationListNodeImpl> nameDeclaration (',' nameDeclaration)*)`
`1000`	`1001`	`;`
`1001`		`-label : ident`
`1002`		`- \| intNum`
`1003`		`- ;`
`1004`	`1002`	`nameDeclaration : ident -> ^(TkNameDeclaration<SimpleNameDeclarationNodeImpl> ident)`
`1005`	`1003`	`;`
`1006`	`1004`	`genericNameDeclaration : ident ('.' extendedIdent)* genericDefinition?`
`@@ -1026,6 +1024,15 @@ extendedNameReference : extendedIdent genericArguments? ('.' extendedName`
`1026`	`1024`	`extendedIdent : ident`
`1027`	`1025`	`\| keywords -> ^({changeTokenType(TkIdentifier)})`
`1028`	`1026`	`;`
	`1027`	`+labelIdent : ident`
	`1028`	`+ \| TkIntNumber -> ^({changeTokenType(TkIdentifier)})`
	`1029`	`+ \| TkHexNumber -> ^({changeTokenType(TkIdentifier)})`
	`1030`	`+ \| TkBinaryNumber -> ^({changeTokenType(TkIdentifier)})`
	`1031`	`+ ;`
	`1032`	`+labelNameDeclaration : labelIdent -> ^(TkNameDeclaration<SimpleNameDeclarationNodeImpl> labelIdent)`
	`1033`	`+ ;`
	`1034`	`+labelNameReference : labelIdent -> ^(TkNameReference<NameReferenceNodeImpl> labelIdent)`
	`1035`	`+ ;`
`1029`	`1036`	`//----------------------------------------------------------------------------`
`1030`	`1037`	`// Literals`
`1031`	`1038`	`//----------------------------------------------------------------------------`