Fully evaluating the arguments to the comparison operators.

Author: Aaron Leung

eval_apply.cpp

@@ -302,14 +302,25 @@ namespace Sass {
       } break;
 
       case Node::relation: {
-        Node lhs(eval(expr[0], prefix, env, f_env, new_Node, ctx));
-        Node op(expr[1]);
-        Node rhs(eval(expr[2], prefix, env, f_env, new_Node, ctx));
+        // Node lhs(eval(expr[0], prefix, env, f_env, new_Node, ctx));
+        // Node op(expr[1]);
+        // Node rhs(eval(expr[2], prefix, env, f_env, new_Node, ctx));
+
+        Node lhs(new_Node(Node::arguments, expr[0].path(), expr[0].line(), 1));
+        Node rhs(new_Node(Node::arguments, expr[2].path(), expr[2].line(), 1));
+        Node rel(expr[1]);
+
+        lhs << expr[0];
+        rhs << expr[2];
+        lhs = eval_arguments(lhs, prefix, env, f_env, new_Node, ctx);
+        rhs = eval_arguments(rhs, prefix, env, f_env, new_Node, ctx);
+        lhs = lhs[0];
+        rhs = rhs[0];
 
         Node T(new_Node(Node::boolean, lhs.path(), lhs.line(), true));
         Node F(new_Node(Node::boolean, lhs.path(), lhs.line(), false));
 
-        switch (op.type())
+        switch (rel.type())
         {
           case Node::eq:  result = ((lhs == rhs) ? T : F); break;
           case Node::neq: result = ((lhs != rhs) ? T : F); break;

eval_apply.hpp

@@ -15,6 +15,7 @@ namespace Sass {
 
   void expand(Node expr, Node prefix, Environment& env, map<string, Function>& f_env, Node_Factory& new_Node, Context& ctx, bool function_name = false);
   Node eval(Node expr, Node prefix, Environment& env, map<string, Function>& f_env, Node_Factory& new_Node, Context& ctx, bool function_name = false);
+  Node eval_arguments(Node args, Node prefix, Environment& env, map<string, Function>& f_env, Node_Factory& new_Node, Context& ctx);
   Node eval_function(string name, Node stm, Environment& bindings, Node_Factory& new_Node, Context& ctx, bool toplevel = false);
   Node reduce(Node list, size_t head, Node acc, Node_Factory& new_Node);
   Node accumulate(Node::Type op, Node acc, Node rhs, Node_Factory& new_Node);