sassc 1.11.1 → 1.11.2

data/ext/libsass/win/libsass.targets

@@ -12,6 +12,7 @@
   <ItemGroup Label="LibSass Headers">
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_def_macros.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\memory\SharedPtr.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_factory.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_fwd_decl.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\backtrace.hpp" />
@@ -38,7 +39,6 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\lexer.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\listize.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\mapping.hpp" />
-    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\memory_manager.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\node.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\operation.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\output.hpp" />
@@ -68,6 +68,7 @@
   </ItemGroup>
   <ItemGroup Label="LibSass Sources">
     <ClCompile Include="$(LIBSASS_SRC_DIR)\ast.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\memory\SharedPtr.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\base64vlq.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\bind.cpp" />
     <ClCompile Condition="$(VisualStudioVersion) &lt; 14.0" Include="$(LIBSASS_SRC_DIR)\c99func.c" />
@@ -89,7 +90,6 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\json.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\lexer.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\listize.cpp" />
-    <ClCompile Include="$(LIBSASS_SRC_DIR)\memory_manager.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\node.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\output.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\parser.cpp" />
@@ -104,6 +104,7 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_values.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass2scss.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\source_map.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\subset_map.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\to_c.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\to_value.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\units.cpp" />

data/ext/libsass/win/libsass.vcxproj.filters

@@ -48,6 +48,9 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\memory\SharedPtr.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_def_macros.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -126,9 +129,6 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\mapping.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
-    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\memory_manager.hpp">
-      <Filter>Headers</Filter>
-    </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\node.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -215,6 +215,9 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\ast.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\memory\SharedPtr.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\base64vlq.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
@@ -278,9 +281,6 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\listize.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
-    <ClCompile Include="$(LIBSASS_SRC_DIR)\memory_manager.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\node.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
@@ -323,6 +323,9 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\source_map.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\subset_map.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\to_c.cpp">
       <Filter>Sources</Filter>
     </ClCompile>

data/lib/sassc/version.rb

@@ -1,3 +1,3 @@
 module SassC
-  VERSION = "1.11.1"
+  VERSION = "1.11.2"
 end

data/sassc.gemspec

@@ -43,4 +43,3 @@ Gem::Specification.new do |spec|
     end
   end
 end
-

data/test/native_test.rb

@@ -9,7 +9,7 @@ module SassC
 
     class General < MiniTest::Test
       def test_it_reports_the_libsass_version
-        assert_equal "3.4.1", Native.version
+        assert_equal "3.4.3", Native.version
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -182,6 +182,7 @@ files:
 - ext/libsass/docs/compatibility-plan.md
 - ext/libsass/docs/contributing.md
 - ext/libsass/docs/custom-functions-internal.md
+- ext/libsass/docs/dev-ast-memory.md
 - ext/libsass/docs/implementations.md
 - ext/libsass/docs/plugins.md
 - ext/libsass/docs/setup-environment.md
@@ -210,11 +211,11 @@ files:
 - ext/libsass/script/spec
 - ext/libsass/script/tap-driver
 - ext/libsass/script/tap-runner
+- ext/libsass/script/test-leaks.pl
 - ext/libsass/src/GNUmakefile.am
 - ext/libsass/src/ast.cpp
 - ext/libsass/src/ast.hpp
 - ext/libsass/src/ast_def_macros.hpp
-- ext/libsass/src/ast_factory.hpp
 - ext/libsass/src/ast_fwd_decl.hpp
 - ext/libsass/src/b64/cencode.h
 - ext/libsass/src/b64/encode.h
@@ -263,8 +264,8 @@ files:
 - ext/libsass/src/listize.cpp
 - ext/libsass/src/listize.hpp
 - ext/libsass/src/mapping.hpp
-- ext/libsass/src/memory_manager.cpp
-- ext/libsass/src/memory_manager.hpp
+- ext/libsass/src/memory/SharedPtr.cpp
+- ext/libsass/src/memory/SharedPtr.hpp
 - ext/libsass/src/node.cpp
 - ext/libsass/src/node.hpp
 - ext/libsass/src/operation.hpp
@@ -294,6 +295,7 @@ files:
 - ext/libsass/src/sass_values.hpp
 - ext/libsass/src/source_map.cpp
 - ext/libsass/src/source_map.hpp
+- ext/libsass/src/subset_map.cpp
 - ext/libsass/src/subset_map.hpp
 - ext/libsass/src/support/libsass.pc.in
 - ext/libsass/src/to_c.cpp

data/ext/libsass/src/ast_factory.hpp

@@ -1,92 +0,0 @@
-#ifndef SASS_AST_FACTORY_H
-#define SASS_AST_FACTORY_H
-
-#include <vector>
-
-#include "ast.hpp"
-
-namespace Sass {
-
-  class AST_Factory {
-    std::vector<AST_Node*> nodes;
-  public:
-    // statements
-    Block* new_Block(std::string p, size_t l, size_t s = 0, bool r = false);
-    Ruleset* new_Ruleset(std::string p, size_t l, Selector* s, Block* b);
-    Supports_Query* new_Supports_Query(std::string p, size_t l, Supports_Query* f, Block* b);
-    Media_Query* new_Media_Query(std::string p, size_t l, List* q, Block* b);
-    At_Root_Block* new_At_Root_Block(std::string p, size_t l, Selector* sel, Block* b);
-    Directive* new_At_Rule(std::string p, size_t l, std::string kwd, Selector* sel, Block* b);
-    Keyframe_Rule* new_Keyframe_Rule(std::string p, size_t l, Block* b);
-    Declaration* new_Declaration(std::string p, size_t l, String* prop, List* vals, Block* b);
-    Assignment* new_Assignment(std::string p, size_t l, std::string var, Expression* val, bool guarded = false);
-    Import<Function_Call*>* new_CSS_Import(std::string p, size_t l, Function_Call* loc);
-    Import<String*>* new_SASS_Import(std::string p, size_t l, String* loc);
-    Custom_Warning* new_Custom_Warning(std::string msg, size_t l, std::string msg);
-    Custom_Error* new_Custom_Error(std::string p, size_t l, std::string msg);
-    Warning* new_Warning(std::string p, size_t l, Expression* msg);
-    Error* new_Error(std::string p, size_t l, Expression* msg);
-    Debug* new_Debug(std::string p, size_t l, Expression* val);
-    Comment* new_Comment(std::string p, size_t l, String* txt);
-    If* new_If(std::string p, size_t l, Expression* pred, Block* con, Block* alt = 0);
-    For* new_For(std::string p, size_t l, std::string var, Expression* lo, Expression* hi, Block* b, bool inc);
-    Each* new_Each(std::string p, size_t l, std::vector<std::string> vars, Expression* lst, Block* b);
-    While* new_While(std::string p, size_t l, Expression* pred, Block* b);
-    Extension* new_Extension(std::string p, size_t l, Selector* s);
-    Definition<MIXIN>* new_Mixin_Definition(std::string p, size_t l, std::string n, Parameters* params, Block* b);
-    Definition<FUNCTION>* new_Function_Definition(std::string p, size_t l, std::string n, Parameters* params, Block* b);
-    Mixin_Call* new_Mixin_Call(std::string p, size_t l, std::string n, Arguments* args, Block* b = 0);
-    // expressions
-    List* new_List(std::string p, size_t l, size_t size = 0, enum Sass_Separator sep = List::space, bool argl = false);
-    Map* new_Map(std::string p, size_t l, size_t size = 0);
-    Binary_Expression<AND>* new_And(std::string p, size_t l, Expression* lhs, Expression* rhs);
-    Binary_Expression<OR>* new_Or(std::string p, size_t l, Expression* lhs, Expression* rhs);
-    Binary_Expression<EQ>* new_Eq(std::string p, size_t l, Expression* lhs, Expression* rhs);
-    Binary_Expression<NEQ>* new_Neq(std::string p, size_t l, Expression* lhs, Expression* rhs);
-    Binary_Expression<GT>* new_Gt(std::string p, size_t l, Expression* lhs, Expression* rhs);
-    Binary_Expression<GTE>* new_Gte(std::string p, size_t l, Expression* lhs, Expression* rhs);
-    Binary_Expression<LT>* new_Lt(std::string p, size_t l, Expression* lhs, Expression* rhs);
-    Binary_Expression<LTE>* new_Lte(std::string p, size_t l, Expression* lhs, Expression* rhs);
-    Binary_Expression<ADD>* new_Add(std::string p, size_t l, Expression* lhs, Expression* rhs);
-    Binary_Expression<SUB>* new_Sub(std::string p, size_t l, Expression* lhs, Expression* rhs);
-    Binary_Expression<MUL>* new_Mul(std::string p, size_t l, Expression* lhs, Expression* rhs);
-    Binary_Expression<DIV>* new_Div(std::string p, size_t l, Expression* lhs, Expression* rhs);
-    Negation* new_Negation(std::string p, size_t l, Expression* o);
-    Function_Call* new_Function_Call(std::string p, size_t l, String* n, Arguments* args);
-    Variable* new_Variable(std::string p, size_t l, std::string n);
-    Textual<NUMBER>* new_Textual_Number(std::string p, size_t l, std::string val);
-    Textual<PERCENTAGE>* new_Textual_Percentage(std::string p, size_t l, std::string val);
-    Textual<DIMENSION>* new_Textual_Dimension(std::string p, size_t l, std::string val);
-    Textual<HEX>* new_Textual_Hex(std::string p, size_t l, std::string val);
-    Number* new_Number(std::string p, size_t l, double val);
-    Percentage* new_Percentage(std::string p, size_t l, double val);
-    Dimension* new_Dimension(std::string p, size_t l, double val, std::string unit);
-    Color* new_Color(std::string p, size_t l, double r, double g, double b, double a = 1, std::string disp = "");
-    Boolean* new_Boolean(std::string p, size_t l, bool val);
-    String_Schema* new_String_Schema(std::string p, size_t l, size_t size = 0);
-    String_Constant* new_String_Constant(std::string p, size_t l, std::string val);
-    String_Constant* new_String_Constant(std::string p, size_t l, const char* beg);
-    String_Constant* new_String_Constant(std::string p, size_t l, const char* beg, const char* end);
-    Supports_Condition* new_Supports_Condition(std::string p, size_t l, String* f, Expression* v);
-    Media_Expression* new_Media_Expression(std::string p, size_t l, String* f, Expression* v);
-    Parent_Selector* new_Parent_Selector(std::string p, size_t l, Selector* s);
-    // parameters and arguments
-    Parameter* new_Parameter(std::string p, size_t l, std::string n, Expression* def = 0, bool rest = false);
-    Parameters* new_Parameters(std::string p, size_t l);
-    Argument* new_Argument(std::string p, size_t l, Expression* val, std::string n = "", bool rest = false);
-    Arguments* new_Arguments(std::string p, size_t l);
-    // selectors
-    Selector_Schema* new_Selector_Schema(std::string p, size_t l, String* c);
-    Attribute_Selector* new_Attribute_Selector(std::string p, size_t l, std::string n, std::string m, String* v);
-    Simple_Selector* new_Simple_Selector(std::string p, size_t l, std::string c);
-    Reference_Selector* new_Reference_Selector(std::string p, size_t l);
-    Placeholder_Selector* new_Placeholder_Selector(std::string p, size_t l, std::string n);
-    Pseudo_Selector* new_Pseudo_Selector(std::string p, size_t l, std::string n, Expression* expr = 0);
-    Wrapped_Selector* new_Wrapped_Selector(std::string p, size_t l, std::string n, Simple_Base* sel);
-    SimpleSequence_Selector* new_SimpleSequence_Selector(std::string p, size_t l, size_t s = 0);
-    Sequence_Selector* new_Sequence_Selector(std::string p, size_t l, Sequence_Selector::Combinator c, Sequence_Selector* ctx, SimpleSequence_Selector* sel);
-    CommaSequence_Selector* new_CommaSequence_Selector(std::string p, size_t l, size_t s = 0);
-  };
-}
-
-#endif

data/ext/libsass/src/memory_manager.cpp

@@ -1,77 +0,0 @@
-#include "sass.hpp"
-#include "ast.hpp"
-#include "memory_manager.hpp"
-
-namespace Sass {
-
-  Memory_Manager::Memory_Manager(size_t size)
-  : nodes(std::vector<Memory_Object*>())
-  {
-    size_t init = size;
-    if (init < 8) init = 8;
-    // reserve some space
-    nodes.reserve(init);
-  }
-
-  Memory_Manager::~Memory_Manager()
-  {
-    // release memory for all controlled nodes
-    // avoid calling erase for every single node
-    for (size_t i = 0, S = nodes.size(); i < S; ++i) {
-      deallocate(nodes[i]);
-    }
-    // just in case
-    nodes.clear();
-  }
-
-  Memory_Object* Memory_Manager::add(Memory_Object* np)
-  {
-    // object has been initialized
-    // it can be "deleted" from now on
-    np->refcount = 1;
-    return np;
-  }
-
-  bool Memory_Manager::has(Memory_Object* np)
-  {
-    // check if the pointer is controlled under our pool
-    return find(nodes.begin(), nodes.end(), np) != nodes.end();
-  }
-
-  Memory_Object* Memory_Manager::allocate(size_t size)
-  {
-    // allocate requested memory
-    void* heap = malloc(size);
-    // init internal refcount status to zero
-    (static_cast<Memory_Object*>(heap))->refcount = 0;
-    // add the memory under our management
-    nodes.push_back(static_cast<Memory_Object*>(heap));
-    // cast object to its initial type
-    return static_cast<Memory_Object*>(heap);
-  }
-
-  void Memory_Manager::deallocate(Memory_Object* np)
-  {
-    // only call destructor if initialized
-    if (np->refcount) np->~Memory_Object();
-    // always free the memory
-    free(np);
-  }
-
-  void Memory_Manager::remove(Memory_Object* np)
-  {
-    // remove node from pool (no longer active)
-    nodes.erase(find(nodes.begin(), nodes.end(), np));
-    // you are now in control of the memory
-  }
-
-  void Memory_Manager::destroy(Memory_Object* np)
-  {
-    // remove from pool
-    remove(np);
-    // release memory
-    deallocate(np);
-  }
-
-}
-

data/ext/libsass/src/memory_manager.hpp

@@ -1,48 +0,0 @@
-#ifndef SASS_MEMORY_MANAGER_H
-#define SASS_MEMORY_MANAGER_H
-
-#include <vector>
-
-namespace Sass {
-
-  class Memory_Object {
-  friend class Memory_Manager;
-    long refcount;
-  public:
-    Memory_Object() { refcount = 0; };
-    virtual ~Memory_Object() {};
-  };
-
-  /////////////////////////////////////////////////////////////////////////////
-  // A class for tracking allocations of AST_Node objects. The intended usage
-  // is something like: Some_Node* n = new (mem_mgr) Some_Node(...);
-  // Then, at the end of the program, the memory manager will delete all of the
-  // allocated nodes that have been passed to it.
-  // In the future, this class may implement a custom allocator.
-  /////////////////////////////////////////////////////////////////////////////
-  class Memory_Manager {
-    std::vector<Memory_Object*> nodes;
-
-  public:
-    Memory_Manager(size_t size = 0);
-    ~Memory_Manager();
-
-    bool has(Memory_Object* np);
-    Memory_Object* allocate(size_t size);
-    void deallocate(Memory_Object* np);
-    void remove(Memory_Object* np);
-    void destroy(Memory_Object* np);
-    Memory_Object* add(Memory_Object* np);
-
-  };
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// Use macros for the allocation task, since overloading operator `new`
-// has been proven to be flaky under certain compilers (see comment below).
-///////////////////////////////////////////////////////////////////////////////
-
-#define SASS_MEMORY_NEW(mgr, Class, ...)                                                 \
-  (static_cast<Class*>(mgr.add(new (mgr.allocate(sizeof(Class))) Class(__VA_ARGS__))))   \
-
-#endif