sassc 2.0.1 → 2.1.0.pre1

data/ext/libsass/src/util_string.cpp

@@ -0,0 +1,75 @@
+#include "util_string.hpp"
+
+#include <algorithm>
+
+namespace Sass {
+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;
+}
+
+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;
+    }
+  }
+  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;
+}
+
+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;
+}
+
+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';
+  }
+}
+
+}  // namespace Sass
+}  // namespace Util

data/ext/libsass/src/util_string.hpp

@@ -0,0 +1,19 @@
+#ifndef SASS_UTIL_STRING_H
+#define SASS_UTIL_STRING_H
+
+#include <string>
+
+namespace Sass {
+namespace Util {
+
+std::string rtrim(const 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);
+char opening_bracket_for(char closing_bracket);
+char closing_bracket_for(char opening_bracket);
+
+}  // namespace Sass
+}  // namespace Util
+#endif  // SASS_UTIL_STRING_H

data/ext/libsass/src/values.cpp

@@ -1,4 +1,7 @@
+// sass.hpp must go before all system headers to get the
+// __EXTENSIONS__ fix on Solaris.
 #include "sass.hpp"
+
 #include "sass.h"
 #include "values.hpp"
 
@@ -7,21 +10,26 @@
 namespace Sass {
 
   // convert value from C++ side to C-API
-  union Sass_Value* ast_node_to_sass_value (const Expression_Ptr val)
+  union Sass_Value* ast_node_to_sass_value (const Expression* val)
   {
     if (val->concrete_type() == Expression::NUMBER)
     {
-      Number_Ptr_Const res = Cast<Number>(val);
+      const Number* 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 = Cast<Color>(val);
-      return sass_make_color(col->r(), col->g(), col->b(), col->a());
+      if (const Color_RGBA* rgba = Cast<Color_RGBA>(val)) {
+        return sass_make_color(rgba->r(), rgba->g(), rgba->b(), rgba->a());
+      } else {
+        // ToDo: allow to also use HSLA colors!!
+        Color_RGBA_Obj col = Cast<Color>(val)->copyAsRGBA();
+        return sass_make_color(col->r(), col->g(), col->b(), col->a());
+      }
     }
     else if (val->concrete_type() == Expression::LIST)
     {
-      List_Ptr_Const l = Cast<List>(val);
+      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);
@@ -32,7 +40,7 @@ namespace Sass {
     }
     else if (val->concrete_type() == Expression::MAP)
     {
-      Map_Ptr_Const m = Cast<Map>(val);
+      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()) {
         sass_map_set_key(map, i, ast_node_to_sass_value(key));
@@ -47,16 +55,16 @@ namespace Sass {
     }
     else if (val->concrete_type() == Expression::BOOLEAN)
     {
-      Boolean_Ptr_Const res = Cast<Boolean>(val);
+      const Boolean* res = Cast<Boolean>(val);
       return sass_make_boolean(res->value());
     }
     else if (val->concrete_type() == Expression::STRING)
     {
-      if (String_Quoted_Ptr_Const qstr = Cast<String_Quoted>(val))
+      if (const String_Quoted* qstr = Cast<String_Quoted>(val))
       {
         return sass_make_qstring(qstr->value().c_str());
       }
-      else if (String_Constant_Ptr_Const cstr = Cast<String_Constant>(val))
+      else if (const String_Constant* cstr = Cast<String_Constant>(val))
       {
         return sass_make_string(cstr->value().c_str());
       }
@@ -65,7 +73,7 @@ namespace Sass {
   }
 
   // convert value from C-API to C++ side
-  Value_Ptr sass_value_to_ast_node (const union Sass_Value* val)
+  Value* sass_value_to_ast_node (const union Sass_Value* val)
   {
     switch (sass_value_get_tag(val)) {
       case SASS_NUMBER:
@@ -78,7 +86,8 @@ namespace Sass {
                                ParserState("[C-VALUE]"),
                                sass_boolean_get_value(val));
       case SASS_COLOR:
-        return SASS_MEMORY_NEW(Color,
+        // ToDo: allow to also use HSLA colors!!
+        return SASS_MEMORY_NEW(Color_RGBA,
                                ParserState("[C-VALUE]"),
                                sass_color_get_r(val),
                                sass_color_get_g(val),
@@ -94,7 +103,7 @@ namespace Sass {
                                  ParserState("[C-VALUE]"),
                                  sass_string_get_value(val));
       case SASS_LIST: {
-        List_Ptr l = SASS_MEMORY_NEW(List,
+        List* l = SASS_MEMORY_NEW(List,
                                   ParserState("[C-VALUE]"),
                                   sass_list_get_length(val),
                                   sass_list_get_separator(val));
@@ -105,7 +114,7 @@ namespace Sass {
         return l;
       }
       case SASS_MAP: {
-        Map_Ptr m = SASS_MEMORY_NEW(Map, ParserState("[C-VALUE]"));
+        Map* m = SASS_MEMORY_NEW(Map, ParserState("[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)),

data/ext/libsass/src/values.hpp

@@ -5,8 +5,8 @@
 
 namespace Sass {
 
-  union Sass_Value* ast_node_to_sass_value (const Expression_Ptr val);
-  Value_Ptr sass_value_to_ast_node (const union Sass_Value* val);
+  union Sass_Value* ast_node_to_sass_value (const Expression* val);
+  Value* sass_value_to_ast_node (const union Sass_Value* val);
 
 }
 #endif

data/ext/libsass/win/libsass.targets

@@ -11,6 +11,9 @@
   </ItemGroup>
   <ItemGroup Label="LibSass Headers">
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_values.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_selectors.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_supports.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" />
@@ -32,7 +35,14 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\expand.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\extend.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\file.hpp" />
-    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\functions.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_utils.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_miscs.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_maps.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_lists.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_colors.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_numbers.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_strings.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_selectors.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\inspect.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\json.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\kwd_arg_macros.hpp" />
@@ -55,7 +65,8 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\sass_values.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\source_map.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\subset_map.hpp" />
-    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\to_c.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast2c.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\c2ast.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\to_value.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\units.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\utf8.h" />
@@ -64,10 +75,16 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\utf8\unchecked.h" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\utf8_string.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\util.hpp" />
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\util_string.hpp" />
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\values.hpp" />
   </ItemGroup>
   <ItemGroup Label="LibSass Sources">
     <ClCompile Include="$(LIBSASS_SRC_DIR)\ast.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\ast_values.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\ast_supports.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\ast_sel_cmp.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\ast_sel_unify.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\ast_selectors.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" />
@@ -86,7 +103,14 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\expand.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\extend.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\file.cpp" />
-    <ClCompile Include="$(LIBSASS_SRC_DIR)\functions.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_utils.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_miscs.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_maps.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_lists.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_colors.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_numbers.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_strings.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_selectors.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\inspect.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\json.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\lexer.cpp" />
@@ -108,11 +132,13 @@
     <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)\ast2c.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\c2ast.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\to_value.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\units.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\utf8_string.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\util.cpp" />
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\util_string.cpp" />
     <ClCompile Include="$(LIBSASS_SRC_DIR)\values.cpp" />
   </ItemGroup>
 </Project>

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

@@ -48,6 +48,15 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_values.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_selectors.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast_supports.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\memory\SharedPtr.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -108,7 +117,28 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\file.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
-    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\functions.hpp">
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_utils.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_miscs.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_maps.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_lists.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_colors.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_numbers.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_strings.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\fn_selectors.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\inspect.hpp">
@@ -174,7 +204,10 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\subset_map.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
-    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\to_c.hpp">
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\ast2c.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\c2ast.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\to_value.hpp">
@@ -201,6 +234,9 @@
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\util.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="$(LIBSASS_HEADERS_DIR)\util_string.hpp">
+      <Filter>Headers</Filter>
+    </ClInclude>
     <ClInclude Include="$(LIBSASS_HEADERS_DIR)\values.hpp">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -215,6 +251,21 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\ast.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\ast_values.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\ast_selectors.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\ast_supports.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\ast_sel_cmp.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\ast_sel_unify.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\memory\SharedPtr.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
@@ -269,7 +320,28 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\file.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
-    <ClCompile Include="$(LIBSASS_SRC_DIR)\functions.cpp">
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_utils.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_miscs.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_maps.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_lists.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_colors.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_numbers.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_strings.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\fn_selectors.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\inspect.cpp">
@@ -335,7 +407,10 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\subset_map.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
-    <ClCompile Include="$(LIBSASS_SRC_DIR)\to_c.cpp">
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\ast2c.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\c2ast.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\to_value.cpp">
@@ -350,6 +425,9 @@
     <ClCompile Include="$(LIBSASS_SRC_DIR)\util.cpp">
       <Filter>Sources</Filter>
     </ClCompile>
+    <ClCompile Include="$(LIBSASS_SRC_DIR)\util_string.cpp">
+      <Filter>Sources</Filter>
+    </ClCompile>
     <ClCompile Include="$(LIBSASS_SRC_DIR)\values.cpp">
       <Filter>Sources</Filter>
     </ClCompile>

data/lib/sassc.rb

@@ -1,6 +1,30 @@
 # frozen_string_literal: true
 
 module SassC
+  # The global load paths for Sass files. This is meant for plugins and
+  # libraries to register the paths to their Sass stylesheets to that they may
+  # be `@imported`. This load path is used by every instance of {Sass::Engine}.
+  # They are lower-precedence than any load paths passed in via the
+  # {file:SASS_REFERENCE.md#load_paths-option `:load_paths` option}.
+  #
+  # If the `SASS_PATH` environment variable is set,
+  # the initial value of `load_paths` will be initialized based on that.
+  # The variable should be a colon-separated list of path names
+  # (semicolon-separated on Windows).
+  #
+  # Note that files on the global load path are never compiled to CSS
+  # themselves, even if they aren't partials. They exist only to be imported.
+  #
+  # @example
+  #   SassC.load_paths << File.dirname(__FILE__ + '/sass')
+  # @return [Array<String, Pathname, Sass::Importers::Base>]
+  def self.load_paths
+    @load_paths ||= if ENV['SASS_PATH']
+                      ENV['SASS_PATH'].split(SassC::Util.windows? ? ';' : ':')
+                    else
+                      []
+                    end
+  end
 end
 
 require_relative "sassc/version"