Changeset 1603

Timestamp:

08/28/08 07:30:27 (3 months ago)

Author:

Chuck.Esterbrook

Message:

Fix a bug in extended initializers regarding passing nil where a strongly typed argument is expected.

Location:

cobra/trunk

Files:

• Source/Expr.cobra (modified) (1 diff)
• Tests/120-classes/320-construct-prop-set.cobra (modified) (2 diffs)

cobra/trunk/Source/Expr.cobra

@@ -1491 +1491 @@
                                 arg = arg.right
                         else
-                                argsForInitCall.add(IdentifierExpr(token.copy('ID', 'arg[i]')))
+                                argsForInitCall.add(if(arg inherits NilLiteral, arg, IdentifierExpr(token.copy('ID', 'arg[i]'))))
                         paramsForDecl.add(Param(box.token.copy('ID', 'arg[i]'), arg.type))
                         i += 1

cobra/trunk/Tests/120-classes/320-construct-prop-set.cobra

@@ -19 +19 @@
                 assert s.b == 'b'
 
+                t = Thing(nil, data=5)  # test passing nil to a strongly typed arg
+                assert t.data == 5
+
+
 class Stuff
 
@@ -33 +37 @@
         
         pro b from var
+
+
+class Thing
+
+        var _data as dynamic?
+
+        def init(s as Stuff?)
+                pass
+
+        pro data from var