sassc 1.11.4 → 1.12.0

data/ext/libsass/src/values.cpp

@@ -11,32 +11,32 @@ namespace Sass {
   {
     if (val->concrete_type() == Expression::NUMBER)
     {
-      Number_Ptr_Const res = dynamic_cast<Number_Ptr_Const>(val);
+      Number_Ptr_Const res = Cast<Number>(val);
       return sass_make_number(res->value(), res->unit().c_str());
     }
     else if (val->concrete_type() == Expression::COLOR)
     {
-      Color_Ptr_Const col = dynamic_cast<Color_Ptr_Const>(val);
+      Color_Ptr_Const col = Cast<Color>(val);
       return sass_make_color(col->r(), col->g(), col->b(), col->a());
     }
     else if (val->concrete_type() == Expression::LIST)
     {
-      List_Ptr_Const l = dynamic_cast<List_Ptr_Const>(val);
-      union Sass_Value* list = sass_make_list(l->size(), l->separator());
+      List_Ptr_Const 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);
-        auto val = ast_node_to_sass_value(&obj);
+        auto val = ast_node_to_sass_value(obj);
         sass_list_set_value(list, i, val);
       }
       return list;
     }
     else if (val->concrete_type() == Expression::MAP)
     {
-      Map_Ptr_Const m = dynamic_cast<Map_Ptr_Const>(val);
+      Map_Ptr_Const m = Cast<Map>(val);
       union Sass_Value* map = sass_make_map(m->length());
       size_t i = 0; for (Expression_Obj 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)));
+        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;
       }
       return map;
@@ -47,16 +47,16 @@ namespace Sass {
     }
     else if (val->concrete_type() == Expression::BOOLEAN)
     {
-      Boolean_Ptr_Const res = dynamic_cast<Boolean_Ptr_Const>(val);
+      Boolean_Ptr_Const res = Cast<Boolean>(val);
       return sass_make_boolean(res->value());
     }
     else if (val->concrete_type() == Expression::STRING)
     {
-      if (String_Quoted_Ptr_Const qstr = dynamic_cast<String_Quoted_Ptr_Const>(val))
+      if (String_Quoted_Ptr_Const qstr = Cast<String_Quoted>(val))
       {
         return sass_make_qstring(qstr->value().c_str());
       }
-      else if (String_Constant_Ptr_Const cstr = dynamic_cast<String_Constant_Ptr_Const>(val))
+      else if (String_Constant_Ptr_Const cstr = Cast<String_Constant>(val))
       {
         return sass_make_string(cstr->value().c_str());
       }
@@ -73,12 +73,10 @@ namespace Sass {
                                ParserState("[C-VALUE]"),
                                sass_number_get_value(val),
                                sass_number_get_unit(val));
-      break;
       case SASS_BOOLEAN:
         return SASS_MEMORY_NEW(Boolean,
                                ParserState("[C-VALUE]"),
                                sass_boolean_get_value(val));
-      break;
       case SASS_COLOR:
         return SASS_MEMORY_NEW(Color,
                                ParserState("[C-VALUE]"),
@@ -86,18 +84,15 @@ namespace Sass {
                                sass_color_get_g(val),
                                sass_color_get_b(val),
                                sass_color_get_a(val));
-      break;
       case SASS_STRING:
         if (sass_string_is_quoted(val)) {
           return SASS_MEMORY_NEW(String_Quoted,
                                  ParserState("[C-VALUE]"),
                                  sass_string_get_value(val));
-        } else {
-          return SASS_MEMORY_NEW(String_Constant,
+        }
+        return SASS_MEMORY_NEW(String_Constant,
                                  ParserState("[C-VALUE]"),
                                  sass_string_get_value(val));
-        }
-      break;
       case SASS_LIST: {
         List_Ptr l = SASS_MEMORY_NEW(List,
                                   ParserState("[C-VALUE]"),
@@ -106,9 +101,9 @@ namespace Sass {
         for (size_t i = 0, L = sass_list_get_length(val); i < L; ++i) {
           l->append(sass_value_to_ast_node(sass_list_get_value(val, i)));
         }
+        l->is_bracketed(sass_list_get_is_bracketed(val));
         return l;
       }
-      break;
       case SASS_MAP: {
         Map_Ptr m = SASS_MEMORY_NEW(Map, ParserState("[C-VALUE]"));
         for (size_t i = 0, L = sass_map_get_length(val); i < L; ++i) {
@@ -118,20 +113,17 @@ namespace Sass {
         }
         return m;
       }
-      break;
       case SASS_NULL:
         return SASS_MEMORY_NEW(Null, ParserState("[C-VALUE]"));
-      break;
       case SASS_ERROR:
         return SASS_MEMORY_NEW(Custom_Error,
                                ParserState("[C-VALUE]"),
                                sass_error_get_message(val));
-      break;
       case SASS_WARNING:
         return SASS_MEMORY_NEW(Custom_Warning,
                                ParserState("[C-VALUE]"),
                                sass_warning_get_message(val));
-      break;
+      default: break;
     }
     return 0;
   }

data/ext/libsass/win/libsass.sln

@@ -1,10 +1,21 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsass", "libsass.vcxproj", "{E4030474-AFC9-4CC6-BEB6-D846F631502B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".SolutionItems", ".SolutionItems", "{33318C77-2391-4399-8118-C109155A4A75}"
+	ProjectSection(SolutionItems) = preProject
+		..\.editorconfig = ..\.editorconfig
+		..\.gitattributes = ..\.gitattributes
+		..\.gitignore = ..\.gitignore
+		..\.travis.yml = ..\.travis.yml
+		..\appveyor.yml = ..\appveyor.yml
+		..\Readme.md = ..\Readme.md
+		..\res\resource.rc = ..\res\resource.rc
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32

data/ext/libsass/win/libsass.sln.DotSettings

@@ -0,0 +1,9 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=E4030474_002DAFC9_002D4CC6_002DBEB6_002DD846F631502B_002Ff_003Acencode_002Ec_002Fl_003A_002E_002E_003Fsrc_003Fcencode_002Ec/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=E4030474_002DAFC9_002D4CC6_002DBEB6_002DD846F631502B_002Ff_003Achecked_002Eh_002Fl_003A_002E_002E_003Fsrc_003Futf8_003Fchecked_002Eh/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=E4030474_002DAFC9_002D4CC6_002DBEB6_002DD846F631502B_002Ff_003Acore_002Eh_002Fl_003A_002E_002E_003Fsrc_003Futf8_003Fcore_002Eh/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=E4030474_002DAFC9_002D4CC6_002DBEB6_002DD846F631502B_002Ff_003Ajson_002Ecpp_002Fl_003A_002E_002E_003Fsrc_003Fjson_002Ecpp/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=E4030474_002DAFC9_002D4CC6_002DBEB6_002DD846F631502B_002Ff_003Ajson_002Ehpp_002Fl_003A_002E_002E_003Fsrc_003Fjson_002Ehpp/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=E4030474_002DAFC9_002D4CC6_002DBEB6_002DD846F631502B_002Ff_003Asass2scss_002Ecpp_002Fl_003A_002E_002E_003Fsrc_003Fsass2scss_002Ecpp/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=E4030474_002DAFC9_002D4CC6_002DBEB6_002DD846F631502B_002Ff_003Asass2scss_002Eh_002Fl_003A_002E_002E_003Finclude_003Fsass2scss_002Eh/@EntryIndexedValue">ExplicitlyExcluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=E4030474_002DAFC9_002D4CC6_002DBEB6_002DD846F631502B_002Ff_003Aunchecked_002Eh_002Fl_003A_002E_002E_003Fsrc_003Futf8_003Funchecked_002Eh/@EntryIndexedValue">ExplicitlyExcluded</s:String></wpf:ResourceDictionary>

data/ext/libsass/win/libsass.targets

@@ -69,6 +69,7 @@
   <ItemGroup Label="LibSass Sources">
     <ClCompile Include="$(LIBSASS_SRC_DIR)\ast.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\memory\SharedPtr.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\ast_fwd_decl.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" />
@@ -96,6 +97,8 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\plugins.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\position.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\prelexer.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\backtrace.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\operators.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\remove_placeholders.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\sass_context.cpp" />

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

@@ -218,6 +218,9 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\memory\SharedPtr.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\ast_fwd_decl.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\base64vlq.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
@@ -299,6 +302,12 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\prelexer.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\backtrace.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\operators.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\remove_placeholders.cpp">
       <Filter>Sources</Filter>
     </ClCompile>

data/lib/sassc/version.rb

@@ -1,3 +1,3 @@
 module SassC
-  VERSION = "1.11.4"
+  VERSION = "1.12.0"
 end

data/sassc.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest-around"
   spec.add_development_dependency "test_construct"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "bundler"
 
-  spec.add_dependency "bundler"
   spec.add_dependency "ffi", "~> 1.9.6"
   spec.add_dependency "sass", ">= 3.3.0"
 

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.3", Native.version
+        assert_equal "3.5.4", Native.version
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 1.11.4
+  version: 1.12.0
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -87,7 +87,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -133,6 +133,7 @@ files:
 - ".gitignore"
 - ".gitmodules"
 - ".travis.yml"
+- CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -205,6 +206,7 @@ files:
 - ext/libsass/script/bootstrap
 - ext/libsass/script/branding
 - ext/libsass/script/ci-build-libsass
+- ext/libsass/script/ci-build-plugin
 - ext/libsass/script/ci-install-compiler
 - ext/libsass/script/ci-install-deps
 - ext/libsass/script/ci-report-coverage
@@ -216,9 +218,11 @@ files:
 - ext/libsass/src/ast.cpp
 - ext/libsass/src/ast.hpp
 - ext/libsass/src/ast_def_macros.hpp
+- ext/libsass/src/ast_fwd_decl.cpp
 - ext/libsass/src/ast_fwd_decl.hpp
 - ext/libsass/src/b64/cencode.h
 - ext/libsass/src/b64/encode.h
+- ext/libsass/src/backtrace.cpp
 - ext/libsass/src/backtrace.hpp
 - ext/libsass/src/base64vlq.cpp
 - ext/libsass/src/base64vlq.hpp
@@ -269,6 +273,8 @@ files:
 - ext/libsass/src/node.cpp
 - ext/libsass/src/node.hpp
 - ext/libsass/src/operation.hpp
+- ext/libsass/src/operators.cpp
+- ext/libsass/src/operators.hpp
 - ext/libsass/src/output.cpp
 - ext/libsass/src/output.hpp
 - ext/libsass/src/parser.cpp
@@ -323,6 +329,7 @@ files:
 - ext/libsass/test/test_unification.cpp
 - ext/libsass/version.sh
 - ext/libsass/win/libsass.sln
+- ext/libsass/win/libsass.sln.DotSettings
 - ext/libsass/win/libsass.targets
 - ext/libsass/win/libsass.vcxproj
 - ext/libsass/win/libsass.vcxproj.filters
@@ -387,7 +394,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Use libsass with Ruby!