Derived types with functions taking functypes as arguments: Eliminate…

…d TODO. Closes #275. Thank you for reporting!
ooc-lang · Feb 5, 2011 · 0bbda31 · 0bbda31
1 parent 413d0f5
commit 0bbda31
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/source/rock/middle/FunctionDecl.ooc b/source/rock/middle/FunctionDecl.ooc
@@ -473,12 +473,16 @@ FunctionDecl: class extends Declaration {
                     if(debugCondition()) "Got -1 from finalScore!" println()
                     return Response OK
                 }
+                parentArgs := parent args getSize()
                 // todo: check for finalScore
                 for(i in 0..args getSize()) {
                     arg := args[i]
                     if(arg getType() instanceOf?(FuncType)) {
                         fType1 := arg getType() as FuncType
-                        // TODO: add check 1) number of argument 2) it's a FuncType
+                        // check 1) number of argument 2) it's a FuncType
+                        if(parentArgs <= i || !parent args[i] getType() instanceOf?(FuncType)) {
+                            break
+                        }
                         fType2 := parent args[i] getType() as FuncType
 
                         //"for %s, got %s vs %s" printfln(toString(), fType1 toString(), fType2 toString())