Merge pull request #1476 from mgreter/bugfix/propset-evaluation

Enable `Propset` prefix evaluation

Author: xzyfer

src/debugger.hpp

@@ -515,6 +515,7 @@ inline void debug_ast(AST_Node* node, std::string ind = "", Env* env = 0)
     std::cerr << " [" << prettyprint(expression->value()) << "]";
     if (expression->is_delayed()) std::cerr << " [delayed]";
     if (expression->sass_fix_1291()) std::cerr << " [sass_fix_1291]";
+    if (expression->is_interpolant()) std::cerr << " [interpolant]";
     if (expression->quote_mark()) std::cerr << " [quote_mark: " << expression->quote_mark() << "]";
     std::cerr << " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << std::endl;
   } else if (dynamic_cast<String_Constant*>(node)) {
@@ -527,13 +528,15 @@ inline void debug_ast(AST_Node* node, std::string ind = "", Env* env = 0)
     std::cerr << " [" << prettyprint(expression->value()) << "]";
     if (expression->is_delayed()) std::cerr << " [delayed]";
     if (expression->sass_fix_1291()) std::cerr << " [sass_fix_1291]";
+    if (expression->is_interpolant()) std::cerr << " [interpolant]";
     std::cerr << " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << std::endl;
   } else if (dynamic_cast<String_Schema*>(node)) {
     String_Schema* expression = dynamic_cast<String_Schema*>(node);
     std::cerr << ind << "String_Schema " << expression;
     std::cerr << " " << expression->concrete_type();
     if (expression->is_delayed()) std::cerr << " [delayed]";
     if (expression->has_interpolants()) std::cerr << " [has_interpolants]";
+    if (expression->is_interpolant()) std::cerr << " [interpolant]";
     std::cerr << " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << std::endl;
     for(auto i : expression->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<String*>(node)) {
@@ -542,6 +545,7 @@ inline void debug_ast(AST_Node* node, std::string ind = "", Env* env = 0)
     std::cerr << " " << expression->concrete_type();
     std::cerr << " (" << pstate_source_position(node) << ")";
     if (expression->sass_fix_1291()) std::cerr << " [sass_fix_1291]";
+    if (expression->is_interpolant()) std::cerr << " [interpolant]";
     std::cerr << " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << std::endl;
   } else if (dynamic_cast<Expression*>(node)) {
     Expression* expression = dynamic_cast<Expression*>(node);

src/expand.cpp

@@ -121,7 +121,7 @@ namespace Sass {
       if (Declaration* dec = static_cast<Declaration*>(stm)) {
         String_Schema* combined_prop = new (ctx.mem) String_Schema(p->pstate());
         if (!property_stack.empty()) {
-          *combined_prop << property_stack.back()
+          *combined_prop << property_stack.back()->perform(&eval)
                          << new (ctx.mem) String_Quoted(p->pstate(), "-")
                          << dec->property(); // TODO: eval the prop into a string constant
         }