aboutsummaryrefslogtreecommitdiffstats
path: root/lib/mako/lexer.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2006-11-18 00:55:14 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2006-11-18 00:55:14 +0000
commit7eac34bd827a82074cd45b285da8c9ca13d0d8b5 (patch)
treef617d36be2720397385b2df477df937e06a2a68e /lib/mako/lexer.py
parent6bacfd878a539655beea0ef354202cc9b0837337 (diff)
downloadexternal_python_mako-7eac34bd827a82074cd45b285da8c9ca13d0d8b5.tar.gz
external_python_mako-7eac34bd827a82074cd45b285da8c9ca13d0d8b5.tar.bz2
external_python_mako-7eac34bd827a82074cd45b285da8c9ca13d0d8b5.zip
adding TemplateNode as lead parsetree value
Diffstat (limited to 'lib/mako/lexer.py')
-rw-r--r--lib/mako/lexer.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mako/lexer.py b/lib/mako/lexer.py
index 64309bb..d1664cb 100644
--- a/lib/mako/lexer.py
+++ b/lib/mako/lexer.py
@@ -1,11 +1,11 @@
import re
from mako import parsetree, exceptions
-from mako.util import adjust_whitespace
+from mako.pygen import adjust_whitespace
class Lexer(object):
def __init__(self, text):
self.text = text
- self.nodes = []
+ self.template = parsetree.TemplateNode()
self.matched_lineno = 1
self.matched_charpos = 0
self.lineno = 1
@@ -47,7 +47,7 @@ class Lexer(object):
if len(self.tag):
self.tag[-1].nodes.append(node)
else:
- self.nodes.append(node)
+ self.template.nodes.append(node)
if isinstance(node, parsetree.Tag):
self.tag.append(node)
elif isinstance(node, parsetree.ControlLine):
@@ -86,7 +86,7 @@ class Lexer(object):
if len(self.tag):
raise exceptions.SyntaxException("Unclosed tag: <%%%s>" % self.tag[-1].keyword, self.matched_lineno, self.matched_charpos)
- return self.nodes
+ return self.template
def match_tag_start(self):
match = self.match(r'''\<%(\w+)\s+(.+?["'])?\s*(/)?>''', re.I | re.S )