collect all methods

Author: FelixAnthonisen

src/main/java/io/github/bldl/astParsing/AstManipulator.java

@@ -181,18 +181,16 @@ public static String appendPackageDeclaration(String existing, String toAppend)
     private Map<String, Map<Integer, Type>> collectMethodParams(CompilationUnit cu, ClassData classData) {
         Map<String, Map<Integer, Type>> methodParams = new HashMap<>();
         cu.findAll(MethodDeclaration.class).forEach(dec -> {
+            String methodName = dec.getNameAsString();
+            if (methodParams.containsKey(methodName)) {
+                messager.printMessage(Kind.ERROR, "Duplicate methods inside a class. Can't handle polymorphism.");
+                return;
+            }
+            methodParams.put(methodName, new HashMap<>());
             NodeList<Parameter> params = dec.getParameters();
             for (int i = 0; i < params.size(); ++i) {
-                Parameter param = params.get(i);
-                if (!(param.getType() instanceof ClassOrInterfaceType))
-                    continue;
-                ClassOrInterfaceType type = ((ClassOrInterfaceType) param.getType());
-                String methodName = dec.getNameAsString();
-                if (type.getNameAsString().equals(classData.className())) {
-                    methodParams.putIfAbsent(methodName, new HashMap<>());
-                    methodParams.get(methodName).put(i,
-                            type);
-                }
+                Type type = params.get(i).getType();
+                methodParams.get(methodName).put(i, type);
             }
         });
         return methodParams;

src/main/java/io/github/bldl/astParsing/visitors/SubtypingCheckVisitor.java

@@ -38,25 +38,16 @@ public SubtypingCheckVisitor(Map<String, Map<Integer, Type>> methodParams,
 
     public void visit(MethodCallExpr methodCall, Void arg) {
         super.visit(methodCall, arg);
-        if (!methodParams.containsKey(methodCall.getNameAsString())) {
-            messager.printMessage(Kind.NOTE, "Don't have key for method: " + methodCall.getNameAsString());
+        if (!methodParams.containsKey(methodCall.getNameAsString()))
             return;
-        }
         // ResolvedMethodDeclaration methodDeclaration = methodCall.resolve();
         for (int i = 0; i < methodCall.getArguments().size(); ++i) {
-            try {
-                ResolvedType argumentType = methodCall.getArgument(i).calculateResolvedType(),
-                        parameterType = methodParams.get(methodCall.getNameAsString()).get(i).resolve();
-                if (!argumentType.isReferenceType() || !parameterType.isReferenceType())
-                    continue;
-                boolean valid = isValidSubtype(parameterType, argumentType);
-                if (!valid)
-                    messager.printMessage(Kind.ERROR,
-                            String.format("Invalid subtype for method call: %s", methodCall.toString()));
-            } catch (Exception e) {
-                messager.printMessage(Kind.NOTE, methodCall.getArguments().toString());
-                messager.printMessage(Kind.NOTE, methodParams.get(methodCall.getNameAsString()).toString());
-            }
+            ResolvedType argumentType = methodCall.getArgument(i).calculateResolvedType(),
+                    parameterType = methodParams.get(methodCall.getNameAsString()).get(i).resolve();
+            boolean valid = isValidSubtype(parameterType, argumentType);
+            if (!valid)
+                messager.printMessage(Kind.ERROR,
+                        String.format("Invalid subtype for method call: %s", methodCall.toString()));
         }
     }