Merge pull request #958 from mgreter/bugfix/issue_938

Add arrow indicator to error message (sass_context)
sass · Mar 19, 2015 · bb10765 · bb10765
2 parents bbfb15e + c75bb51
commit bb10765
Show file tree

Hide file tree

Showing 15 changed files with 382 additions and 450 deletions.
diff --git a/context.cpp b/context.cpp
@@ -301,7 +301,7 @@ namespace Sass {
         0, 0
       );
       import_stack.push_back(import);
-      Parser p(Parser::from_c_str(queue[i].source, *this, ParserState(queue[i].abs_path, i)));
+      Parser p(Parser::from_c_str(queue[i].source, *this, ParserState(queue[i].abs_path, queue[i].source, i)));
       Block* ast = p.parse();
       sass_delete_import(import_stack.back());
       import_stack.pop_back();

diff --git a/error_handling.cpp b/error_handling.cpp
@@ -13,8 +13,6 @@ namespace Sass {
 
   void error(string msg, ParserState pstate, Backtrace* bt)
   {
-    if (!pstate.path.empty() && Prelexer::quoted_string(pstate.path.c_str()))
-      pstate.path = pstate.path.substr(1, pstate.path.size() - 1);
 
     Backtrace top(bt, pstate, "");
     msg += top.to_string();

diff --git a/error_handling.hpp b/error_handling.hpp
@@ -14,7 +14,6 @@ namespace Sass {
     enum Type { read, write, syntax, evaluation };
 
     Type type;
-    string path;
     ParserState pstate;
     string message;
 

diff --git a/eval.cpp b/eval.cpp
@@ -680,7 +680,7 @@ namespace Sass {
       case Textual::DIMENSION:
         result = new (ctx.mem) Number(t->pstate(),
                                       sass_atof(num.c_str()),
-                                      Token(number(text.c_str()), t->pstate()),
+                                      Token(number(text.c_str())),
                                       zero);
         break;
       case Textual::HEX: {