Changeset 9

Timestamp:

12/08/04 12:38:48 (4 years ago)

Author:

steve

Message:

loop counter variables

Files:

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

trunk/airspeed.py

@@ -160 +160 @@
-    def evaluate(self, output_stream, namespace):
-        values = self.eval_expression(self.expression, namespace)
+        counter = 1
-        for value in values:
-            local_namespace = BlockEvaluator.LocalNamespace(namespace)
-            local_namespace[self.iter_var] = value
+            local_namespace['velocityCount'] = counter
-            BlockEvaluator.evaluate(self, output_stream, local_namespace)
+            counter += 1
-
-

trunk/airspeed_test.py

@@ -103 +103 @@
-        self.assertEquals("Hello to Chris Steve. Goodbye to Chris Steve. ", template.merge(namespace))
-
+    def test_loop_counter_variable_available_in_loops(self):
+        template = airspeed.Template("#foreach ($word in $greetings)$velocityCount,#end")
+        namespace = {"greetings": ["Hello", "Goodbye"]}
+        self.assertEquals("1,2,", template.merge(namespace))
+
+    def test_loop_counter_variables_do_not_clash_in_nested_loops(self):
+        template = airspeed.Template("#foreach ($word in $greetings)outer $velocityCount#foreach ($word in $names), inner $velocityCount#end. #end")
+        namespace = {"greetings": ["Hello", "Goodbye"], "names": ["Chris", "Steve"]}
+        self.assertEquals("outer 1, inner 1, inner 2. outer 2, inner 1, inner 2. ", template.merge(namespace))
-
-