From b0fa00eccc59f573633212ad0b8f5684752108f3 Mon Sep 17 00:00:00 2001
From: Marcel Greter <marcel.greter@ocbnet.ch>
Date: Tue, 1 Sep 2015 03:43:40 +0200
Subject: [PATCH] Fix source-map bug introduces with some recent commit

Also revert all other states when backing up the lexer!
---
 src/parser.hpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/parser.hpp b/src/parser.hpp
index ba020648bc..00ad690f95 100644
--- a/src/parser.hpp
+++ b/src/parser.hpp
@@ -168,6 +168,9 @@ 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 >();
@@ -175,8 +178,11 @@ namespace Sass {
       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;