Saner function call scoring and real fix for #315

ooc-lang · Nov 17, 2012 · 188e02f · 188e02f
1 parent fb564b1
commit 188e02f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/source/rock/middle/FunctionCall.ooc b/source/rock/middle/FunctionCall.ooc
@@ -165,7 +165,7 @@ FunctionCall: class extends Expression {
         }
 
         score := getScore(candidate)
-        if(score < 0) {
+        if(score == -1) {
             if(debugCondition()) "** Score = -1! Aboort" println()
             if(res fatal) {
                 // trigger a resolve on the candidate so that it'll display a more helpful error

diff --git a/source/rock/middle/FunctionDecl.ooc b/source/rock/middle/FunctionDecl.ooc
@@ -315,6 +315,7 @@ FunctionDecl: class extends Declaration {
     getType: func -> FuncType {
         type := FuncType new(token)
         if(owner && !isStatic && !vDecl) {
+            type isClosure = true // Hack-ish way to prevent wrapping an access to a method into a closure structure
             type argTypes add(owner instanceType)
         }
         for(arg in args) {