Commit ee2824ef by Aaron Leung

Getting interpolated properties to work.

parent 7e6b3662
...@@ -157,6 +157,8 @@ namespace Sass { ...@@ -157,6 +157,8 @@ namespace Sass {
} break; } break;
case Node::rule: { case Node::rule: {
Node lhs(expr[0]);
if (lhs.should_eval()) eval(lhs, prefix, env, f_env, new_Node, ctx);
Node rhs(expr[1]); Node rhs(expr[1]);
if (rhs.type() == Node::comma_list || rhs.type() == Node::space_list) { if (rhs.type() == Node::comma_list || rhs.type() == Node::space_list) {
for (size_t i = 0, S = rhs.size(); i < S; ++i) { for (size_t i = 0, S = rhs.size(); i < S; ++i) {
...@@ -316,7 +318,8 @@ namespace Sass { ...@@ -316,7 +318,8 @@ namespace Sass {
} break; } break;
case Node::string_schema: case Node::string_schema:
case Node::value_schema: { case Node::value_schema:
case Node::identifier_schema: {
for (size_t i = 0, S = expr.size(); i < S; ++i) { for (size_t i = 0, S = expr.size(); i < S; ++i) {
expr[i] = eval(expr[i], prefix, env, f_env, new_Node, ctx); expr[i] = eval(expr[i], prefix, env, f_env, new_Node, ctx);
} }
......
...@@ -299,7 +299,8 @@ namespace Sass { ...@@ -299,7 +299,8 @@ namespace Sass {
return "!important"; return "!important";
} break; } break;
case value_schema: { case value_schema:
case identifier_schema: {
string result; string result;
for (size_t i = 0, S = size(); i < S; ++i) result += at(i).to_string(); for (size_t i = 0, S = size(); i < S; ++i) result += at(i).to_string();
return result; return result;
...@@ -381,8 +382,9 @@ namespace Sass { ...@@ -381,8 +382,9 @@ namespace Sass {
case rule: { case rule: {
buf << endl << string(2*depth, ' '); buf << endl << string(2*depth, ' ');
at(0).emit_nested_css(buf, depth); // property buf << to_string();
at(1).emit_nested_css(buf, depth); // values // at(0).emit_nested_css(buf, depth); // property
// at(1).emit_nested_css(buf, depth); // values
buf << ";"; buf << ";";
} break; } break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment