sassc 0.0.10 → 0.0.11

data/ext/libsass/sass_version.h

@@ -0,0 +1,8 @@
+#ifndef SASS_VERSION_H
+#define SASS_VERSION_H
+
+#ifndef LIBSASS_VERSION
+#define LIBSASS_VERSION "[NA]"
+#endif
+
+#endif

data/ext/libsass/sass_version.h.in

@@ -0,0 +1,8 @@
+#ifndef SASS_VERSION_H
+#define SASS_VERSION_H
+
+#ifndef LIBSASS_VERSION
+#define LIBSASS_VERSION "@PACKAGE_VERSION@"
+#endif
+
+#endif

data/ext/libsass/script/ci-build-libsass

@@ -14,9 +14,9 @@ if [ "x$SASS_SPEC_PATH" == "x" ]; then export SASS_SPEC_PATH=$(pwd)/sass-spec; f
 
 if [ "x$COVERAGE" == "xyes" ]; then
   COVERAGE_OPT="--enable-coverage"
-  export EXTRA_CFLAGS="-O0 --coverage"
-  export EXTRA_CXXFLAGS="-O0 --coverage"
-  export EXTRA_LDFLAGS="-O0 --coverage"
+  export EXTRA_CFLAGS="--coverage"
+  export EXTRA_CXXFLAGS="--coverage"
+  export EXTRA_LDFLAGS="--coverage"
 else
   COVERAGE_OPT="--disable-coverage"
 fi

data/ext/libsass/script/ci-report-coverage

@@ -10,7 +10,8 @@ if [ "x$COVERAGE" = "xyes" ]; then
                              --exclude utf8 --exclude utf8_string.hpp
                              --exclude utf8.h --exclude utf8_string.cpp
                              --exclude sass2scss.h --exclude sass2scss.cpp
-                             --exclude test --exclude posix"
+                             --exclude test --exclude posix
+                             --exclude debugger.hpp"
   # debug via gcovr
   gcov -v
   gcovr -r .

data/ext/libsass/source_map.cpp

@@ -175,9 +175,9 @@ namespace Sass {
         mappings[i].generated_position.file == pstate.file &&
         mappings[i].generated_position.line == pstate.line &&
         mappings[i].generated_position.column == pstate.column
-      ) return ParserState(pstate.path, mappings[i].original_position, pstate.offset);
+      ) return ParserState(pstate.path, pstate.src, mappings[i].original_position, pstate.offset);
     }
-    return ParserState(pstate.path, Position(-1, -1, -1), Offset(0, 0));
+    return ParserState(pstate.path, pstate.src, Position(-1, -1, -1), Offset(0, 0));
 
   }
 

data/ext/libsass/util.cpp

@@ -27,7 +27,7 @@ namespace Sass {
     char separator = *(localeconv()->decimal_point);
     if(separator != '.'){
       // The current locale specifies another
-      // separator. convert the separator to the 
+      // separator. convert the separator to the
       // one understood by the locale if needed
       const char *found = strchr(str, '.');
       if(found != NULL){
@@ -79,6 +79,29 @@ namespace Sass {
     return out;
   }
 
+  // read css string (handle multiline DELIM)
+  string read_css_string(const string& str)
+  {
+    string out("");
+    bool esc = false;
+    for (auto i : str) {
+      if (i == '\\') {
+        esc = ! esc;
+      } else if (esc && i == '\r') {
+        continue;
+      } else if (esc && i == '\n') {
+        out.resize (out.size () - 1);
+        esc = false;
+        continue;
+      } else {
+        esc = false;
+      }
+      out.push_back(i);
+    }
+    if (esc) out += '\\';
+    return out;
+  }
+
   // evacuate unescaped quoted
   // leave everything else untouched
   string evacuate_quotes(const string& str)
@@ -308,7 +331,7 @@ namespace Sass {
         // don't be that strict
         return s;
         // this basically always means an internal error and not users fault
-        error("Unescaped delimiter in string to unquote found. [" + s + "]", ParserState("[UNQUOTE]", -1));
+        error("Unescaped delimiter in string to unquote found. [" + s + "]", ParserState("[UNQUOTE]"));
       }
       else {
         skipped = false;
@@ -325,12 +348,12 @@ namespace Sass {
   string quote(const string& s, char q)
   {
 
-    // return an empty quoted string
-    if (s.empty()) return string(2, q ? q : '"');
-
     // autodetect with fallback to given quote
     q = detect_best_quotemark(s.c_str(), q);
 
+    // return an empty quoted string
+    if (s.empty()) return string(2, q ? q : '"');
+
     string quoted;
     quoted.reserve(s.length()+2);
     quoted.push_back(q);
@@ -380,10 +403,12 @@ namespace Sass {
 
   bool peek_linefeed(const char* start)
   {
-    if(*start == '\n' || *start == '\r') return true;;
-    const char* linefeed = Prelexer::wspaces(start);
-    if (linefeed == 0) return false;
-    return *linefeed == '\n' || *linefeed == '\r';
+    while (*start) {
+      if (*start == '\n' || *start == '\r') return true;
+      if (*start != ' ' && *start != '\t') return false;
+      ++ start;
+    }
+    return false;
   }
 
   namespace Util {
@@ -450,6 +475,8 @@ namespace Sass {
           } else {
             hasDeclarations = true;
           }
+        } else if (Declaration* d = dynamic_cast<Declaration*>(stm)) {
+          return isPrintable(d, style);
         } else {
           hasDeclarations = true;
         }
@@ -462,6 +489,28 @@ namespace Sass {
       return false;
     }
 
+    bool isPrintable(String_Constant* s, Output_Style style)
+    {
+      return ! s->value().empty();
+    }
+
+    bool isPrintable(String_Quoted* s, Output_Style style)
+    {
+      return true;
+    }
+
+    bool isPrintable(Declaration* d, Output_Style style)
+    {
+      Expression* val = d->value();
+      if (String_Quoted* sq = dynamic_cast<String_Quoted*>(val)) return isPrintable(sq, style);
+      if (String_Constant* sc = dynamic_cast<String_Constant*>(val)) return isPrintable(sc, style);
+      return true;
+    }
+
+    bool isPrintable(Expression* e, Output_Style style) {
+      return isPrintable(e, style);
+    }
+
     bool isPrintable(Feature_Block* f, Output_Style style) {
       if (f == NULL) {
         return false;
@@ -593,8 +642,8 @@ namespace Sass {
       }
     }
 
-     bool isAscii(int ch) {
-         return ch >= 0 && ch < 128;
+     bool isAscii(const char chr) {
+       return unsigned(chr) < 128;
      }
 
   }

data/ext/libsass/util.hpp

@@ -12,6 +12,7 @@ namespace Sass {
   double sass_atof(const char* str);
   string string_escape(const string& str);
   string string_unescape(const string& str);
+  string read_css_string(const string& str);
   string evacuate_quotes(const string& str);
   string evacuate_escapes(const string& str);
   string string_to_output(const string& str);
@@ -40,7 +41,11 @@ namespace Sass {
     bool isPrintable(Feature_Block* r, Output_Style style = NESTED);
     bool isPrintable(Media_Block* r, Output_Style style = NESTED);
     bool isPrintable(Block* b, Output_Style style = NESTED);
-    bool isAscii(int ch);
+    bool isPrintable(String_Constant* s, Output_Style style = NESTED);
+    bool isPrintable(String_Quoted* s, Output_Style style = NESTED);
+    bool isPrintable(Declaration* d, Output_Style style = NESTED);
+    bool isPrintable(Expression* e, Output_Style style = NESTED);
+    bool isAscii(const char chr);
 
   }
 }

data/ext/libsass/win/libsass.filters

@@ -51,6 +51,9 @@
     <ClCompile Include="..\cssize.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\listize.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\extend.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -81,6 +84,9 @@
     <ClCompile Include="..\position.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\lexer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\prelexer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -194,6 +200,9 @@
     <ClInclude Include="..\cssize.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\listize.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\extend.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -239,6 +248,9 @@
     <ClInclude Include="..\position.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\lexer.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\prelexer.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>

data/ext/libsass/win/libsass.vcxproj

@@ -102,6 +102,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>SyncCThrow</ExceptionHandling>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -115,6 +116,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>SyncCThrow</ExceptionHandling>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -130,6 +132,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>SyncCThrow</ExceptionHandling>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -147,6 +150,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>SyncCThrow</ExceptionHandling>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -164,10 +168,12 @@
     <ClCompile Include="..\constants.cpp" />
     <ClCompile Include="..\context.cpp" />
     <ClCompile Include="..\contextualize.cpp" />
+    <ClCompile Include="..\contextualize_eval.cpp" />
     <ClCompile Include="..\error_handling.cpp" />
     <ClCompile Include="..\eval.cpp" />
     <ClCompile Include="..\expand.cpp" />
     <ClCompile Include="..\cssize.cpp" />
+    <ClCompile Include="..\listize.cpp" />
     <ClCompile Include="..\extend.cpp" />
     <ClCompile Include="..\file.cpp" />
     <ClCompile Include="..\functions.cpp" />
@@ -179,6 +185,7 @@
     <ClCompile Include="..\parser.cpp" />
     <ClCompile Include="..\plugins.cpp" />
     <ClCompile Include="..\position.cpp" />
+    <ClCompile Include="..\lexer.cpp" />
     <ClCompile Include="..\prelexer.cpp" />
     <ClCompile Include="..\remove_placeholders.cpp" />
     <ClCompile Include="..\sass.cpp" />
@@ -208,12 +215,14 @@
     <ClInclude Include="..\constants.hpp" />
     <ClInclude Include="..\context.hpp" />
     <ClInclude Include="..\contextualize.hpp" />
+    <ClInclude Include="..\contextualize_eval.hpp" />
     <ClInclude Include="..\debug.hpp" />
     <ClInclude Include="..\environment.hpp" />
     <ClInclude Include="..\error_handling.hpp" />
     <ClInclude Include="..\eval.hpp" />
     <ClInclude Include="..\expand.hpp" />
     <ClInclude Include="..\cssize.hpp" />
+    <ClInclude Include="..\listize.hpp" />
     <ClInclude Include="..\extend.hpp" />
     <ClInclude Include="..\file.hpp" />
     <ClInclude Include="..\functions.hpp" />
@@ -230,6 +239,7 @@
     <ClInclude Include="..\plugins.hpp" />
     <ClInclude Include="..\paths.hpp" />
     <ClInclude Include="..\position.hpp" />
+    <ClInclude Include="..\lexer.hpp" />
     <ClInclude Include="..\prelexer.hpp" />
     <ClInclude Include="..\remove_placeholders.hpp" />
     <ClInclude Include="..\sass.h" />

data/lib/sassc.rb

@@ -3,9 +3,11 @@ end
 
 require_relative "sassc/version"
 require_relative "sassc/native"
-require_relative "sassc/engine"
+require_relative "sassc/import_handler"
 require_relative "sassc/importer"
 require_relative "sassc/script"
+require_relative "sassc/functions_handler"
 require_relative "sassc/cache_stores"
 require_relative "sassc/dependency"
 require_relative "sassc/error"
+require_relative "sassc/engine"

data/lib/sassc/cache_stores/base.rb

@@ -1,6 +1,8 @@
 module SassC
   module CacheStores
     class Base
+      # we don't actually cache anything yet,
+      # this is just for API compatibility
     end
   end
 end

data/lib/sassc/dependency.rb

@@ -1,9 +1,11 @@
 module SassC
   class Dependency
+    attr_reader :filename
     attr_reader :options
 
     def initialize(filename)
-      @options = { filename: filename }
+      @filename = filename
+      @options = { filename: @filename }
     end
 
     def self.from_filenames(filenames)

data/lib/sassc/engine.rb

@@ -1,6 +1,13 @@
+require_relative "error"
+
 module SassC
   class Engine
-    class NotRenderedError < StandardError; end
+    OUTPUT_STYLES = %i[
+      sass_style_nested
+      sass_style_expanded
+      sass_style_compact
+      sass_style_compressed
+    ]
 
     def initialize(template, options = {})
       @template = template
@@ -15,20 +22,20 @@ module SassC
       Native.option_set_is_indented_syntax_src(native_options, true) if sass?
       Native.option_set_input_path(native_options, filename) if filename
       Native.option_set_include_path(native_options, load_paths)
+      Native.option_set_output_style(native_options, output_style_enum)
 
-      importer.setup(native_options) if importer
-
-      status = Script.setup_custom_functions(native_options, @options) do
-        Native.compile_data_context(data_context)
-      end
+      import_handler.setup(native_options)
+      functions_handler.setup(native_options)
 
-      css = Native.context_get_output_string(context)
+      status = Native.compile_data_context(data_context)
 
       if status != 0
-        message = SassC::Native.context_get_error_message(context)
+        message = Native.context_get_error_message(context)
         raise SyntaxError.new(message)
       end
 
+      css = Native.context_get_output_string(context)
+
       @dependencies = Native.context_get_included_files(context)
 
       Native.delete_data_context(data_context)
@@ -55,14 +62,22 @@ module SassC
       @options[:syntax] && @options[:syntax].to_sym == :sass
     end
 
-    def importer
-      @importer ||= begin
-        if @options[:importer]
-          @options[:importer].new(@options)
-        else
-          nil
-        end
-      end
+    def import_handler
+      @import_handler ||= ImportHandler.new(@options)
+    end
+
+    def functions_handler
+      @functions_handler = FunctionsHandler.new(@options)
+    end
+
+    def output_style_enum
+      @output_style_enum ||= Native::SassOutputStyle[output_style]
+    end
+
+    def output_style
+      style = @options.fetch(:style, :sass_style_nested).to_sym
+      raise InvalidStyleError unless Native::SassOutputStyle.symbols.include?(style)
+      style
     end
 
     def load_paths

data/lib/sassc/error.rb

@@ -1,4 +1,5 @@
 module SassC
-  class SyntaxError < StandardError
-  end
+  class SyntaxError < StandardError; end
+  class NotRenderedError < StandardError; end
+  class InvalidStyleError < StandardError; end
 end

data/lib/sassc/functions_handler.rb

@@ -0,0 +1,54 @@
+module SassC
+  class FunctionsHandler
+    def initialize(options)
+      @options = options
+    end
+
+    def setup(native_options)
+      callbacks = {}
+
+      list = Native.make_function_list(Script.custom_functions.count)
+
+      functs = FunctionWrapper.extend(Script::Functions)
+      functs.options = @options
+
+      Script.custom_functions.each_with_index do |custom_function, i|
+        callbacks[custom_function] = FFI::Function.new(:pointer, [:pointer, :pointer]) do |s_args, cookie|
+          length = Native.list_get_length(s_args)
+
+          v = Native.list_get_value(s_args, 0)
+          v = Native.string_get_value(v).dup
+
+          s = Script::String.new(Script::String.unquote(v), Script::String.type(v))
+
+          value = functs.send(custom_function, s)
+
+          if value
+            value = Script::String.new(Script::String.unquote(value.to_s), value.type)
+            value.to_native
+          else
+            Script::String.new("").to_native
+          end
+        end
+
+        callback = Native.make_function(
+          Script.formatted_function_name(custom_function),
+          callbacks[custom_function],
+          nil
+        )
+
+        Native::function_set_list_entry(list, i, callback)
+      end
+
+      Native::option_set_c_functions(native_options, list)
+    end
+
+    private
+
+    class FunctionWrapper
+      class << self
+        attr_accessor :options
+      end
+    end
+  end
+end