Pārlūkot izejas kodu

Applied usage of __pos__ operators in some unit tests.

Taddeus Kroes 14 gadi atpakaļ
vecāks
revīzija
f5d48c9931
2 mainītis faili ar 12 papildinājumiem un 12 dzēšanām
  1. 5 5
      src/rules/negation.py
  2. 7 7
      tests/test_rules_negation.py

+ 5 - 5
src/rules/negation.py

@@ -67,7 +67,7 @@ def double_negation(root, args):
     """
     --a  ->  a
     """
-    return negate(args[0], args[0].negated - 2)
+    return args[0].reduce_negation(2)
 
 
 MESSAGES[double_negation] = _('Remove double negation in {1}.')
@@ -84,9 +84,9 @@ def match_negated_division(node):
     if a.negated and b.negated:
         return [P(node, double_negated_division, (node,))]
     elif a.negated:
-        return [P(node, single_negated_division, (a[0], b))]
+        return [P(node, single_negated_division, (+a, b))]
     elif b.negated:
-        return [P(node, single_negated_division, (a, b[0]))]
+        return [P(node, single_negated_division, (a, +b))]
 
     return []
 
@@ -111,9 +111,9 @@ def double_negated_division(root, args):
     """
     -a / -b  ->  a / b
     """
-    a, b = root
+    a, b = args[0]
 
-    return a[0] / b[0]
+    return +a / +b
 
 
 MESSAGES[double_negated_division] = \

+ 7 - 7
tests/test_rules_negation.py

@@ -14,12 +14,12 @@ class TestRulesNegation(RulesTestCase):
         l1, l2 = root = tree('-1 / 2')
         possibilities = match_negated_division(root)
         self.assertEqualPos(possibilities,
-                [P(root, single_negated_division, (l1[0], l2))])
+                [P(root, single_negated_division, (+l1, l2))])
 
         l1, l2 = root = tree('1 / -2')
         possibilities = match_negated_division(root)
         self.assertEqualPos(possibilities,
-                [P(root, single_negated_division, (l1, l2[0]))])
+                [P(root, single_negated_division, (l1, +l2))])
 
     def test_match_negated_division_double(self):
         root = tree('-1 / -2')
@@ -30,15 +30,15 @@ class TestRulesNegation(RulesTestCase):
 
     def test_single_negated_division(self):
         l1, l2 = root = tree('-1 / 2')
-        self.assertEqualNodes(single_negated_division(root, (l1[0], l2)),
-                              -(l1[0] / l2))
+        self.assertEqualNodes(single_negated_division(root, (+l1, l2)),
+                              -(+l1 / l2))
 
         l1, l2 = root = tree('1 / -2')
-        self.assertEqualNodes(single_negated_division(root, (l1, l2[0])),
-                              -(l1 / l2[0]))
+        self.assertEqualNodes(single_negated_division(root, (l1, +l2)),
+                              -(l1 / +l2))
 
     def test_double_negated_division(self):
         l1, l2 = root = tree('-1 / -2')
 
         self.assertEqualNodes(double_negated_division(root, (root,)),
-                              l1[0] / l2[0])
+                              +l1 / +l2)