sassc 2.2.1 → 2.4.0

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;
-    }
-
   }
 }

data/ext/libsass/src/util.hpp

@@ -8,11 +8,11 @@
 #include "sass/base.h"
 #include "ast_fwd_decl.hpp"
 
+#include <cmath>
 #include <cstring>
 #include <vector>
 #include <string>
 #include <assert.h>
-#include <math.h>
 
 #define SASS_ASSERT(cond, msg) assert(cond && msg)
 
@@ -34,17 +34,17 @@ namespace Sass {
   double sass_strtod(const char* str);
   const char* safe_str(const char *, const char* = "");
   void free_string_array(char **);
-  char **copy_strings(const std::vector<std::string>&, char ***, int = 0);
-  std::string read_css_string(const std::string& str, bool css = true);
-  std::string evacuate_escapes(const std::string& str);
-  std::string string_to_output(const std::string& str);
-  std::string comment_to_compact_string(const std::string& text);
-  std::string read_hex_escapes(const std::string& str);
-  std::string escape_string(const std::string& str);
-  void newline_to_space(std::string& str);
-
-  std::string quote(const std::string&, char q = 0);
-  std::string unquote(const std::string&, char* q = 0, bool keep_utf8_sequences = false, bool strict = true);
+  char **copy_strings(const sass::vector<sass::string>&, char ***, int = 0);
+  sass::string read_css_string(const sass::string& str, bool css = true);
+  sass::string evacuate_escapes(const sass::string& str);
+  sass::string string_to_output(const sass::string& str);
+  sass::string comment_to_compact_string(const sass::string& text);
+  sass::string read_hex_escapes(const sass::string& str);
+  sass::string escape_string(const sass::string& str);
+  void newline_to_space(sass::string& str);
+
+  sass::string quote(const sass::string&, char q = 0);
+  sass::string unquote(const sass::string&, char* q = 0, bool keep_utf8_sequences = false, bool strict = true);
   char detect_best_quotemark(const char* s, char qm = '"');
 
   bool is_hex_doublet(double n);
@@ -63,21 +63,21 @@ namespace Sass {
 
   // C++20 `starts_with` equivalent.
   // See https://en.cppreference.com/w/cpp/string/basic_string/starts_with
-  inline bool starts_with(const std::string& str, const char* prefix, size_t prefix_len) {
+  inline bool starts_with(const sass::string& str, const char* prefix, size_t prefix_len) {
     return str.compare(0, prefix_len, prefix) == 0;
   }
 
-  inline bool starts_with(const std::string& str, const char* prefix) {
+  inline bool starts_with(const sass::string& str, const char* prefix) {
     return starts_with(str, prefix, std::strlen(prefix));
   }
 
   // C++20 `ends_with` equivalent.
   // See https://en.cppreference.com/w/cpp/string/basic_string/ends_with
-  inline bool ends_with(const std::string& str, const std::string& suffix) {
+  inline bool ends_with(const sass::string& str, const sass::string& suffix) {
     return suffix.size() <= str.size() && std::equal(suffix.rbegin(), suffix.rend(), str.rbegin());
   }
 
-  inline bool ends_with(const std::string& str, const char* suffix, size_t suffix_len) {
+  inline bool ends_with(const sass::string& str, const char* suffix, size_t suffix_len) {
     if (suffix_len > str.size()) return false;
     const char* suffix_it = suffix + suffix_len;
     const char* str_it = str.c_str() + str.size();
@@ -85,21 +85,20 @@ namespace Sass {
     return true;
   }
 
-  inline bool ends_with(const std::string& str, const char* suffix) {
+  inline bool ends_with(const sass::string& str, const char* suffix) {
     return ends_with(str, suffix, std::strlen(suffix));
   }
 
   namespace Util {
 
-    bool isPrintable(Ruleset* r, Sass_Output_Style style = NESTED);
-    bool isPrintable(Supports_Block* r, Sass_Output_Style style = NESTED);
-    bool isPrintable(Media_Block* r, Sass_Output_Style style = NESTED);
+    bool isPrintable(StyleRule* r, Sass_Output_Style style = NESTED);
+    bool isPrintable(SupportsRule* r, Sass_Output_Style style = NESTED);
+    bool isPrintable(CssMediaRule* r, Sass_Output_Style style = NESTED);
     bool isPrintable(Comment* b, Sass_Output_Style style = NESTED);
     bool isPrintable(Block_Obj b, Sass_Output_Style style = NESTED);
     bool isPrintable(String_Constant* s, Sass_Output_Style style = NESTED);
     bool isPrintable(String_Quoted* s, Sass_Output_Style style = NESTED);
     bool isPrintable(Declaration* d, Sass_Output_Style style = NESTED);
-    bool isAscii(const char chr);
 
   }
 }

data/ext/libsass/src/util_string.cpp

@@ -1,75 +1,125 @@
 #include "util_string.hpp"
 
+#include <iostream>
 #include <algorithm>
 
 namespace Sass {
-namespace Util {
+  namespace Util {
 
-std::string rtrim(const std::string &str) {
-  std::string trimmed = str;
-  size_t pos_ws = trimmed.find_last_not_of(" \t\n\v\f\r");
-  if (pos_ws != std::string::npos) {
-    trimmed.erase(pos_ws + 1);
-  } else {
-    trimmed.clear();
-  }
-  return trimmed;
-}
+    // ##########################################################################
+    // Special case insensitive string matcher. We can optimize
+    // the more general compare case quite a bit by requiring
+    // consumers to obey some rules (lowercase and no space).
+    // - `literal` must only contain lower case ascii characters
+    // there is one edge case where this could give false positives
+    // test could contain a (non-ascii) char exactly 32 below literal
+    // ##########################################################################
+    bool equalsLiteral(const char* lit, const sass::string& test) {
+      // Work directly on characters
+      const char* src = test.c_str();
+      // There is a small chance that the search string
+      // Is longer than the rest of the string to look at
+      while (*lit && (*src == *lit || *src + 32 == *lit)) {
+        ++src, ++lit;
+      }
+      // True if literal is at end
+      // If not test was too long
+      return *lit == 0;
+    }
 
-std::string normalize_newlines(const std::string& str) {
-  std::string result;
-  result.reserve(str.size());
-  std::size_t pos = 0;
-  while (true) {
-    const std::size_t newline = str.find_first_of("\n\f\r", pos);
-    if (newline == std::string::npos) break;
-    result.append(str, pos, newline - pos);
-    result += '\n';
-    if (str[newline] == '\r' && str[newline + 1] == '\n') {
-      pos = newline + 2;
-    } else {
-      pos = newline + 1;
+    void ascii_str_tolower(sass::string* s) {
+      for (auto& ch : *s) {
+        ch = ascii_tolower(static_cast<unsigned char>(ch));
+      }
     }
-  }
-  result.append(str, pos, std::string::npos);
-  return result;
-}
 
-std::string normalize_underscores(const std::string& str) {
-  std::string normalized = str;
-  std::replace(normalized.begin(), normalized.end(), '_', '-');
-  return normalized;
-}
+    void ascii_str_toupper(sass::string* s) {
+      for (auto& ch : *s) {
+        ch = ascii_toupper(static_cast<unsigned char>(ch));
+      }
+    }
 
-std::string normalize_decimals(const std::string& str) {
-  std::string normalized;
-  if (!str.empty() && str[0] == '.') {
-    normalized.reserve(str.size() + 1);
-    normalized += '0';
-    normalized += str;
-  } else {
-    normalized = str;
-  }
-  return normalized;
-}
+    sass::string rtrim(sass::string str) {
+      auto it = std::find_if_not(str.rbegin(), str.rend(), ascii_isspace);
+      str.erase(str.rend() - it);
+      return str;
+    }
 
-char opening_bracket_for(char closing_bracket) {
-  switch (closing_bracket) {
-    case ')': return '(';
-    case ']': return '[';
-    case '}': return '{';
-    default: return '\0';
-  }
-}
+    // ###########################################################################
+    // Returns [name] without a vendor prefix.
+    // If [name] has no vendor prefix, it's returned as-is.
+    // ###########################################################################
+    sass::string unvendor(const sass::string& name)
+    {
+      if (name.size() < 2) return name;
+      if (name[0] != '-') return name;
+      if (name[1] == '-') return name;
+      for (size_t i = 2; i < name.size(); i++) {
+        if (name[i] == '-') return name.substr(i + 1);
+      }
+      return name;
+    }
+    // EO unvendor
+
+    sass::string normalize_newlines(const sass::string& str) {
+      sass::string result;
+      result.reserve(str.size());
+      std::size_t pos = 0;
+      while (true) {
+        const std::size_t newline = str.find_first_of("\n\f\r", pos);
+        if (newline == sass::string::npos) break;
+        result.append(str, pos, newline - pos);
+        result += '\n';
+        if (str[newline] == '\r' && str[newline + 1] == '\n') {
+          pos = newline + 2;
+        }
+        else {
+          pos = newline + 1;
+        }
+      }
+      result.append(str, pos, sass::string::npos);
+      return result;
+    }
+
+    sass::string normalize_underscores(const sass::string& str) {
+      sass::string normalized = str;
+      std::replace(normalized.begin(), normalized.end(), '_', '-');
+      return normalized;
+    }
+
+    sass::string normalize_decimals(const sass::string& str) {
+      sass::string normalized;
+      if (!str.empty() && str[0] == '.') {
+        normalized.reserve(str.size() + 1);
+        normalized += '0';
+        normalized += str;
+      }
+      else {
+        normalized = str;
+      }
+      return normalized;
+    }
+
+    char opening_bracket_for(char closing_bracket) {
+      switch (closing_bracket) {
+      case ')': return '(';
+      case ']': return '[';
+      case '}': return '{';
+      default: return '\0';
+      }
+    }
+
+    char closing_bracket_for(char opening_bracket) {
+      switch (opening_bracket) {
+      case '(': return ')';
+      case '[': return ']';
+      case '{': return '}';
+      default: return '\0';
+      }
+    }
 
-char closing_bracket_for(char opening_bracket) {
-  switch (opening_bracket) {
-    case '(': return ')';
-    case '[': return ']';
-    case '{': return '}';
-    default: return '\0';
   }
-}
+  // namespace Util
 
-}  // namespace Sass
-}  // namespace Util
+}
+// namespace Sass