Merge pull request #2 from decaf-lang/master

Merge pull request decaf-lang#6 from equation314/master
fengjixuchui · Oct 28, 2019 · 4c53028 · 4c53028
2 parents a727a5e + 0317c46
commit 4c53028
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/decaf/frontend/typecheck/Namer.java b/src/main/java/decaf/frontend/typecheck/Namer.java
@@ -217,7 +217,7 @@ public void visitMethodDef(Tree.MethodDef method, ScopeStack ctx) {
         if (earlier.isPresent()) {
             if (earlier.get().isMethodSymbol()) { // may be overriden
                 var suspect = (MethodSymbol) earlier.get();
-                if (!suspect.isStatic() && !method.isStatic()) {
+                if (suspect.domain() != ctx.currentScope() && !suspect.isStatic() && !method.isStatic()) {
                     // Only non-static methods can be overriden, but the type signature must be equivalent.
                     var formal = new FormalScope();
                     typeMethod(method, ctx, formal);