sassc 2.1.0.pre3 → 2.4.0

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

data/ext/libsass/src/util_string.hpp

@@ -1,19 +1,73 @@
 #ifndef SASS_UTIL_STRING_H
 #define SASS_UTIL_STRING_H
 
+#include "sass.hpp"
 #include <string>
 
 namespace Sass {
-namespace Util {
+  namespace Util {
 
-std::string rtrim(const std::string& str);
+    // ##########################################################################
+    // 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);
 
-std::string normalize_newlines(const std::string& str);
-std::string normalize_underscores(const std::string& str);
-std::string normalize_decimals(const std::string& str);
-char opening_bracket_for(char closing_bracket);
-char closing_bracket_for(char opening_bracket);
+    // ###########################################################################
+    // Returns [name] without a vendor prefix.
+    // If [name] has no vendor prefix, it's returned as-is.
+    // ###########################################################################
+    sass::string unvendor(const sass::string& name);
 
-}  // namespace Sass
+    sass::string rtrim(sass::string str);
+    sass::string normalize_newlines(const sass::string& str);
+    sass::string normalize_underscores(const sass::string& str);
+    sass::string normalize_decimals(const sass::string& str);
+    char opening_bracket_for(char closing_bracket);
+    char closing_bracket_for(char opening_bracket);
+
+    // Locale-independent ASCII character routines.
+
+    inline bool ascii_isalpha(unsigned char c) {
+      return (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z');
+    }
+
+    inline bool ascii_isdigit(unsigned char c) {
+      return (c >= '0' && c <= '9');
+    }
+
+    inline bool ascii_isalnum(unsigned char c) {
+      return ascii_isalpha(c) || ascii_isdigit(c);
+    }
+
+    inline bool ascii_isascii(unsigned char c) { return c < 128; }
+
+    inline bool ascii_isxdigit(unsigned char c) {
+      return ascii_isdigit(c) || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f');
+    }
+
+    inline bool ascii_isspace(unsigned char c) {
+      return c == ' ' || c == '\t' || c == '\v' || c == '\f' || c == '\r' || c == '\n';
+    }
+
+    inline char ascii_tolower(unsigned char c) {
+      if (c >= 'A' && c <= 'Z') return c + 32;
+      return c;
+    }
+
+    void ascii_str_tolower(sass::string* s);
+
+    inline char ascii_toupper(unsigned char c) {
+      if (c >= 'a' && c <= 'z') return c - 32;
+      return c;
+    }
+
+    void ascii_str_toupper(sass::string* s);
+
+  }  // namespace Sass
 }  // namespace Util
 #endif  // SASS_UTIL_STRING_H

data/ext/libsass/src/values.cpp

@@ -32,7 +32,7 @@ namespace Sass {
       const List* l = Cast<List>(val);
       union Sass_Value* list = sass_make_list(l->size(), l->separator(), l->is_bracketed());
       for (size_t i = 0, L = l->length(); i < L; ++i) {
-        Expression_Obj obj = l->at(i);
+        ExpressionObj obj = l->at(i);
         auto val = ast_node_to_sass_value(obj);
         sass_list_set_value(list, i, val);
       }
@@ -42,7 +42,7 @@ namespace Sass {
     {
       const Map* m = Cast<Map>(val);
       union Sass_Value* map = sass_make_map(m->length());
-      size_t i = 0; for (Expression_Obj key : m->keys()) {
+      size_t i = 0; for (ExpressionObj key : m->keys()) {
         sass_map_set_key(map, i, ast_node_to_sass_value(key));
         sass_map_set_value(map, i, ast_node_to_sass_value(m->at(key)));
         ++ i;
@@ -78,17 +78,17 @@ namespace Sass {
     switch (sass_value_get_tag(val)) {
       case SASS_NUMBER:
         return SASS_MEMORY_NEW(Number,
-                               ParserState("[C-VALUE]"),
+                               SourceSpan("[C-VALUE]"),
                                sass_number_get_value(val),
                                sass_number_get_unit(val));
       case SASS_BOOLEAN:
         return SASS_MEMORY_NEW(Boolean,
-                               ParserState("[C-VALUE]"),
+                               SourceSpan("[C-VALUE]"),
                                sass_boolean_get_value(val));
       case SASS_COLOR:
         // ToDo: allow to also use HSLA colors!!
         return SASS_MEMORY_NEW(Color_RGBA,
-                               ParserState("[C-VALUE]"),
+                               SourceSpan("[C-VALUE]"),
                                sass_color_get_r(val),
                                sass_color_get_g(val),
                                sass_color_get_b(val),
@@ -96,15 +96,15 @@ namespace Sass {
       case SASS_STRING:
         if (sass_string_is_quoted(val)) {
           return SASS_MEMORY_NEW(String_Quoted,
-                                 ParserState("[C-VALUE]"),
+                                 SourceSpan("[C-VALUE]"),
                                  sass_string_get_value(val));
         }
         return SASS_MEMORY_NEW(String_Constant,
-                                 ParserState("[C-VALUE]"),
+                                 SourceSpan("[C-VALUE]"),
                                  sass_string_get_value(val));
       case SASS_LIST: {
         List* l = SASS_MEMORY_NEW(List,
-                                  ParserState("[C-VALUE]"),
+                                  SourceSpan("[C-VALUE]"),
                                   sass_list_get_length(val),
                                   sass_list_get_separator(val));
         for (size_t i = 0, L = sass_list_get_length(val); i < L; ++i) {
@@ -114,7 +114,7 @@ namespace Sass {
         return l;
       }
       case SASS_MAP: {
-        Map* m = SASS_MEMORY_NEW(Map, ParserState("[C-VALUE]"));
+        Map* m = SASS_MEMORY_NEW(Map, SourceSpan("[C-VALUE]"));
         for (size_t i = 0, L = sass_map_get_length(val); i < L; ++i) {
           *m << std::make_pair(
             sass_value_to_ast_node(sass_map_get_key(val, i)),
@@ -123,14 +123,14 @@ namespace Sass {
         return m;
       }
       case SASS_NULL:
-        return SASS_MEMORY_NEW(Null, ParserState("[C-VALUE]"));
+        return SASS_MEMORY_NEW(Null, SourceSpan("[C-VALUE]"));
       case SASS_ERROR:
         return SASS_MEMORY_NEW(Custom_Error,
-                               ParserState("[C-VALUE]"),
+                               SourceSpan("[C-VALUE]"),
                                sass_error_get_message(val));
       case SASS_WARNING:
         return SASS_MEMORY_NEW(Custom_Warning,
-                               ParserState("[C-VALUE]"),
+                               SourceSpan("[C-VALUE]"),
                                sass_warning_get_message(val));
       default: break;
     }

data/lib/sassc/engine.rb

@@ -16,6 +16,7 @@ module SassC
     def initialize(template, options = {})
       @template = template
       @options = options
+      @functions = options.fetch(:functions, Script::Functions)
     end
 
     def render
@@ -37,7 +38,7 @@ module SassC
       Native.option_set_omit_source_map_url(native_options, true) if omit_source_map_url?
 
       import_handler.setup(native_options)
-      functions_handler.setup(native_options)
+      functions_handler.setup(native_options, functions: @functions)
 
       status = Native.compile_data_context(data_context)
 
@@ -54,11 +55,12 @@ module SassC
       @dependencies = Native.context_get_included_files(context)
       @source_map   = Native.context_get_source_map_string(context)
 
-      Native.delete_data_context(data_context)
-
       css.force_encoding(@template.encoding)
+      @source_map.force_encoding(@template.encoding) if @source_map.is_a?(String)
 
       return css unless quiet?
+    ensure
+      Native.delete_data_context(data_context) if data_context
     end
 
     def dependencies