Disambiguate index property stored methods correctly

When a property has an `index` specifier, its `stored` specifier must be
a function with a single `Integer` argument.

Author: fourls

delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/visitors/SymbolTableVisitor.java

@@ -103,6 +103,7 @@
 import org.sonar.plugins.communitydelphi.api.ast.PrimaryExpressionNode;
 import org.sonar.plugins.communitydelphi.api.ast.ProcedureTypeHeadingNode;
 import org.sonar.plugins.communitydelphi.api.ast.PropertyNode;
+import org.sonar.plugins.communitydelphi.api.ast.PropertyStoredSpecifierNode;
 import org.sonar.plugins.communitydelphi.api.ast.RecordTypeNode;
 import org.sonar.plugins.communitydelphi.api.ast.RecordVariantTagNode;
 import org.sonar.plugins.communitydelphi.api.ast.RepeatStatementNode;
@@ -517,6 +518,12 @@ public Data visit(PropertyNode node, Data data) {
     return createDeclarationScope(node, data);
   }
 
+  @Override
+  public Data visit(PropertyStoredSpecifierNode node, Data data) {
+    // Already resolved by the PropertyNode visit.
+    return data;
+  }
+
   @Nullable
   private static PropertyNameDeclaration findConcretePropertyDeclaration(PropertyNode property) {
     if (!property.getType().isUnknown()) {

delphi-frontend/src/main/java/au/com/integradev/delphi/symbol/resolve/NameResolutionHelper.java

@@ -32,6 +32,7 @@
 import au.com.integradev.delphi.symbol.scope.RoutineScopeImpl;
 import au.com.integradev.delphi.type.generic.TypeParameterTypeImpl;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -56,6 +57,7 @@
 import org.sonar.plugins.communitydelphi.api.ast.PropertyImplementsSpecifierNode;
 import org.sonar.plugins.communitydelphi.api.ast.PropertyNode;
 import org.sonar.plugins.communitydelphi.api.ast.PropertyReadSpecifierNode;
+import org.sonar.plugins.communitydelphi.api.ast.PropertyStoredSpecifierNode;
 import org.sonar.plugins.communitydelphi.api.ast.PropertyWriteSpecifierNode;
 import org.sonar.plugins.communitydelphi.api.ast.RecordExpressionItemNode;
 import org.sonar.plugins.communitydelphi.api.ast.RoutineDeclarationNode;
@@ -269,6 +271,16 @@ public void resolve(PropertyNode property) {
     if (impl != null) {
       impl.getTypeReferences().stream().map(TypeReferenceNode::getNameNode).forEach(this::resolve);
     }
+
+    PropertyStoredSpecifierNode stored = property.getStoredSpecifier();
+    if (stored != null && stored.getExpression() instanceof PrimaryExpressionNode) {
+      NameResolver storedResolver = createNameResolver();
+      storedResolver.readPrimaryExpression((PrimaryExpressionNode) stored.getExpression());
+      if (isResolvingRoutine(storedResolver)) {
+        storedResolver.disambiguateParameters(getStorageParameterTypes(property));
+      }
+      storedResolver.addToSymbolTable();
+    }
   }
 
   private List<Type> getGetterParameterTypes(PropertyNode property) {
@@ -290,6 +302,14 @@ private List<Type> getSetterParameterTypes(PropertyNode property) {
     return parameterTypes;
   }
 
+  private List<Type> getStorageParameterTypes(PropertyNode property) {
+    if (property.getIndexSpecifier() != null) {
+      return List.of(typeFactory.getIntrinsic(IntrinsicType.INTEGER));
+    } else {
+      return Collections.emptyList();
+    }
+  }
+
   public void resolve(RoutineDeclarationNode routine) {
     resolveRoutine(routine);
   }

delphi-frontend/src/test/java/au/com/integradev/delphi/executor/DelphiSymbolTableExecutorTest.java

@@ -119,9 +119,11 @@ void testProperties() {
     // Alias getter
     verifyUsages(17, 13, reference(22, 33));
     // Index getter
-    verifyUsages(29, 13, reference(32, 41));
+    verifyUsages(29, 13, reference(33, 41));
     // Index setter
-    verifyUsages(30, 14, reference(32, 58));
+    verifyUsages(30, 14, reference(33, 58));
+    // Index storage
+    verifyUsages(31, 13, reference(33, 76));
   }
 
   @Test

delphi-frontend/src/test/resources/au/com/integradev/delphi/symbol/Properties.pas

@@ -28,8 +28,9 @@   TIndexObj = class(TObject)
 
     function GetMyField(Index: Integer): TObject;
     procedure SetMyField(Index: Integer; Value: TObject);
+    function IsStored(Index: Integer): Boolean;
   public
-    property Prop1: TObject index 0 read GetMyField write SetMyField;
+    property Prop1: TObject index 0 read GetMyField write SetMyField stored IsStored;
   end;
 
 implementation