Refactor and unify IncompatibleUnits exception

Author: mgreter

src/ast.cpp

@@ -1867,7 +1867,7 @@ namespace Sass {
     // maybe convert to other unit
     // easier implemented on its own
     try { convert(prefered, strict); }
-    catch (incompatibleUnits& err)
+    catch (Exception::IncompatibleUnits& err)
     { error(err.what(), pstate()); }
     catch (...) { throw; }
 

src/error_handling.cpp

@@ -111,7 +111,6 @@ namespace Sass {
     }
 
     IncompatibleUnits::IncompatibleUnits(const Number& lhs, const Number& rhs)
-    : lhs(lhs), rhs(rhs)
     {
       msg  = "Incompatible units: '";
       msg += rhs.unit();
@@ -120,6 +119,15 @@ namespace Sass {
       msg += "'.";
     }
 
+    IncompatibleUnits::IncompatibleUnits(const UnitType lhs, const UnitType rhs)
+    {
+      msg  = "Incompatible units: '";
+      msg += unit_to_string(rhs);
+      msg += "' and '";
+      msg += unit_to_string(lhs);
+      msg += "'.";
+    }
+
     AlphaChannelsNotEqual::AlphaChannelsNotEqual(Expression_Ptr_Const lhs, Expression_Ptr_Const rhs, const std::string& op)
     : lhs(lhs), rhs(rhs), op(op)
     {

src/error_handling.hpp

@@ -5,6 +5,8 @@
 #include <sstream>
 #include <stdexcept>
 #include "position.hpp"
+#include "ast_fwd_decl.hpp"
+#include "sass/functions.h"
 
 namespace Sass {
 
@@ -136,10 +138,11 @@ namespace Sass {
 
     class IncompatibleUnits : public OperationError {
       protected:
-        const Number& lhs;
-        const Number& rhs;
+        // const Sass::UnitType lhs;
+        // const Sass::UnitType rhs;
       public:
         IncompatibleUnits(const Number& lhs, const Number& rhs);
+        IncompatibleUnits(const UnitType lhs, const UnitType rhs);
         virtual ~IncompatibleUnits() throw() {};
     };
 

src/units.cpp

@@ -1,6 +1,7 @@
 #include "sass.hpp"
 #include <stdexcept>
 #include "units.hpp"
+#include "error_handling.hpp"
 
 namespace Sass {
 
@@ -177,7 +178,7 @@ namespace Sass {
     size_t i2 = u2 - t2;
     // error if units are not of the same group
     // don't error for multiplication and division
-    if (strict && t1 != t2) throw incompatibleUnits(u1, u2);
+    if (strict && t1 != t2) throw Exception::IncompatibleUnits(u1, u2);
     // only process known units
     if (u1 != UNKNOWN && u2 != UNKNOWN) {
       switch (t1) {

src/units.hpp

@@ -66,27 +66,6 @@ namespace Sass {
   // throws incompatibleUnits exceptions
   double conversion_factor(const std::string&, const std::string&, bool = true);
 
-  class incompatibleUnits: public std::exception
-  {
-    public:
-      const char* msg;
-      incompatibleUnits(Sass::UnitType a, Sass::UnitType b)
-      : exception()
-      {
-        std::stringstream ss;
-        ss << "Incompatible units: ";
-        ss << "'" << unit_to_string(a) << "' and ";
-        ss << "'" << unit_to_string(b) << "'";
-        // hold on to string on stack!
-        std::string str(ss.str());
-        msg = str.c_str();
-      }
-      virtual const char* what() const throw()
-      {
-        return msg;
-      }
-  };
-
 }
 
 #endif