Changeset 2318

Timestamp:

03/14/10 08:28:09 (2 years ago)

Author:

Chuck.Esterbrook

Message:

Added IDictionary<of TKey, TValue>.get(key as TKey, default as TValue) as TValue

Location:

cobra/trunk

Files:

• Developer/IntermediateReleaseNotes.text (modified) (1 diff)
• Source/Boxes.cobra (modified) (1 diff)
• Source/Cobra.Lang/ExtendDictionary.cobra (modified) (2 diffs)
• Tests/240-generics/100-use-generics-collections/110-use-dictionary.cobra (modified) (1 diff)

cobra/trunk/Developer/IntermediateReleaseNotes.text

@@ -64 +64 @@
 ================================================================================
 
-* Added extension methods to List<of T>. @@ expand on this
+* Added extension methods to IList<of T>. @@ expand on this
+
+* Added extension methods to IDictionary<of TKey, TValue>. @@ expand on this
 
 * Moved useful Utils methods to extension methods.  ticket:111

cobra/trunk/Source/Boxes.cobra

@@ -1557 +1557 @@
         return true
 
+    get isUninitializedForLocalVars as bool is override
+        return false  # TODO: could use a more sophisticated implementation
+
     get name as String is override
         return _name

cobra/trunk/Source/Cobra.Lang/ExtendDictionary.cobra

@@ -18 +18 @@
                 return newDict
 
+        def get(key as TKey, default as TValue) as TValue
+            """
+            Returns the value for the given key, or returns the default if the key is not found.
+            """
+            ensure not .containsKey(key) implies result == default
+            value as TValue
+            if .tryGetValue(key, out value), return value
+            else, return default
+
+
     class TestIDictionaryExtensions
 
@@ -32 +42 @@
             assert b.count == 2
             assert b['x'] == 1 and b['y'] == 2
+
+            d = {'a': 1, 'b': 2}
+            assert d.get('a', 0) == 1
+            assert d.get('c', 1) == 1

cobra/trunk/Tests/240-generics/100-use-generics-collections/110-use-dictionary.cobra

@@ -13 +13 @@
         for value1 as String in t.values
             assert value1.length
+        assert t.get('a', 'c') == 'b'
+        assert t.get('x', 'c') == 'c'
             
         u as Dictionary<of String, int> = Dictionary<of String, int>()