summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerman M. Bravo <german.mb@deipi.com>2013-08-17 20:16:41 -0500
committerGerman M. Bravo <german.mb@deipi.com>2013-08-17 20:16:41 -0500
commit67bc8eadab35c9a45c4e634c6eb54164126f0883 (patch)
tree695ea9d74c6132b26903acb6a8602ae121889800
parent193747342784c991a97de028a50704ac555a9e74 (diff)
downloadpyscss-67bc8eadab35c9a45c4e634c6eb54164126f0883.tar.gz
Parentheses for maps too
-rw-r--r--scss/expression.py4
-rw-r--r--scss/src/grammar/grammar.g4
2 files changed, 4 insertions, 4 deletions
diff --git a/scss/expression.py b/scss/expression.py
index 904db9d..869550a 100644
--- a/scss/expression.py
+++ b/scss/expression.py
@@ -743,9 +743,9 @@ class SassExpression(Parser):
v = expr_map
else: # in self.argspec_item_chks
expr_lst = self.expr_lst()
- v = Parentheses(expr_lst)
+ v = expr_lst
RPAR = self._scan('RPAR')
- return v
+ return Parentheses(v)
elif _token_ == 'FNCT':
FNCT = self._scan('FNCT')
argspec = ArgspecLiteral([])
diff --git a/scss/src/grammar/grammar.g b/scss/src/grammar/grammar.g
index b3009ad..1da3f46 100644
--- a/scss/src/grammar/grammar.g
+++ b/scss/src/grammar/grammar.g
@@ -118,8 +118,8 @@ parser SassExpression:
rule atom: LPAR (
expr_map {{ v = expr_map }}
- | expr_lst {{ v = Parentheses(expr_lst) }}
- ) RPAR {{ return v }}
+ | expr_lst {{ v = expr_lst }}
+ ) RPAR {{ return Parentheses(v) }}
| FNCT {{ argspec = ArgspecLiteral([]) }}
LPAR [ argspec ] RPAR {{ return CallOp(FNCT, argspec) }}
| BANG_IMPORTANT {{ return Literal(String(BANG_IMPORTANT, quotes=None)) }}