Changeset 30

Timestamp:

23/08/04 15:51:52 (4 years ago)

Author:

steve

Message:

array literals

Files:

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

trunk/airspeed.py

@@ -46 +46 @@
-        if len(got) > 40:
-            got = got[:36] + ' ...'
-, got: %s ..." % (self.line, self.column, expected
+ in %s, got: %s ..." % (self.line, self.column, expected, self.element_name()
-
-    def get_position_strings(self):
@@ -57 +57 @@
-        caret_pos = self.column
-        return [error_line, ' ' * (caret_pos - 1) + '^']
+
+    def element_name(self):
+        return re.sub('([A-Z])', lambda m: ' ' + m.group(1).lower(), self.element.__class__.__name__).strip()
-
-
@@ -230 +233 @@
-
-
-Literal
-\[[ \t]*(\-?\d+)[ \t]*\.\.[ \t]*(\-?\d+)[ \t]*\]
+
+(\-?\d+)[ \t]*\.\.[ \t]*(\-?\d+)
-
-    def parse(self):
@@ -242 +245 @@
-
-
+class ValueList(_Element):
+    COMMA = re.compile(r'\s*,\s*(.*)$', re.S)
+
+    def parse(self):
+        self.values = []
+        try: value = self.next_element(Value)
+        except NoMatch:
+            pass
+        else:
+            self.values.append(value)
+            while self.optional_match(self.COMMA):
+                value = self.require_next_element(Value, 'value')
+                self.values.append(value)
+
+    def calculate(self, namespace):
+        for value in self.values:
+            yield value.calculate(namespace)
+
+
+class _EmptyValues:
+    def calculate(self, namespace):
+        return []
+
+
+class ArrayLiteral(_Element):
+    START = re.compile(r'\[[ \t]*(.*)$')
+    END = re.compile(r'[ \t]*\](.*)$')
+    values = _EmptyValues()
+
+    def parse(self):
+        self.identity_match(self.START)
+        try:
+            self.values = self.next_element((Range, ValueList))
+        except NoMatch:
+            pass
+        self.require_match(self.END, ']')
+        self.calculate = self.values.calculate
+
+
-class Value(_Element):
-    def parse(self):
-Range
+Array
-
-    def calculate(self, namespace):
@@ -273 +315 @@
-            return None ## TODO: an explicit 'not found' exception?
-        if self.parameters is not None:
-
-
+
-        return result
-
@@ -308 +349 @@
-class ParameterList(_Element):
-    START = re.compile(r'\(\s*(.*)$', re.S)
+    COMMA = re.compile(r'\s*,\s*(.*)$', re.S)
-    END = re.compile(r'\s*\)(.*)$', re.S)
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        self.require_match(self.END, ')')
+
+    def calculate(self, namespace):
+        return self.values.calculate(namespace)
-
-

trunk/airspeed_test.py

@@ -377 +377 @@
-        self.assertEquals('2,1,0,-1,-2,', template.merge({}))
-
-not_available
+are_not_available_in_context
-        template = airspeed.Template('#macro(tryme)$values#end#tryme()')
-        self.assertEquals('$values', template.merge({}))
+
+    def test_array_literal(self):
+        template = airspeed.Template('#set($values = ["Hello ", $person, ", your lucky number is ", 7])#foreach($value in $values)$value#end')
+        self.assertEquals('Hello Chris, your lucky number is 7', template.merge({'person': 'Chris'}))
+
+    def test_nested_array_literals(self):
+        template = airspeed.Template('#set($values = [["Hello ", "Steve"], ["Hello", " Chris"]])#foreach($pair in $values)#foreach($word in $pair)$word#end. #end')
+        self.assertEquals('Hello Steve. Hello Chris. ', template.merge({}))
-
-#
@@ -386 +394 @@
-#  Math expressions
-#  Gobbling up whitespace (tricky!)
-#  range literals
-#  list literals
-#  Bind #macro calls at compile time?
-#  #stop ?
-
+ -- what about \$ etc?
-#  Directives inside string literals
-#  map literals