Revert "Merge pull request #2273 from xzyfer/invert-with-weight"

This reverts commit 7a799da, reversing
changes made to 8191bfa.

Author: xzyfer

src/functions.cpp

@@ -288,7 +288,13 @@ namespace Sass {
     BUILT_IN(blue)
     { return SASS_MEMORY_NEW(Number, pstate, ARG("$color", Color)->b()); }
 
-    Color* colormix(Context& ctx, ParserState& pstate, Color* color1, Color* color2, Number* weight) {
+    Signature mix_sig = "mix($color-1, $color-2, $weight: 50%)";
+    BUILT_IN(mix)
+    {
+      Color_Obj  color1 = ARG("$color-1", Color);
+      Color_Obj  color2 = ARG("$color-2", Color);
+      Number_Obj weight = ARGR("$weight", Number, 0, 100);
+
       double p = weight->value()/100;
       double w = 2*p - 1;
       double a = color1->a() - color2->a();
@@ -304,16 +310,6 @@ namespace Sass {
                              color1->a()*p + color2->a()*(1-p));
     }
 
-    Signature mix_sig = "mix($color-1, $color-2, $weight: 50%)";
-    BUILT_IN(mix)
-    {
-      Color_Obj  color1 = ARG("$color-1", Color);
-      Color_Obj  color2 = ARG("$color-2", Color);
-      Number_Obj weight = ARGR("$weight", Number, 0, 100);
-      return colormix(ctx, pstate, color1, color2, weight);
-
-    }
-
     ////////////////
     // HSL FUNCTIONS
     ////////////////
@@ -605,7 +601,7 @@ namespace Sass {
                        pstate);
     }
 
-    Signature invert_sig = "invert($color, $weight: 100%)";
+    Signature invert_sig = "invert($color)";
     BUILT_IN(invert)
     {
       // CSS3 filter function overload: pass literal through directly
@@ -614,15 +610,13 @@ namespace Sass {
         return SASS_MEMORY_NEW(String_Quoted, pstate, "invert(" + amount->to_string(ctx.c_options) + ")");
       }
 
-      Number_Obj weight = ARGR("$weight", Number, 0, 100);
       Color_Ptr rgb_color = ARG("$color", Color);
-      Color_Obj inv = SASS_MEMORY_NEW(Color,
+      return SASS_MEMORY_NEW(Color,
                              pstate,
                              255 - rgb_color->r(),
                              255 - rgb_color->g(),
                              255 - rgb_color->b(),
                              rgb_color->a());
-      return colormix(ctx, pstate, inv, rgb_color, weight);
     }
 
     ////////////////////
@@ -1984,16 +1978,5 @@ namespace Sass {
       ss << "u" << std::setfill('0') << std::setw(8) << std::hex << distributed;
       return SASS_MEMORY_NEW(String_Quoted, pstate, ss.str());
     }
-
-<<<<<<< HEAD
-    Signature is_bracketed_sig = "is-bracketed($list)";
-    BUILT_IN(is_bracketed)
-    {
-      Value_Obj value = ARG("$list", Value);
-      List_Obj list = Cast<List>(value);
-      return SASS_MEMORY_NEW(Boolean, pstate, list && list->is_bracketed());
-    }
-=======
->>>>>>> parent of 46f5244... Merge pull request #2279 from xzyfer/bracked-lists
   }
 }