One step closer to getting nested expansion nodes to emit correctly.

eval_apply.cpp

@@ -233,6 +233,7 @@ namespace Sass {
   {
     // cerr << "APPLYING MIXIN: " << string(mixin[0].token) << endl;
     Node params(mixin[1]);
+    if (mixin[2].has_expansions) cerr << "ORIGINAL BODY FOR " << string(mixin[0].token) << " HAS EXPANSIONS" << endl;
     Node body(mixin[2].clone());
     Environment m_env;
     // cerr << "CLONED BODY" << endl;
@@ -270,6 +271,7 @@ namespace Sass {
     for (int i = 0; i < body.size(); ++i) {
       body[i] = eval(body[i], m_env);
     }
+    if (body.has_expansions) cerr << "APPLYING MIXIN CONTAINING EXPANSIONS" << endl;
     return body;
   }
 }
\ No newline at end of file

node.cpp

@@ -25,6 +25,7 @@ namespace Sass {
     n.has_rules_or_comments = has_rules_or_comments;
     n.has_rulesets = has_rulesets;
     n.has_propsets = has_propsets;
+    n.has_expansions = has_expansions;
     n.has_backref = has_backref;
     n.from_variable = from_variable;
     n.eval_me = eval_me;
@@ -436,9 +437,11 @@ namespace Sass {
   
   void Node::flatten()
   {
+    cerr << "FLATTENING A BLOCK" << endl;
     if (type != block && type != expansion) return;
     for (int i = 0; i < size(); ++i) {
       if (at(i).type == expansion) {
+        cerr << "FLATTEN: found an expansion node" << endl;
         Node expn = at(i);
         if (expn.has_expansions) expn.flatten();
         at(i).type = none;