diff options
Diffstat (limited to 'lib/spack/external/jinja2/parser.py')
| -rw-r--r-- | lib/spack/external/jinja2/parser.py | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/lib/spack/external/jinja2/parser.py b/lib/spack/external/jinja2/parser.py index 0bf74c9459..ed00d9708e 100644 --- a/lib/spack/external/jinja2/parser.py +++ b/lib/spack/external/jinja2/parser.py @@ -176,13 +176,14 @@ class Parser(object): def parse_set(self): """Parse an assign statement.""" lineno = next(self.stream).lineno - target = self.parse_assign_target() + target = self.parse_assign_target(with_namespace=True) if self.stream.skip_if('assign'): expr = self.parse_tuple() return nodes.Assign(target, expr, lineno=lineno) + filter_node = self.parse_filter(None) body = self.parse_statements(('name:endset',), drop_needle=True) - return nodes.AssignBlock(target, body, lineno=lineno) + return nodes.AssignBlock(target, filter_node, body, lineno=lineno) def parse_for(self): """Parse a for loop.""" @@ -210,17 +211,16 @@ class Parser(object): node.test = self.parse_tuple(with_condexpr=False) node.body = self.parse_statements(('name:elif', 'name:else', 'name:endif')) + node.elif_ = [] + node.else_ = [] token = next(self.stream) if token.test('name:elif'): - new_node = nodes.If(lineno=self.stream.current.lineno) - node.else_ = [new_node] - node = new_node + node = nodes.If(lineno=self.stream.current.lineno) + result.elif_.append(node) continue elif token.test('name:else'): - node.else_ = self.parse_statements(('name:endif',), - drop_needle=True) - else: - node.else_ = [] + result.else_ = self.parse_statements(('name:endif',), + drop_needle=True) break return result @@ -334,10 +334,9 @@ class Parser(object): if parse_context() or self.stream.current.type != 'comma': break else: - break + self.stream.expect('name') if not hasattr(node, 'with_context'): node.with_context = False - self.stream.skip_if('comma') return node def parse_signature(self, node): @@ -395,15 +394,21 @@ class Parser(object): return node def parse_assign_target(self, with_tuple=True, name_only=False, - extra_end_rules=None): + extra_end_rules=None, with_namespace=False): """Parse an assignment target. As Jinja2 allows assignments to tuples, this function can parse all allowed assignment targets. Per default assignments to tuples are parsed, that can be disable however by setting `with_tuple` to `False`. If only assignments to names are wanted `name_only` can be set to `True`. The `extra_end_rules` - parameter is forwarded to the tuple parsing function. + parameter is forwarded to the tuple parsing function. If + `with_namespace` is enabled, a namespace assignment may be parsed. """ - if name_only: + if with_namespace and self.stream.look().type == 'dot': + token = self.stream.expect('name') + next(self.stream) # dot + attr = self.stream.expect('name') + target = nodes.NSRef(token.value, attr.value, lineno=token.lineno) + elif name_only: token = self.stream.expect('name') target = nodes.Name(token.value, 'store', lineno=token.lineno) else: |