More fixups

Author: mgreter

src/bind.cpp

@@ -246,7 +246,7 @@ namespace Sass {
 
           if (!param_map.count(param)) {
             std::stringstream msg;
-            msg << callee << " has no parameter named " << param;
+            msg << "No argument named " << param << ".";
             error(msg.str(), a->pstate(), traces);
           }
           env->local_frame()[param] = argmap->at(key);
@@ -275,7 +275,7 @@ namespace Sass {
             varargs->append(a);
           } else {
             std::stringstream msg;
-            msg << callee << " has no parameter named " << a->name();
+            msg << "No argument named " << a->name() << ".";
             error(msg.str(), a->pstate(), traces);
           }
         }

src/fn_colors.cpp

@@ -473,8 +473,8 @@ namespace Sass {
       else if (hsl) {
         Color_HSLA_Obj c = col->copyAsHSLA();
         if (h) c->h(c->h() + absmod(h->value(), 360.0));
-        if (s) c->s(c->s() + DARG_R_PRCT("$saturation"));
-        if (l) c->l(c->l() + DARG_R_PRCT("$lightness"));
+        if (s) c->s(c->s() + DARG_R_CENT("$saturation"));
+        if (l) c->l(c->l() + DARG_R_CENT("$lightness"));
         if (a) c->a(c->a() + DARG_R_FACT("$alpha"));
         return c.detach();
       }

src/fn_colors.hpp

@@ -14,6 +14,7 @@ namespace Sass {
     #define DARG_R_BYTE(argname) get_arg_r(argname, env, sig, pstate, traces, - 255.0, 255.0) // double
     #define DARG_U_PRCT(argname) get_arg_r(argname, env, sig, pstate, traces,   0.0, 100.0) // double
     #define DARG_R_PRCT(argname) get_arg_r(argname, env, sig, pstate, traces, - 100.0, 100.0, "%") // double
+    #define DARG_R_CENT(argname) get_arg_r(argname, env, sig, pstate, traces, - 100.0, 100.0) // double
 
     // macros for color related inputs (rbg and alpha/opacity values)
     #define COLOR_NUM(argname) color_num(argname, env, sig, pstate, traces) // double

src/fn_lists.cpp

@@ -71,11 +71,19 @@ namespace Sass {
         bool empty = m ? m->empty() : sl->empty();
         if (empty) error("argument `$list` of `" + std::string(sig) + "` must not be empty", pstate, traces);
         double index = std::floor(nr < 0 ? len + nr : nr - 1);
-        if (index < 0 || index > len - 1) error("index out of bounds for `" + std::string(sig) + "`", pstate, traces);
+        if (index < 0 || index > len - 1) {
+          if (index == -1) error("$n: List index may not be 0.", pstate, traces);
+          std::stringstream strm;
+          strm << "$n: Invalid index ";
+          strm << (index + 1);
+          strm << " for a list with ";
+          strm << len << " elements.";
+          error(strm.str(), pstate, traces);
+        }
         return Cast<Value>(Listize::perform(sl->get(static_cast<int>(index))));
       }
       List_Obj l = Cast<List>(env["$list"]);
-      if (nr == 0) error("argument `$n` of `" + std::string(sig) + "` must be non-zero", pstate, traces);
+      if (nr == 0) error("$n: List index may not be 0.", pstate, traces);
       // if the argument isn't a list, then wrap it in a singleton list
       if (!m && !l) {
         l = SASS_MEMORY_NEW(List, pstate, 1);
@@ -85,7 +93,15 @@ namespace Sass {
       bool empty = m ? m->empty() : l->empty();
       if (empty) error("argument `$list` of `" + std::string(sig) + "` must not be empty", pstate, traces);
       double index = std::floor(nr < 0 ? len + nr : nr - 1);
-      if (index < 0 || index > len - 1) error("index out of bounds for `" + std::string(sig) + "`", pstate, traces);
+      if (index < 0 || index > len - 1) {
+        if (index == -1) error("$n: List index may not be 0.", pstate, traces);
+        std::stringstream strm;
+        strm << "$n: Invalid index ";
+        strm << (index + 1);
+        strm << " for a list with ";
+        strm << l->length() << " elements.";
+        error(strm.str(), pstate, traces);
+      }
 
       if (m) {
         l = SASS_MEMORY_NEW(List, pstate, 2);
@@ -116,7 +132,15 @@ namespace Sass {
       }
       if (l->empty()) error("argument `$list` of `" + std::string(sig) + "` must not be empty", pstate, traces);
       double index = std::floor(n->value() < 0 ? l->length() + n->value() : n->value() - 1);
-      if (index < 0 || index > l->length() - 1) error("index out of bounds for `" + std::string(sig) + "`", pstate, traces);
+      if (index < 0 || index > l->length() - 1) {
+        if (index == -1) error("$n: List index may not be 0.", pstate, traces);
+        std::stringstream strm;
+        strm << "$n: Invalid index ";
+        strm << (index + 1);
+        strm << " for a list with ";
+        strm << l->length() << " elements.";
+        error(strm.str(), pstate, traces);
+      }
       List* result = SASS_MEMORY_NEW(List, pstate, l->length(), l->separator(), false, l->is_bracketed());
       for (size_t i = 0, L = l->length(); i < L; ++i) {
         result->append(((i == index) ? v : (*l)[i]));
@@ -181,7 +205,7 @@ namespace Sass {
       std::string sep_str = unquote(sep->value());
       if (sep_str == "space") sep_val = SASS_SPACE;
       else if (sep_str == "comma") sep_val = SASS_COMMA;
-      else if (sep_str != "auto") error("argument `$separator` of `" + std::string(sig) + "` must be `space`, `comma`, or `auto`", pstate, traces);
+      else if (sep_str != "auto") error("$separator: Must be \"space\", \"comma\", or \"auto\".", pstate, traces);
 
       if (l1) { l1sep = l1->separator(); }
       if (l2) { l2sep = l2->separator(); }
@@ -242,7 +266,7 @@ namespace Sass {
       if (sep_str != "auto") { // check default first
         if (sep_str == "space") result->separator(SASS_SPACE);
         else if (sep_str == "comma") result->separator(SASS_COMMA);
-        else error("argument `$separator` of `" + std::string(sig) + "` must be `space`, `comma`, or `auto`", pstate, traces);
+        else error("$separator: Must be \"space\", \"comma\", or \"auto\".", pstate, traces);
       }
       if (l->is_arglist()) {
         result->append(SASS_MEMORY_NEW(Argument,

src/fn_numbers.cpp

@@ -60,7 +60,7 @@ namespace Sass {
     BUILT_IN(percentage)
     {
       Number_Obj n = ARGN("$number");
-      if (!n->is_unitless()) error("argument $number of `" + std::string(sig) + "` must be unitless", pstate, traces);
+      if (!n->is_unitless()) error("Exprected " + n->to_string() + " to have no units.", pstate, traces);
       return SASS_MEMORY_NEW(Number, pstate, n->value() * 100, "%");
     }
 
@@ -161,7 +161,7 @@ namespace Sass {
         bool eq_int = std::fabs(trunc(lv) - lv) < NUMBER_EPSILON;
         if (!eq_int) {
           std::stringstream err;
-          err << "Expected $limit to be an integer but got " << lv << " for `random'";
+          err << "$limit: " << lv << " is not an int.";
           error(err.str(), pstate, traces);
         }
         std::uniform_real_distribution<> distributor(1, lv + 1);
@@ -207,11 +207,11 @@ namespace Sass {
       return SASS_MEMORY_NEW(Boolean, pstate, unitless);
     }
 
-    Signature comparable_sig = "comparable($number-1, $number-2)";
+    Signature comparable_sig = "comparable($number1, $number2)";
     BUILT_IN(comparable)
     {
-      Number_Obj n1 = ARGN("$number-1");
-      Number_Obj n2 = ARGN("$number-2");
+      Number_Obj n1 = ARGN("$number1");
+      Number_Obj n2 = ARGN("$number2");
       if (n1->is_unitless() || n2->is_unitless()) {
         return SASS_MEMORY_NEW(Boolean, pstate, true);
       }