Adds default CRTP visitor for String_Quoted

xzyfer · Jul 13, 2015 · 583eac1 · 583eac1
1 parent 40ab322
commit 583eac1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/inspect.cpp b/inspect.cpp
@@ -642,9 +642,6 @@ namespace Sass {
 
   void Inspect::operator()(String_Constant* s)
   {
-    if (String_Quoted* quoted = dynamic_cast<String_Quoted*>(s)) {
-      return Inspect::operator()(quoted);
-    }
     append_token(s->value(), s);
   }
 

diff --git a/operation.hpp b/operation.hpp
@@ -54,6 +54,7 @@ namespace Sass {
     virtual T operator()(Color* x)                  = 0;
     virtual T operator()(Boolean* x)                = 0;
     virtual T operator()(String_Schema* x)          = 0;
+    virtual T operator()(String_Quoted* x)          = 0;
     virtual T operator()(String_Constant* x)        = 0;
     virtual T operator()(Supports_Query* x)          = 0;
     virtual T operator()(Supports_Condition* x)= 0;
@@ -129,6 +130,7 @@ namespace Sass {
     virtual T operator()(Boolean* x)                { return static_cast<D*>(this)->fallback(x); }
     virtual T operator()(String_Schema* x)          { return static_cast<D*>(this)->fallback(x); }
     virtual T operator()(String_Constant* x)        { return static_cast<D*>(this)->fallback(x); }
+    virtual T operator()(String_Quoted* x)          { return static_cast<D*>(this)->fallback(x); }
     virtual T operator()(Supports_Query* x)         { return static_cast<D*>(this)->fallback(x); }
     virtual T operator()(Supports_Condition* x)     { return static_cast<D*>(this)->fallback(x); }
     virtual T operator()(Media_Query* x)            { return static_cast<D*>(this)->fallback(x); }

diff --git a/output.cpp b/output.cpp
@@ -381,18 +381,14 @@ namespace Sass {
 
   void Output::operator()(String_Constant* s)
   {
-    if (String_Quoted* quoted = dynamic_cast<String_Quoted*>(s)) {
-      return Output::operator()(quoted);
+    string value(s->value());
+    if (s->can_compress_whitespace() && output_style() == COMPRESSED) {
+      value.erase(std::remove_if(value.begin(), value.end(), ::isspace), value.end());
+    }
+    if (!in_comment) {
+      append_token(string_to_output(value), s);
     } else {
-      string value(s->value());
-      if (s->can_compress_whitespace() && output_style() == COMPRESSED) {
-        value.erase(std::remove_if(value.begin(), value.end(), ::isspace), value.end());
-      }
-      if (!in_comment) {
-        append_token(string_to_output(value), s);
-      } else {
-        append_token(value, s);
-      }
+      append_token(value, s);
     }
   }
 

diff --git a/to_c.cpp b/to_c.cpp
@@ -19,11 +19,11 @@ namespace Sass {
   { return sass_make_color(c->r(), c->g(), c->b(), c->a()); }
 
   Sass_Value* To_C::operator()(String_Constant* s)
-  { 
+  {
     if (s->quote_mark()) {
       return sass_make_qstring(s->value().c_str());
     } else {
-	  return sass_make_string(s->value().c_str());
+      return sass_make_string(s->value().c_str());
     }
   }
 

diff --git a/to_string.cpp b/to_string.cpp
@@ -29,6 +29,11 @@ namespace Sass {
     return s->value();
   }
 
+  inline string To_String::operator()(String_Quoted* s)
+  {
+    return s->value();
+  }
+
   inline string To_String::operator()(Null* n)
   { return ""; }
 }