fix override check

wurstscript · Feb 13, 2020 · b20a0b3 · b20a0b3
1 parent 9cc999d
commit b20a0b3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/...eeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/AttrFunctionSignature.java b/...eeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/AttrFunctionSignature.java
@@ -47,6 +47,7 @@ private static FunctionSignature filterSigs(
             return candidates.get(0);
         }
 
+        sigs = candidates;
         candidates = filterByIfNotDefinedAnnotation(candidates);
         if (candidates.isEmpty()) {
             // parameters match for no element, just return the first signature
@@ -55,6 +56,7 @@ private static FunctionSignature filterSigs(
             return candidates.get(0);
         }
 
+        sigs = candidates;
         candidates = filterByHasTypeClasses(candidates);
         if (candidates.isEmpty()) {
             // parameters match for no element, just return the first signature
@@ -64,7 +66,6 @@ private static FunctionSignature filterSigs(
         }
 
 
-
         if (argTypes.stream().noneMatch(t -> t instanceof WurstTypeUnknown)) {
             // only show overloading error, if type for all arguments could be determined
             StringBuilder alternatives = new StringBuilder();

diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/AttrPos.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/AttrPos.java
@@ -85,6 +85,10 @@ public static WPos getErrorPos(Element e) {
         return e.attrSource();
     }
 
+    public static WPos getErrorPos(InstanceDecl e) {
+        return e.getImplementedInterface().attrErrorPos();
+    }
+
     public static WPos getErrorPos(SomeSuperConstructorCall e) {
         return e.getKeywordSource();
     }

diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/validation/WurstValidator.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/validation/WurstValidator.java
@@ -1786,7 +1786,11 @@ public void case_FuncDef(FuncDef f) {
                             }
                         }
                     } else {
-                        check(VisibilityPublic.class, Annotation.class);
+                        if (isInInstanceDecl(f)) {
+                            check(VisibilityPublic.class, Annotation.class, ModOverride.class);
+                        } else {
+                            check(VisibilityPublic.class, Annotation.class);
+                        }
                     }
                     if (f.attrIsCompiletime()) {
                         if (f.getParameters().size() > 0) {
@@ -1860,6 +1864,17 @@ public void case_InstanceDecl(InstanceDecl instanceDecl) {
         }
     }
 
+    private boolean isInInstanceDecl(FuncDef f) {
+        Element e = f;
+        while (e != null) {
+            if (e instanceof InstanceDecl) {
+                return true;
+            }
+            e = e.getParent();
+        }
+        return false;
+    }
+
     private static String printMod(Class<? extends Modifier> c) {
         String name = c.getName().toLowerCase();
         name = name.replaceFirst("^.*\\.", "");