Merge pull request #1874 from mgreter/bugfix/issue_1807

Improve error handling API (always return formatted json)

Author: mgreter

src/error_handling.cpp

@@ -71,7 +71,7 @@ namespace Sass {
     }
 
     DuplicateKeyError::DuplicateKeyError(const Map& dup, const Expression& org)
-    : dup(dup), org(org)
+    : Base(org.pstate()), dup(dup), org(org)
     {
       msg  = "Duplicate key ";
       dup.get_duplicate_key()->is_delayed(false);
@@ -82,7 +82,7 @@ namespace Sass {
     }
 
     TypeMismatch::TypeMismatch(const Expression& var, const std::string type)
-    : var(var), type(type)
+    : Base(var.pstate()), var(var), type(type)
     {
       msg  = var.to_string();
       msg += " is not an ";

src/error_handling.hpp

@@ -86,23 +86,23 @@ namespace Sass {
         virtual ~ZeroDivisionError() throw() {};
     };
 
-    class DuplicateKeyError : public OperationError {
+    class DuplicateKeyError : public Base {
       protected:
         const Map& dup;
         const Expression& org;
       public:
         DuplicateKeyError(const Map& dup, const Expression& org);
-        virtual const char* errtype() const { return "DuplicateKeyError"; }
+        virtual const char* errtype() const { return "Error"; }
         virtual ~DuplicateKeyError() throw() {};
     };
 
-    class TypeMismatch : public OperationError {
+    class TypeMismatch : public Base {
       protected:
         const Expression& var;
         const std::string type;
       public:
         TypeMismatch(const Expression& var, const std::string type);
-        virtual const char* errtype() const { return "TypeMismatch"; }
+        virtual const char* errtype() const { return "Error"; }
         virtual ~TypeMismatch() throw() {};
     };
 

src/sass_context.cpp

@@ -123,6 +123,7 @@ extern "C" {
       msg_stream << "Unable to allocate memory: " << ba.what() << std::endl;
       json_append_member(json_err, "status", json_mknumber(2));
       json_append_member(json_err, "message", json_mkstring(ba.what()));
+      json_append_member(json_err, "formatted", json_mkstring(msg_stream.str().c_str()));
       c_ctx->error_json = json_stringify(json_err, "  ");;
       c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_text = sass_strdup(ba.what());
@@ -134,9 +135,10 @@ extern "C" {
     catch (std::exception& e) {
       std::stringstream msg_stream;
       JsonNode* json_err = json_mkobject();
-      msg_stream << "Error: " << e.what() << std::endl;
+      msg_stream << "Internal Error: " << e.what() << std::endl;
       json_append_member(json_err, "status", json_mknumber(3));
       json_append_member(json_err, "message", json_mkstring(e.what()));
+      json_append_member(json_err, "formatted", json_mkstring(msg_stream.str().c_str()));
       c_ctx->error_json = json_stringify(json_err, "  ");;
       c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_text = sass_strdup(e.what());
@@ -148,9 +150,10 @@ extern "C" {
     catch (std::string& e) {
       std::stringstream msg_stream;
       JsonNode* json_err = json_mkobject();
-      msg_stream << "Error: " << e << std::endl;
+      msg_stream << "Internal Error: " << e << std::endl;
       json_append_member(json_err, "status", json_mknumber(4));
       json_append_member(json_err, "message", json_mkstring(e.c_str()));
+      json_append_member(json_err, "formatted", json_mkstring(msg_stream.str().c_str()));
       c_ctx->error_json = json_stringify(json_err, "  ");;
       c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_text = sass_strdup(e.c_str());
@@ -162,9 +165,10 @@ extern "C" {
     catch (const char* e) {
       std::stringstream msg_stream;
       JsonNode* json_err = json_mkobject();
-      msg_stream << "Error: " << e << std::endl;
+      msg_stream << "Internal Error: " << e << std::endl;
       json_append_member(json_err, "status", json_mknumber(4));
       json_append_member(json_err, "message", json_mkstring(e));
+      json_append_member(json_err, "formatted", json_mkstring(msg_stream.str().c_str()));
       c_ctx->error_json = json_stringify(json_err, "  ");;
       c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
       c_ctx->error_text = sass_strdup(e);