sassc 1.11.4 → 1.12.0

data/ext/libsass/src/error_handling.hpp

@@ -5,6 +5,9 @@
 #include <sstream>
 #include <stdexcept>
 #include "position.hpp"
+#include "backtrace.hpp"
+#include "ast_fwd_decl.hpp"
+#include "sass/functions.h"
 
 namespace Sass {
 
@@ -15,6 +18,7 @@ namespace Sass {
     const std::string def_msg = "Invalid sass detected";
     const std::string def_op_msg = "Undefined operation";
     const std::string def_op_null_msg = "Invalid null operation";
+    const std::string def_nesting_limit = "Code too deeply neested";
 
     class Base : public std::runtime_error {
       protected:
@@ -22,9 +26,9 @@ namespace Sass {
         std::string prefix;
       public:
         ParserState pstate;
-        std::vector<Sass_Import_Entry>* import_stack;
+        Backtraces traces;
       public:
-        Base(ParserState pstate, std::string msg = def_msg, std::vector<Sass_Import_Entry>* import_stack = 0);
+        Base(ParserState pstate, std::string msg, Backtraces traces);
         virtual const char* errtype() const { return prefix.c_str(); }
         virtual const char* what() const throw() { return msg.c_str(); }
         virtual ~Base() throw() {};
@@ -32,7 +36,7 @@ namespace Sass {
 
     class InvalidSass : public Base {
       public:
-        InvalidSass(ParserState pstate, std::string msg);
+        InvalidSass(ParserState pstate, Backtraces traces, std::string msg);
         virtual ~InvalidSass() throw() {};
     };
 
@@ -41,7 +45,7 @@ namespace Sass {
         Selector_Ptr parent;
         Selector_Ptr selector;
       public:
-        InvalidParent(Selector_Ptr parent, Selector_Ptr selector);
+        InvalidParent(Selector_Ptr parent, Backtraces traces, Selector_Ptr selector);
         virtual ~InvalidParent() throw() {};
     };
 
@@ -51,7 +55,7 @@ namespace Sass {
         std::string arg;
         std::string fntype;
       public:
-        MissingArgument(ParserState pstate, std::string fn, std::string arg, std::string fntype);
+        MissingArgument(ParserState pstate, Backtraces traces, std::string fn, std::string arg, std::string fntype);
         virtual ~MissingArgument() throw() {};
     };
 
@@ -62,38 +66,29 @@ namespace Sass {
         std::string type;
         const Value_Ptr value;
       public:
-        InvalidArgumentType(ParserState pstate, std::string fn, std::string arg, std::string type, const Value_Ptr value = 0);
+        InvalidArgumentType(ParserState pstate, Backtraces traces, std::string fn, std::string arg, std::string type, const Value_Ptr value = 0);
         virtual ~InvalidArgumentType() throw() {};
     };
 
-    class InvalidSyntax : public Base {
+    class InvalidVarKwdType : public Base {
+      protected:
+        std::string name;
+        const Argument_Ptr arg;
       public:
-        InvalidSyntax(ParserState pstate, std::string msg, std::vector<Sass_Import_Entry>* import_stack = 0);
-        virtual ~InvalidSyntax() throw() {};
+        InvalidVarKwdType(ParserState pstate, Backtraces traces, std::string name, const Argument_Ptr arg = 0);
+        virtual ~InvalidVarKwdType() throw() {};
     };
 
-    /* common virtual base class (has no pstate) */
-    class OperationError : public std::runtime_error {
-      protected:
-        std::string msg;
-      public:
-        OperationError(std::string msg = def_op_msg)
-        : std::runtime_error(msg), msg(msg)
-        {};
+    class InvalidSyntax : public Base {
       public:
-        virtual const char* errtype() const { return "Error"; }
-        virtual const char* what() const throw() { return msg.c_str(); }
-        virtual ~OperationError() throw() {};
+        InvalidSyntax(ParserState pstate, Backtraces traces, std::string msg);
+        virtual ~InvalidSyntax() throw() {};
     };
 
-    class ZeroDivisionError : public OperationError {
-      protected:
-        const Expression& lhs;
-        const Expression& rhs;
+    class NestingLimitError : public Base {
       public:
-        ZeroDivisionError(const Expression& lhs, const Expression& rhs);
-        virtual const char* errtype() const { return "ZeroDivisionError"; }
-        virtual ~ZeroDivisionError() throw() {};
+        NestingLimitError(ParserState pstate, Backtraces traces, std::string msg = def_nesting_limit);
+        virtual ~NestingLimitError() throw() {};
     };
 
     class DuplicateKeyError : public Base {
@@ -101,7 +96,7 @@ namespace Sass {
         const Map& dup;
         const Expression& org;
       public:
-        DuplicateKeyError(const Map& dup, const Expression& org);
+        DuplicateKeyError(Backtraces traces, const Map& dup, const Expression& org);
         virtual const char* errtype() const { return "Error"; }
         virtual ~DuplicateKeyError() throw() {};
     };
@@ -111,7 +106,7 @@ namespace Sass {
         const Expression& var;
         const std::string type;
       public:
-        TypeMismatch(const Expression& var, const std::string type);
+        TypeMismatch(Backtraces traces, const Expression& var, const std::string type);
         virtual const char* errtype() const { return "Error"; }
         virtual ~TypeMismatch() throw() {};
     };
@@ -120,7 +115,7 @@ namespace Sass {
       protected:
         const Expression& val;
       public:
-        InvalidValue(const Expression& val);
+        InvalidValue(Backtraces traces, const Expression& val);
         virtual const char* errtype() const { return "Error"; }
         virtual ~InvalidValue() throw() {};
     };
@@ -129,17 +124,42 @@ namespace Sass {
       protected:
         const AST_Node& node;
       public:
-        StackError(const AST_Node& node);
+        StackError(Backtraces traces, const AST_Node& node);
         virtual const char* errtype() const { return "SystemStackError"; }
         virtual ~StackError() throw() {};
     };
 
+    /* common virtual base class (has no pstate or trace) */
+    class OperationError : public std::runtime_error {
+      protected:
+        std::string msg;
+      public:
+        OperationError(std::string msg = def_op_msg)
+        : std::runtime_error(msg), msg(msg)
+        {};
+      public:
+        virtual const char* errtype() const { return "Error"; }
+        virtual const char* what() const throw() { return msg.c_str(); }
+        virtual ~OperationError() throw() {};
+    };
+
+    class ZeroDivisionError : public OperationError {
+      protected:
+        const Expression& lhs;
+        const Expression& rhs;
+      public:
+        ZeroDivisionError(const Expression& lhs, const Expression& rhs);
+        virtual const char* errtype() const { return "ZeroDivisionError"; }
+        virtual ~ZeroDivisionError() throw() {};
+    };
+
     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 Units& lhs, const Units& rhs);
+        IncompatibleUnits(const UnitType lhs, const UnitType rhs);
         virtual ~IncompatibleUnits() throw() {};
     };
 
@@ -147,16 +167,16 @@ namespace Sass {
       protected:
         Expression_Ptr_Const lhs;
         Expression_Ptr_Const rhs;
-        const std::string op;
+        const Sass_OP op;
       public:
-        UndefinedOperation(Expression_Ptr_Const lhs, Expression_Ptr_Const rhs, const std::string& op);
+        UndefinedOperation(Expression_Ptr_Const lhs, Expression_Ptr_Const rhs, enum Sass_OP op);
         // virtual const char* errtype() const { return "Error"; }
         virtual ~UndefinedOperation() throw() {};
     };
 
     class InvalidNullOperation : public UndefinedOperation {
       public:
-        InvalidNullOperation(Expression_Ptr_Const lhs, Expression_Ptr_Const rhs, const std::string& op);
+        InvalidNullOperation(Expression_Ptr_Const lhs, Expression_Ptr_Const rhs, enum Sass_OP op);
         virtual ~InvalidNullOperation() throw() {};
     };
 
@@ -164,16 +184,16 @@ namespace Sass {
       protected:
         Expression_Ptr_Const lhs;
         Expression_Ptr_Const rhs;
-        const std::string op;
+        const Sass_OP op;
       public:
-        AlphaChannelsNotEqual(Expression_Ptr_Const lhs, Expression_Ptr_Const rhs, const std::string& op);
+        AlphaChannelsNotEqual(Expression_Ptr_Const lhs, Expression_Ptr_Const rhs, enum Sass_OP op);
         // virtual const char* errtype() const { return "Error"; }
         virtual ~AlphaChannelsNotEqual() throw() {};
     };
 
     class SassValueError : public Base {
       public:
-        SassValueError(ParserState pstate, OperationError& err);
+        SassValueError(Backtraces traces, ParserState pstate, OperationError& err);
         virtual ~SassValueError() throw() {};
     };
 
@@ -181,14 +201,15 @@ namespace Sass {
 
   void warn(std::string msg, ParserState pstate);
   void warn(std::string msg, ParserState pstate, Backtrace* bt);
+  void warning(std::string msg, ParserState pstate);
 
   void deprecated_function(std::string msg, ParserState pstate);
-  void deprecated(std::string msg, std::string msg2, ParserState pstate);
+  void deprecated(std::string msg, std::string msg2, bool with_column, ParserState pstate);
   void deprecated_bind(std::string msg, ParserState pstate);
   // void deprecated(std::string msg, ParserState pstate, Backtrace* bt);
 
-  void error(std::string msg, ParserState pstate);
-  void error(std::string msg, ParserState pstate, Backtrace* bt);
+  void coreError(std::string msg, ParserState pstate);
+  void error(std::string msg, ParserState pstate, Backtraces& traces);
 
 }
 

data/ext/libsass/src/eval.cpp

@@ -12,6 +12,7 @@
 #include "bind.hpp"
 #include "util.hpp"
 #include "inspect.hpp"
+#include "operators.hpp"
 #include "environment.hpp"
 #include "position.hpp"
 #include "sass/values.h"
@@ -24,34 +25,21 @@
 #include "parser.hpp"
 #include "expand.hpp"
 #include "color_maps.hpp"
+#include "sass_functions.hpp"
 
 namespace Sass {
 
-  inline double add(double x, double y) { return x + y; }
-  inline double sub(double x, double y) { return x - y; }
-  inline double mul(double x, double y) { return x * y; }
-  inline double div(double x, double y) { return x / y; } // x/0 checked by caller
-  inline double mod(double x, double y) { // x/0 checked by caller
-    if ((x > 0 && y < 0) || (x < 0 && y > 0)) {
-      double ret = std::fmod(x, y);
-      return ret ? ret + y : ret;
-    } else {
-      return std::fmod(x, y);
-    }
-  }
-  typedef double (*bop)(double, double);
-  bop ops[Sass_OP::NUM_OPS] = {
-    0, 0, // and, or
-    0, 0, 0, 0, 0, 0, // eq, neq, gt, gte, lt, lte
-    add, sub, mul, div, mod
-  };
-
   Eval::Eval(Expand& exp)
   : exp(exp),
     ctx(exp.ctx),
+    traces(exp.traces),
     force(false),
-    is_in_comment(false)
-  { }
+    is_in_comment(false),
+    is_in_selector_schema(false)
+  {
+    bool_true = SASS_MEMORY_NEW(Boolean, "[NA]", true);
+    bool_false = SASS_MEMORY_NEW(Boolean, "[NA]", false);
+  }
   Eval::~Eval() { }
 
   Env* Eval::environment()
@@ -64,11 +52,6 @@ namespace Sass {
     return exp.selector();
   }
 
-  Backtrace* Eval::backtrace()
-  {
-    return exp.backtrace();
-  }
-
   Expression_Ptr Eval::operator()(Block_Ptr b)
   {
     Expression_Ptr val = 0;
@@ -86,7 +69,7 @@ namespace Sass {
     if (a->is_global()) {
       if (a->is_default()) {
         if (env->has_global(var)) {
-          Expression_Ptr e = SASS_MEMORY_CAST(Expression, env->get_global(var));
+          Expression_Ptr e = Cast<Expression>(env->get_global(var));
           if (!e || e->concrete_type() == Expression::NULL_VAL) {
             env->set_global(var, a->value()->perform(this));
           }
@@ -105,7 +88,7 @@ namespace Sass {
         while (cur && cur->is_lexical()) {
           if (cur->has_local(var)) {
             if (AST_Node_Obj node = cur->get_local(var)) {
-              Expression_Ptr e = SASS_MEMORY_CAST(Expression, node);
+              Expression_Ptr e = Cast<Expression>(node);
               if (!e || e->concrete_type() == Expression::NULL_VAL) {
                 cur->set_local(var, a->value()->perform(this));
               }
@@ -121,7 +104,7 @@ namespace Sass {
       }
       else if (env->has_global(var)) {
         if (AST_Node_Obj node = env->get_global(var)) {
-          Expression_Ptr e = SASS_MEMORY_CAST(Expression, node);
+          Expression_Ptr e = Cast<Expression>(node);
           if (!e || e->concrete_type() == Expression::NULL_VAL) {
             env->set_global(var, a->value()->perform(this));
           }
@@ -164,28 +147,28 @@ namespace Sass {
     std::string variable(f->variable());
     Expression_Obj low = f->lower_bound()->perform(this);
     if (low->concrete_type() != Expression::NUMBER) {
-      throw Exception::TypeMismatch(*low, "integer");
+      traces.push_back(Backtrace(low->pstate()));
+      throw Exception::TypeMismatch(traces, *low, "integer");
     }
     Expression_Obj high = f->upper_bound()->perform(this);
     if (high->concrete_type() != Expression::NUMBER) {
-      throw Exception::TypeMismatch(*high, "integer");
+      traces.push_back(Backtrace(high->pstate()));
+      throw Exception::TypeMismatch(traces, *high, "integer");
     }
-    Number_Obj sass_start = SASS_MEMORY_CAST(Number, low);
-    Number_Obj sass_end = SASS_MEMORY_CAST(Number, high);
+    Number_Obj sass_start = Cast<Number>(low);
+    Number_Obj sass_end = Cast<Number>(high);
     // check if units are valid for sequence
     if (sass_start->unit() != sass_end->unit()) {
       std::stringstream msg; msg << "Incompatible units: '"
         << sass_end->unit() << "' and '"
         << sass_start->unit() << "'.";
-      error(msg.str(), low->pstate(), backtrace());
+      error(msg.str(), low->pstate(), traces);
     }
     double start = sass_start->value();
     double end = sass_end->value();
     // only create iterator once in this environment
     Env env(environment(), true);
     exp.env_stack.push_back(&env);
-    Number_Ptr it = SASS_MEMORY_NEW(Number, low->pstate(), start, sass_end->unit());
-    env.set_local(variable, it);
     Block_Obj body = f->block();
     Expression_Ptr val = 0;
     if (start < end) {
@@ -193,7 +176,7 @@ namespace Sass {
       for (double i = start;
            i < end;
            ++i) {
-        it->value(i);
+        Number_Obj it = SASS_MEMORY_NEW(Number, low->pstate(), i, sass_end->unit());
         env.set_local(variable, it);
         val = body->perform(this);
         if (val) break;
@@ -203,7 +186,7 @@ namespace Sass {
       for (double i = start;
            i > end;
            --i) {
-        it->value(i);
+        Number_Obj it = SASS_MEMORY_NEW(Number, low->pstate(), i, sass_end->unit());
         env.set_local(variable, it);
         val = body->perform(this);
         if (val) break;
@@ -224,19 +207,19 @@ namespace Sass {
     List_Obj list = 0;
     Map_Ptr map = 0;
     if (expr->concrete_type() == Expression::MAP) {
-      map = SASS_MEMORY_CAST(Map, expr);
+      map = Cast<Map>(expr);
     }
-    else if (Selector_List_Ptr ls = SASS_MEMORY_CAST(Selector_List, expr)) {
+    else if (Selector_List_Ptr ls = Cast<Selector_List>(expr)) {
       Listize listize;
       Expression_Obj rv = ls->perform(&listize);
-      list = dynamic_cast<List_Ptr>(&rv);
+      list = Cast<List>(rv);
     }
     else if (expr->concrete_type() != Expression::LIST) {
       list = SASS_MEMORY_NEW(List, expr->pstate(), 1, SASS_COMMA);
       list->append(expr);
     }
     else {
-      list = SASS_MEMORY_CAST(List, expr);
+      list = Cast<List>(expr);
     }
 
     Block_Obj body = e->block();
@@ -252,8 +235,8 @@ namespace Sass {
           variable->append(value);
           env.set_local(variables[0], variable);
         } else {
-          env.set_local(variables[0], &key);
-          env.set_local(variables[1], &value);
+          env.set_local(variables[0], key);
+          env.set_local(variables[1], value);
         }
 
         val = body->perform(this);
@@ -261,15 +244,15 @@ namespace Sass {
       }
     }
     else {
-      if (list->length() == 1 && SASS_MEMORY_CAST(Selector_List, list)) {
-        list = SASS_MEMORY_CAST(List, list);
+      if (list->length() == 1 && Cast<Selector_List>(list)) {
+        list = Cast<List>(list);
       }
       for (size_t i = 0, L = list->length(); i < L; ++i) {
-        Expression_Ptr e = &list->at(i);
+        Expression_Ptr item = list->at(i);
         // unwrap value if the expression is an argument
-        if (Argument_Ptr arg = SASS_MEMORY_CAST_PTR(Argument, e)) e = &arg->value();
+        if (Argument_Ptr arg = Cast<Argument>(item)) item = arg->value();
         // check if we got passed a list of args (investigate)
-        if (List_Ptr scalars = SASS_MEMORY_CAST_PTR(List, e)) {
+        if (List_Ptr scalars = Cast<List>(item)) {
           if (variables.size() == 1) {
             Expression_Ptr var = scalars;
             env.set_local(variables[0], var);
@@ -278,13 +261,13 @@ namespace Sass {
             for (size_t j = 0, K = variables.size(); j < K; ++j) {
               Expression_Ptr res = j >= scalars->length()
                 ? SASS_MEMORY_NEW(Null, expr->pstate())
-                : &scalars->at(j);
+                : scalars->at(j);
               env.set_local(variables[j], res);
             }
           }
         } else {
           if (variables.size() > 0) {
-            env.set_local(variables.at(0), e);
+            env.set_local(variables.at(0), item);
             for (size_t j = 1, K = variables.size(); j < K; ++j) {
               // XXX: this is never hit via spec tests
               Expression_Ptr res = SASS_MEMORY_NEW(Null, expr->pstate());
@@ -334,17 +317,28 @@ namespace Sass {
     // try to use generic function
     if (env->has("@warn[f]")) {
 
-      Definition_Ptr def = SASS_MEMORY_CAST(Definition, (*env)["@warn[f]"]);
+      // add call stack entry
+      ctx.callee_stack.push_back({
+        "@warn",
+        w->pstate().path,
+        w->pstate().line + 1,
+        w->pstate().column + 1,
+        SASS_CALLEE_FUNCTION,
+        { env }
+      });
+
+      Definition_Ptr def = Cast<Definition>((*env)["@warn[f]"]);
       // Block_Obj          body   = def->block();
       // Native_Function func   = def->native_function();
       Sass_Function_Entry c_function = def->c_function();
       Sass_Function_Fn c_func = sass_function_get_function(c_function);
 
       To_C to_c;
-      union Sass_Value* c_args = sass_make_list(1, SASS_COMMA);
+      union Sass_Value* c_args = sass_make_list(1, SASS_COMMA, false);
       sass_list_set_value(c_args, 0, message->perform(&to_c));
       union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_compiler);
       ctx.c_options.output_style = outstyle;
+      ctx.callee_stack.pop_back();
       sass_delete_value(c_args);
       sass_delete_value(c_val);
       return 0;
@@ -352,11 +346,12 @@ namespace Sass {
     }
 
     std::string result(unquote(message->to_sass()));
-    Backtrace top(backtrace(), w->pstate(), "");
-    std::cerr << "WARNING: " << result;
-    std::cerr << top.to_string();
-    std::cerr << std::endl << std::endl;
+    std::cerr << "WARNING: " << result << std::endl;
+    traces.push_back(Backtrace(w->pstate()));
+    std::cerr << traces_to_string(traces, "         ");
+    std::cerr << std::endl;
     ctx.c_options.output_style = outstyle;
+    traces.pop_back();
     return 0;
   }
 
@@ -370,17 +365,28 @@ namespace Sass {
     // try to use generic function
     if (env->has("@error[f]")) {
 
-      Definition_Ptr def = SASS_MEMORY_CAST(Definition, (*env)["@error[f]"]);
+      // add call stack entry
+      ctx.callee_stack.push_back({
+        "@error",
+        e->pstate().path,
+        e->pstate().line + 1,
+        e->pstate().column + 1,
+        SASS_CALLEE_FUNCTION,
+        { env }
+      });
+
+      Definition_Ptr def = Cast<Definition>((*env)["@error[f]"]);
       // Block_Obj          body   = def->block();
       // Native_Function func   = def->native_function();
       Sass_Function_Entry c_function = def->c_function();
       Sass_Function_Fn c_func = sass_function_get_function(c_function);
 
       To_C to_c;
-      union Sass_Value* c_args = sass_make_list(1, SASS_COMMA);
+      union Sass_Value* c_args = sass_make_list(1, SASS_COMMA, false);
       sass_list_set_value(c_args, 0, message->perform(&to_c));
       union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_compiler);
       ctx.c_options.output_style = outstyle;
+      ctx.callee_stack.pop_back();
       sass_delete_value(c_args);
       sass_delete_value(c_val);
       return 0;
@@ -389,7 +395,7 @@ namespace Sass {
 
     std::string result(unquote(message->to_sass()));
     ctx.c_options.output_style = outstyle;
-    error(result, e->pstate());
+    error(result, e->pstate(), traces);
     return 0;
   }
 
@@ -403,17 +409,28 @@ namespace Sass {
     // try to use generic function
     if (env->has("@debug[f]")) {
 
-      Definition_Ptr def = SASS_MEMORY_CAST(Definition, (*env)["@debug[f]"]);
+      // add call stack entry
+      ctx.callee_stack.push_back({
+        "@debug",
+        d->pstate().path,
+        d->pstate().line + 1,
+        d->pstate().column + 1,
+        SASS_CALLEE_FUNCTION,
+        { env }
+      });
+
+      Definition_Ptr def = Cast<Definition>((*env)["@debug[f]"]);
       // Block_Obj          body   = def->block();
       // Native_Function func   = def->native_function();
       Sass_Function_Entry c_function = def->c_function();
       Sass_Function_Fn c_func = sass_function_get_function(c_function);
 
       To_C to_c;
-      union Sass_Value* c_args = sass_make_list(1, SASS_COMMA);
+      union Sass_Value* c_args = sass_make_list(1, SASS_COMMA, false);
       sass_list_set_value(c_args, 0, message->perform(&to_c));
       union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_compiler);
       ctx.c_options.output_style = outstyle;
+      ctx.callee_stack.pop_back();
       sass_delete_value(c_args);
       sass_delete_value(c_val);
       return 0;
@@ -441,14 +458,15 @@ namespace Sass {
                                 l->length() / 2);
       for (size_t i = 0, L = l->length(); i < L; i += 2)
       {
-        Expression_Ptr key = (*l)[i+0]->perform(this);
-        Expression_Ptr val = (*l)[i+1]->perform(this);
+        Expression_Obj key = (*l)[i+0]->perform(this);
+        Expression_Obj val = (*l)[i+1]->perform(this);
         // make sure the color key never displays its real name
         key->is_delayed(true); // verified
         *lm << std::make_pair(key, val);
       }
       if (lm->has_duplicate_key()) {
-        throw Exception::DuplicateKeyError(*lm, *l);
+        traces.push_back(Backtrace(l->pstate()));
+        throw Exception::DuplicateKeyError(traces, *lm, *l);
       }
 
       lm->is_interpolant(l->is_interpolant());
@@ -461,7 +479,8 @@ namespace Sass {
                                l->pstate(),
                                l->length(),
                                l->separator(),
-                               l->is_arglist());
+                               l->is_arglist(),
+                               l->is_bracketed());
     for (size_t i = 0, L = l->length(); i < L; ++i) {
       ll->append((*l)[i]->perform(this));
     }
@@ -478,7 +497,8 @@ namespace Sass {
     // make sure we're not starting with duplicate keys.
     // the duplicate key state will have been set in the parser phase.
     if (m->has_duplicate_key()) {
-      throw Exception::DuplicateKeyError(*m, *m);
+      traces.push_back(Backtrace(m->pstate()));
+      throw Exception::DuplicateKeyError(traces, *m, *m);
     }
 
     Map_Obj mm = SASS_MEMORY_NEW(Map,
@@ -486,13 +506,16 @@ namespace Sass {
                                 m->length());
     for (auto key : m->keys()) {
       Expression_Ptr ex_key = key->perform(this);
-      Expression_Ptr ex_val = m->at(key)->perform(this);
+      Expression_Ptr ex_val = m->at(key);
+      if (ex_val == NULL) continue;
+      ex_val = ex_val->perform(this);
       *mm << std::make_pair(ex_key, ex_val);
     }
 
     // check the evaluated keys aren't duplicates.
     if (mm->has_duplicate_key()) {
-      throw Exception::DuplicateKeyError(*mm, *m);
+      traces.push_back(Backtrace(m->pstate()));
+      throw Exception::DuplicateKeyError(traces, *mm, *m);
     }
 
     mm->is_expanded(true);
@@ -502,16 +525,141 @@ namespace Sass {
   Expression_Ptr Eval::operator()(Binary_Expression_Ptr b_in)
   {
 
-    String_Schema_Obj ret_schema;
+    Expression_Obj lhs = b_in->left();
+    Expression_Obj rhs = b_in->right();
+    enum Sass_OP op_type = b_in->optype();
+
+    if (op_type == Sass_OP::AND) {
+      // LOCAL_FLAG(force, true);
+      lhs = lhs->perform(this);
+      if (!*lhs) return lhs.detach();
+      return rhs->perform(this);
+    }
+    else if (op_type == Sass_OP::OR) {
+      // LOCAL_FLAG(force, true);
+      lhs = lhs->perform(this);
+      if (*lhs) return lhs.detach();
+      return rhs->perform(this);
+    }
+
+    // Evaluate variables as early o
+    while (Variable_Ptr l_v = Cast<Variable>(lhs)) {
+      lhs = operator()(l_v);
+    }
+    while (Variable_Ptr r_v = Cast<Variable>(rhs)) {
+      rhs = operator()(r_v);
+    }
+
     Binary_Expression_Obj b = b_in;
-    enum Sass_OP op_type = b->type();
+
+    // Evaluate sub-expressions early on
+    while (Binary_Expression_Ptr l_b = Cast<Binary_Expression>(lhs)) {
+      if (!force && l_b->is_delayed()) break;
+      lhs = operator()(l_b);
+    }
+    while (Binary_Expression_Ptr r_b = Cast<Binary_Expression>(rhs)) {
+      if (!force && r_b->is_delayed()) break;
+      rhs = operator()(r_b);
+    }
+
+    // don't eval delayed expressions (the '/' when used as a separator)
+    if (!force && op_type == Sass_OP::DIV && b->is_delayed()) {
+      b->right(b->right()->perform(this));
+      b->left(b->left()->perform(this));
+      return b.detach();
+    }
+
+    // specific types we know are final
+    // handle them early to avoid overhead
+    if (Number_Ptr l_n = Cast<Number>(lhs)) {
+      // lhs is number and rhs is number
+      if (Number_Ptr r_n = Cast<Number>(rhs)) {
+        try {
+          switch (op_type) {
+            case Sass_OP::EQ: return *l_n == *r_n ? bool_true : bool_false;
+            case Sass_OP::NEQ: return *l_n == *r_n ? bool_false : bool_true;
+            case Sass_OP::LT: return *l_n < *r_n ? bool_true : bool_false;
+            case Sass_OP::GTE: return *l_n < *r_n ? bool_false : bool_true;
+            case Sass_OP::LTE: return *l_n < *r_n || *l_n == *r_n ? bool_true : bool_false;
+            case Sass_OP::GT: return *l_n < *r_n || *l_n == *r_n ? bool_false : bool_true;
+            case Sass_OP::ADD: case Sass_OP::SUB: case Sass_OP::MUL: case Sass_OP::DIV: case Sass_OP::MOD:
+              return Operators::op_numbers(op_type, *l_n, *r_n, ctx.c_options, b_in->pstate());
+            default: break;
+          }
+        }
+        catch (Exception::OperationError& err)
+        {
+          traces.push_back(Backtrace(b_in->pstate()));
+          throw Exception::SassValueError(traces, b_in->pstate(), err);
+        }
+      }
+      // lhs is number and rhs is color
+      else if (Color_Ptr r_c = Cast<Color>(rhs)) {
+        try {
+          switch (op_type) {
+            case Sass_OP::EQ: return *l_n == *r_c ? bool_true : bool_false;
+            case Sass_OP::NEQ: return *l_n == *r_c ? bool_false : bool_true;
+            case Sass_OP::ADD: case Sass_OP::SUB: case Sass_OP::MUL: case Sass_OP::DIV: case Sass_OP::MOD:
+              return Operators::op_number_color(op_type, *l_n, *r_c, ctx.c_options, b_in->pstate());
+            default: break;
+          }
+        }
+        catch (Exception::OperationError& err)
+        {
+          traces.push_back(Backtrace(b_in->pstate()));
+          throw Exception::SassValueError(traces, b_in->pstate(), err);
+        }
+      }
+    }
+    else if (Color_Ptr l_c = Cast<Color>(lhs)) {
+      // lhs is color and rhs is color
+      if (Color_Ptr r_c = Cast<Color>(rhs)) {
+        try {
+          switch (op_type) {
+            case Sass_OP::EQ: return *l_c == *r_c ? bool_true : bool_false;
+            case Sass_OP::NEQ: return *l_c == *r_c ? bool_false : bool_true;
+            case Sass_OP::LT: return *l_c < *r_c ? bool_true : bool_false;
+            case Sass_OP::GTE: return *l_c < *r_c ? bool_false : bool_true;
+            case Sass_OP::LTE: return *l_c < *r_c || *l_c == *r_c ? bool_true : bool_false;
+            case Sass_OP::GT: return *l_c < *r_c || *l_c == *r_c ? bool_false : bool_true;
+            case Sass_OP::ADD: case Sass_OP::SUB: case Sass_OP::MUL: case Sass_OP::DIV: case Sass_OP::MOD:
+              return Operators::op_colors(op_type, *l_c, *r_c, ctx.c_options, b_in->pstate());
+            default: break;
+          }
+        }
+        catch (Exception::OperationError& err)
+        {
+          traces.push_back(Backtrace(b_in->pstate()));
+          throw Exception::SassValueError(traces, b_in->pstate(), err);
+        }
+      }
+      // lhs is color and rhs is number
+      else if (Number_Ptr r_n = Cast<Number>(rhs)) {
+        try {
+          switch (op_type) {
+            case Sass_OP::EQ: return *l_c == *r_n ? bool_true : bool_false;
+            case Sass_OP::NEQ: return *l_c == *r_n ? bool_false : bool_true;
+            case Sass_OP::ADD: case Sass_OP::SUB: case Sass_OP::MUL: case Sass_OP::DIV: case Sass_OP::MOD:
+              return Operators::op_color_number(op_type, *l_c, *r_n, ctx.c_options, b_in->pstate());
+            default: break;
+          }
+        }
+        catch (Exception::OperationError& err)
+        {
+          traces.push_back(Backtrace(b_in->pstate()));
+          throw Exception::SassValueError(traces, b_in->pstate(), err);
+        }
+      }
+    }
+
+    String_Schema_Obj ret_schema;
 
     // only the last item will be used to eval the binary expression
-    if (String_Schema_Ptr s_l = SASS_MEMORY_CAST(String_Schema, b->left())) {
+    if (String_Schema_Ptr s_l = Cast<String_Schema>(b->left())) {
       if (!s_l->has_interpolant() && (!s_l->is_right_interpolant())) {
         ret_schema = SASS_MEMORY_NEW(String_Schema, b->pstate());
         Binary_Expression_Obj bin_ex = SASS_MEMORY_NEW(Binary_Expression, b->pstate(),
-                                                    b->op(), &s_l->last(), b->right());
+                                                    b->op(), s_l->last(), b->right());
         bin_ex->is_delayed(b->left()->is_delayed() || b->right()->is_delayed()); // unverified
         for (size_t i = 0; i < s_l->length() - 1; ++i) {
           ret_schema->append(s_l->at(i)->perform(this));
@@ -520,12 +668,12 @@ namespace Sass {
         return ret_schema->perform(this);
       }
     }
-    if (String_Schema_Ptr s_r = SASS_MEMORY_CAST(String_Schema, b->right())) {
+    if (String_Schema_Ptr s_r = Cast<String_Schema>(b->right())) {
 
       if (!s_r->has_interpolant() && (!s_r->is_left_interpolant() || op_type == Sass_OP::DIV)) {
         ret_schema = SASS_MEMORY_NEW(String_Schema, b->pstate());
         Binary_Expression_Obj bin_ex = SASS_MEMORY_NEW(Binary_Expression, b->pstate(),
-                                                    b->op(), b->left(), &s_r->first());
+                                                    b->op(), b->left(), s_r->first());
         bin_ex->is_delayed(b->left()->is_delayed() || b->right()->is_delayed()); // verified
         ret_schema->append(bin_ex->perform(this));
         for (size_t i = 1; i < s_r->length(); ++i) {
@@ -535,16 +683,6 @@ namespace Sass {
       }
     }
 
-    // don't eval delayed expressions (the '/' when used as a separator)
-    if (!force && op_type == Sass_OP::DIV && b->is_delayed()) {
-      b->right(b->right()->perform(this));
-      b->left(b->left()->perform(this));
-      return b.detach();
-    }
-
-    Expression_Obj lhs = b->left();
-    Expression_Obj rhs = b->right();
-
     // fully evaluate their values
     if (op_type == Sass_OP::EQ ||
         op_type == Sass_OP::NEQ ||
@@ -565,32 +703,19 @@ namespace Sass {
       lhs = lhs->perform(this);
     }
 
-    Binary_Expression_Obj u3 = b;
-    switch (op_type) {
-      case Sass_OP::AND: {
-        return *lhs ? b->right()->perform(this) : lhs.detach();
-      } break;
-
-      case Sass_OP::OR: {
-        return *lhs ? lhs.detach() : b->right()->perform(this);
-      } break;
-
-      default:
-        break;
-    }
     // not a logical connective, so go ahead and eval the rhs
     rhs = rhs->perform(this);
-    AST_Node_Obj lu = &lhs;
-    AST_Node_Obj ru = &rhs;
+    AST_Node_Obj lu = lhs;
+    AST_Node_Obj ru = rhs;
 
-    Expression::Concrete_Type l_type = lhs->concrete_type();
-    Expression::Concrete_Type r_type = rhs->concrete_type();
+    Expression::Concrete_Type l_type;
+    Expression::Concrete_Type r_type;
 
     // Is one of the operands an interpolant?
-    String_Schema_Obj s1 = SASS_MEMORY_CAST(String_Schema, b->left());
-    String_Schema_Obj s2 = SASS_MEMORY_CAST(String_Schema, b->right());
-    Binary_Expression_Obj b1 = SASS_MEMORY_CAST(Binary_Expression, b->left());
-    Binary_Expression_Obj b2 = SASS_MEMORY_CAST(Binary_Expression, b->right());
+    String_Schema_Obj s1 = Cast<String_Schema>(b->left());
+    String_Schema_Obj s2 = Cast<String_Schema>(b->right());
+    Binary_Expression_Obj b1 = Cast<Binary_Expression>(b->left());
+    Binary_Expression_Obj b2 = Cast<Binary_Expression>(b->right());
 
     bool schema_op = false;
 
@@ -604,40 +729,26 @@ namespace Sass {
       if (op_type == Sass_OP::DIV || op_type == Sass_OP::MUL || op_type == Sass_OP::MOD || op_type == Sass_OP::ADD || op_type == Sass_OP::SUB ||
           op_type == Sass_OP::EQ) {
         // If possible upgrade LHS to a number (for number to string compare)
-        if (String_Constant_Ptr str = SASS_MEMORY_CAST(String_Constant, lhs)) {
+        if (String_Constant_Ptr str = Cast<String_Constant>(lhs)) {
           std::string value(str->value());
           const char* start = value.c_str();
           if (Prelexer::sequence < Prelexer::dimension, Prelexer::end_of_file >(start) != 0) {
-            Textual_Obj l = SASS_MEMORY_NEW(Textual, b->pstate(), Textual::DIMENSION, str->value());
-            lhs = l->perform(this);
+            lhs = Parser::lexed_dimension(b->pstate(), str->value());
           }
         }
         // If possible upgrade RHS to a number (for string to number compare)
-        if (String_Constant_Ptr str = SASS_MEMORY_CAST(String_Constant, rhs)) {
+        if (String_Constant_Ptr str = Cast<String_Constant>(rhs)) {
           std::string value(str->value());
           const char* start = value.c_str();
           if (Prelexer::sequence < Prelexer::dimension, Prelexer::number >(start) != 0) {
-            Textual_Obj r = SASS_MEMORY_NEW(Textual, b->pstate(), Textual::DIMENSION, str->value());
-            rhs = r->perform(this);
+            rhs = Parser::lexed_dimension(b->pstate(), str->value());
           }
         }
       }
 
       To_Value to_value(ctx);
-      Value_Obj v_l = dynamic_cast<Value_Ptr>(lhs->perform(&to_value));
-      Value_Obj v_r = dynamic_cast<Value_Ptr>(rhs->perform(&to_value));
-      l_type = lhs->concrete_type();
-      r_type = rhs->concrete_type();
-
-      if (s2 && s2->has_interpolants() && s2->length()) {
-        Textual_Obj front = SASS_MEMORY_CAST(Textual, s2->elements().front());
-        if (front && !front->is_interpolant())
-        {
-          // XXX: this is never hit via spec tests
-          schema_op = true;
-          rhs = front->perform(this);
-        }
-      }
+      Value_Obj v_l = Cast<Value>(lhs->perform(&to_value));
+      Value_Obj v_r = Cast<Value>(rhs->perform(&to_value));
 
       if (force_delay) {
         std::string str("");
@@ -655,19 +766,20 @@ namespace Sass {
     // see if it's a relational expression
     try {
       switch(op_type) {
-        case Sass_OP::EQ:  return SASS_MEMORY_NEW(Boolean, b->pstate(), eq(lhs, rhs));
-        case Sass_OP::NEQ: return SASS_MEMORY_NEW(Boolean, b->pstate(), !eq(lhs, rhs));
-        case Sass_OP::GT:  return SASS_MEMORY_NEW(Boolean, b->pstate(), !lt(lhs, rhs, "gt") && !eq(lhs, rhs));
-        case Sass_OP::GTE: return SASS_MEMORY_NEW(Boolean, b->pstate(), !lt(lhs, rhs, "gte"));
-        case Sass_OP::LT:  return SASS_MEMORY_NEW(Boolean, b->pstate(), lt(lhs, rhs, "lt"));
-        case Sass_OP::LTE: return SASS_MEMORY_NEW(Boolean, b->pstate(), lt(lhs, rhs, "lte") || eq(lhs, rhs));
-        default:                     break;
+        case Sass_OP::EQ:  return SASS_MEMORY_NEW(Boolean, b->pstate(), Operators::eq(lhs, rhs));
+        case Sass_OP::NEQ: return SASS_MEMORY_NEW(Boolean, b->pstate(), Operators::neq(lhs, rhs));
+        case Sass_OP::GT:  return SASS_MEMORY_NEW(Boolean, b->pstate(), Operators::gt(lhs, rhs));
+        case Sass_OP::GTE: return SASS_MEMORY_NEW(Boolean, b->pstate(), Operators::gte(lhs, rhs));
+        case Sass_OP::LT:  return SASS_MEMORY_NEW(Boolean, b->pstate(), Operators::lt(lhs, rhs));
+        case Sass_OP::LTE: return SASS_MEMORY_NEW(Boolean, b->pstate(), Operators::lte(lhs, rhs));
+        default: break;
       }
     }
     catch (Exception::OperationError& err)
     {
       // throw Exception::Base(b->pstate(), err.what());
-      throw Exception::SassValueError(b->pstate(), err);
+      traces.push_back(Backtrace(b->pstate()));
+      throw Exception::SassValueError(traces, b->pstate(), err);
     }
 
     l_type = lhs->concrete_type();
@@ -675,53 +787,56 @@ namespace Sass {
 
     // ToDo: throw error in op functions
     // ToDo: then catch and re-throw them
-    Expression_Obj rv = 0;
+    Expression_Obj rv;
     try {
       ParserState pstate(b->pstate());
       if (l_type == Expression::NUMBER && r_type == Expression::NUMBER) {
-        Number_Ptr l_n = SASS_MEMORY_CAST(Number, lhs);
-        Number_Ptr r_n = SASS_MEMORY_CAST(Number, rhs);
-        rv = op_numbers(op_type, *l_n, *r_n, ctx.c_options, &pstate);
+        Number_Ptr l_n = Cast<Number>(lhs);
+        Number_Ptr r_n = Cast<Number>(rhs);
+        l_n->reduce(); r_n->reduce();
+        rv = Operators::op_numbers(op_type, *l_n, *r_n, ctx.c_options, pstate);
       }
       else if (l_type == Expression::NUMBER && r_type == Expression::COLOR) {
-        Number_Ptr l_n = SASS_MEMORY_CAST(Number, lhs);
-        Color_Ptr r_c = SASS_MEMORY_CAST(Color, rhs);
-        rv = op_number_color(op_type, *l_n, *r_c, ctx.c_options, &pstate);
+        Number_Ptr l_n = Cast<Number>(lhs);
+        Color_Ptr r_c = Cast<Color>(rhs);
+        rv = Operators::op_number_color(op_type, *l_n, *r_c, ctx.c_options, pstate);
       }
       else if (l_type == Expression::COLOR && r_type == Expression::NUMBER) {
-        Color_Ptr l_c = SASS_MEMORY_CAST(Color, lhs);
-        Number_Ptr r_n = SASS_MEMORY_CAST(Number, rhs);
-        rv = op_color_number(op_type, *l_c, *r_n, ctx.c_options, &pstate);
+        Color_Ptr l_c = Cast<Color>(lhs);
+        Number_Ptr r_n = Cast<Number>(rhs);
+        rv = Operators::op_color_number(op_type, *l_c, *r_n, ctx.c_options, pstate);
       }
       else if (l_type == Expression::COLOR && r_type == Expression::COLOR) {
-        Color_Ptr l_c = SASS_MEMORY_CAST(Color, lhs);
-        Color_Ptr r_c = SASS_MEMORY_CAST(Color, rhs);
-        rv = op_colors(op_type, *l_c, *r_c, ctx.c_options, &pstate);
+        Color_Ptr l_c = Cast<Color>(lhs);
+        Color_Ptr r_c = Cast<Color>(rhs);
+        rv = Operators::op_colors(op_type, *l_c, *r_c, ctx.c_options, pstate);
       }
       else {
         To_Value to_value(ctx);
         // this will leak if perform does not return a value!
-        Value_Obj v_l = SASS_MEMORY_CAST_PTR(Value, lhs->perform(&to_value));
-        Value_Obj v_r = SASS_MEMORY_CAST_PTR(Value, rhs->perform(&to_value));
+        Value_Obj v_l = Cast<Value>(lhs->perform(&to_value));
+        Value_Obj v_r = Cast<Value>(rhs->perform(&to_value));
         bool interpolant = b->is_right_interpolant() ||
                            b->is_left_interpolant() ||
                            b->is_interpolant();
         if (op_type == Sass_OP::SUB) interpolant = false;
         // if (op_type == Sass_OP::DIV) interpolant = true;
         // check for type violations
-        if (l_type == Expression::MAP) {
-          throw Exception::InvalidValue(*v_l);
+        if (l_type == Expression::MAP || l_type == Expression::FUNCTION_VAL) {
+          traces.push_back(Backtrace(v_l->pstate()));
+          throw Exception::InvalidValue(traces, *v_l);
         }
-        if (r_type == Expression::MAP) {
-          throw Exception::InvalidValue(*v_r);
+        if (r_type == Expression::MAP || l_type == Expression::FUNCTION_VAL) {
+          traces.push_back(Backtrace(v_r->pstate()));
+          throw Exception::InvalidValue(traces, *v_r);
         }
-        Value_Ptr ex = op_strings(b->op(), *v_l, *v_r, ctx.c_options, &pstate, !interpolant); // pass true to compress
-        if (String_Constant_Ptr str = dynamic_cast<String_Constant_Ptr>(ex))
+        Value_Ptr ex = Operators::op_strings(b->op(), *v_l, *v_r, ctx.c_options, pstate, !interpolant); // pass true to compress
+        if (String_Constant_Ptr str = Cast<String_Constant>(ex))
         {
           if (str->concrete_type() == Expression::STRING)
           {
-            String_Constant_Ptr lstr = SASS_MEMORY_CAST(String_Constant, lhs);
-            String_Constant_Ptr rstr = SASS_MEMORY_CAST(String_Constant, rhs);
+            String_Constant_Ptr lstr = Cast<String_Constant>(lhs);
+            String_Constant_Ptr rstr = Cast<String_Constant>(rhs);
             if (op_type != Sass_OP::SUB) {
               if (String_Constant_Ptr org = lstr ? lstr : rstr)
               { str->quote_mark(org->quote_mark()); }
@@ -734,8 +849,9 @@ namespace Sass {
     }
     catch (Exception::OperationError& err)
     {
+      traces.push_back(Backtrace(b->pstate()));
       // throw Exception::Base(b->pstate(), err.what());
-      throw Exception::SassValueError(b->pstate(), err);
+      throw Exception::SassValueError(traces, b->pstate(), err);
     }
 
     if (rv) {
@@ -753,31 +869,36 @@ namespace Sass {
   Expression_Ptr Eval::operator()(Unary_Expression_Ptr u)
   {
     Expression_Obj operand = u->operand()->perform(this);
-    if (u->type() == Unary_Expression::NOT) {
+    if (u->optype() == Unary_Expression::NOT) {
       Boolean_Ptr result = SASS_MEMORY_NEW(Boolean, u->pstate(), (bool)*operand);
       result->value(!result->value());
       return result;
     }
-    else if (operand->concrete_type() == Expression::NUMBER) {
-      Number_Ptr result = SASS_MEMORY_NEW(Number, static_cast<Number_Ptr>(&operand));
-      result->value(u->type() == Unary_Expression::MINUS
-                    ? -result->value()
-                    :  result->value());
-      return result;
+    else if (Number_Obj nr = Cast<Number>(operand)) {
+      // negate value for minus unary expression
+      if (u->optype() == Unary_Expression::MINUS) {
+        Number_Obj cpy = SASS_MEMORY_COPY(nr);
+        cpy->value( - cpy->value() ); // negate value
+        return cpy.detach(); // return the copy
+      }
+      else if (u->optype() == Unary_Expression::SLASH) {
+        std::string str = '/' + nr->to_string(ctx.c_options);
+        return SASS_MEMORY_NEW(String_Constant, u->pstate(), str);
+      }
+      // nothing for positive
+      return nr.detach();
     }
     else {
       // Special cases: +/- variables which evaluate to null ouput just +/-,
       // but +/- null itself outputs the string
-      if (operand->concrete_type() == Expression::NULL_VAL && SASS_MEMORY_CAST(Variable, u->operand())) {
+      if (operand->concrete_type() == Expression::NULL_VAL && Cast<Variable>(u->operand())) {
         u->operand(SASS_MEMORY_NEW(String_Quoted, u->pstate(), ""));
       }
       // Never apply unary opertions on colors @see #2140
-      else if (operand->concrete_type() == Expression::COLOR) {
-        Color_Ptr c = dynamic_cast<Color_Ptr>(&operand);
-
+      else if (Color_Ptr color = Cast<Color>(operand)) {
         // Use the color name if this was eval with one
-        if (c->disp().length() > 0) {
-          operand = SASS_MEMORY_NEW(String_Constant, operand->pstate(), c->disp());
+        if (color->disp().length() > 0) {
+          operand = SASS_MEMORY_NEW(String_Constant, operand->pstate(), color->disp());
           u->operand(operand);
         }
       }
@@ -785,10 +906,9 @@ namespace Sass {
         u->operand(operand);
       }
 
-      String_Constant_Ptr result = SASS_MEMORY_NEW(String_Quoted,
-                                                  u->pstate(),
-                                                  u->inspect());
-      return result;
+      return SASS_MEMORY_NEW(String_Quoted,
+                             u->pstate(),
+                             u->inspect());
     }
     // unreachable
     return u;
@@ -796,11 +916,11 @@ namespace Sass {
 
   Expression_Ptr Eval::operator()(Function_Call_Ptr c)
   {
-    if (backtrace()->parent != NULL && backtrace()->depth() > Constants::MaxCallStack) {
+    if (traces.size() > Constants::MaxCallStack) {
         // XXX: this is never hit via spec tests
         std::ostringstream stm;
         stm << "Stack depth exceeded max of " << Constants::MaxCallStack;
-        error(stm.str(), c->pstate(), backtrace());
+        error(stm.str(), c->pstate(), traces);
     }
     std::string name(Util::normalize_underscores(c->name()));
     std::string full_name(name + "[f]");
@@ -811,17 +931,17 @@ namespace Sass {
     if (!env->has(full_name) || (!c->via_call() && Prelexer::re_special_fun(name.c_str()))) {
       if (!env->has("*[f]")) {
         for (Argument_Obj arg : args->elements()) {
-          if (List_Obj ls = SASS_MEMORY_CAST(List, arg->value())) {
-            if (ls->size() == 0) error("() isn't a valid CSS value.", c->pstate());
+          if (List_Obj ls = Cast<List>(arg->value())) {
+            if (ls->size() == 0) error("() isn't a valid CSS value.", c->pstate(), traces);
           }
         }
-        args = SASS_MEMORY_CAST_PTR(Arguments, args->perform(this));
+        args = Cast<Arguments>(args->perform(this));
         Function_Call_Obj lit = SASS_MEMORY_NEW(Function_Call,
                                              c->pstate(),
                                              c->name(),
-                                             &args);
+                                             args);
         if (args->has_named_arguments()) {
-          error("Function " + c->name() + " doesn't support keyword arguments", c->pstate());
+          error("Function " + c->name() + " doesn't support keyword arguments", c->pstate(), traces);
         }
         String_Quoted_Ptr str = SASS_MEMORY_NEW(String_Quoted,
                                              c->pstate(),
@@ -839,9 +959,11 @@ namespace Sass {
       args->set_delayed(false); // verified
     }
     if (full_name != "if[f]") {
-      args = SASS_MEMORY_CAST_PTR(Arguments, args->perform(this));
+      args = Cast<Arguments>(args->perform(this));
     }
-    Definition_Ptr def = SASS_MEMORY_CAST(Definition, (*env)[full_name]);
+    Definition_Ptr def = Cast<Definition>((*env)[full_name]);
+
+    if (c->func()) def = c->func()->definition();
 
     if (def->is_overload_stub()) {
       std::stringstream ss;
@@ -849,15 +971,15 @@ namespace Sass {
       // account for rest arguments
       if (args->has_rest_argument() && args->length() > 0) {
         // get the rest arguments list
-        List_Ptr rest = SASS_MEMORY_CAST(List, args->last()->value());
+        List_Ptr rest = Cast<List>(args->last()->value());
         // arguments before rest argument plus rest
         if (rest) L += rest->length() - 1;
       }
       ss << full_name << L;
       full_name = ss.str();
       std::string resolved_name(full_name);
-      if (!env->has(resolved_name)) error("overloaded function `" + std::string(c->name()) + "` given wrong number of arguments", c->pstate());
-      def = SASS_MEMORY_CAST(Definition, (*env)[resolved_name]);
+      if (!env->has(resolved_name)) error("overloaded function `" + std::string(c->name()) + "` given wrong number of arguments", c->pstate(), traces);
+      def = Cast<Definition>((*env)[resolved_name]);
     }
 
     Expression_Obj     result = c;
@@ -865,25 +987,37 @@ namespace Sass {
     Native_Function func   = def->native_function();
     Sass_Function_Entry c_function = def->c_function();
 
+    if (c->is_css()) return result.detach();
+
     Parameters_Obj params = def->parameters();
     Env fn_env(def->environment());
     exp.env_stack.push_back(&fn_env);
 
     if (func || body) {
       bind(std::string("Function"), c->name(), params, args, &ctx, &fn_env, this);
-      Backtrace here(backtrace(), c->pstate(), ", in function `" + c->name() + "`");
-      exp.backtrace_stack.push_back(&here);
+      std::string msg(", in function `" + c->name() + "`");
+      traces.push_back(Backtrace(c->pstate(), msg));
+      ctx.callee_stack.push_back({
+        c->name().c_str(),
+        c->pstate().path,
+        c->pstate().line + 1,
+        c->pstate().column + 1,
+        SASS_CALLEE_FUNCTION,
+        { env }
+      });
+
       // eval the body if user-defined or special, invoke underlying CPP function if native
       if (body /* && !Prelexer::re_special_fun(name.c_str()) */) {
         result = body->perform(this);
       }
       else if (func) {
-        result = func(fn_env, *env, ctx, def->signature(), c->pstate(), backtrace(), exp.selector_stack);
+        result = func(fn_env, *env, ctx, def->signature(), c->pstate(), traces, exp.selector_stack);
       }
       if (!result) {
-        error(std::string("Function ") + c->name() + " did not return a value", c->pstate());
+        error(std::string("Function ") + c->name() + " finished without @return", c->pstate(), traces);
       }
-      exp.backtrace_stack.pop_back();
+      ctx.callee_stack.pop_back();
+      traces.pop_back();
     }
 
     // else if it's a user-defined c function
@@ -893,36 +1027,44 @@ namespace Sass {
       if (full_name == "*[f]") {
         String_Quoted_Obj str = SASS_MEMORY_NEW(String_Quoted, c->pstate(), c->name());
         Arguments_Obj new_args = SASS_MEMORY_NEW(Arguments, c->pstate());
-        new_args->append(SASS_MEMORY_NEW(Argument, c->pstate(), &str));
-        new_args->concat(&args);
+        new_args->append(SASS_MEMORY_NEW(Argument, c->pstate(), str));
+        new_args->concat(args);
         args = new_args;
       }
 
       // populates env with default values for params
       std::string ff(c->name());
       bind(std::string("Function"), c->name(), params, args, &ctx, &fn_env, this);
-
-      Backtrace here(backtrace(), c->pstate(), ", in function `" + c->name() + "`");
-      exp.backtrace_stack.push_back(&here);
+      std::string msg(", in function `" + c->name() + "`");
+      traces.push_back(Backtrace(c->pstate(), msg));
+      ctx.callee_stack.push_back({
+        c->name().c_str(),
+        c->pstate().path,
+        c->pstate().line + 1,
+        c->pstate().column + 1,
+        SASS_CALLEE_C_FUNCTION,
+        { env }
+      });
 
       To_C to_c;
-      union Sass_Value* c_args = sass_make_list(params->length(), SASS_COMMA);
+      union Sass_Value* c_args = sass_make_list(params->length(), SASS_COMMA, false);
       for(size_t i = 0; i < params->length(); i++) {
         Parameter_Obj param = params->at(i);
         std::string key = param->name();
         AST_Node_Obj node = fn_env.get_local(key);
-        Expression_Obj arg = SASS_MEMORY_CAST(Expression, node);
+        Expression_Obj arg = Cast<Expression>(node);
         sass_list_set_value(c_args, i, arg->perform(&to_c));
       }
       union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_compiler);
       if (sass_value_get_tag(c_val) == SASS_ERROR) {
-        error("error in C function " + c->name() + ": " + sass_error_get_message(c_val), c->pstate(), backtrace());
+        error("error in C function " + c->name() + ": " + sass_error_get_message(c_val), c->pstate(), traces);
       } else if (sass_value_get_tag(c_val) == SASS_WARNING) {
-        error("warning in C function " + c->name() + ": " + sass_warning_get_message(c_val), c->pstate(), backtrace());
+        error("warning in C function " + c->name() + ": " + sass_warning_get_message(c_val), c->pstate(), traces);
       }
-      result = cval_to_astnode(c_val, backtrace(), c->pstate());
+      result = cval_to_astnode(c_val, traces, c->pstate());
 
-      exp.backtrace_stack.pop_back();
+      ctx.callee_stack.pop_back();
+      traces.pop_back();
       sass_delete_value(c_args);
       if (c_val != c_args)
         sass_delete_value(c_val);
@@ -951,104 +1093,22 @@ namespace Sass {
 
   Expression_Ptr Eval::operator()(Variable_Ptr v)
   {
-    std::string name(v->name());
     Expression_Obj value = 0;
     Env* env = environment();
-    if (env->has(name)) {
-      value = SASS_MEMORY_CAST(Expression, (*env)[name]);
-    }
-    else error("Undefined variable: \"" + v->name() + "\".", v->pstate());
-    if (typeid(*value) == typeid(Argument)) {
-      value = SASS_MEMORY_CAST(Argument, value)->value();
-    }
-
-    // behave according to as ruby sass (add leading zero)
-    if (Number_Ptr nr = SASS_MEMORY_CAST(Number, value)) {
-      nr->zero(true);
-    }
-
+    const std::string& name(v->name());
+    EnvResult rv(env->find(name));
+    if (rv.found) value = static_cast<Expression*>(rv.it->second.ptr());
+    else error("Undefined variable: \"" + v->name() + "\".", v->pstate(), traces);
+    if (Argument_Ptr arg = Cast<Argument>(value)) value = arg->value();
+    if (Number_Ptr nr = Cast<Number>(value)) nr->zero(true); // force flag
     value->is_interpolant(v->is_interpolant());
     if (force) value->is_expanded(false);
     value->set_delayed(false); // verified
     value = value->perform(this);
-    if(!force) (*env)[name] = &value;
+    if(!force) rv.it->second = value;
     return value.detach();
   }
 
-  Expression_Ptr Eval::operator()(Textual_Ptr t)
-  {
-    using Prelexer::number;
-    Expression_Obj result = 0;
-    size_t L = t->value().length();
-    bool zero = !( (L > 0 && t->value().substr(0, 1) == ".") ||
-                   (L > 1 && t->value().substr(0, 2) == "0.") ||
-                   (L > 1 && t->value().substr(0, 2) == "-.")  ||
-                   (L > 2 && t->value().substr(0, 3) == "-0.")
-                 );
-
-    const std::string& text = t->value();
-    size_t num_pos = text.find_first_not_of(" \n\r\t");
-    if (num_pos == std::string::npos) num_pos = text.length();
-    size_t unit_pos = text.find_first_not_of("-+0123456789.", num_pos);
-    if (unit_pos == std::string::npos) unit_pos = text.length();
-    const std::string& num = text.substr(num_pos, unit_pos - num_pos);
-
-    switch (t->type())
-    {
-      case Textual::NUMBER:
-        result = SASS_MEMORY_NEW(Number,
-                                 t->pstate(),
-                                 sass_atof(num.c_str()),
-                                 "",
-                                 zero);
-        break;
-      case Textual::PERCENTAGE:
-        result = SASS_MEMORY_NEW(Number,
-                                 t->pstate(),
-                                 sass_atof(num.c_str()),
-                                 "%",
-                                 true);
-        break;
-      case Textual::DIMENSION:
-        result = SASS_MEMORY_NEW(Number,
-                                 t->pstate(),
-                                 sass_atof(num.c_str()),
-                                 Token(number(text.c_str())),
-                                 zero);
-        break;
-      case Textual::HEX: {
-        if (t->value().substr(0, 1) != "#") {
-          result = SASS_MEMORY_NEW(String_Quoted, t->pstate(), t->value());
-          break;
-        }
-        std::string hext(t->value().substr(1)); // chop off the '#'
-        if (hext.length() == 6) {
-          std::string r(hext.substr(0,2));
-          std::string g(hext.substr(2,2));
-          std::string b(hext.substr(4,2));
-          result = SASS_MEMORY_NEW(Color,
-                                   t->pstate(),
-                                   static_cast<double>(strtol(r.c_str(), NULL, 16)),
-                                   static_cast<double>(strtol(g.c_str(), NULL, 16)),
-                                   static_cast<double>(strtol(b.c_str(), NULL, 16)),
-                                   1, // alpha channel
-                                   t->value());
-        }
-        else {
-          result = SASS_MEMORY_NEW(Color,
-                                   t->pstate(),
-                                   static_cast<double>(strtol(std::string(2,hext[0]).c_str(), NULL, 16)),
-                                   static_cast<double>(strtol(std::string(2,hext[1]).c_str(), NULL, 16)),
-                                   static_cast<double>(strtol(std::string(2,hext[2]).c_str(), NULL, 16)),
-                                   1, // alpha channel
-                                   t->value());
-        }
-      } break;
-    }
-    result->is_interpolant(t->is_interpolant());
-    return result.detach();
-  }
-
   Expression_Ptr Eval::operator()(Color_Ptr c)
   {
     return c;
@@ -1068,7 +1128,7 @@ namespace Sass {
 
     bool needs_closing_brace = false;
 
-    if (Arguments_Ptr args = SASS_MEMORY_CAST(Arguments, ex)) {
+    if (Arguments_Ptr args = Cast<Arguments>(ex)) {
       List_Ptr ll = SASS_MEMORY_NEW(List, args->pstate(), 0, SASS_COMMA);
       for(auto arg : args->elements()) {
         ll->append(arg->value());
@@ -1078,15 +1138,18 @@ namespace Sass {
       res += "(";
       ex = ll;
     }
-    if (Number_Ptr nr = SASS_MEMORY_CAST(Number, ex)) {
-      if (!nr->is_valid_css_unit()) {
-        throw Exception::InvalidValue(*nr);
+    if (Number_Ptr nr = Cast<Number>(ex)) {
+      Number reduced(nr);
+      reduced.reduce();
+      if (!reduced.is_valid_css_unit()) {
+        traces.push_back(Backtrace(nr->pstate()));
+        throw Exception::InvalidValue(traces, *nr);
       }
     }
-    if (Argument_Ptr arg = SASS_MEMORY_CAST(Argument, ex)) {
-      ex = &arg->value();
+    if (Argument_Ptr arg = Cast<Argument>(ex)) {
+      ex = arg->value();
     }
-    if (String_Quoted_Ptr sq = SASS_MEMORY_CAST(String_Quoted, ex)) {
+    if (String_Quoted_Ptr sq = Cast<String_Quoted>(ex)) {
       if (was_itpl) {
         bool was_interpolant = ex->is_interpolant();
         ex = SASS_MEMORY_NEW(String_Constant, sq->pstate(), sq->value());
@@ -1094,22 +1157,22 @@ namespace Sass {
       }
     }
 
-    if (SASS_MEMORY_CAST(Null, ex)) { return; }
+    if (Cast<Null>(ex)) { return; }
 
     // parent selector needs another go
-    if (SASS_MEMORY_CAST(Parent_Selector, ex)) {
+    if (Cast<Parent_Selector>(ex)) {
       // XXX: this is never hit via spec tests
       ex = ex->perform(this);
     }
 
-    if (List_Ptr l = SASS_MEMORY_CAST(List, ex)) {
+    if (List_Ptr l = Cast<List>(ex)) {
       List_Obj ll = SASS_MEMORY_NEW(List, l->pstate(), 0, l->separator());
       // this fixes an issue with bourbon sample, not really sure why
-      // if (l->size() && dynamic_cast<Null_Ptr>((*l)[0])) { res += ""; }
+      // if (l->size() && Cast<Null>((*l)[0])) { res += ""; }
       for(Expression_Obj item : *l) {
         item->is_interpolant(l->is_interpolant());
-        std::string rl(""); interpolation(ctx, rl, &item, into_quotes, l->is_interpolant());
-        bool is_null = dynamic_cast<Null_Ptr>(&item) != 0; // rl != ""
+        std::string rl(""); interpolation(ctx, rl, item, into_quotes, l->is_interpolant());
+        bool is_null = Cast<Null>(item) != 0; // rl != ""
         if (!is_null) ll->append(SASS_MEMORY_NEW(String_Quoted, item->pstate(), rl));
       }
       // Check indicates that we probably should not get a list
@@ -1117,6 +1180,7 @@ namespace Sass {
       if (l->size() > 1) {
         // string_to_output would fail "#{'_\a' '_\a'}";
         std::string str(ll->to_string(ctx.c_options));
+        str = read_hex_escapes(str); // read escapes
         newline_to_space(str); // replace directly
         res += str; // append to result string
       } else {
@@ -1126,7 +1190,6 @@ namespace Sass {
     }
 
     // Value
-    // Textual
     // Function_Call
     // Selector_List
     // String_Quoted
@@ -1138,7 +1201,9 @@ namespace Sass {
       if (into_quotes && ex->is_interpolant()) {
         res += evacuate_escapes(ex ? ex->to_string(ctx.c_options) : "");
       } else {
-        res += ex ? ex->to_string(ctx.c_options) : "";
+        std::string str(ex ? ex->to_string(ctx.c_options) : "");
+        if (into_quotes) str = read_hex_escapes(str);
+        res += str; // append to result string
       }
     }
 
@@ -1151,9 +1216,9 @@ namespace Sass {
     size_t L = s->length();
     bool into_quotes = false;
     if (L > 1) {
-      if (!SASS_MEMORY_CAST(String_Quoted, (*s)[0]) && !SASS_MEMORY_CAST(String_Quoted, (*s)[L - 1])) {
-      if (String_Constant_Ptr l = SASS_MEMORY_CAST(String_Constant, (*s)[0])) {
-        if (String_Constant_Ptr r = SASS_MEMORY_CAST(String_Constant, (*s)[L - 1])) {
+      if (!Cast<String_Quoted>((*s)[0]) && !Cast<String_Quoted>((*s)[L - 1])) {
+      if (String_Constant_Ptr l = Cast<String_Constant>((*s)[0])) {
+        if (String_Constant_Ptr r = Cast<String_Constant>((*s)[L - 1])) {
           if (r->value().size() > 0) {
             if (l->value()[0] == '"' && r->value()[r->value().size() - 1] == '"') into_quotes = true;
             if (l->value()[0] == '\'' && r->value()[r->value().size() - 1] == '\'') into_quotes = true;
@@ -1166,21 +1231,21 @@ namespace Sass {
     bool was_interpolant = false;
     std::string res("");
     for (size_t i = 0; i < L; ++i) {
-      bool is_quoted = SASS_MEMORY_CAST(String_Quoted, (*s)[i]) != NULL;
+      bool is_quoted = Cast<String_Quoted>((*s)[i]) != NULL;
       if (was_quoted && !(*s)[i]->is_interpolant() && !was_interpolant) { res += " "; }
       else if (i > 0 && is_quoted && !(*s)[i]->is_interpolant() && !was_interpolant) { res += " "; }
       Expression_Obj ex = (*s)[i]->perform(this);
       interpolation(ctx, res, ex, into_quotes, ex->is_interpolant());
-      was_quoted = SASS_MEMORY_CAST(String_Quoted, (*s)[i]) != NULL;
+      was_quoted = Cast<String_Quoted>((*s)[i]) != NULL;
       was_interpolant = (*s)[i]->is_interpolant();
 
     }
     if (!s->is_interpolant()) {
       if (s->length() > 1 && res == "") return SASS_MEMORY_NEW(Null, s->pstate());
-      return SASS_MEMORY_NEW(String_Constant, s->pstate(), res);
+      return SASS_MEMORY_NEW(String_Constant, s->pstate(), res, s->css());
     }
     // string schema seems to have a special unquoting behavior (also handles "nested" quotes)
-    String_Quoted_Obj str = SASS_MEMORY_NEW(String_Quoted, s->pstate(), res, 0, false, false, false);
+    String_Quoted_Obj str = SASS_MEMORY_NEW(String_Quoted, s->pstate(), res, 0, false, false, false, s->css());
     // if (s->is_interpolant()) str->quote_mark(0);
     // String_Constant_Ptr str = SASS_MEMORY_NEW(String_Constant, s->pstate(), res);
     if (str->quote_mark()) str->quote_mark('*');
@@ -1192,13 +1257,6 @@ namespace Sass {
 
   Expression_Ptr Eval::operator()(String_Constant_Ptr s)
   {
-    if (!s->is_delayed() && name_to_color(s->value())) {
-      Color_Ptr c = SASS_MEMORY_COPY(name_to_color(s->value())); // copy
-      c->pstate(s->pstate());
-      c->disp(s->value());
-      c->is_delayed(true);
-      return c;
-    }
     return s;
   }
 
@@ -1217,8 +1275,8 @@ namespace Sass {
     Expression_Ptr right = c->right()->perform(this);
     Supports_Operator_Ptr cc = SASS_MEMORY_NEW(Supports_Operator,
                                  c->pstate(),
-                                 dynamic_cast<Supports_Condition_Ptr>(left),
-                                 dynamic_cast<Supports_Condition_Ptr>(right),
+                                 Cast<Supports_Condition>(left),
+                                 Cast<Supports_Condition>(right),
                                  c->operand());
     return cc;
   }
@@ -1228,7 +1286,7 @@ namespace Sass {
     Expression_Ptr condition = c->condition()->perform(this);
     Supports_Negation_Ptr cc = SASS_MEMORY_NEW(Supports_Negation,
                                  c->pstate(),
-                                 dynamic_cast<Supports_Condition_Ptr>(condition));
+                                 Cast<Supports_Condition>(condition));
     return cc;
   }
 
@@ -1260,18 +1318,18 @@ namespace Sass {
     value = (value ? value->perform(this) : 0);
     Expression_Ptr ee = SASS_MEMORY_NEW(At_Root_Query,
                                      e->pstate(),
-                                     dynamic_cast<String_Ptr>(&feature),
+                                     Cast<String>(feature),
                                      value);
     return ee;
   }
 
-  Expression_Ptr Eval::operator()(Media_Query_Ptr q)
+  Media_Query_Ptr Eval::operator()(Media_Query_Ptr q)
   {
     String_Obj t = q->media_type();
-    t = static_cast<String_Ptr>(&t ? t->perform(this) : 0);
+    t = static_cast<String_Ptr>(t.isNull() ? 0 : t->perform(this));
     Media_Query_Obj qq = SASS_MEMORY_NEW(Media_Query,
                                       q->pstate(),
-                                      &t,
+                                      t,
                                       q->length(),
                                       q->is_negated(),
                                       q->is_restricted());
@@ -1285,18 +1343,18 @@ namespace Sass {
   {
     Expression_Obj feature = e->feature();
     feature = (feature ? feature->perform(this) : 0);
-    if (feature && SASS_MEMORY_CAST(String_Quoted, feature)) {
+    if (feature && Cast<String_Quoted>(feature)) {
       feature = SASS_MEMORY_NEW(String_Quoted,
                                   feature->pstate(),
-                                  SASS_MEMORY_CAST(String_Quoted, feature)->value());
+                                  Cast<String_Quoted>(feature)->value());
     }
     Expression_Obj value = e->value();
     value = (value ? value->perform(this) : 0);
-    if (value && SASS_MEMORY_CAST(String_Quoted, value)) {
+    if (value && Cast<String_Quoted>(value)) {
       // XXX: this is never hit via spec tests
       value = SASS_MEMORY_NEW(String_Quoted,
                                 value->pstate(),
-                                SASS_MEMORY_CAST(String_Quoted, value)->value());
+                                Cast<String_Quoted>(value)->value());
     }
     return SASS_MEMORY_NEW(Media_Query_Expression,
                            e->pstate(),
@@ -1328,7 +1386,7 @@ namespace Sass {
                                         SASS_COMMA,
                                         true);
         wrapper->append(val);
-        val = &wrapper;
+        val = wrapper;
       }
     }
     return SASS_MEMORY_NEW(Argument,
@@ -1345,7 +1403,7 @@ namespace Sass {
     if (a->length() == 0) return aa.detach();
     for (size_t i = 0, L = a->length(); i < L; ++i) {
       Expression_Obj rv = (*a)[i]->perform(this);
-      Argument_Ptr arg = SASS_MEMORY_CAST(Argument, rv);
+      Argument_Ptr arg = Cast<Argument>(rv);
       if (!(arg->is_rest_argument() || arg->is_keyword_argument())) {
         aa->append(arg);
       }
@@ -1353,11 +1411,11 @@ namespace Sass {
 
     if (a->has_rest_argument()) {
       Expression_Obj rest = a->get_rest_argument()->perform(this);
-      Expression_Obj splat = SASS_MEMORY_CAST(Argument, rest)->value()->perform(this);
+      Expression_Obj splat = Cast<Argument>(rest)->value()->perform(this);
 
       Sass_Separator separator = SASS_COMMA;
-      List_Ptr ls = SASS_MEMORY_CAST(List, splat);
-      Map_Ptr ms = SASS_MEMORY_CAST(Map, splat);
+      List_Ptr ls = Cast<List>(splat);
+      Map_Ptr ms = Cast<Map>(splat);
 
       List_Obj arglist = SASS_MEMORY_NEW(List,
                                       splat->pstate(),
@@ -1375,13 +1433,13 @@ namespace Sass {
         arglist->append(splat);
       }
       if (arglist->length()) {
-        aa->append(SASS_MEMORY_NEW(Argument, splat->pstate(), &arglist, "", true));
+        aa->append(SASS_MEMORY_NEW(Argument, splat->pstate(), arglist, "", true));
       }
     }
 
     if (a->has_keyword_argument()) {
       Expression_Obj rv = a->get_keyword_argument()->perform(this);
-      Argument_Ptr rvarg = SASS_MEMORY_CAST(Argument, rv);
+      Argument_Ptr rvarg = Cast<Argument>(rv);
       Expression_Obj kwarg = rvarg->value()->perform(this);
 
       aa->append(SASS_MEMORY_NEW(Argument, kwarg->pstate(), kwarg, "", false, true));
@@ -1401,191 +1459,7 @@ namespace Sass {
 
   // All the binary helpers.
 
-  bool Eval::eq(Expression_Obj lhs, Expression_Obj rhs)
-  {
-    // use compare operator from ast node
-    return lhs && rhs && *lhs == *rhs;
-  }
-
-  bool Eval::lt(Expression_Obj lhs, Expression_Obj rhs, std::string op)
-  {
-    Number_Obj l = SASS_MEMORY_CAST(Number, lhs);
-    Number_Obj r = SASS_MEMORY_CAST(Number, rhs);
-    // use compare operator from ast node
-    if (!l || !r) throw Exception::UndefinedOperation(&lhs, &rhs, op);
-    // use compare operator from ast node
-    return *l < *r;
-  }
-
-  Value_Ptr Eval::op_numbers(enum Sass_OP op, const Number& l, const Number& r, struct Sass_Inspect_Options opt, ParserState* pstate)
-  {
-    double lv = l.value();
-    double rv = r.value();
-    if (op == Sass_OP::DIV && rv == 0) {
-      // XXX: this is never hit via spec tests
-      return SASS_MEMORY_NEW(String_Quoted, pstate ? *pstate : l.pstate(), lv ? "Infinity" : "NaN");
-    }
-    if (op == Sass_OP::MOD && !rv) {
-      // XXX: this is never hit via spec tests
-      throw Exception::ZeroDivisionError(l, r);
-    }
-
-    Number tmp(&r); // copy
-    bool strict = op != Sass_OP::MUL && op != Sass_OP::DIV;
-    tmp.normalize(l.find_convertible_unit(), strict);
-    std::string l_unit(l.unit());
-    std::string r_unit(tmp.unit());
-    Number_Obj v = SASS_MEMORY_COPY(&l); // copy
-    v->pstate(pstate ? *pstate : l.pstate());
-    if (l_unit.empty() && (op == Sass_OP::ADD || op == Sass_OP::SUB || op == Sass_OP::MOD)) {
-      v->numerator_units() = r.numerator_units();
-      v->denominator_units() = r.denominator_units();
-    }
-
-    if (op == Sass_OP::MUL) {
-      v->value(ops[op](lv, rv));
-      for (size_t i = 0, S = r.numerator_units().size(); i < S; ++i) {
-        v->numerator_units().push_back(r.numerator_units()[i]);
-      }
-      for (size_t i = 0, S = r.denominator_units().size(); i < S; ++i) {
-        v->denominator_units().push_back(r.denominator_units()[i]);
-      }
-    }
-    else if (op == Sass_OP::DIV) {
-      v->value(ops[op](lv, rv));
-      for (size_t i = 0, S = r.numerator_units().size(); i < S; ++i) {
-        v->denominator_units().push_back(r.numerator_units()[i]);
-      }
-      for (size_t i = 0, S = r.denominator_units().size(); i < S; ++i) {
-        v->numerator_units().push_back(r.denominator_units()[i]);
-      }
-    } else {
-      v->value(ops[op](lv, r.value() * r.convert_factor(l)));
-      // v->normalize();
-      return v.detach();
-
-      v->value(ops[op](lv, tmp.value()));
-    }
-    v->normalize();
-    return v.detach();
-  }
-
-  Value_Ptr Eval::op_number_color(enum Sass_OP op, const Number& l, const Color& r, struct Sass_Inspect_Options opt, ParserState* pstate)
-  {
-    double lv = l.value();
-    switch (op) {
-      case Sass_OP::ADD:
-      case Sass_OP::MUL: {
-        return SASS_MEMORY_NEW(Color,
-                               pstate ? *pstate : l.pstate(),
-                               ops[op](lv, r.r()),
-                               ops[op](lv, r.g()),
-                               ops[op](lv, r.b()),
-                               r.a());
-      } break;
-      case Sass_OP::SUB:
-      case Sass_OP::DIV: {
-        std::string sep(op == Sass_OP::SUB ? "-" : "/");
-        std::string color(r.to_string(opt));
-        return SASS_MEMORY_NEW(String_Quoted,
-                               pstate ? *pstate : l.pstate(),
-                               l.to_string(opt)
-                               + sep
-                               + color);
-      } break;
-      case Sass_OP::MOD: {
-        throw Exception::UndefinedOperation(&l, &r, sass_op_to_name(op));
-      } break;
-      default: break; // caller should ensure that we don't get here
-    }
-    // unreachable
-    return NULL;
-  }
-
-  Value_Ptr Eval::op_color_number(enum Sass_OP op, const Color& l, const Number& r, struct Sass_Inspect_Options opt, ParserState* pstate)
-  {
-    double rv = r.value();
-    if (op == Sass_OP::DIV && !rv) {
-      // comparison of Fixnum with Float failed?
-      throw Exception::ZeroDivisionError(l, r);
-    }
-    return SASS_MEMORY_NEW(Color,
-                           pstate ? *pstate : l.pstate(),
-                           ops[op](l.r(), rv),
-                           ops[op](l.g(), rv),
-                           ops[op](l.b(), rv),
-                           l.a());
-  }
-
-  Value_Ptr Eval::op_colors(enum Sass_OP op, const Color& l, const Color& r, struct Sass_Inspect_Options opt, ParserState* pstate)
-  {
-    if (l.a() != r.a()) {
-      throw Exception::AlphaChannelsNotEqual(&l, &r, "+");
-    }
-    if (op == Sass_OP::DIV && (!r.r() || !r.g() ||!r.b())) {
-      // comparison of Fixnum with Float failed?
-      throw Exception::ZeroDivisionError(l, r);
-    }
-    return SASS_MEMORY_NEW(Color,
-                           pstate ? *pstate : l.pstate(),
-                           ops[op](l.r(), r.r()),
-                           ops[op](l.g(), r.g()),
-                           ops[op](l.b(), r.b()),
-                           l.a());
-  }
-
-  Value_Ptr Eval::op_strings(Sass::Operand operand, Value& lhs, Value& rhs, struct Sass_Inspect_Options opt, ParserState* pstate, bool delayed)
-  {
-    Expression::Concrete_Type ltype = lhs.concrete_type();
-    Expression::Concrete_Type rtype = rhs.concrete_type();
-    enum Sass_OP op = operand.operand;
-
-    String_Quoted_Ptr lqstr = dynamic_cast<String_Quoted_Ptr>(&lhs);
-    String_Quoted_Ptr rqstr = dynamic_cast<String_Quoted_Ptr>(&rhs);
-
-    std::string lstr(lqstr ? lqstr->value() : lhs.to_string(opt));
-    std::string rstr(rqstr ? rqstr->value() : rhs.to_string(opt));
-
-    if (ltype == Expression::NULL_VAL) throw Exception::InvalidNullOperation(&lhs, &rhs, sass_op_to_name(op));
-    if (rtype == Expression::NULL_VAL) throw Exception::InvalidNullOperation(&lhs, &rhs, sass_op_to_name(op));
-    if (op == Sass_OP::MOD) throw Exception::UndefinedOperation(&lhs, &rhs, sass_op_to_name(op));
-    if (op == Sass_OP::MUL) throw Exception::UndefinedOperation(&lhs, &rhs, sass_op_to_name(op));
-    std::string sep;
-    switch (op) {
-      case Sass_OP::SUB: sep = "-"; break;
-      case Sass_OP::DIV: sep = "/"; break;
-      case Sass_OP::MUL: sep = "*"; break;
-      case Sass_OP::MOD: sep = "%"; break;
-      case Sass_OP::EQ:  sep = "=="; break;
-      case Sass_OP::NEQ:  sep = "!="; break;
-      case Sass_OP::LT:  sep = "<"; break;
-      case Sass_OP::GT:  sep = ">"; break;
-      case Sass_OP::LTE:  sep = "<="; break;
-      case Sass_OP::GTE:  sep = ">="; break;
-      default:                      break;
-    }
-
-    if ( (sep == "") /* &&
-         (sep != "/" || !rqstr || !rqstr->quote_mark()) */
-    ) {
-      // create a new string that might be quoted on output (but do not unquote what we pass)
-      return SASS_MEMORY_NEW(String_Quoted, pstate ? *pstate : lhs.pstate(), lstr + rstr, 0, false, true);
-    }
-
-    if (sep != "" && !delayed) {
-      if (operand.ws_before) sep = " " + sep;
-      if (operand.ws_after) sep = sep + " ";
-    }
-
-    if (op == Sass_OP::SUB || op == Sass_OP::DIV) {
-      if (lqstr && lqstr->quote_mark()) lstr = quote(lstr);
-      if (rqstr && rqstr->quote_mark()) rstr = quote(rstr);
-    }
-
-    return SASS_MEMORY_NEW(String_Constant, pstate ? *pstate : lhs.pstate(), lstr + sep + rstr);
-  }
-
-  Expression_Ptr cval_to_astnode(union Sass_Value* v, Backtrace* backtrace, ParserState pstate)
+  Expression_Ptr cval_to_astnode(union Sass_Value* v, Backtraces traces, ParserState pstate)
   {
     using std::strlen;
     using std::strcpy;
@@ -1610,16 +1484,17 @@ namespace Sass {
       case SASS_LIST: {
         List_Ptr l = SASS_MEMORY_NEW(List, pstate, sass_list_get_length(v), sass_list_get_separator(v));
         for (size_t i = 0, L = sass_list_get_length(v); i < L; ++i) {
-          l->append(cval_to_astnode(sass_list_get_value(v, i), backtrace, pstate));
+          l->append(cval_to_astnode(sass_list_get_value(v, i), traces, pstate));
         }
+        l->is_bracketed(sass_list_get_is_bracketed(v));
         e = l;
       } break;
       case SASS_MAP: {
         Map_Ptr m = SASS_MEMORY_NEW(Map, pstate);
         for (size_t i = 0, L = sass_map_get_length(v); i < L; ++i) {
           *m << std::make_pair(
-            cval_to_astnode(sass_map_get_key(v, i), backtrace, pstate),
-            cval_to_astnode(sass_map_get_value(v, i), backtrace, pstate));
+            cval_to_astnode(sass_map_get_key(v, i), traces, pstate),
+            cval_to_astnode(sass_map_get_value(v, i), traces, pstate));
         }
         e = m;
       } break;
@@ -1627,11 +1502,12 @@ namespace Sass {
         e = SASS_MEMORY_NEW(Null, pstate);
       } break;
       case SASS_ERROR: {
-        error("Error in C function: " + std::string(sass_error_get_message(v)), pstate, backtrace);
+        error("Error in C function: " + std::string(sass_error_get_message(v)), pstate, traces);
       } break;
       case SASS_WARNING: {
-        error("Warning in C function: " + std::string(sass_warning_get_message(v)), pstate, backtrace);
+        error("Warning in C function: " + std::string(sass_warning_get_message(v)), pstate, traces);
       } break;
+      default: break;
     }
     return e;
   }
@@ -1644,7 +1520,7 @@ namespace Sass {
     sl->media_block(s->media_block());
     sl->is_optional(s->is_optional());
     for (size_t i = 0, iL = s->length(); i < iL; ++i) {
-      rv.push_back(operator()(&(*s)[i]));
+      rv.push_back(operator()((*s)[i]));
     }
 
     // we should actually permutate parent first
@@ -1672,37 +1548,72 @@ namespace Sass {
   Selector_List_Ptr Eval::operator()(Complex_Selector_Ptr s)
   {
     bool implicit_parent = !exp.old_at_root_without_rule;
-    return s->resolve_parent_refs(ctx, exp.selector_stack, implicit_parent);
+    if (is_in_selector_schema) exp.selector_stack.push_back(0);
+    Selector_List_Obj resolved = s->resolve_parent_refs(exp.selector_stack, traces, implicit_parent);
+    if (is_in_selector_schema) exp.selector_stack.pop_back();
+    for (size_t i = 0; i < resolved->length(); i++) {
+      Complex_Selector_Ptr is = resolved->at(i)->first();
+      while (is) {
+        if (is->head()) {
+          is->head(operator()(is->head()));
+        }
+        is = is->tail();
+      }
+    }
+    return resolved.detach();
   }
 
-  // XXX: this is never hit via spec tests
-  Attribute_Selector_Ptr Eval::operator()(Attribute_Selector_Ptr s)
+  Compound_Selector_Ptr Eval::operator()(Compound_Selector_Ptr s)
   {
-    String_Obj attr = s->value();
-    if (attr) { attr = static_cast<String_Ptr>(attr->perform(this)); }
-    Attribute_Selector_Ptr ss = SASS_MEMORY_COPY(s);
-    ss->value(attr);
-    return ss;
+    for (size_t i = 0; i < s->length(); i++) {
+      Simple_Selector_Ptr ss = s->at(i);
+      // skip parents here (called via resolve_parent_refs)
+      if (ss == NULL || Cast<Parent_Selector>(ss)) continue;
+      s->at(i) = Cast<Simple_Selector>(ss->perform(this));
+    }
+    return s;
   }
 
   Selector_List_Ptr Eval::operator()(Selector_Schema_Ptr s)
   {
+    LOCAL_FLAG(is_in_selector_schema, true);
     // the parser will look for a brace to end the selector
+    ctx.c_options.in_selector = true; // do not compress colors
     Expression_Obj sel = s->contents()->perform(this);
     std::string result_str(sel->to_string(ctx.c_options));
-    result_str = unquote(Util::rtrim(result_str)) + "\n{";
-    Parser p = Parser::from_c_str(result_str.c_str(), ctx, s->pstate());
+    ctx.c_options.in_selector = false; // flag temporary only
+    result_str = unquote(Util::rtrim(result_str));
+    char* temp_cstr = sass_copy_c_string(result_str.c_str());
+    ctx.strings.push_back(temp_cstr); // attach to context
+    Parser p = Parser::from_c_str(temp_cstr, ctx, traces, s->pstate());
     p.last_media_block = s->media_block();
-    Selector_List_Obj sl = p.parse_selector_list(exp.block_stack.back()->is_root());
-    if (s->has_parent_ref()) sl->remove_parent_selectors();
-    return operator()(&sl);
+    // a selector schema may or may not connect to parent?
+    bool chroot = s->connect_parent() == false;
+    Selector_List_Obj sl = p.parse_selector_list(chroot);
+    auto vec_str_rend = ctx.strings.rend();
+    auto vec_str_rbegin = ctx.strings.rbegin();
+    // remove the first item searching from the back
+    // we cannot assume our item is still the last one
+    // order is not important, so we can optimize this
+    auto it = std::find(vec_str_rbegin, vec_str_rend, temp_cstr);
+    // undefined behavior if not found!
+    if (it != vec_str_rend) {
+      // overwrite with last item
+      *it = ctx.strings.back();
+      // remove last one from vector
+      ctx.strings.pop_back();
+      // free temporary copy
+      free(temp_cstr);
+    }
+    flag_is_in_selector_schema.reset();
+    return operator()(sl);
   }
 
   Expression_Ptr Eval::operator()(Parent_Selector_Ptr p)
   {
     if (Selector_List_Obj pr = selector()) {
       exp.selector_stack.pop_back();
-      Selector_List_Obj rv = operator()(&pr);
+      Selector_List_Obj rv = operator()(pr);
       exp.selector_stack.push_back(rv);
       return rv.detach();
     } else {
@@ -1710,4 +1621,43 @@ namespace Sass {
     }
   }
 
+  Simple_Selector_Ptr Eval::operator()(Simple_Selector_Ptr s)
+  {
+    return s;
+  }
+
+  // hotfix to avoid invalid nested `:not` selectors
+  // probably the wrong place, but this should ultimately
+  // be fixed by implement superselector correctly for `:not`
+  // first use of "find" (ATM only implemented for selectors)
+  bool hasNotSelector(AST_Node_Obj obj) {
+    if (Wrapped_Selector_Ptr w = Cast<Wrapped_Selector>(obj)) {
+      return w->name() == ":not";
+    }
+    return false;
+  }
+
+  Wrapped_Selector_Ptr Eval::operator()(Wrapped_Selector_Ptr s)
+  {
+
+    if (s->name() == ":not") {
+      if (exp.selector_stack.back()) {
+        if (s->selector()->find(hasNotSelector)) {
+          s->selector()->clear();
+          s->name(" ");
+        } else if (s->selector()->length() == 1) {
+          Complex_Selector_Ptr cs = s->selector()->at(0);
+          if (cs->tail()) {
+            s->selector()->clear();
+            s->name(" ");
+          }
+        } else if (s->selector()->length() > 1) {
+          s->selector()->clear();
+          s->name(" ");
+        }
+      }
+    }
+    return s;
+  };
+
 }