Changeset 1745

Timestamp:

11/07/08 21:49:39 (2 months ago)

Author:

Chuck.Esterbrook

Message:

Fixed: No warning for derived methods that are not marked "override" or "new" when the parameters differ by being nilable (String?) or not (String).
ticket:59

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/Members.cobra (modified) (1 diff)
• Tests/120-classes/720-override/110-error-for-no-override-of-overload.cobra (modified) (1 diff)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -214 +214 @@
 
 * Fixed: The error message for fixed size array syntax (`int[10]`) is misleading and uninformative. ticket:27
+
+* Fixed: No warning for derived methods that are not marked "override" or "new" when the parameters differ by being nilable (String?) or not (String). ticket:59

cobra/trunk/Source/Members.cobra

@@ -278 +278 @@
                 if params.count <> otherParams.count
                         return false
-                for i = 0 .. params.count
-                        if params[i].type <> otherParams[i].type
+                for i in params.count
+                        if not _matchesForOverride(params[i].type, otherParams[i].type)
                                 return false
                 return true
+
+        def _matchesForOverride(a as IType, b as IType) as bool
+                if a == b
+                        return true
+                if (a inherits NilableType) <> (b inherits NilableType)
+                        if a inherits NilableType, a = a.theWrappedType
+                        if b inherits NilableType, b = b.theWrappedType
+                        return a == b
+                return false
 
 

cobra/trunk/Tests/120-classes/720-override/110-error-for-no-override-of-overload.cobra

@@ -1 @@
-# .error. must specify
+class Top
 
-class Top
         def foo(i as int)
                 pass
+
         def foo(i as int, j as int)
                 pass
 
+        def equals(other as Object) as bool  # .error. Member "equals" also exists in the base class. You must specify
+                # ^ Missing ? on Object
+                return this is other
+
+
 class Bottom
         inherits Top
-        def foo(i as int)  # <--  should be error for no "is override", new or base
+
+        def foo(i as int)  # .error. must specify
                 pass
+
         def main is shared
                 pass