Fix dict+set tests

coolreader18 · coolreader18 · commit 6095557fb864 · 2020-09-21T10:55:15.000-05:00
diff --git a/vm/src/obj/objdict.rs b/vm/src/obj/objdict.rs
@@ -157,16 +157,20 @@ impl PyDict {
         item: bool,
         vm: &VirtualMachine,
     ) -> PyResult<PyComparisonValue> {
+        if op == PyComparisonOp::Ne {
+            return Self::inner_cmp(zelf, other, PyComparisonOp::Eq, item, vm)
+                .map(|x| x.map(|eq| !eq));
+        }
         if !op.eval_ord(zelf.len().cmp(&other.len())) {
             return Ok(Implemented(false));
         }
-        let (zelf, other) = if zelf.len() < other.len() {
+        let (superset, subset) = if zelf.len() < other.len() {
             (other, zelf)
         } else {
             (zelf, other)
         };
-        for (k, v1) in other {
-            match zelf.get_item_option(k, vm)? {
+        for (k, v1) in subset {
+            match superset.get_item_option(k, vm)? {
                 Some(v2) => {
                     if v1.is(&v2) {
                         continue;
@@ -421,11 +425,8 @@ impl Comparable for PyDict {
         vm: &VirtualMachine,
     ) -> PyResult<PyComparisonValue> {
         op.eq_only(|| {
-            if let Ok(other) = other.downcast::<PyDict>() {
-                Self::inner_cmp(zelf, other, PyComparisonOp::Eq, true, vm)
-            } else {
-                Ok(PyComparisonValue::NotImplemented)
-            }
+            let other = class_or_notimplemented!(Self, other);
+            Self::inner_cmp(zelf, other, PyComparisonOp::Eq, true, vm)
         })
     }
 }
diff --git a/vm/src/obj/objset.rs b/vm/src/obj/objset.rs
@@ -112,6 +112,9 @@ impl PySetInner {
         op: PyComparisonOp,
         vm: &VirtualMachine,
     ) -> PyResult<bool> {
+        if op == PyComparisonOp::Ne {
+            return self.compare(other, PyComparisonOp::Eq, vm).map(|eq| !eq);
+        }
         if !op.eval_ord(self.len().cmp(&other.len())) {
             return Ok(false);
         }
