From e44f3c879e6702813c616e6cafc69504e41d529e Mon Sep 17 00:00:00 2001
From: Nikhil Benesch <nikhil.benesch@gmail.com>
Date: Wed, 13 Aug 2014 12:26:12 -0400
Subject: [PATCH] support colliding CSS filter effects functions

CSS filter effects [0] define several functions (invert, grayscale,
opacity, saturation) that collide with the names of built-in Sass
functions. Overload these functions with a no-op when the filter effects
function signature is discovered. This is compatible with Ruby Sass.

For example, calling `invert` with a color will return an inverted color
as before:

    color: invert(#333) => color: #cccccc

But calling `invert` with a percentage will pass through the function
call unharmed.

    filter: invert(30%) => filter: invert(30%)
    filter: invert(.03) => filter: invert(.03)

Fixes #151.

[0]: http://www.w3.org/TR/filter-effects/
---
 functions.cpp | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/functions.cpp b/functions.cpp
index 4ec406b9c7..874a797af6 100644
--- a/functions.cpp
+++ b/functions.cpp
@@ -344,9 +344,15 @@ namespace Sass {
                        position);
     }
 
-    Signature saturate_sig = "saturate($color, $amount)";
+    Signature saturate_sig = "saturate($color, $amount: nil)";
     BUILT_IN(saturate)
     {
+      Number* filter_amount = dynamic_cast<Number*>(env["$color"]);
+      if (filter_amount) {
+        To_String to_string;
+        return new (ctx.mem) String_Constant(path, position, "saturate(" + filter_amount->perform(&to_string) + ")");
+      }
+
       Color* rgb_color = ARG("$color", Color);
       Number* amount = ARGR("$amount", Number, 0, 100);
       HSL hsl_color = rgb_to_hsl(rgb_color->r(),
@@ -394,6 +400,12 @@ namespace Sass {
     Signature grayscale_sig = "grayscale($color)";
     BUILT_IN(grayscale)
     {
+      Number* amount = dynamic_cast<Number*>(env["$color"]);
+      if (amount) {
+        To_String to_string;
+        return new (ctx.mem) String_Constant(path, position, "grayscale(" + amount->perform(&to_string) + ")");
+      }
+
       Color* rgb_color = ARG("$color", Color);
       HSL hsl_color = rgb_to_hsl(rgb_color->r(),
                                  rgb_color->g(),
@@ -426,6 +438,12 @@ namespace Sass {
     Signature invert_sig = "invert($color)";
     BUILT_IN(invert)
     {
+      Number* amount = dynamic_cast<Number*>(env["$color"]);
+      if (amount) {
+        To_String to_string;
+        return new (ctx.mem) String_Constant(path, position, "invert(" + amount->perform(&to_string) + ")");
+      }
+
       Color* rgb_color = ARG("$color", Color);
       return new (ctx.mem) Color(path,
                                  position,
@@ -446,9 +464,14 @@ namespace Sass {
       if (ie_kwd) {
         return new (ctx.mem) String_Constant(path, position, "alpha(" + ie_kwd->value() + ")");
       }
-      else {
-        return new (ctx.mem) Number(path, position, ARG("$color", Color)->a());
+
+      Number* amount = dynamic_cast<Number*>(env["$color"]);
+      if (amount) {
+        To_String to_string;
+        return new (ctx.mem) String_Constant(path, position, "opacity(" + amount->perform(&to_string) + ")");
       }
+
+      return new (ctx.mem) Number(path, position, ARG("$color", Color)->a());
     }
 
     Signature opacify_sig = "opacify($color, $amount)";