sassc 2.3.0 → 2.4.0

data/ext/libsass/src/util_string.cpp

@@ -14,7 +14,7 @@ namespace Sass {
     // 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 std::string& test) {
+    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
@@ -27,19 +27,19 @@ namespace Sass {
       return *lit == 0;
     }
 
-    void ascii_str_tolower(std::string* s) {
+    void ascii_str_tolower(sass::string* s) {
       for (auto& ch : *s) {
         ch = ascii_tolower(static_cast<unsigned char>(ch));
       }
     }
 
-    void ascii_str_toupper(std::string* s) {
+    void ascii_str_toupper(sass::string* s) {
       for (auto& ch : *s) {
         ch = ascii_toupper(static_cast<unsigned char>(ch));
       }
     }
 
-    std::string rtrim(std::string str) {
+    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;
@@ -49,7 +49,7 @@ namespace Sass {
     // Returns [name] without a vendor prefix.
     // If [name] has no vendor prefix, it's returned as-is.
     // ###########################################################################
-    std::string unvendor(const std::string& name)
+    sass::string unvendor(const sass::string& name)
     {
       if (name.size() < 2) return name;
       if (name[0] != '-') return name;
@@ -61,13 +61,13 @@ namespace Sass {
     }
     // EO unvendor
 
-    std::string normalize_newlines(const std::string& str) {
-      std::string result;
+    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 == std::string::npos) break;
+        if (newline == sass::string::npos) break;
         result.append(str, pos, newline - pos);
         result += '\n';
         if (str[newline] == '\r' && str[newline + 1] == '\n') {
@@ -77,18 +77,18 @@ namespace Sass {
           pos = newline + 1;
         }
       }
-      result.append(str, pos, std::string::npos);
+      result.append(str, pos, sass::string::npos);
       return result;
     }
 
-    std::string normalize_underscores(const std::string& str) {
-      std::string normalized = str;
+    sass::string normalize_underscores(const sass::string& str) {
+      sass::string normalized = str;
       std::replace(normalized.begin(), normalized.end(), '_', '-');
       return normalized;
     }
 
-    std::string normalize_decimals(const std::string& str) {
-      std::string normalized;
+    sass::string normalize_decimals(const sass::string& str) {
+      sass::string normalized;
       if (!str.empty() && str[0] == '.') {
         normalized.reserve(str.size() + 1);
         normalized += '0';

data/ext/libsass/src/util_string.hpp

@@ -1,6 +1,7 @@
 #ifndef SASS_UTIL_STRING_H
 #define SASS_UTIL_STRING_H
 
+#include "sass.hpp"
 #include <string>
 
 namespace Sass {
@@ -14,18 +15,18 @@ namespace Sass {
     // 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 std::string& test);
+    bool equalsLiteral(const char* lit, const sass::string& test);
 
     // ###########################################################################
     // Returns [name] without a vendor prefix.
     // If [name] has no vendor prefix, it's returned as-is.
     // ###########################################################################
-    std::string unvendor(const std::string& name);
+    sass::string unvendor(const sass::string& name);
 
-    std::string rtrim(std::string str);
-    std::string normalize_newlines(const std::string& str);
-    std::string normalize_underscores(const std::string& str);
-    std::string normalize_decimals(const std::string& str);
+    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);
 
@@ -58,14 +59,14 @@ namespace Sass {
       return c;
     }
 
-    void ascii_str_tolower(std::string* s);
+    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(std::string* s);
+    void ascii_str_toupper(sass::string* s);
 
   }  // namespace Sass
 }  // namespace Util

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/native.rb

@@ -34,7 +34,6 @@ module SassC
     require_relative "native/sass_input_style"
     require_relative "native/sass_output_style"
     require_relative "native/string_list"
-    require_relative "native/lib_c"
 
     # Remove the redundant "sass_" from the beginning of every method name
     def self.attach_function(*args)
@@ -53,10 +52,9 @@ module SassC
     end
 
     def self.native_string(string)
-      string = "#{string}\0"
-      data = Native::LibC.malloc(string.bytesize)
-      data.write_string(string)
-      data
+      m = FFI::MemoryPointer.from_string(string)
+      m.autorelease = false
+      m
     end
 
     require_relative "native/native_context_api"

data/lib/sassc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SassC
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

data/test/native_test.rb

@@ -11,7 +11,7 @@ module SassC
 
     class General < MiniTest::Test
       def test_it_reports_the_libsass_version
-        assert_equal "3.6.3", Native.version
+        assert_equal "3.6.4", Native.version
       end
     end
 
@@ -185,9 +185,9 @@ module SassC
         funct = FFI::Function.new(:pointer, [:pointer, :pointer, :pointer]) do |url, prev, cookie|
           list = Native.make_import_list(2)
 
-          str = "$var: 5px;\0"
-          data = Native::LibC.malloc(str.size)
-          data.write_string(str)
+          str = "$var: 5px;"
+          data = FFI::MemoryPointer.from_string(str)
+          data.autorelease = false
 
           entry0 = Native.make_import_entry("fake_includ.scss", data, nil)
           entry1 = Native.make_import_entry("not_included.scss", nil, nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -164,6 +164,7 @@ files:
 - ext/libsass/include/sass/values.h
 - ext/libsass/include/sass/version.h
 - ext/libsass/include/sass2scss.h
+- ext/libsass/src/MurmurHash2.hpp
 - ext/libsass/src/ast.cpp
 - ext/libsass/src/ast.hpp
 - ext/libsass/src/ast2c.cpp
@@ -250,8 +251,13 @@ files:
 - ext/libsass/src/listize.cpp
 - ext/libsass/src/listize.hpp
 - ext/libsass/src/mapping.hpp
-- ext/libsass/src/memory/SharedPtr.cpp
-- ext/libsass/src/memory/SharedPtr.hpp
+- ext/libsass/src/memory.hpp
+- ext/libsass/src/memory/allocator.cpp
+- ext/libsass/src/memory/allocator.hpp
+- ext/libsass/src/memory/config.hpp
+- ext/libsass/src/memory/memory_pool.hpp
+- ext/libsass/src/memory/shared_ptr.cpp
+- ext/libsass/src/memory/shared_ptr.hpp
 - ext/libsass/src/operation.hpp
 - ext/libsass/src/operators.cpp
 - ext/libsass/src/operators.hpp
@@ -279,6 +285,10 @@ files:
 - ext/libsass/src/sass_functions.hpp
 - ext/libsass/src/sass_values.cpp
 - ext/libsass/src/sass_values.hpp
+- ext/libsass/src/settings.hpp
+- ext/libsass/src/source.cpp
+- ext/libsass/src/source.hpp
+- ext/libsass/src/source_data.hpp
 - ext/libsass/src/source_map.cpp
 - ext/libsass/src/source_map.hpp
 - ext/libsass/src/stylesheet.cpp
@@ -307,7 +317,6 @@ files:
 - lib/sassc/import_handler.rb
 - lib/sassc/importer.rb
 - lib/sassc/native.rb
-- lib/sassc/native/lib_c.rb
 - lib/sassc/native/native_context_api.rb
 - lib/sassc/native/native_functions_api.rb
 - lib/sassc/native/sass2scss_api.rb

data/lib/sassc/native/lib_c.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module SassC
-  module Native
-    module LibC
-      extend FFI::Library
-      ffi_lib FFI::Library::LIBC
-
-      # memory allocators
-      attach_function :malloc, [:size_t], :pointer
-      # attach_function :calloc, [:size_t], :pointer
-      # attach_function :valloc, [:size_t], :pointer
-      # attach_function :realloc, [:pointer, :size_t], :pointer
-      # attach_function :free, [:pointer], :void
-
-      # memory movers
-      # attach_function :memcpy, [:pointer, :pointer, :size_t], :pointer
-      # attach_function :bcopy, [:pointer, :pointer, :size_t], :void
-    end
-  end
-end