Fixup more messages

Author: mgreter

src/bind.cpp

@@ -58,7 +58,7 @@ namespace Sass {
         }
         std::stringstream msg;
         msg << "Only " << LP << " ";
-        msg << (LP <= 1 ? "argument" : "arguments");
+        msg << (LP == 1 ? "argument" : "arguments");
         msg << " allowed, but " << LA << " ";
         msg << (LA <= 1 ? "was" : "were");
         msg << " passed.";

src/error_handling.cpp

@@ -49,7 +49,7 @@ namespace Sass {
     MissingArgument::MissingArgument(ParserState pstate, Backtraces traces, std::string fn, std::string arg, std::string fntype)
     : Base(pstate, def_msg, traces), fn(fn), arg(arg), fntype(fntype)
     {
-      msg = fntype + " " + fn + " is missing argument " + arg + ".";
+      msg = "Missing argument " + arg + ".";
     }
 
     InvalidCss::InvalidCss(ParserState pstate, Backtraces traces, std::string msg)

src/fn_colors.hpp

@@ -8,11 +8,11 @@ namespace Sass {
   namespace Functions {
 
     // macros for common ranges (u mean unsigned or upper, r for full range)
-    #define DARG_U_FACT(argname) get_arg_r(argname, env, sig, pstate, traces, - 0.0, 1.0) // double
+    #define DARG_U_FACT(argname) get_arg_r(argname, env, sig, pstate, traces,   0.0, 1.0) // double
     #define DARG_R_FACT(argname) get_arg_r(argname, env, sig, pstate, traces, - 1.0, 1.0) // double
-    #define DARG_U_BYTE(argname) get_arg_r(argname, env, sig, pstate, traces, - 0.0, 255.0) // double
+    #define DARG_U_BYTE(argname) get_arg_r(argname, env, sig, pstate, traces,   0.0, 255.0) // double
     #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_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
 
     // macros for color related inputs (rbg and alpha/opacity values)

src/fn_miscs.cpp

@@ -50,7 +50,7 @@ namespace Sass {
     {
       String_Constant* ss = Cast<String_Constant>(env["$name"]);
       if (!ss) {
-        error("$name: " + (env["$name"]->to_string()) + " is not a string for `function-exists'", pstate, traces);
+        error("$name: " + (env["$name"]->to_string()) + " is not a string.", pstate, traces);
       }
 
       std::string name = unquote(ss->value());

src/fn_utils.cpp

@@ -61,8 +61,8 @@ namespace Sass {
       double v = tmpnr.value();
       if (!(lo <= v && v <= hi)) {
         std::stringstream msg;
-        msg << "argument `" << argname << "` of `" << sig << "` must be between ";
-        msg << lo << " and " << hi;
+        msg << "Expected " << v << " to be within ";
+        msg << lo << " and " << hi << ".";
         error(msg.str(), pstate, traces);
       }
       return v;

src/fn_utils.hpp

@@ -41,7 +41,7 @@ namespace Sass {
     {
       T* val = Cast<T>(env[argname]);
       if (!val) {
-        error(argname + " is not a " + T::type_name(), pstate, traces);
+        error(argname + ": " + env[argname]->to_string() + " is not a " + T::type_name() + ".", pstate, traces);
       }
       return val;
     }