From 5c88a6bc0cef8f595560377a8b28a2f5fb4bb97a Mon Sep 17 00:00:00 2001 From: Marcel Greter Date: Mon, 23 Mar 2015 20:08:56 +0100 Subject: [PATCH] Fix reported position when no token can be parsed Fixes https://github.com/sass/libsass/issues/972 --- parser.cpp | 1 + prelexer.cpp | 3 ++- prelexer.hpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/parser.cpp b/parser.cpp index d5c86c8d10..bf8efd74c0 100644 --- a/parser.cpp +++ b/parser.cpp @@ -143,6 +143,7 @@ namespace Sass { } else { lex< css_whitespace >(); + before_token = after_token; if (position >= end) break; error("invalid top-level expression", pstate); } diff --git a/prelexer.cpp b/prelexer.cpp index c95f5dea60..3937518f00 100644 --- a/prelexer.cpp +++ b/prelexer.cpp @@ -62,13 +62,14 @@ namespace Sass { return line_comment(src); } + /* not used anymore - remove? const char* wspaces(const char* src) { return alternatives< exactly<' '>, exactly<'\t'> >(src); - } + }*/ /* not used anymore - remove? const char* newline(const char* src) { diff --git a/prelexer.hpp b/prelexer.hpp index a0145bd4ff..f7d4f11c4e 100644 --- a/prelexer.hpp +++ b/prelexer.hpp @@ -261,7 +261,7 @@ namespace Sass { const char* alnums(const char* src); const char* puncts(const char* src); // Match certain white-space charactes. - const char* wspaces(const char* src); + // const char* wspaces(const char* src); // const char* newline(const char* src); // const char* whitespace(const char* src);