diff options
| author | German M. Bravo <german.mb@deipi.com> | 2013-08-14 11:05:55 -0500 |
|---|---|---|
| committer | German M. Bravo <german.mb@deipi.com> | 2013-08-16 09:56:58 -0500 |
| commit | d92541662b4b2d1fd5c53d31c199328ca02e358d (patch) | |
| tree | ad762420bcd7087ac34bb69927a3754873471f42 | |
| parent | df0cd8c81730c40ca1ca49e26be5ea33c3ee8095 (diff) | |
| download | pyscss-d92541662b4b2d1fd5c53d31c199328ca02e358d.tar.gz | |
Optional comma at the end of the function arguments
| -rw-r--r-- | scss/src/grammar/grammar.g | 2 | ||||
| -rw-r--r-- | scss/src/grammar/grammar.py | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/scss/src/grammar/grammar.g b/scss/src/grammar/grammar.g index e1d9b8e..2e71741 100644 --- a/scss/src/grammar/grammar.g +++ b/scss/src/grammar/grammar.g @@ -82,6 +82,8 @@ parser SassExpression: | FNCT {{ v = ArgspecLiteral([]) }} LPAR [ expr_lst {{ v = expr_lst }} + [ COMMA + ] ] RPAR {{ return CallOp(FNCT, v) }} | NUM [ UNITS {{ return Literal(NumberValue(float(NUM), unit=UNITS.lower())) }} diff --git a/scss/src/grammar/grammar.py b/scss/src/grammar/grammar.py index 48aec53..8c843f9 100644 --- a/scss/src/grammar/grammar.py +++ b/scss/src/grammar/grammar.py @@ -183,11 +183,13 @@ class SassExpression(Parser): if self._peek(self.atom_rsts) != 'RPAR': expr_lst = self.expr_lst() v = expr_lst + if self._peek(self.atom_rsts_) == 'COMMA': + COMMA = self._scan('COMMA') RPAR = self._scan('RPAR') return CallOp(FNCT, v) elif _token_ == 'NUM': NUM = self._scan('NUM') - if self._peek(self.atom_rsts_) == 'UNITS': + if self._peek(self.atom_rsts__) == 'UNITS': UNITS = self._scan('UNITS') return Literal(NumberValue(float(NUM), unit=UNITS.lower())) return Literal(NumberValue(float(NUM))) @@ -235,6 +237,7 @@ class SassExpression(Parser): m_expr_chks = set(['MUL', 'DIV']) comparison_rsts = set(['LPAR', 'QSTR', 'RPAR', 'BANG_IMPORTANT', 'LE', 'COLOR', 'NE', 'LT', 'NUM', 'COMMA', 'GT', 'END', 'SIGN', 'ADD', 'FNCT', 'STR', 'VAR', 'EQ', 'ID', 'AND', 'GE', 'NOT', 'OR']) atom_rsts = set(['LPAR', 'BANG_IMPORTANT', 'COLOR', 'QSTR', 'SIGN', 'NOT', 'ADD', 'NUM', 'FNCT', 'STR', 'VAR', 'RPAR', 'ID']) + atom_rsts__ = set(['LPAR', 'SUB', 'QSTR', 'RPAR', 'VAR', 'MUL', 'DIV', 'BANG_IMPORTANT', 'LE', 'COLOR', 'NE', 'LT', 'NUM', 'COMMA', 'GT', 'END', 'SIGN', 'GE', 'FNCT', 'STR', 'UNITS', 'EQ', 'ID', 'AND', 'ADD', 'NOT', 'OR']) u_expr_chks = set(['LPAR', 'COLOR', 'QSTR', 'NUM', 'FNCT', 'STR', 'VAR', 'BANG_IMPORTANT', 'ID']) m_expr_rsts = set(['LPAR', 'SUB', 'QSTR', 'RPAR', 'MUL', 'DIV', 'BANG_IMPORTANT', 'LE', 'COLOR', 'NE', 'LT', 'NUM', 'COMMA', 'GT', 'END', 'SIGN', 'GE', 'FNCT', 'STR', 'VAR', 'EQ', 'ID', 'AND', 'ADD', 'NOT', 'OR']) expr_lst_rsts = set(['END', 'COMMA', 'RPAR']) @@ -243,7 +246,7 @@ class SassExpression(Parser): expr_rsts = set(['LPAR', 'RPAR', 'END', 'COLOR', 'QSTR', 'SIGN', 'VAR', 'ADD', 'NUM', 'COMMA', 'FNCT', 'STR', 'NOT', 'ID', 'BANG_IMPORTANT', 'OR']) expr_item_rsts = set(['LPAR', 'COLOR', 'QSTR', 'SIGN', 'NOT', 'ADD', 'NUM', 'FNCT', 'STR', 'VAR', 'BANG_IMPORTANT', 'ID']) not_expr_rsts = set(['LPAR', 'COLOR', 'QSTR', 'SIGN', 'VAR', 'ADD', 'NUM', 'FNCT', 'STR', 'NOT', 'BANG_IMPORTANT', 'ID']) - atom_rsts_ = set(['LPAR', 'SUB', 'QSTR', 'RPAR', 'VAR', 'MUL', 'DIV', 'BANG_IMPORTANT', 'LE', 'COLOR', 'NE', 'LT', 'NUM', 'COMMA', 'GT', 'END', 'SIGN', 'GE', 'FNCT', 'STR', 'UNITS', 'EQ', 'ID', 'AND', 'ADD', 'NOT', 'OR']) + atom_rsts_ = set(['COMMA', 'RPAR']) comparison_chks = set(['GT', 'GE', 'NE', 'LT', 'LE', 'EQ']) a_expr_chks = set(['ADD', 'SUB']) a_expr_rsts = set(['LPAR', 'SUB', 'QSTR', 'RPAR', 'BANG_IMPORTANT', 'LE', 'COLOR', 'NE', 'LT', 'NUM', 'COMMA', 'GT', 'END', 'SIGN', 'GE', 'FNCT', 'STR', 'VAR', 'EQ', 'ID', 'AND', 'ADD', 'NOT', 'OR']) |