Adjust default color args

Author: mgreter

src/context.cpp

@@ -779,25 +779,25 @@ namespace Sass {
   void register_built_in_functions(Context& ctx, Env* env)
   {
     using namespace Functions;
-    register_overload_stub(ctx, "rgb", env, 3);
+    register_overload_stub(ctx, "rgb", env, 1);
     register_function(ctx, rgb_4_sig, rgb_4, 4, env);
     register_function(ctx, rgb_3_sig, rgb_3, 3, env);
     register_function(ctx, rgb_2_sig, rgb_2, 2, env);
     register_function(ctx, rgb_1_sig, rgb_1, 1, env);
 
-    register_overload_stub(ctx, "rgba", env, 4);
+    register_overload_stub(ctx, "rgba", env, 1);
     register_function(ctx, rgba_4_sig, rgba_4, 4, env);
     register_function(ctx, rgba_3_sig, rgba_3, 3, env);
     register_function(ctx, rgba_2_sig, rgba_2, 2, env);
     register_function(ctx, rgba_1_sig, rgba_1, 1, env);
 
-    register_overload_stub(ctx, "hsl", env, 3);
+    register_overload_stub(ctx, "hsl", env, 1);
     register_function(ctx, hsl_4_sig, hsl_4, 4, env);
     register_function(ctx, hsl_3_sig, hsl_3, 3, env);
     register_function(ctx, hsl_2_sig, hsl_2, 2, env);
     register_function(ctx, hsl_1_sig, hsl_1, 1, env);
 
-    register_overload_stub(ctx, "hsla", env, 4);
+    register_overload_stub(ctx, "hsla", env, 1);
     register_function(ctx, hsla_4_sig, hsla_4, 4, env);
     register_function(ctx, hsla_3_sig, hsla_3, 3, env);
     register_function(ctx, hsla_2_sig, hsla_2, 2, env);

src/eval.cpp

@@ -294,15 +294,12 @@ namespace Sass {
         if (Argument* arg = Cast<Argument>(item)) item = arg->value();
         // check if we got passed a list of args (investigate)
         if (List* scalars = Cast<List>(item)) {
-          // debug_ast(scalars);
           if (variables.size() == 1) {
             Expression* var = scalars;
             env.set_local(variables[0], var);
           } else {
             // XXX: this is never hit via spec tests
-            // std::cerr << "qweqwe";
             for (size_t j = 0, K = variables.size(); j < K; ++j) {
-              // std::cerr << "set next item\n";
               Expression* res = j >= scalars->length()
                 ? SASS_MEMORY_NEW(Null, expr->pstate())
                 : scalars->at(j);
@@ -1213,13 +1210,11 @@ namespace Sass {
 
   Expression* Eval::operator()(Variable* v)
   {
-    // return SASS_MEMORY_NEW(Number, "", 1);
     Expression_Obj value;
     Env* env = environment();
     std::string name(v->name());
     EnvResult rv(env->find(name));
     if (rv.found) value = static_cast<Expression*>(rv.it->second.ptr());
-    // else error("Undefined variable: \"" + v->name() + "\".", v->pstate(), traces);
     else error("Undefined variable.", v->pstate(), traces);
     if (Argument* arg = Cast<Argument>(value)) value = arg->value();
 
@@ -1471,8 +1466,6 @@ namespace Sass {
     feature = (feature ? feature->perform(this) : 0);
     Expression_Obj value = e->value();
     value = (value ? value->perform(this) : 0);
-    // if (feature) std::cerr << "feature: [" << feature->to_string() << "]\n";
-    // if (value) std::cerr << "value: [" << value->to_string() << "]\n";
     Expression* ee = SASS_MEMORY_NEW(At_Root_Query,
                                      e->pstate(),
                                      Cast<String>(feature),
@@ -1487,7 +1480,6 @@ namespace Sass {
 
   Expression* Eval::operator()(Argument* a)
   {
-    // std::cerr << "EVAL ARGUMENT\n";
     Expression_Obj val = a->value()->perform(this);
     bool is_rest_argument = a->is_rest_argument();
     bool is_keyword_argument = a->is_keyword_argument();

src/listize.cpp

@@ -26,13 +26,10 @@ namespace Sass {
   Expression* Listize::operator()(SelectorList* sel)
   {
     List_Obj l = SASS_MEMORY_NEW(List, sel->pstate(), sel->length(), SASS_COMMA);
-    // l->from_selector(true);
     for (size_t i = 0, L = sel->length(); i < L; ++i) {
       if (!sel->at(i)) continue;
       l->append(sel->at(i)->perform(this));
     }
-    // debug_ast(l);
-    // std::cerr << "[" << l->inspect() << "]\n";
     if (l->length()) return l.detach();
     return SASS_MEMORY_NEW(Null, l->pstate());
   }
@@ -49,12 +46,9 @@ namespace Sass {
 
   Expression* Listize::operator()(ComplexSelector* sel)
   {
-    // std::string text(sel->to_css());
-    // return SASS_MEMORY_NEW(String_Quoted, sel->pstate(), text);
     List_Obj l = SASS_MEMORY_NEW(List, sel->pstate(), 0, SASS_SPACE );
     // ToDo: investigate what this does
     // Note: seems reated to parent ref
-    // l->from_selector(true);
 
     for (auto component : sel->elements()) {
       if (CompoundSelectorObj compound = Cast<CompoundSelector>(component)) {