sassc 2.0.1 → 2.1.0.pre1

data/ext/libsass/src/eval.cpp

@@ -1,4 +1,7 @@
+// sass.hpp must go before all system headers to get the
+// __EXTENSIONS__ fix on Solaris.
 #include "sass.hpp"
+
 #include <cstdlib>
 #include <cmath>
 #include <iostream>
@@ -17,7 +20,8 @@
 #include "position.hpp"
 #include "sass/values.h"
 #include "to_value.hpp"
-#include "to_c.hpp"
+#include "ast2c.hpp"
+#include "c2ast.hpp"
 #include "context.hpp"
 #include "backtrace.hpp"
 #include "lexer.hpp"
@@ -26,6 +30,7 @@
 #include "expand.hpp"
 #include "color_maps.hpp"
 #include "sass_functions.hpp"
+#include "util_string.hpp"
 
 namespace Sass {
 
@@ -47,14 +52,51 @@ namespace Sass {
     return exp.environment();
   }
 
+  const std::string Eval::cwd()
+  {
+    return ctx.cwd();
+  }
+
+  struct Sass_Inspect_Options& Eval::options()
+  {
+    return ctx.c_options;
+  }
+
+  struct Sass_Compiler* Eval::compiler()
+  {
+    return ctx.c_compiler;
+  }
+
+  EnvStack& Eval::env_stack()
+  {
+    return exp.env_stack;
+  }
+
   Selector_List_Obj Eval::selector()
   {
     return exp.selector();
   }
 
-  Expression_Ptr Eval::operator()(Block_Ptr b)
+  std::vector<Sass_Callee>& Eval::callee_stack()
+  {
+    return ctx.callee_stack;
+  }
+
+
+  SelectorStack& Eval::selector_stack()
+  {
+    return exp.selector_stack;
+  }
+
+  bool& Eval::old_at_root_without_rule()
+  {
+    return exp.old_at_root_without_rule;
+  }
+
+
+  Expression* Eval::operator()(Block* b)
   {
-    Expression_Ptr val = 0;
+    Expression* val = 0;
     for (size_t i = 0, L = b->length(); i < L; ++i) {
       val = b->at(i)->perform(this);
       if (val) return val;
@@ -62,14 +104,14 @@ namespace Sass {
     return val;
   }
 
-  Expression_Ptr Eval::operator()(Assignment_Ptr a)
+  Expression* Eval::operator()(Assignment* a)
   {
-    Env* env = exp.environment();
+    Env* env = environment();
     std::string var(a->variable());
     if (a->is_global()) {
       if (a->is_default()) {
         if (env->has_global(var)) {
-          Expression_Ptr e = Cast<Expression>(env->get_global(var));
+          Expression* e = Cast<Expression>(env->get_global(var));
           if (!e || e->concrete_type() == Expression::NULL_VAL) {
             env->set_global(var, a->value()->perform(this));
           }
@@ -88,7 +130,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 = Cast<Expression>(node);
+              Expression* e = Cast<Expression>(node);
               if (!e || e->concrete_type() == Expression::NULL_VAL) {
                 cur->set_local(var, a->value()->perform(this));
               }
@@ -104,7 +146,7 @@ namespace Sass {
       }
       else if (env->has_global(var)) {
         if (AST_Node_Obj node = env->get_global(var)) {
-          Expression_Ptr e = Cast<Expression>(node);
+          Expression* e = Cast<Expression>(node);
           if (!e || e->concrete_type() == Expression::NULL_VAL) {
             env->set_global(var, a->value()->perform(this));
           }
@@ -123,11 +165,11 @@ namespace Sass {
     return 0;
   }
 
-  Expression_Ptr Eval::operator()(If_Ptr i)
+  Expression* Eval::operator()(If* i)
   {
-    Expression_Obj rv = 0;
-    Env env(exp.environment());
-    exp.env_stack.push_back(&env);
+    Expression_Obj rv;
+    Env env(environment());
+    env_stack().push_back(&env);
     Expression_Obj cond = i->predicate()->perform(this);
     if (!cond->is_false()) {
       rv = i->block()->perform(this);
@@ -136,13 +178,13 @@ namespace Sass {
       Block_Obj alt = i->alternative();
       if (alt) rv = alt->perform(this);
     }
-    exp.env_stack.pop_back();
+    env_stack().pop_back();
     return rv.detach();
   }
 
   // For does not create a new env scope
   // But iteration vars are reset afterwards
-  Expression_Ptr Eval::operator()(For_Ptr f)
+  Expression* Eval::operator()(For* f)
   {
     std::string variable(f->variable());
     Expression_Obj low = f->lower_bound()->perform(this);
@@ -168,9 +210,9 @@ namespace Sass {
     double end = sass_end->value();
     // only create iterator once in this environment
     Env env(environment(), true);
-    exp.env_stack.push_back(&env);
+    env_stack().push_back(&env);
     Block_Obj body = f->block();
-    Expression_Ptr val = 0;
+    Expression* val = 0;
     if (start < end) {
       if (f->is_inclusive()) ++end;
       for (double i = start;
@@ -192,24 +234,24 @@ namespace Sass {
         if (val) break;
       }
     }
-    exp.env_stack.pop_back();
+    env_stack().pop_back();
     return val;
   }
 
   // Eval does not create a new env scope
   // But iteration vars are reset afterwards
-  Expression_Ptr Eval::operator()(Each_Ptr e)
+  Expression* Eval::operator()(Each* e)
   {
     std::vector<std::string> variables(e->variables());
     Expression_Obj expr = e->list()->perform(this);
     Env env(environment(), true);
-    exp.env_stack.push_back(&env);
-    List_Obj list = 0;
-    Map_Ptr map = 0;
+    env_stack().push_back(&env);
+    List_Obj list;
+    Map* map = nullptr;
     if (expr->concrete_type() == Expression::MAP) {
       map = Cast<Map>(expr);
     }
-    else if (Selector_List_Ptr ls = Cast<Selector_List>(expr)) {
+    else if (Selector_List* ls = Cast<Selector_List>(expr)) {
       Listize listize;
       Expression_Obj rv = ls->perform(&listize);
       list = Cast<List>(rv);
@@ -223,14 +265,14 @@ namespace Sass {
     }
 
     Block_Obj body = e->block();
-    Expression_Obj val = 0;
+    Expression_Obj val;
 
     if (map) {
       for (Expression_Obj key : map->keys()) {
         Expression_Obj value = map->at(key);
 
         if (variables.size() == 1) {
-          List_Ptr variable = SASS_MEMORY_NEW(List, map->pstate(), 2, SASS_SPACE);
+          List* variable = SASS_MEMORY_NEW(List, map->pstate(), 2, SASS_SPACE);
           variable->append(key);
           variable->append(value);
           env.set_local(variables[0], variable);
@@ -248,18 +290,18 @@ namespace Sass {
         list = Cast<List>(list);
       }
       for (size_t i = 0, L = list->length(); i < L; ++i) {
-        Expression_Ptr item = list->at(i);
+        Expression* item = list->at(i);
         // unwrap value if the expression is an argument
-        if (Argument_Ptr arg = Cast<Argument>(item)) item = arg->value();
+        if (Argument* arg = Cast<Argument>(item)) item = arg->value();
         // check if we got passed a list of args (investigate)
-        if (List_Ptr scalars = Cast<List>(item)) {
+        if (List* scalars = Cast<List>(item)) {
           if (variables.size() == 1) {
-            Expression_Ptr var = scalars;
+            Expression* var = scalars;
             env.set_local(variables[0], var);
           } else {
             // XXX: this is never hit via spec tests
             for (size_t j = 0, K = variables.size(); j < K; ++j) {
-              Expression_Ptr res = j >= scalars->length()
+              Expression* res = j >= scalars->length()
                 ? SASS_MEMORY_NEW(Null, expr->pstate())
                 : scalars->at(j);
               env.set_local(variables[j], res);
@@ -270,7 +312,7 @@ namespace Sass {
             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());
+              Expression* res = SASS_MEMORY_NEW(Null, expr->pstate());
               env.set_local(variables[j], res);
             }
           }
@@ -279,46 +321,46 @@ namespace Sass {
         if (val) break;
       }
     }
-    exp.env_stack.pop_back();
+    env_stack().pop_back();
     return val.detach();
   }
 
-  Expression_Ptr Eval::operator()(While_Ptr w)
+  Expression* Eval::operator()(While* w)
   {
     Expression_Obj pred = w->predicate();
     Block_Obj body = w->block();
     Env env(environment(), true);
-    exp.env_stack.push_back(&env);
+    env_stack().push_back(&env);
     Expression_Obj cond = pred->perform(this);
     while (!cond->is_false()) {
       Expression_Obj val = body->perform(this);
       if (val) {
-        exp.env_stack.pop_back();
+        env_stack().pop_back();
         return val.detach();
       }
       cond = pred->perform(this);
     }
-    exp.env_stack.pop_back();
+    env_stack().pop_back();
     return 0;
   }
 
-  Expression_Ptr Eval::operator()(Return_Ptr r)
+  Expression* Eval::operator()(Return* r)
   {
     return r->value()->perform(this);
   }
 
-  Expression_Ptr Eval::operator()(Warning_Ptr w)
+  Expression* Eval::operator()(Warning* w)
   {
-    Sass_Output_Style outstyle = ctx.c_options.output_style;
-    ctx.c_options.output_style = NESTED;
+    Sass_Output_Style outstyle = options().output_style;
+    options().output_style = NESTED;
     Expression_Obj message = w->message()->perform(this);
-    Env* env = exp.environment();
+    Env* env = environment();
 
     // try to use generic function
     if (env->has("@warn[f]")) {
 
       // add call stack entry
-      ctx.callee_stack.push_back({
+      callee_stack().push_back({
         "@warn",
         w->pstate().path,
         w->pstate().line + 1,
@@ -327,18 +369,18 @@ namespace Sass {
         { env }
       });
 
-      Definition_Ptr def = Cast<Definition>((*env)["@warn[f]"]);
+      Definition* 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;
+      AST2C ast2c;
       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_list_set_value(c_args, 0, message->perform(&ast2c));
+      union Sass_Value* c_val = c_func(c_args, c_function, compiler());
+      options().output_style = outstyle;
+      callee_stack().pop_back();
       sass_delete_value(c_args);
       sass_delete_value(c_val);
       return 0;
@@ -350,23 +392,23 @@ namespace Sass {
     traces.push_back(Backtrace(w->pstate()));
     std::cerr << traces_to_string(traces, "         ");
     std::cerr << std::endl;
-    ctx.c_options.output_style = outstyle;
+    options().output_style = outstyle;
     traces.pop_back();
     return 0;
   }
 
-  Expression_Ptr Eval::operator()(Error_Ptr e)
+  Expression* Eval::operator()(Error* e)
   {
-    Sass_Output_Style outstyle = ctx.c_options.output_style;
-    ctx.c_options.output_style = NESTED;
+    Sass_Output_Style outstyle = options().output_style;
+    options().output_style = NESTED;
     Expression_Obj message = e->message()->perform(this);
-    Env* env = exp.environment();
+    Env* env = environment();
 
     // try to use generic function
     if (env->has("@error[f]")) {
 
       // add call stack entry
-      ctx.callee_stack.push_back({
+      callee_stack().push_back({
         "@error",
         e->pstate().path,
         e->pstate().line + 1,
@@ -375,18 +417,18 @@ namespace Sass {
         { env }
       });
 
-      Definition_Ptr def = Cast<Definition>((*env)["@error[f]"]);
+      Definition* 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;
+      AST2C ast2c;
       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_list_set_value(c_args, 0, message->perform(&ast2c));
+      union Sass_Value* c_val = c_func(c_args, c_function, compiler());
+      options().output_style = outstyle;
+      callee_stack().pop_back();
       sass_delete_value(c_args);
       sass_delete_value(c_val);
       return 0;
@@ -394,23 +436,23 @@ namespace Sass {
     }
 
     std::string result(unquote(message->to_sass()));
-    ctx.c_options.output_style = outstyle;
+    options().output_style = outstyle;
     error(result, e->pstate(), traces);
     return 0;
   }
 
-  Expression_Ptr Eval::operator()(Debug_Ptr d)
+  Expression* Eval::operator()(Debug* d)
   {
-    Sass_Output_Style outstyle = ctx.c_options.output_style;
-    ctx.c_options.output_style = NESTED;
+    Sass_Output_Style outstyle = options().output_style;
+    options().output_style = NESTED;
     Expression_Obj message = d->value()->perform(this);
-    Env* env = exp.environment();
+    Env* env = environment();
 
     // try to use generic function
     if (env->has("@debug[f]")) {
 
       // add call stack entry
-      ctx.callee_stack.push_back({
+      callee_stack().push_back({
         "@debug",
         d->pstate().path,
         d->pstate().line + 1,
@@ -419,37 +461,36 @@ namespace Sass {
         { env }
       });
 
-      Definition_Ptr def = Cast<Definition>((*env)["@debug[f]"]);
+      Definition* 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;
+      AST2C ast2c;
       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_list_set_value(c_args, 0, message->perform(&ast2c));
+      union Sass_Value* c_val = c_func(c_args, c_function, compiler());
+      options().output_style = outstyle;
+      callee_stack().pop_back();
       sass_delete_value(c_args);
       sass_delete_value(c_val);
       return 0;
 
     }
 
-    std::string cwd(ctx.cwd());
     std::string result(unquote(message->to_sass()));
-    std::string abs_path(Sass::File::rel2abs(d->pstate().path, cwd, cwd));
-    std::string rel_path(Sass::File::abs2rel(d->pstate().path, cwd, cwd));
+    std::string abs_path(Sass::File::rel2abs(d->pstate().path, cwd(), cwd()));
+    std::string rel_path(Sass::File::abs2rel(d->pstate().path, cwd(), cwd()));
     std::string output_path(Sass::File::path_for_console(rel_path, abs_path, d->pstate().path));
-    ctx.c_options.output_style = outstyle;
+    options().output_style = outstyle;
 
     std::cerr << output_path << ":" << d->pstate().line+1 << " DEBUG: " << result;
     std::cerr << std::endl;
     return 0;
   }
 
-  Expression_Ptr Eval::operator()(List_Ptr l)
+  Expression* Eval::operator()(List* l)
   {
     // special case for unevaluated map
     if (l->separator() == SASS_HASH) {
@@ -490,7 +531,7 @@ namespace Sass {
     return ll.detach();
   }
 
-  Expression_Ptr Eval::operator()(Map_Ptr m)
+  Expression* Eval::operator()(Map* m)
   {
     if (m->is_expanded()) return m;
 
@@ -505,8 +546,8 @@ namespace Sass {
                                 m->pstate(),
                                 m->length());
     for (auto key : m->keys()) {
-      Expression_Ptr ex_key = key->perform(this);
-      Expression_Ptr ex_val = m->at(key);
+      Expression* ex_key = key->perform(this);
+      Expression* ex_val = m->at(key);
       if (ex_val == NULL) continue;
       ex_val = ex_val->perform(this);
       *mm << std::make_pair(ex_key, ex_val);
@@ -522,7 +563,7 @@ namespace Sass {
     return mm.detach();
   }
 
-  Expression_Ptr Eval::operator()(Binary_Expression_Ptr b_in)
+  Expression* Eval::operator()(Binary_Expression* b_in)
   {
 
     Expression_Obj lhs = b_in->left();
@@ -543,21 +584,21 @@ namespace Sass {
     }
 
     // Evaluate variables as early o
-    while (Variable_Ptr l_v = Cast<Variable>(lhs)) {
+    while (Variable* l_v = Cast<Variable>(lhs)) {
       lhs = operator()(l_v);
     }
-    while (Variable_Ptr r_v = Cast<Variable>(rhs)) {
+    while (Variable* r_v = Cast<Variable>(rhs)) {
       rhs = operator()(r_v);
     }
 
     Binary_Expression_Obj b = b_in;
 
     // Evaluate sub-expressions early on
-    while (Binary_Expression_Ptr l_b = Cast<Binary_Expression>(lhs)) {
+    while (Binary_Expression* 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)) {
+    while (Binary_Expression* r_b = Cast<Binary_Expression>(rhs)) {
       if (!force && r_b->is_delayed()) break;
       rhs = operator()(r_b);
     }
@@ -571,9 +612,9 @@ namespace Sass {
 
     // specific types we know are final
     // handle them early to avoid overhead
-    if (Number_Ptr l_n = Cast<Number>(lhs)) {
+    if (Number* l_n = Cast<Number>(lhs)) {
       // lhs is number and rhs is number
-      if (Number_Ptr r_n = Cast<Number>(rhs)) {
+      if (Number* r_n = Cast<Number>(rhs)) {
         try {
           switch (op_type) {
             case Sass_OP::EQ: return *l_n == *r_n ? bool_true : bool_false;
@@ -583,7 +624,7 @@ namespace Sass {
             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());
+              return Operators::op_numbers(op_type, *l_n, *r_n, options(), b_in->pstate());
             default: break;
           }
         }
@@ -594,17 +635,15 @@ namespace Sass {
         }
       }
       // lhs is number and rhs is color
-      else if (Color_Ptr r_c = Cast<Color>(rhs)) {
+      // Todo: allow to work with HSLA colors
+      else if (Color* r_col = Cast<Color>(rhs)) {
+        Color_RGBA_Obj r_c = r_col->toRGBA();
         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::LT: return *l_n < *r_c ? bool_true : bool_false;
-            case Sass_OP::GTE: return *l_n < *r_c ? bool_false : bool_true;
-            case Sass_OP::LTE: return *l_n < *r_c || *l_n == *r_c ? bool_true : bool_false;
-            case Sass_OP::GT: return *l_n < *r_c || *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());
+              return Operators::op_number_color(op_type, *l_n, *r_c, options(), b_in->pstate());
             default: break;
           }
         }
@@ -615,9 +654,11 @@ namespace Sass {
         }
       }
     }
-    else if (Color_Ptr l_c = Cast<Color>(lhs)) {
+    else if (Color* l_col = Cast<Color>(lhs)) {
+      Color_RGBA_Obj l_c = l_col->toRGBA();
       // lhs is color and rhs is color
-      if (Color_Ptr r_c = Cast<Color>(rhs)) {
+      if (Color* r_col = Cast<Color>(rhs)) {
+        Color_RGBA_Obj r_c = r_col->toRGBA();
         try {
           switch (op_type) {
             case Sass_OP::EQ: return *l_c == *r_c ? bool_true : bool_false;
@@ -627,7 +668,7 @@ namespace Sass {
             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());
+              return Operators::op_colors(op_type, *l_c, *r_c, options(), b_in->pstate());
             default: break;
           }
         }
@@ -638,17 +679,13 @@ namespace Sass {
         }
       }
       // lhs is color and rhs is number
-      else if (Number_Ptr r_n = Cast<Number>(rhs)) {
+      else if (Number* 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::LT: return *l_c < *r_n ? bool_true : bool_false;
-            case Sass_OP::GTE: return *l_c < *r_n ? bool_false : bool_true;
-            case Sass_OP::LTE: return *l_c < *r_n || *l_c == *r_n ? bool_true : bool_false;
-            case Sass_OP::GT: return *l_c < *r_n || *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());
+              return Operators::op_color_number(op_type, *l_c, *r_n, options(), b_in->pstate());
             default: break;
           }
         }
@@ -663,29 +700,29 @@ namespace Sass {
     String_Schema_Obj ret_schema;
 
     // only the last item will be used to eval the binary expression
-    if (String_Schema_Ptr s_l = Cast<String_Schema>(b->left())) {
+    if (String_Schema* 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());
         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));
+          ret_schema->append(Cast<PreValue>(s_l->at(i)->perform(this)));
         }
-        ret_schema->append(bin_ex->perform(this));
+        ret_schema->append(Cast<PreValue>(bin_ex->perform(this)));
         return ret_schema->perform(this);
       }
     }
-    if (String_Schema_Ptr s_r = Cast<String_Schema>(b->right())) {
+    if (String_Schema* 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());
         bin_ex->is_delayed(b->left()->is_delayed() || b->right()->is_delayed()); // verified
-        ret_schema->append(bin_ex->perform(this));
+        ret_schema->append(Cast<PreValue>(bin_ex->perform(this)));
         for (size_t i = 1; i < s_r->length(); ++i) {
-          ret_schema->append(s_r->at(i)->perform(this));
+          ret_schema->append(Cast<PreValue>(s_r->at(i)->perform(this)));
         }
         return ret_schema->perform(this);
       }
@@ -716,8 +753,8 @@ namespace Sass {
     AST_Node_Obj lu = lhs;
     AST_Node_Obj ru = rhs;
 
-    Expression::Concrete_Type l_type;
-    Expression::Concrete_Type r_type;
+    Expression::Type l_type;
+    Expression::Type r_type;
 
     // Is one of the operands an interpolant?
     String_Schema_Obj s1 = Cast<String_Schema>(b->left());
@@ -737,7 +774,7 @@ 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 = Cast<String_Constant>(lhs)) {
+        if (String_Constant* 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) {
@@ -745,7 +782,7 @@ namespace Sass {
           }
         }
         // If possible upgrade RHS to a number (for string to number compare)
-        if (String_Constant_Ptr str = Cast<String_Constant>(rhs)) {
+        if (String_Constant* 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) {
@@ -760,12 +797,12 @@ namespace Sass {
 
       if (force_delay) {
         std::string str("");
-        str += v_l->to_string(ctx.c_options);
+        str += v_l->to_string(options());
         if (b->op().ws_before) str += " ";
         str += b->separator();
         if (b->op().ws_after) str += " ";
-        str += v_r->to_string(ctx.c_options);
-        String_Constant_Ptr val = SASS_MEMORY_NEW(String_Constant, b->pstate(), str);
+        str += v_r->to_string(options());
+        String_Constant* val = SASS_MEMORY_NEW(String_Constant, b->pstate(), str);
         val->is_interpolant(b->left()->has_interpolant());
         return val;
       }
@@ -785,7 +822,6 @@ namespace Sass {
     }
     catch (Exception::OperationError& err)
     {
-      // throw Exception::Base(b->pstate(), err.what());
       traces.push_back(Backtrace(b->pstate()));
       throw Exception::SassValueError(traces, b->pstate(), err);
     }
@@ -799,25 +835,25 @@ namespace Sass {
     try {
       ParserState pstate(b->pstate());
       if (l_type == Expression::NUMBER && r_type == Expression::NUMBER) {
-        Number_Ptr l_n = Cast<Number>(lhs);
-        Number_Ptr r_n = Cast<Number>(rhs);
+        Number* l_n = Cast<Number>(lhs);
+        Number* 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);
+        rv = Operators::op_numbers(op_type, *l_n, *r_n, options(), pstate);
       }
       else if (l_type == Expression::NUMBER && r_type == Expression::COLOR) {
-        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);
+        Number* l_n = Cast<Number>(lhs);
+        Color_RGBA_Obj r_c = Cast<Color>(rhs)->toRGBA();
+        rv = Operators::op_number_color(op_type, *l_n, *r_c, options(), pstate);
       }
       else if (l_type == Expression::COLOR && r_type == Expression::NUMBER) {
-        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);
+        Color_RGBA_Obj l_c = Cast<Color>(lhs)->toRGBA();
+        Number* r_n = Cast<Number>(rhs);
+        rv = Operators::op_color_number(op_type, *l_c, *r_n, options(), pstate);
       }
       else if (l_type == Expression::COLOR && r_type == Expression::COLOR) {
-        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);
+        Color_RGBA_Obj l_c = Cast<Color>(lhs)->toRGBA();
+        Color_RGBA_Obj r_c = Cast<Color>(rhs)->toRGBA();
+        rv = Operators::op_colors(op_type, *l_c, *r_c, options(), pstate);
       }
       else {
         To_Value to_value(ctx);
@@ -838,15 +874,15 @@ namespace Sass {
           traces.push_back(Backtrace(v_r->pstate()));
           throw Exception::InvalidValue(traces, *v_r);
         }
-        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))
+        Value* ex = Operators::op_strings(b->op(), *v_l, *v_r, options(), pstate, !interpolant); // pass true to compress
+        if (String_Constant* str = Cast<String_Constant>(ex))
         {
           if (str->concrete_type() == Expression::STRING)
           {
-            String_Constant_Ptr lstr = Cast<String_Constant>(lhs);
-            String_Constant_Ptr rstr = Cast<String_Constant>(rhs);
+            String_Constant* lstr = Cast<String_Constant>(lhs);
+            String_Constant* rstr = Cast<String_Constant>(rhs);
             if (op_type != Sass_OP::SUB) {
-              if (String_Constant_Ptr org = lstr ? lstr : rstr)
+              if (String_Constant* org = lstr ? lstr : rstr)
               { str->quote_mark(org->quote_mark()); }
             }
           }
@@ -874,11 +910,11 @@ namespace Sass {
 
   }
 
-  Expression_Ptr Eval::operator()(Unary_Expression_Ptr u)
+  Expression* Eval::operator()(Unary_Expression* u)
   {
     Expression_Obj operand = u->operand()->perform(this);
     if (u->optype() == Unary_Expression::NOT) {
-      Boolean_Ptr result = SASS_MEMORY_NEW(Boolean, u->pstate(), (bool)*operand);
+      Boolean* result = SASS_MEMORY_NEW(Boolean, u->pstate(), (bool)*operand);
       result->value(!result->value());
       return result;
     }
@@ -890,7 +926,7 @@ namespace Sass {
         return cpy.detach(); // return the copy
       }
       else if (u->optype() == Unary_Expression::SLASH) {
-        std::string str = '/' + nr->to_string(ctx.c_options);
+        std::string str = '/' + nr->to_string(options());
         return SASS_MEMORY_NEW(String_Constant, u->pstate(), str);
       }
       // nothing for positive
@@ -903,7 +939,7 @@ namespace Sass {
         u->operand(SASS_MEMORY_NEW(String_Quoted, u->pstate(), ""));
       }
       // Never apply unary opertions on colors @see #2140
-      else if (Color_Ptr color = Cast<Color>(operand)) {
+      else if (Color* color = Cast<Color>(operand)) {
         // Use the color name if this was eval with one
         if (color->disp().length() > 0) {
           operand = SASS_MEMORY_NEW(String_Constant, operand->pstate(), color->disp());
@@ -922,7 +958,7 @@ namespace Sass {
     return u;
   }
 
-  Expression_Ptr Eval::operator()(Function_Call_Ptr c)
+  Expression* Eval::operator()(Function_Call* c)
   {
     if (traces.size() > Constants::MaxCallStack) {
         // XXX: this is never hit via spec tests
@@ -930,8 +966,18 @@ namespace Sass {
         stm << "Stack depth exceeded max of " << Constants::MaxCallStack;
         error(stm.str(), c->pstate(), traces);
     }
+
+    if (Cast<String_Schema>(c->sname())) {
+      Expression_Obj evaluated_name = c->sname()->perform(this);
+      Expression_Obj evaluated_args = c->arguments()->perform(this);
+      std::string str(evaluated_name->to_string());
+      str += evaluated_args->to_string();
+      return SASS_MEMORY_NEW(String_Constant, c->pstate(), str);
+    }
+
     std::string name(Util::normalize_underscores(c->name()));
     std::string full_name(name + "[f]");
+
     // we make a clone here, need to implement that further
     Arguments_Obj args = c->arguments();
 
@@ -951,9 +997,9 @@ namespace Sass {
         if (args->has_named_arguments()) {
           error("Function " + c->name() + " doesn't support keyword arguments", c->pstate(), traces);
         }
-        String_Quoted_Ptr str = SASS_MEMORY_NEW(String_Quoted,
+        String_Quoted* str = SASS_MEMORY_NEW(String_Quoted,
                                              c->pstate(),
-                                             lit->to_string(ctx.c_options));
+                                             lit->to_string(options()));
         str->is_interpolant(c->is_interpolant());
         return str;
       } else {
@@ -969,7 +1015,7 @@ namespace Sass {
     if (full_name != "if[f]") {
       args = Cast<Arguments>(args->perform(this));
     }
-    Definition_Ptr def = Cast<Definition>((*env)[full_name]);
+    Definition* def = Cast<Definition>((*env)[full_name]);
 
     if (c->func()) def = c->func()->definition();
 
@@ -979,7 +1025,7 @@ namespace Sass {
       // account for rest arguments
       if (args->has_rest_argument() && args->length() > 0) {
         // get the rest arguments list
-        List_Ptr rest = Cast<List>(args->last()->value());
+        List* rest = Cast<List>(args->last()->value());
         // arguments before rest argument plus rest
         if (rest) L += rest->length() - 1;
       }
@@ -999,13 +1045,13 @@ namespace Sass {
 
     Parameters_Obj params = def->parameters();
     Env fn_env(def->environment());
-    exp.env_stack.push_back(&fn_env);
+    env_stack().push_back(&fn_env);
 
     if (func || body) {
-      bind(std::string("Function"), c->name(), params, args, &ctx, &fn_env, this);
+      bind(std::string("Function"), c->name(), params, args, &fn_env, this, traces);
       std::string msg(", in function `" + c->name() + "`");
       traces.push_back(Backtrace(c->pstate(), msg));
-      ctx.callee_stack.push_back({
+      callee_stack().push_back({
         c->name().c_str(),
         c->pstate().path,
         c->pstate().line + 1,
@@ -1024,7 +1070,7 @@ namespace Sass {
       if (!result) {
         error(std::string("Function ") + c->name() + " finished without @return", c->pstate(), traces);
       }
-      ctx.callee_stack.pop_back();
+      callee_stack().pop_back();
       traces.pop_back();
     }
 
@@ -1042,10 +1088,10 @@ namespace Sass {
 
       // populates env with default values for params
       std::string ff(c->name());
-      bind(std::string("Function"), c->name(), params, args, &ctx, &fn_env, this);
+      bind(std::string("Function"), c->name(), params, args, &fn_env, this, traces);
       std::string msg(", in function `" + c->name() + "`");
       traces.push_back(Backtrace(c->pstate(), msg));
-      ctx.callee_stack.push_back({
+      callee_stack().push_back({
         c->name().c_str(),
         c->pstate().path,
         c->pstate().line + 1,
@@ -1054,24 +1100,30 @@ namespace Sass {
         { env }
       });
 
-      To_C to_c;
+      AST2C ast2c;
       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 = Cast<Expression>(node);
-        sass_list_set_value(c_args, i, arg->perform(&to_c));
+        sass_list_set_value(c_args, i, arg->perform(&ast2c));
       }
-      union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_compiler);
+      union Sass_Value* c_val = c_func(c_args, c_function, 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(), traces);
+        std::string message("error in C function " + c->name() + ": " + sass_error_get_message(c_val));
+        sass_delete_value(c_val);
+        sass_delete_value(c_args);
+        error(message, 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(), traces);
+        std::string message("warning in C function " + c->name() + ": " + sass_warning_get_message(c_val));
+        sass_delete_value(c_val);
+        sass_delete_value(c_args);
+        error(message, c->pstate(), traces);
       }
-      result = cval_to_astnode(c_val, traces, c->pstate());
+      result = c2ast(c_val, traces, c->pstate());
 
-      ctx.callee_stack.pop_back();
+      callee_stack().pop_back();
       traces.pop_back();
       sass_delete_value(c_args);
       if (c_val != c_args)
@@ -1085,30 +1137,20 @@ namespace Sass {
 
     result = result->perform(this);
     result->is_interpolant(c->is_interpolant());
-    exp.env_stack.pop_back();
+    env_stack().pop_back();
     return result.detach();
   }
 
-  Expression_Ptr Eval::operator()(Function_Call_Schema_Ptr s)
+  Expression* Eval::operator()(Variable* v)
   {
-    Expression_Ptr evaluated_name = s->name()->perform(this);
-    Expression_Ptr evaluated_args = s->arguments()->perform(this);
-    String_Schema_Obj ss = SASS_MEMORY_NEW(String_Schema, s->pstate(), 2);
-    ss->append(evaluated_name);
-    ss->append(evaluated_args);
-    return ss->perform(this);
-  }
-
-  Expression_Ptr Eval::operator()(Variable_Ptr v)
-  {
-    Expression_Obj value = 0;
+    Expression_Obj value;
     Env* env = environment();
     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
+    if (Argument* arg = Cast<Argument>(value)) value = arg->value();
+    if (Number* 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
@@ -1117,17 +1159,22 @@ namespace Sass {
     return value.detach();
   }
 
-  Expression_Ptr Eval::operator()(Color_Ptr c)
+  Expression* Eval::operator()(Color_RGBA* c)
+  {
+    return c;
+  }
+
+  Expression* Eval::operator()(Color_HSLA* c)
   {
     return c;
   }
 
-  Expression_Ptr Eval::operator()(Number_Ptr n)
+  Expression* Eval::operator()(Number* n)
   {
     return n;
   }
 
-  Expression_Ptr Eval::operator()(Boolean_Ptr b)
+  Expression* Eval::operator()(Boolean* b)
   {
     return b;
   }
@@ -1136,8 +1183,8 @@ namespace Sass {
 
     bool needs_closing_brace = false;
 
-    if (Arguments_Ptr args = Cast<Arguments>(ex)) {
-      List_Ptr ll = SASS_MEMORY_NEW(List, args->pstate(), 0, SASS_COMMA);
+    if (Arguments* args = Cast<Arguments>(ex)) {
+      List* ll = SASS_MEMORY_NEW(List, args->pstate(), 0, SASS_COMMA);
       for(auto arg : args->elements()) {
         ll->append(arg->value());
       }
@@ -1146,7 +1193,7 @@ namespace Sass {
       res += "(";
       ex = ll;
     }
-    if (Number_Ptr nr = Cast<Number>(ex)) {
+    if (Number* nr = Cast<Number>(ex)) {
       Number reduced(nr);
       reduced.reduce();
       if (!reduced.is_valid_css_unit()) {
@@ -1154,10 +1201,10 @@ namespace Sass {
         throw Exception::InvalidValue(traces, *nr);
       }
     }
-    if (Argument_Ptr arg = Cast<Argument>(ex)) {
+    if (Argument* arg = Cast<Argument>(ex)) {
       ex = arg->value();
     }
-    if (String_Quoted_Ptr sq = Cast<String_Quoted>(ex)) {
+    if (String_Quoted* sq = Cast<String_Quoted>(ex)) {
       if (was_itpl) {
         bool was_interpolant = ex->is_interpolant();
         ex = SASS_MEMORY_NEW(String_Constant, sq->pstate(), sq->value());
@@ -1172,8 +1219,13 @@ namespace Sass {
       // XXX: this is never hit via spec tests
       ex = ex->perform(this);
     }
+    // parent selector needs another go
+    if (Cast<Parent_Reference>(ex)) {
+      // XXX: this is never hit via spec tests
+      ex = ex->perform(this);
+    }
 
-    if (List_Ptr l = Cast<List>(ex)) {
+    if (List* 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() && Cast<Null>((*l)[0])) { res += ""; }
@@ -1187,12 +1239,12 @@ namespace Sass {
       // here. Normally single list items are already unwrapped.
       if (l->size() > 1) {
         // string_to_output would fail "#{'_\a' '_\a'}";
-        std::string str(ll->to_string(ctx.c_options));
+        std::string str(ll->to_string(options()));
         str = read_hex_escapes(str); // read escapes
         newline_to_space(str); // replace directly
         res += str; // append to result string
       } else {
-        res += (ll->to_string(ctx.c_options));
+        res += (ll->to_string(options()));
       }
       ll->is_interpolant(l->is_interpolant());
     }
@@ -1207,9 +1259,9 @@ namespace Sass {
     else {
       // ex = ex->perform(this);
       if (into_quotes && ex->is_interpolant()) {
-        res += evacuate_escapes(ex ? ex->to_string(ctx.c_options) : "");
+        res += evacuate_escapes(ex ? ex->to_string(options()) : "");
       } else {
-        std::string str(ex ? ex->to_string(ctx.c_options) : "");
+        std::string str(ex ? ex->to_string(options()) : "");
         if (into_quotes) str = read_hex_escapes(str);
         res += str; // append to result string
       }
@@ -1219,14 +1271,14 @@ namespace Sass {
 
   }
 
-  Expression_Ptr Eval::operator()(String_Schema_Ptr s)
+  Expression* Eval::operator()(String_Schema* s)
   {
     size_t L = s->length();
     bool into_quotes = false;
     if (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 (String_Constant* l = Cast<String_Constant>((*s)[0])) {
+        if (String_Constant* 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;
@@ -1255,7 +1307,7 @@ namespace Sass {
     // 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, s->css());
     // if (s->is_interpolant()) str->quote_mark(0);
-    // String_Constant_Ptr str = SASS_MEMORY_NEW(String_Constant, s->pstate(), res);
+    // String_Constant* str = SASS_MEMORY_NEW(String_Constant, s->pstate(), res);
     if (str->quote_mark()) str->quote_mark('*');
     else if (!is_in_comment) str->value(string_to_output(str->value()));
     str->is_interpolant(s->is_interpolant());
@@ -1263,32 +1315,25 @@ namespace Sass {
   }
 
 
-  Expression_Ptr Eval::operator()(String_Constant_Ptr s)
+  Expression* Eval::operator()(String_Constant* 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;
   }
 
-  Expression_Ptr Eval::operator()(String_Quoted_Ptr s)
+  Expression* Eval::operator()(String_Quoted* s)
   {
-    String_Quoted_Ptr str = SASS_MEMORY_NEW(String_Quoted, s->pstate(), "");
+    String_Quoted* str = SASS_MEMORY_NEW(String_Quoted, s->pstate(), "");
     str->value(s->value());
     str->quote_mark(s->quote_mark());
     str->is_interpolant(s->is_interpolant());
     return str;
   }
 
-  Expression_Ptr Eval::operator()(Supports_Operator_Ptr c)
+  Expression* Eval::operator()(Supports_Operator* c)
   {
-    Expression_Ptr left = c->left()->perform(this);
-    Expression_Ptr right = c->right()->perform(this);
-    Supports_Operator_Ptr cc = SASS_MEMORY_NEW(Supports_Operator,
+    Expression* left = c->left()->perform(this);
+    Expression* right = c->right()->perform(this);
+    Supports_Operator* cc = SASS_MEMORY_NEW(Supports_Operator,
                                  c->pstate(),
                                  Cast<Supports_Condition>(left),
                                  Cast<Supports_Condition>(right),
@@ -1296,52 +1341,52 @@ namespace Sass {
     return cc;
   }
 
-  Expression_Ptr Eval::operator()(Supports_Negation_Ptr c)
+  Expression* Eval::operator()(Supports_Negation* c)
   {
-    Expression_Ptr condition = c->condition()->perform(this);
-    Supports_Negation_Ptr cc = SASS_MEMORY_NEW(Supports_Negation,
+    Expression* condition = c->condition()->perform(this);
+    Supports_Negation* cc = SASS_MEMORY_NEW(Supports_Negation,
                                  c->pstate(),
                                  Cast<Supports_Condition>(condition));
     return cc;
   }
 
-  Expression_Ptr Eval::operator()(Supports_Declaration_Ptr c)
+  Expression* Eval::operator()(Supports_Declaration* c)
   {
-    Expression_Ptr feature = c->feature()->perform(this);
-    Expression_Ptr value = c->value()->perform(this);
-    Supports_Declaration_Ptr cc = SASS_MEMORY_NEW(Supports_Declaration,
+    Expression* feature = c->feature()->perform(this);
+    Expression* value = c->value()->perform(this);
+    Supports_Declaration* cc = SASS_MEMORY_NEW(Supports_Declaration,
                               c->pstate(),
                               feature,
                               value);
     return cc;
   }
 
-  Expression_Ptr Eval::operator()(Supports_Interpolation_Ptr c)
+  Expression* Eval::operator()(Supports_Interpolation* c)
   {
-    Expression_Ptr value = c->value()->perform(this);
-    Supports_Interpolation_Ptr cc = SASS_MEMORY_NEW(Supports_Interpolation,
+    Expression* value = c->value()->perform(this);
+    Supports_Interpolation* cc = SASS_MEMORY_NEW(Supports_Interpolation,
                             c->pstate(),
                             value);
     return cc;
   }
 
-  Expression_Ptr Eval::operator()(At_Root_Query_Ptr e)
+  Expression* Eval::operator()(At_Root_Query* e)
   {
     Expression_Obj feature = e->feature();
     feature = (feature ? feature->perform(this) : 0);
     Expression_Obj value = e->value();
     value = (value ? value->perform(this) : 0);
-    Expression_Ptr ee = SASS_MEMORY_NEW(At_Root_Query,
+    Expression* ee = SASS_MEMORY_NEW(At_Root_Query,
                                      e->pstate(),
                                      Cast<String>(feature),
                                      value);
     return ee;
   }
 
-  Media_Query_Ptr Eval::operator()(Media_Query_Ptr q)
+  Media_Query* Eval::operator()(Media_Query* q)
   {
     String_Obj t = q->media_type();
-    t = static_cast<String_Ptr>(t.isNull() ? 0 : t->perform(this));
+    t = static_cast<String*>(t.isNull() ? 0 : t->perform(this));
     Media_Query_Obj qq = SASS_MEMORY_NEW(Media_Query,
                                       q->pstate(),
                                       t,
@@ -1349,12 +1394,12 @@ namespace Sass {
                                       q->is_negated(),
                                       q->is_restricted());
     for (size_t i = 0, L = q->length(); i < L; ++i) {
-      qq->append(static_cast<Media_Query_Expression_Ptr>((*q)[i]->perform(this)));
+      qq->append(static_cast<Media_Query_Expression*>((*q)[i]->perform(this)));
     }
     return qq.detach();
   }
 
-  Expression_Ptr Eval::operator()(Media_Query_Expression_Ptr e)
+  Expression* Eval::operator()(Media_Query_Expression* e)
   {
     Expression_Obj feature = e->feature();
     feature = (feature ? feature->perform(this) : 0);
@@ -1378,12 +1423,12 @@ namespace Sass {
                            e->is_interpolated());
   }
 
-  Expression_Ptr Eval::operator()(Null_Ptr n)
+  Expression* Eval::operator()(Null* n)
   {
     return n;
   }
 
-  Expression_Ptr Eval::operator()(Argument_Ptr a)
+  Expression* Eval::operator()(Argument* a)
   {
     Expression_Obj val = a->value()->perform(this);
     bool is_rest_argument = a->is_rest_argument();
@@ -1412,13 +1457,13 @@ namespace Sass {
                            is_keyword_argument);
   }
 
-  Expression_Ptr Eval::operator()(Arguments_Ptr a)
+  Expression* Eval::operator()(Arguments* a)
   {
     Arguments_Obj aa = SASS_MEMORY_NEW(Arguments, a->pstate());
     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 = Cast<Argument>(rv);
+      Argument* arg = Cast<Argument>(rv);
       if (!(arg->is_rest_argument() || arg->is_keyword_argument())) {
         aa->append(arg);
       }
@@ -1429,8 +1474,8 @@ namespace Sass {
       Expression_Obj splat = Cast<Argument>(rest)->value()->perform(this);
 
       Sass_Separator separator = SASS_COMMA;
-      List_Ptr ls = Cast<List>(splat);
-      Map_Ptr ms = Cast<Map>(splat);
+      List* ls = Cast<List>(splat);
+      Map* ms = Cast<Map>(splat);
 
       List_Obj arglist = SASS_MEMORY_NEW(List,
                                       splat->pstate(),
@@ -1454,7 +1499,7 @@ namespace Sass {
 
     if (a->has_keyword_argument()) {
       Expression_Obj rv = a->get_keyword_argument()->perform(this);
-      Argument_Ptr rvarg = Cast<Argument>(rv);
+      Argument* rvarg = Cast<Argument>(rv);
       Expression_Obj kwarg = rvarg->value()->perform(this);
 
       aa->append(SASS_MEMORY_NEW(Argument, kwarg->pstate(), kwarg, "", false, true));
@@ -1462,74 +1507,14 @@ namespace Sass {
     return aa.detach();
   }
 
-  Expression_Ptr Eval::operator()(Comment_Ptr c)
+  Expression* Eval::operator()(Comment* c)
   {
     return 0;
   }
 
-  inline Expression_Ptr Eval::fallback_impl(AST_Node_Ptr n)
+  Selector_List* Eval::operator()(Selector_List* s)
   {
-    return static_cast<Expression_Ptr>(n);
-  }
-
-  // All the binary helpers.
-
-  Expression_Ptr cval_to_astnode(union Sass_Value* v, Backtraces traces, ParserState pstate)
-  {
-    using std::strlen;
-    using std::strcpy;
-    Expression_Ptr e = NULL;
-    switch (sass_value_get_tag(v)) {
-      case SASS_BOOLEAN: {
-        e = SASS_MEMORY_NEW(Boolean, pstate, !!sass_boolean_get_value(v));
-      } break;
-      case SASS_NUMBER: {
-        e = SASS_MEMORY_NEW(Number, pstate, sass_number_get_value(v), sass_number_get_unit(v));
-      } break;
-      case SASS_COLOR: {
-        e = SASS_MEMORY_NEW(Color, pstate, sass_color_get_r(v), sass_color_get_g(v), sass_color_get_b(v), sass_color_get_a(v));
-      } break;
-      case SASS_STRING: {
-        if (sass_string_is_quoted(v))
-          e = SASS_MEMORY_NEW(String_Quoted, pstate, sass_string_get_value(v));
-        else {
-          e = SASS_MEMORY_NEW(String_Constant, pstate, sass_string_get_value(v));
-        }
-      } break;
-      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), 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), traces, pstate),
-            cval_to_astnode(sass_map_get_value(v, i), traces, pstate));
-        }
-        e = m;
-      } break;
-      case SASS_NULL: {
-        e = SASS_MEMORY_NEW(Null, pstate);
-      } break;
-      case SASS_ERROR: {
-        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, traces);
-      } break;
-      default: break;
-    }
-    return e;
-  }
-
-  Selector_List_Ptr Eval::operator()(Selector_List_Ptr s)
-  {
-    std::vector<Selector_List_Obj> rv;
+    SelectorStack rv;
     Selector_List_Obj sl = SASS_MEMORY_NEW(Selector_List, s->pstate());
     sl->is_optional(s->is_optional());
     sl->media_block(s->media_block());
@@ -1560,14 +1545,14 @@ namespace Sass {
   }
 
 
-  Selector_List_Ptr Eval::operator()(Complex_Selector_Ptr s)
+  Selector_List* Eval::operator()(Complex_Selector* s)
   {
     bool implicit_parent = !exp.old_at_root_without_rule;
-    if (is_in_selector_schema) exp.selector_stack.push_back(0);
+    if (is_in_selector_schema) exp.selector_stack.push_back({});
     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();
+      Complex_Selector* is = resolved->at(i)->mutable_first();
       while (is) {
         if (is->head()) {
           is->head(operator()(is->head()));
@@ -1578,10 +1563,10 @@ namespace Sass {
     return resolved.detach();
   }
 
-  Compound_Selector_Ptr Eval::operator()(Compound_Selector_Ptr s)
+  Compound_Selector* Eval::operator()(Compound_Selector* s)
   {
     for (size_t i = 0; i < s->length(); i++) {
-      Simple_Selector_Ptr ss = s->at(i);
+      Simple_Selector* 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));
@@ -1589,14 +1574,12 @@ namespace Sass {
     return s;
   }
 
-  Selector_List_Ptr Eval::operator()(Selector_Schema_Ptr s)
+  Selector_List* Eval::operator()(Selector_Schema* 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));
-    ctx.c_options.in_selector = false; // flag temporary only
+    std::string result_str(sel->to_string(options()));
     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
@@ -1605,26 +1588,23 @@ namespace Sass {
     // 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)
+  Expression* Eval::operator()(Parent_Selector* p)
+  {
+    if (Selector_List_Obj pr = selector()) {
+      exp.selector_stack.pop_back();
+      Selector_List_Obj rv = operator()(pr);
+      exp.selector_stack.push_back(rv);
+      return rv.detach();
+    } else {
+      return SASS_MEMORY_NEW(Null, p->pstate());
+    }
+  }
+
+  Expression* Eval::operator()(Parent_Reference* p)
   {
     if (Selector_List_Obj pr = selector()) {
       exp.selector_stack.pop_back();
@@ -1636,7 +1616,7 @@ namespace Sass {
     }
   }
 
-  Simple_Selector_Ptr Eval::operator()(Simple_Selector_Ptr s)
+  Simple_Selector* Eval::operator()(Simple_Selector* s)
   {
     return s;
   }
@@ -1646,13 +1626,13 @@ namespace Sass {
   // 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)) {
+    if (Wrapped_Selector* w = Cast<Wrapped_Selector>(obj)) {
       return w->name() == ":not";
     }
     return false;
   }
 
-  Wrapped_Selector_Ptr Eval::operator()(Wrapped_Selector_Ptr s)
+  Wrapped_Selector* Eval::operator()(Wrapped_Selector* s)
   {
 
     if (s->name() == ":not") {
@@ -1660,15 +1640,14 @@ namespace Sass {
         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 {
+          for (size_t i = 0; i < s->selector()->length(); ++i) {
+            Complex_Selector* cs = s->selector()->at(i);
+            if (cs->tail()) {
+              s->selector()->clear();
+              s->name(" ");
+            }
           }
-        } else if (s->selector()->length() > 1) {
-          s->selector()->clear();
-          s->name(" ");
         }
       }
     }