sassc 1.8.0.pre2 → 1.8.0

data/ext/libsass/docs/unicode.md

@@ -0,0 +1,39 @@
+LibSass currently expects all input to be utf8 encoded (and outputs only utf8), if you actually have any unicode characters at all. We do not support conversion between encodings, even if you declare it with a `@charset` rule. The text below was originally posted as an [issue](https://github.com/sass/libsass/issues/381) on the LibSass tracker.
+
+### [Declaring character encodings in CSS](http://www.w3.org/International/questions/qa-css-charset.en)
+
+This [explains](http://www.w3.org/International/questions/qa-css-charset.en) how the character encoding of a css file is determined. Since we are only dealing with local files, we never have a HTTP header. So the precedence should be 'charset' rule, byte-order mark (BOM) or auto-detection (finally falling back to system default/UTF-8). This may not sound too hard to implement, but what about import rules? The CSS specs do not forbid the mixing of different encodings! I solved that by converting all files to UTF-8 internally. On writing there is an option to tell the tool what encoding it should be (UTF-8 by default). One can also define if it should write a BOM or not and if it should add the charset declaration.
+
+Since my tool is written in perl, I have a lot of utilities at hand to deal with different unicode charsets. I'm pretty sure that most OSS uses [libiconv](https://www.gnu.org/software/libiconv/) to convert between different encodings. But I have now idea how easy/hard this would be to integrate platform independent (it seems doable).
+
+### Current status on LibSass unicode support
+
+Currently LibSass seems to handle the common UTF-8 case pretty well. I believe it should correctly support all ASCII compatible encodings (like UTF-8 or Latin-1). If all includes use the same encoding, the output should be correct (in the same encoding). It should also handle unicode chars in [selectors, variable names and other identifiers](https://github.com/hcatlin/libsass/issues/244#issuecomment-34681227). This is true for all ASCII compatible encodings. So the main incompatible encodings (I'm aware of) are UTF-16/UTF-32 (which could be converted to UTF-8 with libiconv).
+
+### Current encoding auto detection
+
+LibSass currently reads all kind of BOMs and will error out if it finds something it doesn't know how to handle! It seems that it throws away the optional UTF-8 BOM (if any is found). IMO it would be nice if users could configure that (also if a charset rule should be added to the output).
+
+### What is currently not supported
+
+- Using non ASCII compatible encodings (like UTF-16)
+- Using non ASCII characters in different encodings in different includes
+
+### What is missing to support the above cases
+
+- A way to convert between encodings (like libiconv)
+- Sniffing the charset inside the file (source is available)
+- Handling the conversion on import (and export)
+- Optional: Make output encoding configurable
+- Optional: Add optional/mandatory BOM (configurable)
+
+### Low priority feature
+
+I guess the current implementation should handle more than 99% of all real world use cases.
+A) Unicode characters are still seldomly seen (as they can be written escaped)
+B) It will still work if it's UTF-8 or in any of the most common known western ISO codepages.
+Although I'm not sure how this applies to asian and other "exotic" codepages!
+
+I guess the biggest Problem is to have libiconv (or some other) library as a dependency. Since it contains a lot of rules for the conversions, I see it as the only way to handle this correctly. Once that is sorted out it should be pretty much straight forward to implement the missing pieces (in parser.cpp - Parser::parse should return encoding and add Parser::sniff_charset, then convert the source byte stream to UTF-8).
+
+I hope the statements above all hold true. Unicode is really not the easiest topic to wrap your head around. But since I did all the above recently in Perl, I wanted to document it here. Feel free to extend or criticize.

data/ext/libsass/include/sass/context.h

@@ -136,6 +136,7 @@ ADDAPI char** ADDCALL sass_context_take_included_files (struct Sass_Context* ctx
 // Getters for Sass_Compiler options
 ADDAPI enum Sass_Compiler_State ADDCALL sass_compiler_get_state(struct Sass_Compiler* compiler);
 ADDAPI struct Sass_Context* ADDCALL sass_compiler_get_context(struct Sass_Compiler* compiler);
+ADDAPI struct Sass_Options* ADDCALL sass_compiler_get_options(struct Sass_Compiler* compiler);
 ADDAPI size_t ADDCALL sass_compiler_get_import_stack_size(struct Sass_Compiler* compiler);
 ADDAPI Sass_Import_Entry ADDCALL sass_compiler_get_last_import(struct Sass_Compiler* compiler);
 ADDAPI Sass_Import_Entry ADDCALL sass_compiler_get_import_entry(struct Sass_Compiler* compiler, size_t idx);

data/ext/libsass/include/sass/functions.h

@@ -32,7 +32,7 @@ typedef struct Sass_Function (*Sass_Function_Entry);
 typedef struct Sass_Function* (*Sass_Function_List);
 // Typedef defining function signature and return type
 typedef union Sass_Value* (*Sass_Function_Fn)
-  (const union Sass_Value*, Sass_Function_Entry cb, struct Sass_Options* options);
+  (const union Sass_Value*, Sass_Function_Entry cb, struct Sass_Compiler* compiler);
 
 
 // Creator for sass custom importer return argument list

data/ext/libsass/src/ast.cpp

@@ -235,6 +235,16 @@ namespace Sass {
     return this == &rhs;
   }
 
+  // Selector lists can be compared to comma lists
+  bool Selector_List::operator==(const Expression& rhs) const
+  {
+    // solve the double dispatch problem by using RTTI information via dynamic cast
+    if (const List* ls = dynamic_cast<const List*>(&rhs)) { return *this == *ls; }
+    if (const Selector* ls = dynamic_cast<const Selector*>(&rhs)) { return *this == *ls; }
+    // compare invalid (maybe we should error?)
+    return false;
+  }
+
   bool Selector_List::operator== (const Selector_List& rhs) const
   {
     // for array access
@@ -258,10 +268,10 @@ namespace Sass {
       // skip nulls
       if (!l) ++i;
       else if (!r) ++n;
-      // do the check now
+      // do the check
       else if (*l != *r)
       { return false; }
-      // advance now
+      // advance
       ++i; ++n;
     }
     // no mismatch

data/ext/libsass/src/ast.hpp

@@ -191,6 +191,7 @@ namespace Sass {
     T last()                { return elements_.back(); }
     T first()               { return elements_.front(); }
     T& operator[](size_t i) { return elements_[i]; }
+    virtual const T& at(size_t i) const { return elements_.at(i); }
     const T& operator[](size_t i) const { return elements_[i]; }
     Vectorized& operator<<(T element)
     {
@@ -2117,7 +2118,10 @@ namespace Sass {
                      Compound_Selector* h = 0,
                      Complex_Selector* t = 0,
                      String* r = 0)
-    : Selector(pstate), combinator_(c), head_(h), tail_(t), reference_(r)
+    : Selector(pstate),
+      combinator_(c),
+      head_(h), tail_(t),
+      reference_(r)
     {
       if ((h && h->has_reference())   || (t && t->has_reference()))   has_reference(true);
       if ((h && h->has_placeholder()) || (t && t->has_placeholder())) has_placeholder(true);
@@ -2129,9 +2133,10 @@ namespace Sass {
       if ((!head_ || !head_->length() || head_->is_empty_reference()) &&
           combinator() == Combinator::ANCESTOR_OF)
       {
+        if (!tail_) return 0;
         tail_->has_line_feed_ = this->has_line_feed_;
         // tail_->has_line_break_ = this->has_line_break_;
-        return tail_ ? tail_->skip_empty_reference() : 0;
+        return tail_->skip_empty_reference();
       }
       return this;
     }
@@ -2251,6 +2256,7 @@ namespace Sass {
     Selector_List(ParserState pstate, size_t s = 0)
     : Selector(pstate), Vectorized<Complex_Selector*>(s), wspace_(0)
     { }
+    std::string type() { return "list"; }
     // remove parent selector references
     // basically unwraps parsed selectors
     void remove_parent_selectors();
@@ -2276,6 +2282,8 @@ namespace Sass {
     Selector_List* cloneFully(Context&) const; // clones Compound_Selector*s
     virtual bool operator==(const Selector& rhs) const;
     virtual bool operator==(const Selector_List& rhs) const;
+    // Selector Lists can be compared to comma lists
+    virtual bool operator==(const Expression& rhs) const;
     ATTACH_OPERATIONS()
   };
 

data/ext/libsass/src/bind.cpp

@@ -39,8 +39,6 @@ namespace Sass {
     size_t ia = 0, LA = as->length();
     while (ia < LA) {
       Argument* a = (*as)[ia];
-      // this is only needed for selectors
-      a->value(a->value()->perform(&listize));
       if (ip >= LP) {
         // skip empty rest arguments
         if (a->is_rest_argument()) {

data/ext/libsass/src/debug.hpp

@@ -3,6 +3,10 @@
 
 #include <stdint.h>
 
+#ifndef UINT32_MAX
+  #define UINT32_MAX 0xffffffffU
+#endif
+
 enum dbg_lvl_t : uint32_t {
   NONE = 0,
   TRIM = 1,

data/ext/libsass/src/debugger.hpp

@@ -71,7 +71,8 @@ inline void debug_ast(AST_Node* node, std::string ind, Env* env)
     std::cerr << " (" << pstate_source_position(node) << ")";
     std::cerr << " " << root_block->tabs();
     std::cerr << std::endl;
-    if (root_block->block()) for(auto i : root_block->block()->elements()) { debug_ast(i, ind + " ", env); }
+    debug_ast(root_block->expression(), ind + ":", env);
+    debug_ast(root_block->block(), ind + " ", env);
   } else if (dynamic_cast<Selector_List*>(node)) {
     Selector_List* selector = dynamic_cast<Selector_List*>(node);
     std::cerr << ind << "Selector_List " << selector;

data/ext/libsass/src/emitter.cpp

@@ -146,6 +146,7 @@ namespace Sass {
   {
     if (output_style() == COMPRESSED) return;
     if (output_style() == COMPACT) return;
+    if (in_declaration && in_comma_array) return;
     if (scheduled_linefeed && indentation)
       scheduled_linefeed = 1;
     std::string indent = "";
@@ -208,6 +209,7 @@ namespace Sass {
 
   void Emitter::append_optional_linefeed()
   {
+    if (in_declaration && in_comma_array) return;
     if (output_style() == COMPACT) {
       append_mandatory_space();
     } else {

data/ext/libsass/src/eval.cpp

@@ -258,7 +258,6 @@ namespace Sass {
       }
     }
     else {
-      bool arglist = list->is_arglist();
       for (size_t i = 0, L = list->length(); i < L; ++i) {
         Expression* e = (*list)[i];
         // unwrap value if the expression is an argument
@@ -267,7 +266,6 @@ namespace Sass {
         if (List* scalars = dynamic_cast<List*>(e)) {
           if (variables.size() == 1) {
             Expression* var = scalars;
-            if (arglist) var = (*scalars)[0];
             env->set_local(variables[0], var);
           } else {
             for (size_t j = 0, K = variables.size(); j < K; ++j) {
@@ -332,7 +330,7 @@ namespace Sass {
       To_C to_c;
       union Sass_Value* c_args = sass_make_list(1, SASS_COMMA);
       sass_list_set_value(c_args, 0, message->perform(&to_c));
-      union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_options);
+      union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_compiler);
       sass_delete_value(c_args);
       sass_delete_value(c_val);
       return 0;
@@ -365,7 +363,7 @@ namespace Sass {
       To_C to_c;
       union Sass_Value* c_args = sass_make_list(1, SASS_COMMA);
       sass_list_set_value(c_args, 0, message->perform(&to_c));
-      union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_options);
+      union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_compiler);
       sass_delete_value(c_args);
       sass_delete_value(c_val);
       return 0;
@@ -395,7 +393,7 @@ namespace Sass {
       To_C to_c;
       union Sass_Value* c_args = sass_make_list(1, SASS_COMMA);
       sass_list_set_value(c_args, 0, message->perform(&to_c));
-      union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_options);
+      union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_compiler);
       sass_delete_value(c_args);
       sass_delete_value(c_val);
       return 0;
@@ -690,7 +688,7 @@ namespace Sass {
         Expression* arg = static_cast<Expression*>(node);
         sass_list_set_value(c_args, i, arg->perform(&to_c));
       }
-      union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_options);
+      union Sass_Value* c_val = c_func(c_args, c_function, ctx.c_compiler);
       if (sass_value_get_tag(c_val) == SASS_ERROR) {
         error("error in C function " + c->name() + ": " + sass_error_get_message(c_val), c->pstate(), backtrace());
       } else if (sass_value_get_tag(c_val) == SASS_WARNING) {
@@ -763,7 +761,7 @@ namespace Sass {
       value = SASS_MEMORY_NEW(ctx.mem, Null, value->pstate());
     }
     else if (value->concrete_type() == Expression::SELECTOR) {
-      value = value->perform(this)->perform(&listize);
+      value = value->perform(this); // ->perform(&listize);
     }
 
     // std::cerr << "\ttype is now: " << typeid(*value).name() << std::endl << std::endl;

data/ext/libsass/src/expand.cpp

@@ -625,11 +625,18 @@ namespace Sass {
     Env* env = environment();
     // convert @content directives into mixin calls to the underlying thunk
     if (!env->has("@content[m]")) return 0;
+    if (block_stack.back()->is_root()) {
+      selector_stack.push_back(0);
+    }
     Mixin_Call* call = SASS_MEMORY_NEW(ctx.mem, Mixin_Call,
                                        c->pstate(),
                                        "@content",
                                        SASS_MEMORY_NEW(ctx.mem, Arguments, c->pstate()));
-    return call->perform(this);
+    Statement* stm = call->perform(this);
+    if (block_stack.back()->is_root()) {
+      selector_stack.pop_back();
+    }
+    return stm;
   }
 
   // produce an error if something is not implemented

data/ext/libsass/src/functions.cpp

@@ -1188,12 +1188,13 @@ namespace Sass {
     Signature length_sig = "length($list)";
     BUILT_IN(length)
     {
+      if (Selector_List* sl = dynamic_cast<Selector_List*>(env["$list"])) {
+        return SASS_MEMORY_NEW(ctx.mem, Number, pstate, (double)sl->length());
+      }
       Expression* v = ARG("$list", Expression);
       if (v->concrete_type() == Expression::MAP) {
         Map* map = dynamic_cast<Map*>(env["$list"]);
-        return SASS_MEMORY_NEW(ctx.mem, Number,
-     pstate,
-     (double)(map ? map->length() : 1));
+        return SASS_MEMORY_NEW(ctx.mem, Number, pstate, (double)(map ? map->length() : 1));
       }
       if (v->concrete_type() == Expression::SELECTOR) {
         if (Compound_Selector* h = dynamic_cast<Compound_Selector*>(v)) {
@@ -1214,9 +1215,19 @@ namespace Sass {
     Signature nth_sig = "nth($list, $n)";
     BUILT_IN(nth)
     {
+      Number* n = ARG("$n", Number);
       Map* m = dynamic_cast<Map*>(env["$list"]);
+      if (Selector_List* sl = dynamic_cast<Selector_List*>(env["$list"])) {
+        size_t len = m ? m->length() : sl->length();
+        bool empty = m ? m->empty() : sl->empty();
+        if (empty) error("argument `$list` of `" + std::string(sig) + "` must not be empty", pstate);
+        double index = std::floor(n->value() < 0 ? len + n->value() : n->value() - 1);
+        if (index < 0 || index > len - 1) error("index out of bounds for `" + std::string(sig) + "`", pstate);
+        // return (*sl)[static_cast<int>(index)];
+        Listize listize(ctx);
+        return (*sl)[static_cast<int>(index)]->perform(&listize);
+      }
       List* l = dynamic_cast<List*>(env["$list"]);
-      Number* n = ARG("$n", Number);
       if (n->value() == 0) error("argument `$n` of `" + std::string(sig) + "` must be non-zero", pstate);
       // if the argument isn't a list, then wrap it in a singleton list
       if (!m && !l) {
@@ -1307,6 +1318,10 @@ namespace Sass {
     {
       List* l = dynamic_cast<List*>(env["$list"]);
       Expression* v = ARG("$val", Expression);
+      if (Selector_List* sl = dynamic_cast<Selector_List*>(env["$list"])) {
+        Listize listize(ctx);
+        l = dynamic_cast<List*>(sl->perform(&listize));
+      }
       String_Constant* sep = ARG("$separator", String_Constant);
       if (!l) {
         l = SASS_MEMORY_NEW(ctx.mem, List, pstate, 1);

data/ext/libsass/src/inspect.cpp

@@ -738,7 +738,10 @@ namespace Sass {
     in_wrapped = true;
     append_token(s->name(), s);
     append_string("(");
+    bool was_comma_array = in_comma_array;
+    in_comma_array = false;
     s->selector()->perform(this);
+    in_comma_array = was_comma_array;
     append_string(")");
     in_wrapped = was;
   }
@@ -816,6 +819,14 @@ namespace Sass {
   void Inspect::operator()(Selector_List* g)
   {
     if (g->empty()) return;
+
+    bool was_comma_array = in_comma_array;
+    if (!in_declaration && in_comma_array) {
+      append_string("(");
+    }
+
+    if (in_declaration) in_comma_array = true;
+
     for (size_t i = 0, L = g->length(); i < L; ++i) {
       if (!in_wrapped && i == 0) append_indentation();
       if ((*g)[i] == 0) continue;
@@ -825,6 +836,12 @@ namespace Sass {
         append_comma_separator();
       }
     }
+
+    in_comma_array = was_comma_array;
+    if (!in_declaration && in_comma_array) {
+      append_string(")");
+    }
+
   }
 
   void Inspect::fallback_impl(AST_Node* n)

data/ext/libsass/src/json.cpp

@@ -802,7 +802,7 @@ failure:
 bool parse_string(const char **sp, char **out)
 {
   const char *s = *sp;
-  SB sb;
+  SB sb = { 0, 0, 0};
   char throwaway_buffer[4];
     /* enough space for a UTF-8 character */
   char *b;

data/ext/libsass/src/parser.cpp

@@ -2331,7 +2331,7 @@ namespace Sass {
     // match in one big "regex"
     if (const char* q =
       peek <
-        one_plus <
+        non_greedy <
           alternatives <
             // consume whitespace
             block_comment, spaces,
@@ -2344,10 +2344,19 @@ namespace Sass {
               parenthese_scope,
               interpolant
             >
+          >,
+          sequence <
+            optional_spaces,
+            alternatives <
+              exactly<'{'>,
+              exactly<'}'>,
+              exactly<';'>
+            >
           >
         >
       >(p)
     ) {
+      if (p == q) return rv;
       while (p < q) {
         // did we have interpolations?
         if (*p == '#' && *(p+1) == '{') {

data/ext/libsass/src/prelexer.cpp

@@ -1070,7 +1070,7 @@ namespace Sass {
                                      >,
                                      static_component
                        > >,
-                       optional_css_whitespace,
+                       zero_plus < spaces >,
                        alternatives< exactly<';'>, exactly<'}'> >
                       >(src);
     }

data/ext/libsass/src/sass_context.cpp

@@ -806,6 +806,7 @@ extern "C" {
   // Getters for Sass_Compiler options (get conected sass context)
   enum Sass_Compiler_State ADDCALL sass_compiler_get_state(struct Sass_Compiler* compiler) { return compiler->state; }
   struct Sass_Context* ADDCALL sass_compiler_get_context(struct Sass_Compiler* compiler) { return compiler->c_ctx; }
+  struct Sass_Options* ADDCALL sass_compiler_get_options(struct Sass_Compiler* compiler) { return compiler->c_ctx; }
   // Getters for Sass_Compiler options (query import stack)
   size_t ADDCALL sass_compiler_get_import_stack_size(struct Sass_Compiler* compiler) { return compiler->cpp_ctx->import_stack.size(); }
   Sass_Import_Entry ADDCALL sass_compiler_get_last_import(struct Sass_Compiler* compiler) { return compiler->cpp_ctx->import_stack.back(); }

data/ext/libsass/src/sass_values.cpp

@@ -210,7 +210,7 @@ extern "C" {
     v->list.tag = SASS_LIST;
     v->list.length = len;
     v->list.separator = sep;
-    v->list.values = (union Sass_Value**) calloc(len, sizeof(union Sass_Value));
+    v->list.values = (union Sass_Value**) calloc(len, sizeof(union Sass_Value*));
     if (v->list.values == 0) { free(v); return 0; }
     return v;
   }

data/lib/sassc/version.rb

@@ -1,3 +1,3 @@
 module SassC
-  VERSION = "1.8.0.pre2"
+  VERSION = "1.8.0"
 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.3.0-beta3", Native.version
+        assert_equal "3.3.0", Native.version
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sassc
 version: !ruby/object:Gem::Version
-  version: 1.8.0.pre2
+  version: 1.8.0
 platform: ruby
 authors:
 - Ryan Boland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -154,6 +154,39 @@ files:
 - ext/libsass/configure.ac
 - ext/libsass/contrib/libsass.spec
 - ext/libsass/contrib/plugin.cpp
+- ext/libsass/docs/README.md
+- ext/libsass/docs/api-context-example.md
+- ext/libsass/docs/api-context-internal.md
+- ext/libsass/docs/api-context.md
+- ext/libsass/docs/api-doc.md
+- ext/libsass/docs/api-function-example.md
+- ext/libsass/docs/api-function-internal.md
+- ext/libsass/docs/api-function.md
+- ext/libsass/docs/api-importer-example.md
+- ext/libsass/docs/api-importer-internal.md
+- ext/libsass/docs/api-importer.md
+- ext/libsass/docs/api-value-example.md
+- ext/libsass/docs/api-value-internal.md
+- ext/libsass/docs/api-value.md
+- ext/libsass/docs/build-on-darwin.md
+- ext/libsass/docs/build-on-gentoo.md
+- ext/libsass/docs/build-on-windows.md
+- ext/libsass/docs/build-shared-library.md
+- ext/libsass/docs/build-with-autotools.md
+- ext/libsass/docs/build-with-makefiles.md
+- ext/libsass/docs/build-with-mingw.md
+- ext/libsass/docs/build-with-visual-studio.md
+- ext/libsass/docs/build.md
+- ext/libsass/docs/compatibility-plan.md
+- ext/libsass/docs/contributing.md
+- ext/libsass/docs/custom-functions-internal.md
+- ext/libsass/docs/implementations.md
+- ext/libsass/docs/plugins.go
+- ext/libsass/docs/setup-environment.md
+- ext/libsass/docs/source-map-internals.md
+- ext/libsass/docs/trace.md
+- ext/libsass/docs/triage.md
+- ext/libsass/docs/unicode.md
 - ext/libsass/extconf.rb
 - ext/libsass/include/sass.h
 - ext/libsass/include/sass/base.h
@@ -339,9 +372,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2