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

Fix source-map bug introduces with some recent commit

Author: xzyfer

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;