Fixed issue#6 (is vs ==)

santinic · Nov 28, 2018 · 63a98d8 · 63a98d8
1 parent 5eecad3
commit 63a98d8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/pampy/pampy.py b/pampy/pampy.py
@@ -30,7 +30,9 @@ def match_value(pattern, value) -> Tuple[bool, List]:
     if value is PaddedValue:
         return False, []
     elif isinstance(pattern, ValueType):
-        return pattern is value, []
+        eq = pattern == value
+        type_eq = type(pattern) == type(value)
+        return eq and type_eq, []
     elif pattern is None:
         return value is None, []
     elif isinstance(pattern, type):

diff --git a/tests/test_basic.py b/tests/test_basic.py
@@ -28,13 +28,21 @@ def test_match_value_None(self):
     def test_match_None(self):
         self.assertEqual(match(None, None, 'None', _, 'else'), 'None')
 
-    def test_equality_comparison_should_be_strict(self):
+    def test_equality_comparison_should_not_be_strict(self):
         self.assertEqual(match_value(1, True), (False, []))
         self.assertEqual(match_value(0, False), (False, []))
         self.assertEqual(match_value(1.0, 1), (False, []))
         self.assertEqual(match_value(0.0, 0), (False, []))
         self.assertEqual(match_value(1.0, 1), (False, []))
 
+    def test_match_value_is_vs_equal(self):
+        a = 'x' * 1000000
+        b = 'x' * 1000000
+        self.assertEqual(a, b)
+        self.assertFalse(a is b)
+        self.assertEqual(match_value(a, b), (True, []))
+        self.assertEqual(match(a, b, True), True)
+
     def test_match_value_var_extraction(self):
         self.assertEqual(match_value(3, 3), (True, []))
         self.assertEqual(match_value(_, 3), (True, [3]))
@@ -129,4 +137,5 @@ def what_is(pet):
                 _, "something else"
             )
 
-        self.assertEqual(what_is('my-fuffy-cat'), 'fuffy-cat')
+        self.assertEqual(what_is('my-fuffy-cat'), 'fuffy-cat')
+
diff --git a/tests/test_elaborate.py b/tests/test_elaborate.py
@@ -70,6 +70,7 @@ def lisp(exp):
         self.assertEqual(lisp((plus, 1, 2)), 3)
         self.assertEqual(lisp((plus, 1, (minus, 4, 2))), 3)
         self.assertEqual(lisp((reduce, plus, (1, 2, 3))), 6)
+        self.assertEqual(lisp((reduce, plus, (range, 10))), 45)
 
     def test_myzip(self):
         def myzip(a, b):