small refactoring

--HG--
branch : trunk

diff --git a/examples/rwbench/rwbench.py b/examples/rwbench/rwbench.py
index 2406de2a257ba7df528fd6989e19e2f5739794f6..2483a8d2253aa43f3e9f8b8d4becacc9916a1295 100644 (file)
--- a/examples/rwbench/rwbench.py
+++ b/examples/rwbench/rwbench.py
@@ -41,8 +41,7 @@ class Article(object):
         self.title = generate_lorem_ipsum(1, False, 5, 10)
         self.user = choice(users)
         self.body = generate_lorem_ipsum()
-        self.pub_date = datetime.utcfromtimestamp(randrange(1000000000,
-                                                            2000000000))
+        self.pub_date = datetime.utcfromtimestamp(randrange(10 ** 9, 2 * 10 ** 9))
 
 
 class User(object):

diff --git a/jinja2/compiler.py b/jinja2/compiler.py
index e27ecc31baef5a6729a66e99bf73229b9ac349f7..2423787c2c2dd54984e3c766623a04051ca56c38 100644 (file)
--- a/jinja2/compiler.py
+++ b/jinja2/compiler.py
@@ -357,6 +357,19 @@ class CodeGenerator(NodeVisitor):
         self._last_identifier += 1
         return 't%d' % self._last_identifier
 
+    def buffer(self, frame):
+        """Enable buffering for the frame from that point onwards."""
+        frame.buffer = buf = self.temporary_identifier()
+        self.writeline('%s = []' % buf)
+        return buf
+
+    def return_buffer_contents(self, frame):
+        """Return the buffer contents of the frame."""
+        if self.environment.autoescape:
+            self.writeline('return Markup(concat(%s))' % frame.buffer)
+        else:
+            self.writeline('return concat(%s)' % frame.buffer)
+
     def indent(self):
         """Indent by one."""
         self._indentation += 1
@@ -748,7 +761,7 @@ class CodeGenerator(NodeVisitor):
         if frame.buffer is None:
             self.writeline('yield event')
         else:
-            self.writeline('%s.append(event)' % frame.buffer)
+            self.writeline('%s(event)' % frame.buffer)
         self.outdent()
 
     def visit_Import(self, node, frame):
@@ -839,10 +852,9 @@ class CodeGenerator(NodeVisitor):
 
         # otherwise we set up a buffer and add a function def
         else:
-            loop_frame.buffer = buf = self.temporary_identifier()
             self.writeline('def loop(reciter, loop_render_func):', node)
             self.indent()
-            self.writeline('%s = []' % buf, node)
+            self.buffer(loop_frame)
             aliases = {}
 
         self.pull_locals(loop_frame)
@@ -919,10 +931,7 @@ class CodeGenerator(NodeVisitor):
         # if the node was recursive we have to return the buffer contents
         # and start the iteration code
         if node.recursive:
-            if self.environment.autoescape:
-                self.writeline('return Markup(concat(%s))' % buf)
-            else:
-                self.writeline('return concat(%s)' % buf)
+            self.return_buffer_contents(loop_frame)
             self.outdent()
             if frame.buffer is None:
                 self.writeline('yield loop(', node)
@@ -951,15 +960,11 @@ class CodeGenerator(NodeVisitor):
         macro_frame = self.function_scoping(node, frame)
         args = macro_frame.arguments
         self.writeline('def macro(%s):' % ', '.join(args), node)
-        macro_frame.buffer = buf = self.temporary_identifier()
         self.indent()
+        self.buffer(macro_frame)
         self.pull_locals(macro_frame)
-        self.writeline('%s = []' % buf)
         self.blockvisit(node.body, macro_frame)
-        if self.environment.autoescape:
-            self.writeline('return Markup(concat(%s))' % buf)
-        else:
-            self.writeline("return concat(%s)" % buf)
+        self.return_buffer_contents(macro_frame)
         self.outdent()
         self.newline()
         if frame.toplevel:
@@ -985,15 +990,11 @@ class CodeGenerator(NodeVisitor):
                                            (exclude=('call',)))
         args = call_frame.arguments
         self.writeline('def call(%s):' % ', '.join(args), node)
-        call_frame.buffer = buf = self.temporary_identifier()
         self.indent()
         self.pull_locals(call_frame)
-        self.writeline('%s = []' % buf)
+        self.buffer(call_frame)
         self.blockvisit(node.body, call_frame)
-        if self.environment.autoescape:
-            self.writeline("return Markup(concat(%s))" % buf)
-        else:
-            self.writeline('return concat(%s)' % buf)
+        self.return_buffer_contents(call_frame)
         self.outdent()
         arg_tuple = ', '.join(repr(x.name) for x in node.args)
         if len(node.args) == 1:
@@ -1022,9 +1023,8 @@ class CodeGenerator(NodeVisitor):
 
         aliases = self.collect_shadowed(filter_frame)
         self.pull_locals(filter_frame)
-        filter_frame.buffer = buf = self.temporary_identifier()
+        self.buffer(filter_frame)
 
-        self.writeline('%s = []' % buf, node)
         for child in node.body:
             self.visit(child, filter_frame)
 
@@ -1032,7 +1032,8 @@ class CodeGenerator(NodeVisitor):
             self.writeline('yield ', node)
         else:
             self.writeline('%s.append(' % frame.buffer, node)
-        self.visit_Filter(node.filter, filter_frame, 'concat(%s)' % buf)
+        self.visit_Filter(node.filter, filter_frame, 'concat(%s)'
+                          % filter_frame.buffer)
         if frame.buffer is not None:
             self.write(')')
 
@@ -1070,9 +1071,8 @@ class CodeGenerator(NodeVisitor):
             else:
                 body.append([const])
 
-        # if we have less than 3 nodes or less than 6 and a buffer we
-        # yield or extend/append
-        if len(body) < 3 or (frame.buffer is not None and len(body) < 6):
+        # if we have less than 3 nodes or a buffer we yield or extend/append
+        if len(body) < 3 or frame.buffer is not None:
             if frame.buffer is not None:
                 # for one item we append, for more we extend
                 if len(body) == 1:
@@ -1089,7 +1089,7 @@ class CodeGenerator(NodeVisitor):
                         self.writeline(val + ', ')
                 else:
                     if frame.buffer is None:
-                        self.writeline('yield ')
+                        self.writeline('yield ', item)
                     else:
                         self.newline(item)
                     close = 1
@@ -1119,15 +1119,12 @@ class CodeGenerator(NodeVisitor):
                 else:
                     format.append('%s')
                     arguments.append(item)
-            if frame.buffer is None:
-                self.writeline('yield ')
-            else:
-                self.writeline('%s.append(' % frame.buffer)
+            self.writeline('yield ')
             self.write(repr(concat(format)) + ' % (')
             idx = -1
             self.indent()
             for argument in arguments:
-                self.newline()
+                self.newline(argument)
                 close = 0
                 if self.environment.autoescape:
                     self.write('escape(')
@@ -1139,8 +1136,6 @@ class CodeGenerator(NodeVisitor):
                 self.write(')' * close + ', ')
             self.outdent()
             self.writeline(')')
-            if frame.buffer is not None:
-                self.write(')')
 
         if outdent_later:
             self.outdent()
@@ -1187,27 +1182,9 @@ class CodeGenerator(NodeVisitor):
             frame.assigned_names.add(node.name)
         self.write('l_' + node.name)
 
-    def visit_MarkSafe(self, node, frame):
-        self.write('Markup(')
-        self.visit(node.expr, frame)
-        self.write(')')
-
-    def visit_EnvironmentAttribute(self, node, frame):
-        self.write('environment.' + node.name)
-
-    def visit_ExtensionAttribute(self, node, frame):
-        self.write('environment.extensions[%r].%s' % (node.identifier, node.attr))
-
-    def visit_ImportedName(self, node, frame):
-        self.write(self.import_aliases[node.importname])
-
-    def visit_InternalName(self, node, frame):
-        self.write(node.name)
-
     def visit_Const(self, node, frame):
         val = node.value
         if isinstance(val, float):
-            # XXX: add checks for infinity and nan
             self.write(str(val))
         else:
             self.write(repr(val))
@@ -1372,3 +1349,28 @@ class CodeGenerator(NodeVisitor):
     def visit_Keyword(self, node, frame):
         self.write(node.key + '=')
         self.visit(node.value, frame)
+
+    # Unused nodes for extensions
+
+    def visit_MarkSafe(self, node, frame):
+        self.write('Markup(')
+        self.visit(node.expr, frame)
+        self.write(')')
+
+    def visit_EnvironmentAttribute(self, node, frame):
+        self.write('environment.' + node.name)
+
+    def visit_ExtensionAttribute(self, node, frame):
+        self.write('environment.extensions[%r].%s' % (node.identifier, node.attr))
+
+    def visit_ImportedName(self, node, frame):
+        self.write(self.import_aliases[node.importname])
+
+    def visit_InternalName(self, node, frame):
+        self.write(node.name)
+
+    def visit_Continue(self, node, frame):
+        self.writeline('continue', node)
+
+    def visit_Break(self, node, frame):
+        self.writeline('break', node)

diff --git a/jinja2/environment.py b/jinja2/environment.py
index e10510cb1dae85fef52bd7521c1512217a7fe77b..54973972144317d2373327fb9bff160b0d4aa10f 100644 (file)
--- a/jinja2/environment.py
+++ b/jinja2/environment.py
@@ -337,7 +337,6 @@ class Environment(object):
         if self.optimized:
             node = optimize(source, self)
         source = generate(node, self, name, filename)
-        #print source
         if raw:
             return source
         if filename is None:

diff --git a/jinja2/nodes.py b/jinja2/nodes.py
index 1f742fad8a88ac20c81398dda3d6f2534d9a4039..960a5408005b814f4ef5f94fddc1d56082f9d59b 100644 (file)
--- a/jinja2/nodes.py
+++ b/jinja2/nodes.py
@@ -800,5 +800,13 @@ class MarkSafe(Expr):
         return Markup(self.expr.as_const())
 
 
+class Continue(Stmt):
+    """Continue a loop."""
+
+
+class Break(Stmt):
+    """Break a loop."""
+
+
 # and close down
 _node_setup_finished = True

diff --git a/jinja2/runtime.py b/jinja2/runtime.py
index 17a599695178ba624e3cefa1e1116153e5c4116b..9a61040af50e57830ccfb86ff3dd5a01ec1cdada 100644 (file)
--- a/jinja2/runtime.py
+++ b/jinja2/runtime.py
@@ -185,7 +185,7 @@ class LoopContext(object):
             len(self)
 
     def cycle(self, *args):
-        """A replacement for the old ``{% cycle %}`` tag."""
+        """Cycles among the arguments with the current loop index."""
         if not args:
             raise TypeError('no items for cycling given')
         return args[self.index0 % len(args)]
@@ -200,7 +200,7 @@ class LoopContext(object):
         return self.length
 
     def __iter__(self):
-        return self
+        return LoopContextIterator(self)
 
     def loop(self, iterable):
         if self._recurse is None:
@@ -212,16 +212,17 @@ class LoopContext(object):
     # the the loop without or with too many arguments.
     __call__ = loop; del loop
 
-    def next(self):
-        self.index0 += 1
-        return self._next(), self
-
     @property
     def length(self):
         if self._length is None:
             try:
+                # first try to get the length from the iterable (if the
+                # iterable is a sequence)
                 length = len(self._iterable)
             except TypeError:
+                # if that's not possible (ie: iterating over a generator)
+                # we have to convert the iterable into a sequence and
+                # use the length of that.
                 self._iterable = tuple(self._iterable)
                 self._next = iter(self._iterable).next
                 length = len(tuple(self._iterable)) + self.index0 + 1
@@ -236,6 +237,22 @@ class LoopContext(object):
         )
 
 
+class LoopContextIterator(object):
+    """The iterator for a loop context."""
+    __slots__ = ('context',)
+
+    def __init__(self, context):
+        self.context = context
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        ctx = self.context
+        ctx.index0 += 1
+        return ctx._next(), ctx
+
+
 class Macro(object):
     """Wraps a macro."""