Fixing an edge case in which dimensions fetched from variables aren't negated by the unary negation operator.

Aaron Leung · Aaron Leung · commit 135e02c271d5 · 2012-11-12T16:43:14.000-08:00
diff --git a/eval_apply.cpp b/eval_apply.cpp
@@ -510,7 +510,24 @@ namespace Sass {
       case Node::unary_minus: {
         Node arg(eval(expr[0], prefix, env, f_env, new_Node, ctx, bt));
         if (arg.is_numeric()) {
-          result = new_Node(expr.path(), expr.line(), -arg.numeric_value());
+          double neg_val = -arg.numeric_value();
+          Node::Type t = arg.type();
+          switch (t)
+          {
+            case Node::number:
+            case Node::numeric_percentage: {
+              result = new_Node(expr.path(), expr.line(), neg_val, t);
+            } break;
+
+            case Node::numeric_dimension: {
+              result = new_Node(expr.path(), expr.line(), neg_val, arg.unit());
+            } break;
+
+            default: {
+              // unreachable
+              result = arg;
+            } break;
+          }
         }
         else {
           result = new_Node(Node::unary_minus, expr.path(), expr.line(), 1);
diff --git a/node_factory.hpp b/node_factory.hpp
@@ -26,9 +26,7 @@ namespace Sass {
     Node operator()(Node::Type type, string file, size_t line, Token t);
     // for making boolean values or interior nodes that have children
     Node operator()(Node::Type type, string file, size_t line, size_t size);
-    // // for making nodes representing boolean values
-    // Node operator()(Node::Type type, string file, size_t line, bool b);
-    // for making nodes representing numbers
+    // for making nodes representing numbers and numeric percentages
     Node operator()(string file, size_t line, double v, Node::Type type = Node::number);
     // for making nodes representing numeric dimensions (e.g. 5px, 3em)
     Node operator()(string file, size_t line, double v, const Token& t);
