More fixes for mixin content.

Author: Aaron Leung

document_parser.cpp

@@ -601,7 +601,7 @@ namespace Sass {
         throw_syntax_error("only variable declarations and control directives are allowed inside functions");
       }
       else if (peek< include >(position)) {
-        block << parse_mixin_call();
+        block << parse_mixin_call(inside_of);
         semicolon = true;
       }
       else if (lex< content >()) {

eval_apply.cpp

@@ -320,7 +320,14 @@ namespace Sass {
         re_expand(expr[1], expr[2], env, f_env, new_Node, ctx, bt, false, content);
       } break;
 
-      case Node::block: {
+      case Node::block:
+      case Node::mixin_call:
+      case Node::mixin_content:
+      case Node::if_directive:
+      case Node::for_through_directive:
+      case Node::for_to_directive:
+      case Node::each_directive:
+      case Node::while_directive: {
         for (size_t i = 0, S = expr.size(); i < S; ++i) {
           re_expand(expr[i], prefix, env, f_env, new_Node, ctx, bt, false, content);
         }