Merge pull request #1069 from mgreter/feature/restore-token-on-fail

Improve `lex_css` to restore old token on non-match
sass · Apr 11, 2015 · 0dd6543 · 0dd6543
2 parents 72bebed + 8330a1a
commit 0dd6543
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/parser.hpp b/parser.hpp
@@ -165,11 +165,17 @@ namespace Sass {
     template <prelexer mx>
     const char* lex_css()
     {
+      // copy old token
+      Token prev = lexed;
       // throw away comments
       // update srcmap position
       lex < css_comments >();
-      // now lex a token
-      return lex< mx >();
+      // now lex a new token
+      const char* pos = lex< mx >();
+      // maybe restore prev token
+      if (pos == 0) lexed = prev;
+      // return match
+      return pos;
     }
 
     // all block comments will be skipped and thrown away