sassc 2.1.0.pre3 → 2.4.0

data/ext/libsass/src/stylesheet.cpp

@@ -0,0 +1,22 @@
+// sass.hpp must go before all system headers to get the
+// __EXTENSIONS__ fix on Solaris.
+#include "sass.hpp"
+
+#include "stylesheet.hpp"
+
+namespace Sass {
+
+  // Constructor
+  Sass::StyleSheet::StyleSheet(const Resource& res, Block_Obj root) :
+    Resource(res),
+    root(root)
+  {
+  }
+
+  StyleSheet::StyleSheet(const StyleSheet& sheet) :
+    Resource(sheet),
+    root(sheet.root)
+  {
+  }
+
+}

data/ext/libsass/src/stylesheet.hpp

@@ -0,0 +1,57 @@
+#ifndef SASS_STYLESHEET_H
+#define SASS_STYLESHEET_H
+
+// sass.hpp must go before all system headers to get the
+// __EXTENSIONS__ fix on Solaris.
+#include "sass.hpp"
+
+#include "ast_fwd_decl.hpp"
+#include "extender.hpp"
+#include "file.hpp"
+
+namespace Sass {
+
+  // parsed stylesheet from loaded resource
+  // this should be a `Module` for sass 4.0
+  class StyleSheet : public Resource {
+    public:
+
+      // The canonical URL for this module's source file. This may be `null`
+      // if the module was loaded from a string without a URL provided.
+      // Uri get url;
+
+      // Modules that this module uses.
+      // List<Module> get upstream;
+
+      // The module's variables.
+      // Map<String, Value> get variables;
+
+      // The module's functions. Implementations must ensure
+      // that each [Callable] is stored under its own name.
+      // Map<String, Callable> get functions;
+
+      // The module's mixins. Implementations must ensure that
+      // each [Callable] is stored under its own name.
+      // Map<String, Callable> get mixins;
+
+      // The extensions defined in this module, which is also able to update
+      // [css]'s style rules in-place based on downstream extensions.
+      // Extender extender;
+
+      // The module's CSS tree.
+      Block_Obj root;
+
+    public:
+
+      // default argument constructor
+      StyleSheet(const Resource& res, Block_Obj root);
+
+      // Copy constructor
+      StyleSheet(const StyleSheet& res);
+
+  };
+
+
+}
+
+#endif

data/ext/libsass/src/to_value.cpp

@@ -95,8 +95,8 @@ namespace Sass {
     return arg->value()->perform(this);
   }
 
-  // Selector_List is converted to a string
-  Value* To_Value::operator()(Selector_List* s)
+  // SelectorList is converted to a string
+  Value* To_Value::operator()(SelectorList* s)
   {
     return SASS_MEMORY_NEW(String_Quoted,
                            s->pstate(),

data/ext/libsass/src/to_value.hpp

@@ -36,7 +36,7 @@ namespace Sass {
     Value* operator()(Function*);
 
     // convert to string via `To_String`
-    Value* operator()(Selector_List*);
+    Value* operator()(SelectorList*);
     Value* operator()(Binary_Expression*);
 
   };

data/ext/libsass/src/units.cpp

@@ -1,5 +1,7 @@
 #include "sass.hpp"
+#include <map>
 #include <stdexcept>
+#include <algorithm>
 #include "units.hpp"
 #include "error_handling.hpp"
 
@@ -63,7 +65,7 @@ namespace Sass {
     }
   };
 
-  std::string get_unit_class(UnitType unit)
+  sass::string get_unit_class(UnitType unit)
   {
     switch (unit & 0xFF00)
     {
@@ -89,7 +91,7 @@ namespace Sass {
     }
   };
 
-  UnitType string_to_unit(const std::string& s)
+  UnitType string_to_unit(const sass::string& s)
   {
     // size units
     if      (s == "px")   return UnitType::PX;
@@ -147,7 +149,7 @@ namespace Sass {
     }
   }
 
-  std::string unit_to_class(const std::string& s)
+  sass::string unit_to_class(const sass::string& s)
   {
     if      (s == "px")   return "LENGTH";
     else if (s == "pt")   return "LENGTH";
@@ -175,7 +177,7 @@ namespace Sass {
   }
 
   // throws incompatibleUnits exceptions
-  double conversion_factor(const std::string& s1, const std::string& s2)
+  double conversion_factor(const sass::string& s1, const sass::string& s2)
   {
     // assert for same units
     if (s1 == s2) return 1;
@@ -217,7 +219,7 @@ namespace Sass {
     return 0;
   }
 
-  double convert_units(const std::string& lhs, const std::string& rhs, int& lhsexp, int& rhsexp)
+  double convert_units(const sass::string& lhs, const sass::string& rhs, int& lhsexp, int& rhsexp)
   {
     double f = 0;
     // do not convert same ones
@@ -281,7 +283,7 @@ namespace Sass {
     double factor = 1;
 
     for (size_t i = 0; i < iL; i++) {
-      std::string &lhs = numerators[i];
+      sass::string &lhs = numerators[i];
       UnitType ulhs = string_to_unit(lhs);
       if (ulhs == UNKNOWN) continue;
       UnitClass clhs = get_unit_type(ulhs);
@@ -294,7 +296,7 @@ namespace Sass {
     }
 
     for (size_t n = 0; n < nL; n++) {
-      std::string &rhs = denominators[n];
+      sass::string &rhs = denominators[n];
       UnitType urhs = string_to_unit(rhs);
       if (urhs == UNKNOWN) continue;
       UnitClass crhs = get_unit_type(urhs);
@@ -326,9 +328,9 @@ namespace Sass {
     // it seems that a map table will fit nicely to do this
     // we basically construct exponents for each unit
     // has the advantage that they will be pre-sorted
-    std::map<std::string, int> exponents;
+    std::map<sass::string, int> exponents;
 
-    // initialize by summing up occurences in unit vectors
+    // initialize by summing up occurrences in unit vectors
     // this will already cancel out equivalent units (e.q. px/px)
     for (size_t i = 0; i < iL; i ++) exponents[numerators[i]] += 1;
     for (size_t n = 0; n < nL; n ++) exponents[denominators[n]] -= 1;
@@ -339,7 +341,7 @@ namespace Sass {
     // convert between compatible units
     for (size_t i = 0; i < iL; i++) {
       for (size_t n = 0; n < nL; n++) {
-        std::string &lhs = numerators[i], &rhs = denominators[n];
+        sass::string &lhs = numerators[i], &rhs = denominators[n];
         int &lhsexp = exponents[lhs], &rhsexp = exponents[rhs];
         double f(convert_units(lhs, rhs, lhsexp, rhsexp));
         if (f == 0) continue;
@@ -365,9 +367,9 @@ namespace Sass {
 
   }
 
-  std::string Units::unit() const
+  sass::string Units::unit() const
   {
-    std::string u;
+    sass::string u;
     size_t iL = numerators.size();
     size_t nL = denominators.size();
     for (size_t i = 0; i < iL; i += 1) {
@@ -394,15 +396,15 @@ namespace Sass {
            denominators.size() == 0;
   }
 
-  // this does not cover all cases (multiple prefered units)
+  // this does not cover all cases (multiple preferred units)
   double Units::convert_factor(const Units& r) const
   {
 
-    std::vector<std::string> miss_nums(0);
-    std::vector<std::string> miss_dens(0);
+    sass::vector<sass::string> miss_nums(0);
+    sass::vector<sass::string> miss_dens(0);
     // create copy since we need these for state keeping
-    std::vector<std::string> r_nums(r.numerators);
-    std::vector<std::string> r_dens(r.denominators);
+    sass::vector<sass::string> r_nums(r.numerators);
+    sass::vector<sass::string> r_dens(r.denominators);
 
     auto l_num_it = numerators.begin();
     auto l_num_end = numerators.end();
@@ -417,7 +419,7 @@ namespace Sass {
     while (l_num_it != l_num_end)
     {
       // get and increment afterwards
-      const std::string l_num = *(l_num_it ++);
+      const sass::string l_num = *(l_num_it ++);
 
       auto r_num_it = r_nums.begin(), r_num_end = r_nums.end();
 
@@ -426,7 +428,7 @@ namespace Sass {
       while (r_num_it != r_num_end)
       {
         // get and increment afterwards
-        const std::string r_num = *(r_num_it);
+        const sass::string r_num = *(r_num_it);
         // get possible conversion factor for units
         double conversion = conversion_factor(l_num, r_num);
         // skip incompatible numerator
@@ -454,7 +456,7 @@ namespace Sass {
     while (l_den_it != l_den_end)
     {
       // get and increment afterwards
-      const std::string l_den = *(l_den_it ++);
+      const sass::string l_den = *(l_den_it ++);
 
       auto r_den_it = r_dens.begin();
       auto r_den_end = r_dens.end();
@@ -464,8 +466,8 @@ namespace Sass {
       while (r_den_it != r_den_end)
       {
         // get and increment afterwards
-        const std::string r_den = *(r_den_it);
-        // get possible converstion factor for units
+        const sass::string r_den = *(r_den_it);
+        // get possible conversion factor for units
         double conversion = conversion_factor(l_den, r_den);
         // skip incompatible denominator
         if (conversion == 0) {

data/ext/libsass/src/units.hpp

@@ -55,8 +55,8 @@ namespace Sass {
 
   class Units {
   public:
-    std::vector<std::string> numerators;
-    std::vector<std::string> denominators;
+    sass::vector<sass::string> numerators;
+    sass::vector<sass::string> denominators;
   public:
     // default constructor
     Units() :
@@ -69,7 +69,7 @@ namespace Sass {
       denominators(ptr->denominators)
     { }
     // convert to string
-    std::string unit() const;
+    sass::string unit() const;
     // get if units are empty
     bool is_unitless() const;
     // return if valid for css
@@ -95,15 +95,15 @@ namespace Sass {
   extern const double resolution_conversion_factors[3][3];
 
   UnitType get_main_unit(const UnitClass unit);
-  enum Sass::UnitType string_to_unit(const std::string&);
+  enum Sass::UnitType string_to_unit(const sass::string&);
   const char* unit_to_string(Sass::UnitType unit);
   enum Sass::UnitClass get_unit_type(Sass::UnitType unit);
-  std::string get_unit_class(Sass::UnitType unit);
-  std::string unit_to_class(const std::string&);
+  sass::string get_unit_class(Sass::UnitType unit);
+  sass::string unit_to_class(const sass::string&);
   // throws incompatibleUnits exceptions
-  double conversion_factor(const std::string&, const std::string&);
+  double conversion_factor(const sass::string&, const sass::string&);
   double conversion_factor(UnitType, UnitType, UnitClass, UnitClass);
-  double convert_units(const std::string&, const std::string&, int&, int&);
+  double convert_units(const sass::string&, const sass::string&, int&, int&);
 
 }
 

data/ext/libsass/src/utf8_string.cpp

@@ -11,7 +11,6 @@
 
 namespace Sass {
   namespace UTF_8 {
-    using std::string;
 
     // naming conventions:
     // offset: raw byte offset (0 based)
@@ -19,25 +18,25 @@ namespace Sass {
     // index: code point offset (1 based or negative)
 
     // function that will count the number of code points (utf-8 characters) from the given beginning to the given end
-    size_t code_point_count(const string& str, size_t start, size_t end) {
+    size_t code_point_count(const sass::string& str, size_t start, size_t end) {
       return utf8::distance(str.begin() + start, str.begin() + end);
     }
 
-    size_t code_point_count(const string& str) {
+    size_t code_point_count(const sass::string& str) {
       return utf8::distance(str.begin(), str.end());
     }
 
     // function that will return the byte offset at a code point position
-    size_t offset_at_position(const string& str, size_t position) {
-      string::const_iterator it = str.begin();
+    size_t offset_at_position(const sass::string& str, size_t position) {
+      sass::string::const_iterator it = str.begin();
       utf8::advance(it, position, str.end());
       return std::distance(str.begin(), it);
     }
 
     // function that returns number of bytes in a character at offset
-    size_t code_point_size_at_offset(const string& str, size_t offset) {
+    size_t code_point_size_at_offset(const sass::string& str, size_t offset) {
       // get iterator from string and forward by offset
-      string::const_iterator stop = str.begin() + offset;
+      sass::string::const_iterator stop = str.begin() + offset;
       // check if beyond boundary
       if (stop == str.end()) return 0;
       // advance by one code point
@@ -78,9 +77,9 @@ namespace Sass {
     using std::wstring;
 
     // convert from utf16/wide string to utf8 string
-    string convert_from_utf16(const wstring& utf16)
+    sass::string convert_from_utf16(const wstring& utf16)
     {
-      string utf8;
+      sass::string utf8;
       // pre-allocate expected memory
       utf8.reserve(sizeof(utf16)/2);
       utf8::utf16to8(utf16.begin(), utf16.end(),
@@ -89,7 +88,7 @@ namespace Sass {
     }
 
     // convert from utf8 string to utf16/wide string
-    wstring convert_to_utf16(const string& utf8)
+    wstring convert_to_utf16(const sass::string& utf8)
     {
       wstring utf16;
       // pre-allocate expected memory

data/ext/libsass/src/utf8_string.hpp

@@ -3,6 +3,7 @@
 
 #include <string>
 #include "utf8.h"
+#include "memory.hpp"
 
 namespace Sass {
   namespace UTF_8 {
@@ -13,22 +14,22 @@ namespace Sass {
     // index: code point offset (1 based or negative)
 
     // function that will count the number of code points (utf-8 characters) from the beginning to the given end
-    size_t code_point_count(const std::string& str, size_t start, size_t end);
-    size_t code_point_count(const std::string& str);
+    size_t code_point_count(const sass::string& str, size_t start, size_t end);
+    size_t code_point_count(const sass::string& str);
 
     // function that will return the byte offset of a code point in a
-    size_t offset_at_position(const std::string& str, size_t position);
+    size_t offset_at_position(const sass::string& str, size_t position);
 
     // function that returns number of bytes in a character in a string
-    size_t code_point_size_at_offset(const std::string& str, size_t offset);
+    size_t code_point_size_at_offset(const sass::string& str, size_t offset);
 
     // function that will return a normalized index, given a crazy one
     size_t normalize_index(int index, size_t len);
 
     #ifdef _WIN32
     // functions to handle unicode paths on windows
-    std::string convert_from_utf16(const std::wstring& wstr);
-    std::wstring convert_to_utf16(const std::string& str);
+    sass::string convert_from_utf16(const std::wstring& wstr);
+    std::wstring convert_to_utf16(const sass::string& str);
     #endif
 
   }

data/ext/libsass/src/util.cpp

@@ -2,6 +2,7 @@
 #include "sass.h"
 #include "ast.hpp"
 #include "util.hpp"
+#include "util_string.hpp"
 #include "lexer.hpp"
 #include "prelexer.hpp"
 #include "constants.hpp"
@@ -26,8 +27,8 @@ namespace Sass {
     #endif
 
     // https://github.com/sass/sass/commit/4e3e1d5684cc29073a507578fc977434ff488c93
-    if (fmod(val, 1) - 0.5 > - std::pow(0.1, precision + 1)) return std::ceil(val);
-    else if (fmod(val, 1) - 0.5 > std::pow(0.1, precision)) return std::floor(val);
+    if (std::fmod(val, 1) - 0.5 > - std::pow(0.1, precision + 1)) return std::ceil(val);
+    else if (std::fmod(val, 1) - 0.5 > std::pow(0.1, precision)) return std::floor(val);
     // work around some compiler issue
     // cygwin has it not defined in std
     using namespace std;
@@ -75,7 +76,7 @@ namespace Sass {
     free(arr);
   }
 
-  char **copy_strings(const std::vector<std::string>& strings, char*** array, int skip) {
+  char **copy_strings(const sass::vector<sass::string>& strings, char*** array, int skip) {
     int num = static_cast<int>(strings.size()) - skip;
     char** arr = (char**) calloc(num + 1, sizeof(char*));
     if (arr == 0)
@@ -96,10 +97,10 @@ namespace Sass {
   }
 
   // read css string (handle multiline DELIM)
-  std::string read_css_string(const std::string& str, bool css)
+  sass::string read_css_string(const sass::string& str, bool css)
   {
     if (!css) return str;
-    std::string out("");
+    sass::string out("");
     bool esc = false;
     for (auto i : str) {
       if (i == '\\') {
@@ -124,9 +125,9 @@ namespace Sass {
 
   // double escape all escape sequences
   // keep unescaped quotes and backslashes
-  std::string evacuate_escapes(const std::string& str)
+  sass::string evacuate_escapes(const sass::string& str)
   {
-    std::string out("");
+    sass::string out("");
     bool esc = false;
     for (auto i : str) {
       if (i == '\\' && !esc) {
@@ -158,7 +159,7 @@ namespace Sass {
   }
 
   // bell characters are replaced with spaces
-  void newline_to_space(std::string& str)
+  void newline_to_space(sass::string& str)
   {
     std::replace(str.begin(), str.end(), '\n', ' ');
   }
@@ -167,14 +168,14 @@ namespace Sass {
   // 2. Replaces newlines with spaces.
   //
   // This method only considers LF and CRLF as newlines.
-  std::string string_to_output(const std::string& str)
+  sass::string string_to_output(const sass::string& str)
   {
-    std::string result;
+    sass::string result;
     result.reserve(str.size());
     std::size_t pos = 0;
     while (true) {
       const std::size_t newline = str.find_first_of("\n\r", pos);
-      if (newline == std::string::npos) break;
+      if (newline == sass::string::npos) break;
       result.append(str, pos, newline - pos);
       if (str[newline] == '\r') {
         if (str[newline + 1] == '\n') {
@@ -190,17 +191,17 @@ namespace Sass {
       }
       result += ' ';
       const std::size_t non_space = str.find_first_not_of(" \f\n\r\t\v", pos);
-      if (non_space != std::string::npos) {
+      if (non_space != sass::string::npos) {
         pos = non_space;
       }
     }
-    result.append(str, pos, std::string::npos);
+    result.append(str, pos, sass::string::npos);
     return result;
   }
 
-  std::string escape_string(const std::string& str)
+  sass::string escape_string(const sass::string& str)
   {
-    std::string out;
+    sass::string out;
     out.reserve(str.size());
     for (char c : str) {
       switch (c) {
@@ -220,9 +221,9 @@ namespace Sass {
     return out;
   }
 
-  std::string comment_to_compact_string(const std::string& text)
+  sass::string comment_to_compact_string(const sass::string& text)
   {
-    std::string str = "";
+    sass::string str = "";
     size_t has = 0;
     char prev = 0;
     bool clean = false;
@@ -269,10 +270,10 @@ namespace Sass {
     return quote_mark;
   }
 
-  std::string read_hex_escapes(const std::string& s)
+  sass::string read_hex_escapes(const sass::string& s)
   {
 
-    std::string result;
+    sass::string result;
     bool skipped = false;
 
     for (size_t i = 0, L = s.length(); i < L; ++i) {
@@ -289,7 +290,7 @@ namespace Sass {
 
         // parse as many sequence chars as possible
         // ToDo: Check if ruby aborts after possible max
-        while (i + len < L && s[i + len] && isxdigit(s[i + len])) ++ len;
+        while (i + len < L && s[i + len] && Util::ascii_isxdigit(static_cast<unsigned char>(s[i + len]))) ++ len;
 
         if (len > 1) {
 
@@ -338,7 +339,7 @@ namespace Sass {
 
   }
 
-  std::string unquote(const std::string& s, char* qd, bool keep_utf8_sequences, bool strict)
+  sass::string unquote(const sass::string& s, char* qd, bool keep_utf8_sequences, bool strict)
   {
 
     // not enough room for quotes
@@ -354,7 +355,7 @@ namespace Sass {
     else if (*s.begin() == '\'' && *s.rbegin() == '\'') q = '\'';
     else                                                return s;
 
-    std::string unq;
+    sass::string unq;
     unq.reserve(s.length()-2);
 
     for (size_t i = 1, L = s.length() - 1; i < L; ++i) {
@@ -375,7 +376,7 @@ namespace Sass {
 
         // parse as many sequence chars as possible
         // ToDo: Check if ruby aborts after possible max
-        while (i + len < L && s[i + len] && isxdigit(s[i + len])) ++ len;
+        while (i + len < L && s[i + len] && Util::ascii_isxdigit(static_cast<unsigned char>(s[i + len]))) ++ len;
 
         // hex string?
         if (keep_utf8_sequences) {
@@ -413,7 +414,7 @@ namespace Sass {
       //   // don't be that strict
       //   return s;
       //   // this basically always means an internal error and not users fault
-      //   error("Unescaped delimiter in string to unquote found. [" + s + "]", ParserState("[UNQUOTE]"));
+      //   error("Unescaped delimiter in string to unquote found. [" + s + "]", SourceSpan("[UNQUOTE]"));
       // }
       else {
         if (strict && !skipped) {
@@ -430,16 +431,16 @@ namespace Sass {
 
   }
 
-  std::string quote(const std::string& s, char q)
+  sass::string quote(const sass::string& s, char q)
   {
 
     // autodetect with fallback to given quote
     q = detect_best_quotemark(s.c_str(), q);
 
     // return an empty quoted string
-    if (s.empty()) return std::string(2, q ? q : '"');
+    if (s.empty()) return sass::string(2, q ? q : '"');
 
-    std::string quoted;
+    sass::string quoted;
     quoted.reserve(s.length()+2);
     quoted.push_back(q);
 
@@ -528,14 +529,14 @@ namespace Sass {
 
   namespace Util {
 
-    bool isPrintable(Ruleset* r, Sass_Output_Style style) {
+    bool isPrintable(StyleRule* r, Sass_Output_Style style) {
       if (r == NULL) {
         return false;
       }
 
       Block_Obj b = r->block();
 
-      Selector_List* sl = Cast<Selector_List>(r->selector());
+      SelectorList* sl = r->selector();
       bool hasSelectors = sl ? sl->length() > 0 : false;
 
       if (!hasSelectors) {
@@ -546,11 +547,11 @@ namespace Sass {
       bool hasPrintableChildBlocks = false;
       for (size_t i = 0, L = b->length(); i < L; ++i) {
         Statement_Obj stm = b->at(i);
-        if (Cast<Directive>(stm)) {
+        if (Cast<AtRule>(stm)) {
           return true;
         } else if (Declaration* d = Cast<Declaration>(stm)) {
           return isPrintable(d, style);
-        } else if (Has_Block* p = Cast<Has_Block>(stm)) {
+        } else if (ParentStatement* p = Cast<ParentStatement>(stm)) {
           Block_Obj pChildBlock = p->block();
           if (isPrintable(pChildBlock, style)) {
             hasPrintableChildBlocks = true;
@@ -588,13 +589,13 @@ namespace Sass {
 
     bool isPrintable(Declaration* d, Sass_Output_Style style)
     {
-      Expression_Obj val = d->value();
+      ExpressionObj val = d->value();
       if (String_Quoted_Obj sq = Cast<String_Quoted>(val)) return isPrintable(sq.ptr(), style);
       if (String_Constant_Obj sc = Cast<String_Constant>(val)) return isPrintable(sc.ptr(), style);
       return true;
     }
 
-    bool isPrintable(Supports_Block* f, Sass_Output_Style style) {
+    bool isPrintable(SupportsRule* f, Sass_Output_Style style) {
       if (f == NULL) {
         return false;
       }
@@ -605,10 +606,10 @@ namespace Sass {
       bool hasPrintableChildBlocks = false;
       for (size_t i = 0, L = b->length(); i < L; ++i) {
         Statement_Obj stm = b->at(i);
-        if (Cast<Declaration>(stm) || Cast<Directive>(stm)) {
+        if (Cast<Declaration>(stm) || Cast<AtRule>(stm)) {
           hasDeclarations = true;
         }
-        else if (Has_Block* b = Cast<Has_Block>(stm)) {
+        else if (ParentStatement* b = Cast<ParentStatement>(stm)) {
           Block_Obj pChildBlock = b->block();
           if (!b->is_invisible()) {
             if (isPrintable(pChildBlock, style)) {
@@ -625,36 +626,37 @@ namespace Sass {
       return false;
     }
 
-    bool isPrintable(Media_Block* m, Sass_Output_Style style)
+    bool isPrintable(CssMediaRule* m, Sass_Output_Style style)
     {
       if (m == nullptr) return false;
       Block_Obj b = m->block();
       if (b == nullptr) return false;
+      if (m->empty()) return false;
       for (size_t i = 0, L = b->length(); i < L; ++i) {
         Statement_Obj stm = b->at(i);
-        if (Cast<Directive>(stm)) return true;
+        if (Cast<AtRule>(stm)) return true;
         else if (Cast<Declaration>(stm)) return true;
         else if (Comment* c = Cast<Comment>(stm)) {
           if (isPrintable(c, style)) {
             return true;
           }
         }
-        else if (Ruleset* r = Cast<Ruleset>(stm)) {
+        else if (StyleRule* r = Cast<StyleRule>(stm)) {
           if (isPrintable(r, style)) {
             return true;
           }
         }
-        else if (Supports_Block* f = Cast<Supports_Block>(stm)) {
+        else if (SupportsRule* f = Cast<SupportsRule>(stm)) {
           if (isPrintable(f, style)) {
             return true;
           }
         }
-        else if (Media_Block* mb = Cast<Media_Block>(stm)) {
+        else if (CssMediaRule* mb = Cast<CssMediaRule>(stm)) {
           if (isPrintable(mb, style)) {
             return true;
           }
         }
-        else if (Has_Block* b = Cast<Has_Block>(stm)) {
+        else if (ParentStatement* b = Cast<ParentStatement>(stm)) {
           if (isPrintable(b->block(), style)) {
             return true;
           }
@@ -684,7 +686,7 @@ namespace Sass {
 
       for (size_t i = 0, L = b->length(); i < L; ++i) {
         Statement_Obj stm = b->at(i);
-        if (Cast<Declaration>(stm) || Cast<Directive>(stm)) {
+        if (Cast<Declaration>(stm) || Cast<AtRule>(stm)) {
           return true;
         }
         else if (Comment* c = Cast<Comment>(stm)) {
@@ -692,22 +694,22 @@ namespace Sass {
             return true;
           }
         }
-        else if (Ruleset* r = Cast<Ruleset>(stm)) {
+        else if (StyleRule* r = Cast<StyleRule>(stm)) {
           if (isPrintable(r, style)) {
             return true;
           }
         }
-        else if (Supports_Block* f = Cast<Supports_Block>(stm)) {
+        else if (SupportsRule* f = Cast<SupportsRule>(stm)) {
           if (isPrintable(f, style)) {
             return true;
           }
         }
-        else if (Media_Block* m = Cast<Media_Block>(stm)) {
+        else if (CssMediaRule * m = Cast<CssMediaRule>(stm)) {
           if (isPrintable(m, style)) {
             return true;
           }
         }
-        else if (Has_Block* b = Cast<Has_Block>(stm)) {
+        else if (ParentStatement* b = Cast<ParentStatement>(stm)) {
           if (isPrintable(b->block(), style)) {
             return true;
           }
@@ -717,9 +719,5 @@ namespace Sass {
       return false;
     }
 
-    bool isAscii(const char chr) {
-      return unsigned(chr) < 128;
-    }
-
   }
 }