Changeset 48

Timestamp:

15/09/05 10:01:39 (3 years ago)

Author:

steve

Message:

Add ! unary operator

Files:

• trunk/airspeed.py (modified) (2 diffs)
• trunk/airspeed_test.py (modified) (1 diff)

trunk/airspeed.py

@@ -319 +319 @@
-class Value(_Element):
-    def parse(self):
-
+, UnaryOperatorValue
-
-    def calculate(self, namespace, loader):
@@ -449 +449 @@
-
-
+class UnaryOperatorValue(_Element):
+    UNARY_OP = re.compile(r'\s*(!)\s*(.*)$', re.S)
+    OPERATORS = {'!': operator.__not__}
+    def parse(self):
+        op_string, = self.identity_match(self.UNARY_OP)
+        self.value = self.next_element(Value)
+        self.op = self.OPERATORS[op_string]
+
+    def calculate(self, namespace, loader):
+        return self.op(self.value.calculate(namespace, loader))
+
+
-class Condition(_Element):
-    START = re.compile(r'\(\s*(.*)$', re.S)

trunk/airspeed_test.py

@@ -332 +332 @@
-        self.assertEquals('', template.merge({'value': False}))
-        self.assertEquals('yes', template.merge({'value': True}))
+
+    def test_logical_negation_operator(self):
+        template = airspeed.Template('#if ( !$value )yes#end')
+        self.assertEquals('yes', template.merge({'value': False}))
+        self.assertEquals('', template.merge({'value': True}))
+
+    def test_compound_binary_and_unary_operators(self):
+        template = airspeed.Template('#if ( !$value1 && !$value2 )yes#end')
+        self.assertEquals('', template.merge({'value1': False, 'value2': True}))
+        self.assertEquals('', template.merge({'value1': True, 'value2': False}))
+        self.assertEquals('', template.merge({'value1': True, 'value2': True}))
+        self.assertEquals('yes', template.merge({'value1': False, 'value2': False}))
-
-    def test_cannot_define_macro_to_override_reserved_statements(self):