Instance functions correctly have the same uid as the class they implement

Author: Marwes

renamer.rs

@@ -97,8 +97,6 @@ impl Renamer {
         let mut names = module.dataDefinitions.iter()
             .flat_map(|data| data.constructors.iter().map(|ctor| ctor.name))
             .chain(module.newtypes.iter().map(|newtype| newtype.constructor_name))
-            .chain(module.instances.iter()
-                .flat_map(|instance| binding_groups(instance.bindings.as_slice()).map(|binds| binds[0].name)))
             .chain(module.classes.iter().flat_map(|class|
                 Some(class.name).move_iter()
                 .chain(class.declarations.iter().map(|decl| decl.name))
@@ -107,6 +105,12 @@ impl Renamer {
         for name in names {
             self.declare_global(name, uid);
         }
+        for instance in module.instances.iter() {
+            let class_uid = self.get_name(instance.classname).uid;
+            for binds in binding_groups(instance.bindings.as_slice()) {
+                self.declare_global(binds[0].name, class_uid);
+            }
+        }
     }
 
     fn rename_bindings(&mut self, bindings: ~[Binding<InternedStr>], is_global: bool) -> ~[Binding<Name>] {

vm.rs

@@ -1046,6 +1046,24 @@ main = (test (0 :: Int) 2) && not (test (1 :: Int) 0)")
         .unwrap_or_else(|err| fail!("{}", err));
     assert_eq!(result, Some(ConstructorResult(0, Vec::new())));
 }
+#[test]
+fn implement_class() {
+    let result = execute_main_string(
+r"
+import Prelude
+data AB = A | B
+
+instance Eq AB where
+    (==) A A = True
+    (==) B B = True
+    (==) _ _ = False
+
+test x y = x == y
+
+main = A == B && test A A")
+        .unwrap_or_else(|err| fail!("{}", err));
+    assert_eq!(result, Some(ConstructorResult(1, Vec::new())));
+}
 
 #[test]
 fn deriving_eq() {