More eval edge cases.

Author: Aaron Leung

document_parser.cpp

@@ -237,7 +237,7 @@ namespace Sass {
         Node var(context.new_Node(Node::variable, path, line, lexed));
         lex< exactly<':'> >();
         Node val(parse_space_list());
-        // val.should_eval() = true;
+        val.should_eval() = true;
         Node assn(context.new_Node(Node::assignment, path, line, 2));
         assn << var << val;
         return assn;
@@ -253,7 +253,7 @@ namespace Sass {
       Node var(context.new_Node(Node::variable, path, line, lexed));
       lex< exactly<':'> >();
       Node val(parse_space_list());
-      // val.should_eval() = true;
+      val.should_eval() = true;
       Node assn(context.new_Node(Node::assignment, path, line, 2));
       assn << var << val;
       return assn;

eval_apply.cpp

@@ -610,8 +610,10 @@ namespace Sass {
         evaluated_args << eval(args[i], prefix, env, f_env, new_Node, ctx);
         if (evaluated_args.back().type() == Node::list) {
           Node arg_list(evaluated_args.back());
+          Node new_arg_list(new_Node(Node::list, arg_list.path(), arg_list.line(), arg_list.size()));
           for (size_t j = 0, S = arg_list.size(); j < S; ++j) {
-            if (arg_list[j].should_eval()) arg_list[j] = eval(arg_list[j], prefix, env, f_env, new_Node, ctx);
+            if (arg_list[j].should_eval()) new_arg_list << eval(arg_list[j], prefix, env, f_env, new_Node, ctx);
+            else                           new_arg_list << arg_list[j];
           }
         }
       }
@@ -621,16 +623,20 @@ namespace Sass {
         kwdarg << eval(args[i][1], prefix, env, f_env, new_Node, ctx);
         if (kwdarg.back().type() == Node::list) {
           Node arg_list(kwdarg.back());
+          Node new_arg_list(new_Node(Node::list, arg_list.path(), arg_list.line(), arg_list.size()));
           for (size_t j = 0, S = arg_list.size(); j < S; ++j) {
-            if (arg_list[j].should_eval()) arg_list[j] = eval(arg_list[j], prefix, env, f_env, new_Node, ctx);
+            if (arg_list[j].should_eval()) new_arg_list << eval(arg_list[j], prefix, env, f_env, new_Node, ctx);
+            else                           new_arg_list << arg_list[j];
           }
+          kwdarg[1] = new_arg_list;
         }
         evaluated_args << kwdarg;
       }
     }
     // eval twice because args may be delayed
     for (size_t i = 0, S = evaluated_args.size(); i < S; ++i) {
       if (evaluated_args[i].type() != Node::assignment) {
+        evaluated_args[i].should_eval() = true;
         evaluated_args[i] = eval(evaluated_args[i], prefix, env, f_env, new_Node, ctx);
         if (evaluated_args[i].type() == Node::list) {
           Node arg_list(evaluated_args[i]);
@@ -641,6 +647,7 @@ namespace Sass {
       }
       else {
         Node kwdarg(evaluated_args[i]);
+        kwdarg[1].should_eval() = true;
         kwdarg[1] = eval(kwdarg[1], prefix, env, f_env, new_Node, ctx);
         if (kwdarg[1].type() == Node::list) {
           Node arg_list(kwdarg[1]);