Add source pointer to ParserState

Maybe we want to access the original source!
Should come in handy to generate better errors!

Author: mgreter

context.cpp

@@ -297,7 +297,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();

parser.cpp

@@ -213,7 +213,7 @@ namespace Sass {
               // char *srcmap = sass_import_take_srcmap(include);
               if (message) {
                 if (line == string::npos && column == string::npos) error(message, pstate);
-                else error(message, ParserState(message, Position(line, column)));
+                else error(message, ParserState(message, source, Position(line, column)));
               } else if (source) {
                 if (file) {
                   ctx.add_source(file, inc_path, source);
@@ -564,7 +564,7 @@ namespace Sass {
       sel_source_position = before_token;
     }
     if (!sel_source_position.line) sel_source_position = before_token;
-    Complex_Selector* cpx = new (ctx.mem) Complex_Selector(ParserState(path, sel_source_position), cmb, lhs, rhs);
+    Complex_Selector* cpx = new (ctx.mem) Complex_Selector(ParserState(path, source, sel_source_position), cmb, lhs, rhs);
     cpx->media_block(last_media_block);
     cpx->last_block(block_stack.back());
     if (cpx_lf) cpx->has_line_break(cpx_lf);
@@ -2184,7 +2184,7 @@ namespace Sass {
 
   void Parser::error(string msg, Position pos)
   {
-    throw Sass_Error(Sass_Error::syntax, ParserState(path, pos.line ? pos : before_token, Offset(0, 0)), msg);
+    throw Sass_Error(Sass_Error::syntax, ParserState(path, source, pos.line ? pos : before_token, Offset(0, 0)), msg);
   }
 
 }

parser.hpp

@@ -139,7 +139,7 @@ namespace Sass {
       after_token = before_token.inc(it_before_token, it_after_token);
 
       // ToDo: could probably do this incremetal on original object
-      pstate = ParserState(path, lexed, before_token, after_token - before_token);
+      pstate = ParserState(path, source, lexed, before_token, after_token - before_token);
 
       // advance internal char iterator
       return position = it_after_token;

position.cpp

@@ -94,14 +94,14 @@ namespace Sass {
   : Offset(line, column), file(file) { }
 
 
-  ParserState::ParserState(string path, const size_t file)
-  : Position(file, 0, 0), path(path), offset(0, 0), token() { }
+  ParserState::ParserState(string path, const char* src, const size_t file)
+  : Position(file, 0, 0), path(path), src(src), offset(0, 0), token() { }
 
-  ParserState::ParserState(string path, Position position, Offset offset)
-  : Position(position), path(path), offset(offset), token() { }
+  ParserState::ParserState(string path, const char* src, Position position, Offset offset)
+  : Position(position), path(path), src(src), offset(offset), token() { }
 
-  ParserState::ParserState(string path, Token token, Position position, Offset offset)
-  : Position(position), path(path), offset(offset), token(token) { }
+  ParserState::ParserState(string path, const char* src, Token token, Position position, Offset offset)
+  : Position(position), path(path), src(src), offset(offset), token(token) { }
 
   void Position::add(const char* begin, const char* end)
   {

position.hpp

@@ -99,16 +99,17 @@ namespace Sass {
   class ParserState : public Position {
 
     public: // c-tor
-      ParserState(string path, const size_t file = string::npos);
-      ParserState(string path, Position position, Offset offset = Offset(0, 0));
-      ParserState(string path, Token token, Position position, Offset offset = Offset(0, 0));
+      ParserState(string path, const char* src = 0, const size_t file = string::npos);
+      ParserState(string path, const char* src, Position position, Offset offset = Offset(0, 0));
+      ParserState(string path, const char* src, Token token, Position position, Offset offset = Offset(0, 0));
 
     public: // down casts
       Offset off() { return *this; };
       Position pos() { return *this; };
 
     public:
       string path;
+      const char* src;
       Offset offset;
       Token token;
 

sass_context.cpp

@@ -128,6 +128,7 @@ extern "C" {
     char* error_file;
     size_t error_line;
     size_t error_column;
+    const char* error_src;
 
     // report imported files
     char** included_files;
@@ -256,6 +257,7 @@ extern "C" {
       c_ctx->error_file = sass_strdup(e.pstate.path.c_str());
       c_ctx->error_line = e.pstate.line+1;
       c_ctx->error_column = e.pstate.column+1;
+      c_ctx->error_src = e.pstate.src;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
       json_delete(json_err);
@@ -406,6 +408,7 @@ extern "C" {
       c_ctx->error_message = 0;
       c_ctx->error_status = 0;
       // reset error position
+      c_ctx->error_src = 0;
       c_ctx->error_file = 0;
       c_ctx->error_line = string::npos;
       c_ctx->error_column = string::npos;
@@ -757,6 +760,7 @@ extern "C" {
   IMPLEMENT_SASS_CONTEXT_GETTER(const char*, error_file);
   IMPLEMENT_SASS_CONTEXT_GETTER(size_t, error_line);
   IMPLEMENT_SASS_CONTEXT_GETTER(size_t, error_column);
+  IMPLEMENT_SASS_CONTEXT_GETTER(const char*, error_src);
   IMPLEMENT_SASS_CONTEXT_GETTER(const char*, output_string);
   IMPLEMENT_SASS_CONTEXT_GETTER(const char*, source_map_string);
   IMPLEMENT_SASS_CONTEXT_GETTER(char**, included_files);

sass_context.h

@@ -104,6 +104,7 @@ ADDAPI const char* ADDCALL sass_context_get_error_json (struct Sass_Context* ctx
 ADDAPI const char* ADDCALL sass_context_get_error_text (struct Sass_Context* ctx);
 ADDAPI const char* ADDCALL sass_context_get_error_message (struct Sass_Context* ctx);
 ADDAPI const char* ADDCALL sass_context_get_error_file (struct Sass_Context* ctx);
+ADDAPI const char* ADDCALL sass_context_get_error_src (struct Sass_Context* ctx);
 ADDAPI size_t ADDCALL sass_context_get_error_line (struct Sass_Context* ctx);
 ADDAPI size_t ADDCALL sass_context_get_error_column (struct Sass_Context* ctx);
 ADDAPI const char* ADDCALL sass_context_get_source_map_string (struct Sass_Context* ctx);

source_map.cpp

@@ -175,9 +175,9 @@ namespace Sass {
         mappings[i].generated_position.file == pstate.file &&
         mappings[i].generated_position.line == pstate.line &&
         mappings[i].generated_position.column == pstate.column
-      ) return ParserState(pstate.path, mappings[i].original_position, pstate.offset);
+      ) return ParserState(pstate.path, pstate.src, mappings[i].original_position, pstate.offset);
     }
-    return ParserState(pstate.path, Position(-1, -1, -1), Offset(0, 0));
+    return ParserState(pstate.path, pstate.src, Position(-1, -1, -1), Offset(0, 0));
 
   }