Correctly clone FuncTypes, fixes lotsa problems with specialization :)

ooc-lang · Jun 8, 2012 · 6a62950 · 6a62950
1 parent bf0e3e6
commit 6a62950
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 16 deletions.
diff --git a/source/rock/middle/Block.ooc b/source/rock/middle/Block.ooc
@@ -11,7 +11,7 @@ Block: class extends ControlStatement {
 
     clone: func -> This {
         copy := new(token)
-        body list each(|e| copy body add(e clone()))
+        body list each(|stat| copy body add(stat clone()))
         copy
     }
 

diff --git a/source/rock/middle/CommaSequence.ooc b/source/rock/middle/CommaSequence.ooc
@@ -13,7 +13,7 @@ CommaSequence: class extends Expression {
 
     clone: func -> This {
         copy := new(token)
-        body each(|e| copy body add(e clone()))
+        body each(|stat| copy body add(stat clone()))
         copy
     }
 

diff --git a/source/rock/middle/Foreach.ooc b/source/rock/middle/Foreach.ooc
@@ -17,7 +17,7 @@ Foreach: class extends ControlStatement {
 
     clone: func -> This {
         copy := new(variable clone(), collection clone(), token)
-        body list each(|e| copy body add(e clone()))
+        body list each(|stat| copy body add(stat clone()))
         copy
     }
 

diff --git a/source/rock/middle/FuncType.ooc b/source/rock/middle/FuncType.ooc
@@ -57,16 +57,16 @@ FuncType: class extends Type {
         for(argType in argTypes) {
             copy argTypes add(argType realTypize(call))
         }
-        copy returnType = returnType realTypize
+        copy returnType = returnType ? returnType realTypize(call) : null
         copy varArg = varArg
         copy
     }
 
     clone: func -> This {
         copy := This new(token)
-        if(typeArgs) typeArgs each(|typeArg| copy addTypeArg(typeArg))
-        copy argTypes addAll(argTypes)
-        copy returnType = returnType
+        if(typeArgs) typeArgs each(|typeArg| copy addTypeArg(typeArg clone()))
+        argTypes each(|argType| copy argTypes add(argType clone()))
+        copy returnType = returnType ? returnType clone() : null
         copy varArg = varArg
         copy
     }

diff --git a/source/rock/middle/FunctionCall.ooc b/source/rock/middle/FunctionCall.ooc
@@ -120,7 +120,7 @@ FunctionCall: class extends Expression {
     clone: func -> This {
         copy := new(expr, name, token)
         copy suffix = suffix
-        args each(|e| copy args add(e clone()))
+        args each(|arg| copy args add(arg clone()))
         copy
     }
 
@@ -145,7 +145,7 @@ FunctionCall: class extends Expression {
      * a return expression, when it's being used.
      */
     debugCondition: func -> Bool {
-        false
+        name == "falafel"
     }
 
     /**
@@ -234,6 +234,12 @@ FunctionCall: class extends Expression {
 
     resolve: func (trail: Trail, res: Resolver) -> Response {
 
+        // DEBUG code
+        if (name == "bbtrap") {
+            "Trail from trap = " println()
+            trail toString() println()
+        }
+
         if(debugCondition() || res params veryVerbose) {
             "===============================================================" println()
             "     - Resolving call to %s (ref = %s)" printfln(name, ref ? ref toString(): "(nil)")

diff --git a/source/rock/middle/Scope.ooc b/source/rock/middle/Scope.ooc
@@ -6,11 +6,11 @@ import ../frontend/[BuildParams, Token]
 
 Scope: class extends Node {
 
-	size: SSizeT {
-		get {
-			list getSize()
-		}
-	}
+    size: SSizeT {
+        get {
+            list getSize()
+        }
+    }
 
     list : ArrayList<Statement> { get set }
 
@@ -20,7 +20,7 @@ Scope: class extends Node {
 
     clone: func -> This {
         copy := new()
-        list each(|e| copy list add(e clone()))
+        list each(|stat| copy list add(stat clone()))
         copy
     }
 

diff --git a/source/rock/middle/tinker/Trail.ooc b/source/rock/middle/tinker/Trail.ooc
@@ -165,7 +165,7 @@ Trail: class extends Stack<Node> {
             for(j in 0..i) {
                 sb append("  ")
             }
-            sb append("\\_, "). append(get(i) toString()). append('\n')
+            sb append("\\_, "). append(get(i) class name). append(" | "). append(get(i) toString()). append('\n')
         }
 
         sb toString()