Fix error reporting

Author: mgreter

src/debugger.hpp

@@ -321,8 +321,9 @@ inline std::string pstate_source_position(AST_Node* node)
 {
   std::stringstream str;
   SourceSpan pstate(node->pstate());
-  str << (pstate.getSrcId() == std::string::npos ? 99999999 : pstate.getSrcId())
-    << "@[" << (pstate.getLine()) << ":" << (pstate.getColumn()) << "]";
+  str << (pstate.getSrcId() == std::string::npos ? 9999999 : pstate.getSrcId())
+    << "@[" << (pstate.position.line) << ":" << (pstate.position.column) << "]"
+    << "+[" << (pstate.span.line) << ":" << (pstate.span.column) << "]";
 #ifdef DEBUG_SHARED_PTR
       str << "x" << node->getRefCount() << ""
         << " {#" << node->objId << "}"

src/scanner_string.cpp

@@ -61,6 +61,9 @@ namespace Sass {
   void StringScanner::consumedChar(uint8_t character)
   {
     switch (character) {
+    case $cr:
+      offset.column += 1;
+      break;
     case $lf:
       offset.line += 1;
       offset.column = 0;