diff options
author | German M. Bravo <german.mb@deipi.com> | 2014-07-23 10:51:44 -0500 |
---|---|---|
committer | German M. Bravo <german.mb@deipi.com> | 2014-07-23 10:51:44 -0500 |
commit | 2ef5ca62be635b3078985ecc80902c91db00e243 (patch) | |
tree | 6aa211ccda68eeedd81ac058af54699d85dc62cb | |
parent | a3da0b698b481ae014635aa305c830f720b92d65 (diff) | |
download | pyscss-2ef5ca62be635b3078985ecc80902c91db00e243.tar.gz |
Grammar was using wrong (undefined) variable.
-rw-r--r-- | scss/expression.py | 2 | ||||
-rw-r--r-- | scss/src/grammar/grammar.g | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/scss/expression.py b/scss/expression.py index 7eda216..091e554 100644 --- a/scss/expression.py +++ b/scss/expression.py @@ -912,7 +912,7 @@ class SassExpression(Parser): return Literal(String(dequote(KWQSTR), quotes='"')) elif _token_ == 'KWCOLOR': KWCOLOR = self._scan('KWCOLOR') - return Literal(Color.from_hex(COLOR, literal=True)) + return Literal(Color.from_hex(KWCOLOR, literal=True)) else: # == 'KWVAR' KWVAR = self._scan('KWVAR') return Variable(KWVAR) diff --git a/scss/src/grammar/grammar.g b/scss/src/grammar/grammar.g index 10a178c..0f94228 100644 --- a/scss/src/grammar/grammar.g +++ b/scss/src/grammar/grammar.g @@ -177,7 +177,6 @@ parser SassExpression: | COLOR {{ return Literal(Color.from_hex(COLOR, literal=True)) }} | VAR {{ return Variable(VAR) }} - rule kwatom: # nothing | KWID {{ return Literal(parse_bareword(KWID)) }} @@ -185,7 +184,7 @@ parser SassExpression: [ UNITS ] {{ return Literal(Number(float(KWNUM), unit=UNITS)) }} | KWSTR {{ return Literal(String(dequote(KWSTR), quotes="'")) }} | KWQSTR {{ return Literal(String(dequote(KWQSTR), quotes='"')) }} - | KWCOLOR {{ return Literal(Color.from_hex(COLOR, literal=True)) }} + | KWCOLOR {{ return Literal(Color.from_hex(KWCOLOR, literal=True)) }} | KWVAR {{ return Variable(KWVAR) }} %% |