Merge pull request #1510 from mgreter/bugfix/source-map-lex-back

Fix source-map bug introduces with some recent commit
sass · Sep 1, 2015 · 702ac5a · 702ac5a
2 parents 9ed6324 + b0fa00e
commit 702ac5a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/parser.hpp b/src/parser.hpp
@@ -168,15 +168,21 @@ namespace Sass {
       Token prev = lexed;
       // store previous pointer
       const char* oldpos = position;
+      Position bt = before_token;
+      Position at = after_token;
+      ParserState op = pstate;
       // throw away comments
       // update srcmap position
       lex < Prelexer::css_comments >();
       // now lex a new token
       const char* pos = lex< mx >();
       // maybe restore prev state
       if (pos == 0) {
+        pstate = op;
         lexed = prev;
         position = oldpos;
+        after_token = at;
+        before_token = bt;
       }
       // return match
       return pos;