Ticket #54: infer-hashTable-enumType.patch

Source/Compiler.cobra

@@ -1227 +1227 @@
     def enumeratorOfType as Box
         return _libraryBox('System.Collections.Generic.IEnumerator<of>')
 
+    def dictEnumeratorType as Box
+        return _libraryBox('System.Collections.IDictionaryEnumerator')
+        
     def collectionType as Box
         return _libraryBox('System.Collections.ICollection')
 

Source/Boxes.cobra

@@ -437 +437 @@
                 rt = rt.memberForName('current').resultType
                 return rt
             else
+                if rt.isDescendantOf(.compiler.dictEnumeratorType)
+                    return rt.memberForName('entry').resultType
                 if rt.isDescendantOf(.compiler.enumeratorType)
                     return rt.memberForName('current').resultType
                 else

Tests/400-misc-bugs/220-infer-hashTable-enumerator.cobra

@@ +1 @@
+#Test inference of DictionaryEntry from Hashtable enumerator
+class HTBug
+    def main is shared
+        .testHTEnumerator   
+        .testKeyValDecompose    
+        
+    def testHTEnumerator is shared
+        ht = Hashtable()
+        ht['a'] = 'value1'
+        ht['b'] = 'value2'
+        ht['c'] = 'value3'
+        for de in ht
+            assert de.getType == System.Collections.DictionaryEntry.getType
+            #print de.key, de.value
+            assert de.key in ['a', 'b', 'c']
+            assert de.value in ['value1', 'value2', 'value3']       
+
+        ht1 = Hashtable()
+        ht1['x'] = 'Xvalue1'
+        ht1['y'] = 'Xvalue2'
+        ht1['z'] = 'Xvalue3'
+        for de1 in ht1
+            assert de1.key in ['x', 'y', 'z']
+            assert de1.value in ['Xvalue1', 'Xvalue2', 'Xvalue3']       
+            
+        for de in ht1
+            assert de.key in ['x', 'y', 'z']
+            assert de.value in ['Xvalue1', 'Xvalue2', 'Xvalue3']        
+            
+
+    def testKeyValDecompose is shared       
+        ht=Hashtable()
+        ht['a'] = 'value1'
+        ht['b'] = 'value2'
+        ht['c'] = 'value3'
+        for k,v in ht
+            assert k in ['a', 'b', 'c']
+            assert v in ['value1', 'value2', 'value3']      

Tests/320-misc-two/810-multi-assignment/220-multi-arg-for-dict.cobra

@@ -76 +76 @@
         gdict['c'] = 'w'
         assert gdict['a'] == 'z'
         
-        for dev in gdict
-            de = dev to DictionaryEntry # necessary casting
+        for de in gdict
             k, v = [de.key, de.value]
             assert k in ['a', 'b', 'c']
             assert v in ['z', 'y', 'w']
             
-        # this not work till HashTable enumerator type inference implemented
-/#      for k, v in gdict
+        for k, v in gdict
             assert k in ['a', 'b', 'c']
             assert v in ['z', 'y', 'w']
-#/          
+            

Developer/IntermediateReleaseNotes.text

@@ -175 +175 @@
 * Fixed: CobraCore.exePath uses `Assembly.getExecutingAssembly` when it should be using `Assembly.getEntryAssembly` instead. This reveals itself when using -embed-run-time:no.
 
 * Fixed: Reading enums with non-int32 storage types (such as uint32 and uint64) causes an exception in the compiler.
+
+* Fixed: A for statement iterating over a Hashtable didnt infer the enumerator type (DictionaryEntry) correctly. ticket:54