More adjustements

Author: mgreter

src/fn_colors.cpp

@@ -460,7 +460,7 @@ namespace Sass {
       bool hsl = h || s || l;
 
       if (rgb && hsl) {
-        error("Cannot specify HSL and RGB values for a color at the same time for `adjust-color'", pstate, traces);
+        error("RGB parameters may not be passed along with HSL parameters.", pstate, traces);
       }
       else if (rgb) {
         Color_RGBA_Obj c = col->copyAsRGBA();
@@ -505,7 +505,7 @@ namespace Sass {
       bool hsl = h || s || l;
 
       if (rgb && hsl) {
-        error("Cannot specify HSL and RGB values for a color at the same time for `scale-color'", pstate, traces);
+        error("RGB parameters may not be passed along with HSL parameters.", pstate, traces);
       }
       else if (rgb) {
         Color_RGBA_Obj c = col->copyAsRGBA();
@@ -559,7 +559,7 @@ namespace Sass {
       bool hsl = h || s || l;
 
       if (rgb && hsl) {
-        error("Cannot specify HSL and RGB values for a color at the same time for `change-color'", pstate, traces);
+        error("RGB parameters may not be passed along with HSL parameters.", pstate, traces);
       }
       else if (rgb) {
         Color_RGBA_Obj c = col->copyAsRGBA();

src/fn_colors.hpp

@@ -13,7 +13,7 @@ namespace Sass {
     #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_R_PRCT(argname) get_arg_r(argname, env, sig, pstate, traces, - 100.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)
     #define COLOR_NUM(argname) color_num(argname, env, sig, pstate, traces) // double

src/fn_utils.cpp

@@ -1,6 +1,7 @@
 // sass.hpp must go before all system headers to get the
 // __EXTENSIONS__ fix on Solaris.
 #include "sass.hpp"
+#include "ast.hpp"
 
 #include "fn_utils.hpp"
 #include "util_string.hpp"
@@ -53,16 +54,16 @@ namespace Sass {
       return get_arg<Map>(argname, env, sig, pstate, traces);
     }
 
-    double get_arg_r(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtraces traces, double lo, double hi)
+    double get_arg_r(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtraces traces, double lo, double hi, std::string unit)
     {
       Number* val = get_arg<Number>(argname, env, sig, pstate, traces);
       Number tmpnr(val);
       tmpnr.reduce();
       double v = tmpnr.value();
       if (!(lo <= v && v <= hi)) {
         std::stringstream msg;
-        msg << "Expected " << v << " to be within ";
-        msg << lo << " and " << hi << ".";
+        msg << "Expected " << v << unit << " to be within ";
+        msg << lo << unit << " and " << hi << unit << ".";
         error(msg.str(), pstate, traces);
       }
       return v;

src/fn_utils.hpp

@@ -50,7 +50,7 @@ namespace Sass {
     Number* get_arg_n(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtraces traces); // numbers only
     double alpha_num(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtraces traces); // colors only
     double color_num(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtraces traces); // colors only
-    double get_arg_r(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtraces traces, double lo, double hi); // colors only
+    double get_arg_r(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtraces traces, double lo, double hi, std::string unit = ""); // colors only
     double get_arg_val(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtraces traces); // shared
     SelectorListObj get_arg_sels(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtraces traces, Context& ctx); // selectors only
     CompoundSelectorObj get_arg_sel(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtraces traces, Context& ctx); // selectors only