Change inspect to use to_value from Value

Author: mgreter

inspect.cpp

@@ -459,191 +459,35 @@ namespace Sass {
 
   void Inspect::operator()(Number* n)
   {
-
-    string res;
-
-    // init stuff
-    n->normalize();
-    int precision = 5;
-    double value = n->value();
-    // get option from optional context
-    if (ctx) precision = ctx->precision;
-
-    // check if the fractional part of the value equals to zero
-    // neat trick from http://stackoverflow.com/a/1521682/1550314
-    // double int_part; bool is_int = modf(value, &int_part) == 0.0;
-
-    // this all cannot be done with one run only, since fixed
-    // output differs from normal output and regular output
-    // can contain scientific notation which we do not want!
-
-    // first sample
-    stringstream ss;
-    ss.precision(12);
-    ss << value;
-
-    // check if we got scientific notation in result
-    if (ss.str().find_first_of("e") != string::npos) {
-      ss.clear(); ss.str(string());
-      ss.precision(max(12, precision));
-      ss << fixed << value;
-    }
-
-    string tmp = ss.str();
-    size_t pos_point = tmp.find_first_of(".,");
-    size_t pos_fract = tmp.find_last_not_of("0");
-    bool is_int = pos_point == pos_fract ||
-                  pos_point == string::npos;
-
-    // reset stream for another run
-    ss.clear(); ss.str(string());
-
-    // take a shortcut for integers
-    if (is_int)
-    {
-      ss.precision(0);
-      ss << fixed << value;
-      res = string(ss.str());
-    }
-    // process floats
-    else
-    {
-      // do we have have too much precision?
-      if (pos_fract < precision + pos_point)
-      { precision = pos_fract - pos_point; }
-      // round value again
-      ss.precision(precision);
-      ss << fixed << value;
-      res = string(ss.str());
-      // maybe we truncated up to decimal point
-      size_t pos = res.find_last_not_of("0");
-      bool at_dec_point = res[pos] == '.' ||
-                          res[pos] == ',';
-      // don't leave a blank point
-      if (at_dec_point) ++ pos;
-      res.resize (pos + 1);
-    }
-
-    // some final cosmetics
-    if (res == "-0.0") res.erase(0, 1);
-    else if (res == "-0") res.erase(0, 1);
-
-    // add unit now
-    res += n->unit();
-
-    // check for a valid unit here
-    // includes result for reporting
-    if (n->numerator_units().size() > 1 ||
-        n->denominator_units().size() > 0 ||
-        (n->numerator_units().size() && n->numerator_units()[0].find_first_of('/') != string::npos) ||
-        (n->numerator_units().size() && n->numerator_units()[0].find_first_of('*') != string::npos)
-    ) {
-      error(res + " isn't a valid CSS value.", n->pstate());
-    }
-
+    // use values to_string facility
+    bool compressed = ctx->output_style == COMPRESSED;
+    string res = n->to_string(compressed, ctx->precision);
     // output the final token
     append_token(res, n);
-
-  }
-
-  // helper function for serializing colors
-  template <size_t range>
-  static double cap_channel(double c) {
-    if      (c > range) return range;
-    else if (c < 0)     return 0;
-    else                return c;
   }
 
   void Inspect::operator()(Color* c)
   {
-    stringstream ss;
-
-    // check if we prefer short hex colors
-    bool want_short = output_style() == COMPRESSED;
-
-    // original color name
-    // maybe an unknown token
-    string name = c->disp();
-
-    // resolved color
-    string res_name = name;
-
-    double r = round(cap_channel<0xff>(c->r()));
-    double g = round(cap_channel<0xff>(c->g()));
-    double b = round(cap_channel<0xff>(c->b()));
-    double a = cap_channel<1>   (c->a());
-
-    // get color from given name (if one was given at all)
-    if (name != "" && names_to_colors.count(name)) {
-      Color* n = name_to_color(name);
-      r = round(cap_channel<0xff>(n->r()));
-      g = round(cap_channel<0xff>(n->g()));
-      b = round(cap_channel<0xff>(n->b()));
-      a = cap_channel<1>   (n->a());
-    }
-    // otherwise get the possible resolved color name
-    else {
-      int numval = static_cast<int>(r) * 0x10000 + static_cast<int>(g) * 0x100 + static_cast<int>(b);
-      if (colors_to_names.count(numval))
-        res_name = color_to_name(numval);
-    }
-
-    stringstream hexlet;
-    hexlet << '#' << setw(1) << setfill('0');
-    // create a short color hexlet if there is any need for it
-    if (want_short && is_color_doublet(r, g, b) && a == 1) {
-      hexlet << hex << setw(1) << (static_cast<unsigned long>(r) >> 4);
-      hexlet << hex << setw(1) << (static_cast<unsigned long>(g) >> 4);
-      hexlet << hex << setw(1) << (static_cast<unsigned long>(b) >> 4);
-    } else {
-      hexlet << hex << setw(2) << static_cast<unsigned long>(r);
-      hexlet << hex << setw(2) << static_cast<unsigned long>(g);
-      hexlet << hex << setw(2) << static_cast<unsigned long>(b);
-    }
-
-    if (want_short && !c->is_delayed()) name = "";
-
-    // retain the originally specified color definition if unchanged
-    if (name != "") {
-      ss << name;
-    }
-    else if (r == 0 && g == 0 && b == 0 && a == 0) {
-        ss << "transparent";
-    }
-    else if (a >= 1) {
-      if (res_name != "") {
-        if (want_short && hexlet.str().size() < res_name.size()) {
-          ss << hexlet.str();
-        } else {
-          ss << res_name;
-        }
-      }
-      else {
-        ss << hexlet.str();
-      }
-    }
-    else {
-      ss << "rgba(";
-      ss << static_cast<unsigned long>(r) << ",";
-      if (output_style() != COMPRESSED) ss << " ";
-      ss << static_cast<unsigned long>(g) << ",";
-      if (output_style() != COMPRESSED) ss << " ";
-      ss << static_cast<unsigned long>(b) << ",";
-      if (output_style() != COMPRESSED) ss << " ";
-      ss << a << ')';
-    }
-    append_token(ss.str(), c);
+    // use values to_string facility
+    bool compressed = ctx->output_style == COMPRESSED;
+    string res = c->to_string(compressed, ctx->precision);
+    // output the final token
+    append_token(res, c);
   }
 
   void Inspect::operator()(Boolean* b)
   {
-    append_token(b->value() ? "true" : "false", b);
+    // use values to_string facility
+    bool compressed = ctx->output_style == COMPRESSED;
+    string res = b->to_string(compressed, ctx->precision);
+    // output the final token
+    append_token(res, b);
   }
 
   void Inspect::operator()(String_Schema* ss)
   {
-    // Evaluation should turn these into String_Constants, so this method is
-    // only for inspection purposes.
+    // Evaluation should turn these into String_Constants,
+    // so this method is only for inspection purposes.
     for (size_t i = 0, L = ss->length(); i < L; ++i) {
       if ((*ss)[i]->is_interpolant()) append_string("#{");
       (*ss)[i]->perform(this);
@@ -653,16 +497,24 @@ namespace Sass {
 
   void Inspect::operator()(String_Constant* s)
   {
-    append_token(s->value(), s);
+    // get options from optional? context
+    int precision = ctx ? ctx->precision : 5;
+    bool compressed = ctx ? ctx->output_style == COMPRESSED : false;
+    // use values to_string facility
+    string res(s->to_string(compressed, precision));
+    // output the final token
+    append_token(res, s);
   }
 
   void Inspect::operator()(String_Quoted* s)
   {
-    if (s->quote_mark()) {
-      append_token(quote(s->value(), s->quote_mark(), true), s);
-    } else {
-      append_token(s->value(), s);
-    }
+    // get options from optional? context
+    int precision = ctx ? ctx->precision : 5;
+    bool compressed = ctx ? ctx->output_style == COMPRESSED : false;
+    // use values to_string facility
+    string res(s->to_string(compressed, precision));
+    // output the final token
+    append_token(res, s);
   }
 
   void Inspect::operator()(Supports_Query* fq)
@@ -754,7 +606,11 @@ namespace Sass {
 
   void Inspect::operator()(Null* n)
   {
-    append_token("null", n);
+    // use values to_string facility
+    bool compressed = ctx->output_style == COMPRESSED;
+    string res = n->to_string(compressed, ctx->precision);
+    // output the final token
+    append_token(res, n);
   }
 
   // parameters and arguments