Lots of fixes to gritty details of how Sass treats url().

Basically: if it looks like it's a single bare URL, only interpolations
are allowed.  Otherwise, it's expected to be a whole expression.

Handling of interpolation in barewords is much improved.

Also fixed the wrapping of SassSyntaxError.

1 files changed, 6 insertions, 2 deletions

diff --git a/yapps2.py b/yapps2.py
index e94a7b2..a732c35 100755
--- a/yapps2.py
+++ b/yapps2.py
@@ -747,7 +747,9 @@ class Scanner(object):
                 msg = "Bad Token"
                 if restrict:
                     msg = "Trying to find one of " + ", ".join(restrict)
-                raise SyntaxError("SyntaxError[@ char %s: %s]" % (repr(self.pos), msg))
+                err = SyntaxError("SyntaxError[@ char %s: %s]" % (repr(self.pos), msg))
+                err.pos = self.pos
+                raise err
 
             # If we found something that isn't to be ignored, return it
             if best_pat in self.ignore:
@@ -875,7 +877,9 @@ class Parser(object):
         """
         tok = self._scanner.token(self._pos, set([type]))
         if tok[2] != type:
-            raise SyntaxError("SyntaxError[@ char %s: %s]" % (repr(tok[0]), "Trying to find " + type))
+            err = SyntaxError("SyntaxError[@ char %s: %s]" % (repr(tok[0]), "Trying to find " + type))
+            err.pos = tok[0]
+            raise err
         self._pos += 1
         return tok[3]