Making the color name to value conversion case-insensitive. Also handling the…

Making the color name to value conversion case-insensitive. Also handling the edge case of a function having the same name as a color.

eval_apply.cpp

@@ -2,6 +2,7 @@
 #include "eval_apply.hpp"
 #include "document.hpp"
 #include "error.hpp"
+#include <cctype>
 #include <iostream>
 #include <sstream>
 #include <cstdlib>
@@ -19,7 +20,7 @@ namespace Sass {
 
   // Evaluate the parse tree in-place (mostly). Most nodes will be left alone.
 
-  Node eval(Node expr, Node prefix, Environment& env, map<string, Function>& f_env, Node_Factory& new_Node, Context& ctx)
+  Node eval(Node expr, Node prefix, Environment& env, map<string, Function>& f_env, Node_Factory& new_Node, Context& ctx, bool function_name)
   {
     switch (expr.type())
     {
@@ -292,7 +293,7 @@ namespace Sass {
         // TO DO: default-constructed Function should be a generic callback (maybe)
 
         // eval the function name in case it's interpolated
-        expr[0] = eval(expr[0], prefix, env, f_env, new_Node, ctx);
+        expr[0] = eval(expr[0], prefix, env, f_env, new_Node, ctx, true);
         string name(expr[0].to_string());
         if (!f_env.count(name)) {
           // no definition available; just pass it through (with evaluated args)
@@ -340,7 +341,8 @@ namespace Sass {
 
       case Node::identifier: {
         string id_str(expr.to_string());
-        if (ctx.color_names_to_values.count(id_str)) {
+        to_lowercase(id_str);
+        if (!function_name && ctx.color_names_to_values.count(id_str)) {
           return ctx.color_names_to_values[id_str];
         }
         else {
@@ -1268,4 +1270,7 @@ namespace Sass {
   Node selector_butlast(Node sel, Node_Factory& new_Node)
   { return selector_but(sel, new_Node, 0, 1); }
 
+  void to_lowercase(string& s)
+  { for (size_t i = 0, L = s.length(); i < L; ++i) s[i] = tolower(s[i]); }
+
 }

eval_apply.hpp

@@ -11,7 +11,7 @@
 namespace Sass {
   using std::map;
   
-  Node eval(Node expr, Node prefix, Environment& env, map<string, Function>& f_env, Node_Factory& new_Node, Context& ctx);
+  Node eval(Node expr, Node prefix, Environment& env, map<string, Function>& f_env, Node_Factory& new_Node, Context& ctx, bool function_name = false);
   Node function_eval(string name, Node stm, Environment& bindings, Node_Factory& new_Node, Context& ctx, bool toplevel = false);
   Node accumulate(Node::Type op, Node acc, Node rhs, Node_Factory& new_Node);
   double operate(Node::Type op, double lhs, double rhs);
@@ -29,4 +29,5 @@ namespace Sass {
   Node selector_butfirst(Node sel, Node_Factory& new_Node);
   Node selector_butlast(Node sel, Node_Factory& new_Node);
 
+  void to_lowercase(string& s);
 }
\ No newline at end of file