Changeset 1713

Timestamp:

10/29/08 01:21:51 (2 months ago)

Author:

Chuck.Esterbrook

Message:

Minor improvs.
Make BoxVar? use Expr.canBeAssignedTo rather that Expr.isKindOf for consistency with AssignExpr?.bindImp's behavior.
Also change the error message to be identical; again for consistency.
Add a test case.

Location:

cobra/trunk

Files:

• Source/Members.cobra (modified) (3 diffs)
• Source/Vars.cobra (modified) (1 diff)
• Tests/120-classes/220-fields-error-incompatible-expr.cobra (added)

cobra/trunk/Source/Members.cobra

@@ -397 +397 @@
         def addRefFields is override
                 base.addRefFields
-                if _type
-                        .addField('type', _type)
-                else
-                        .addField('typeNode', _typeNode)
+                if _type, .addField('type', _type)
+                else, .addField('typeNode', _typeNode)
 
         def addSubFields is override
@@ -434 +432 @@
                                                 node.doNotPopIfInheritsStack
                                                 count -= 1
-                                                if count == 0
-                                                        break                                           
+                                                if count == 0, break                                            
                         return true
                 else
@@ -449 +446 @@
                         if _type is nil
                                 _type = _initExpr.type
-                        else if not _initExpr.isKindOf(_type to !)
-                                .throwError('The expression type of [_initExpr.type.name] does not match the variable type of [_type.name].')
+                        else if not _initExpr.canBeAssignedTo(_type to !)
+                                .throwError('Incompatible types. Cannot assign value of type [_initExpr.type.name] on the right to [_type.name] on the left.')
 
         get resultType as IType is override

cobra/trunk/Source/Vars.cobra

@@ -114 +114 @@
                                                 node.doNotPopIfInheritsStack
                                                 count -= 1
-                                                if count == 0
-                                                        break
+                                                if count == 0, break
                         return true
                 else