Detecting implicit This for static functions.

magic-lang · Mar 22, 2016 · 098a7e6 · 098a7e6
1 parent 4ff6c37
commit 098a7e6
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/source/rock/middle/TypeDecl.ooc b/source/rock/middle/TypeDecl.ooc
@@ -1383,10 +1383,13 @@ TypeDecl: abstract class extends Declaration {
         if (fDecl) {
             if (call debugCondition()) "    \\o/ Found fDecl for %s, it's %s" format(call name, fDecl toString()) println()
             if (call suggest(fDecl, res, trail)) {
-                if (fDecl hasThis() && !call getExpr()) {
-                    call setExpr(VariableAccess new("this", call token))
+                if (!call getExpr()) {
+                    if (fDecl hasThis()) {
+                        call setExpr(VariableAccess new("this", call token))
+                    }
                     if (res params explicitThis && fDecl name != "init" && fDecl name != "__defaults__") {
-                        call token printMessage("Implicit this detected for call to " + fDecl name + "!")
+                        name := fDecl hasThis() ? "this" : "This"
+                        call token printMessage("Implicit " + name + " detected for call to " + fDecl name + "!")
                     }
                 }
                 return 0
@@ -1418,7 +1421,7 @@ TypeDecl: abstract class extends Declaration {
                             name := vDecl isStatic() ? "This" : "this"
                             call setExpr(VariableAccess new(name, call token))
                             if (res params explicitThis) {
-                                call token printMessage("Implicit this detected for unresolved call to " + vDecl name + "!")
+                                call token printMessage("Implicit " + name + " detected for unresolved call to " + vDecl name + "!")
                             }
                         }
                     }