Changeset 53

Timestamp:

02/02/06 22:04:52 (2 years ago)

Author:

steve

Message:

Add the modulus operator (fixes #10)

Files:

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

trunk/airspeed.py

@@ -27 +27 @@
-    operator.__eq__ = lambda a, b: a == b
-    operator.__ne__ = lambda a, b: a != b
+    operator.mod = lambda a, b: a % b
-try:
-    basestring
@@ -450 +451 @@
-
-class BinaryOperator(_Element):
-
+%|
-    OPERATORS = {'>' : operator.__gt__, '>=': operator.__ge__,
-                 '<' : operator.__lt__, '<=': operator.__le__,
-                 '==': operator.__eq__, '!=': operator.__ne__,
+                 '%' : operator.mod,
-                 '||': lambda a,b : boolean_value(a) or boolean_value(b),
-                 '&&': lambda a,b : boolean_value(a) and boolean_value(b)}

trunk/airspeed_test.py

@@ -531 +531 @@
-        self.assertEquals('works', template.merge({}, loader=Loader()))
-
+    def test_modulus_operator(self):
+        template = airspeed.Template('#set( $modulus = ($value % 2) )$modulus')
+        self.assertEquals('1', template.merge({'value': 3}))
+
-
-#
@@ -536 +540 @@
-#
-#  Report locations for template errors in strings
-
+ (requires operator precedence)
-#  Gobbling up whitespace (tricky!)
-#  Bind #macro calls at compile time?
@@ -544 +548 @@
-#  Q. What is scope of #set ($customer.Name = 'john')  ???
-#  Scope of #set across if/elseif/else?
-#  Scope of namespace for #parse etc
-#
-