sassc 1.9.0 → 1.10.0

data/ext/libsass/src/prelexer.hpp

@@ -162,13 +162,19 @@ namespace Sass {
       return src;
     }
 
+    // equivalent of STRING_REGULAR_EXPRESSIONS
+    const char* re_string_double_open(const char* src);
+    const char* re_string_double_close(const char* src);
+    const char* re_string_single_open(const char* src);
+    const char* re_string_single_close(const char* src);
+    const char* re_string_uri_open(const char* src);
+    const char* re_string_uri_close(const char* src);
+
     // Match a line comment.
     const char* line_comment(const char* src);
-    const char* line_comment_prefix(const char* src);
 
     // Match a block comment.
     const char* block_comment(const char* src);
-    const char* block_comment_prefix(const char* src);
     // Match either.
     const char* comment(const char* src);
     // Match double- and single-quoted strings.
@@ -218,6 +224,11 @@ namespace Sass {
     // const char* url_schema(const char* src);
     // const char* url_value(const char* src);
     const char* vendor_prefix(const char* src);
+
+    const char* re_special_directive(const char* src);
+    const char* re_prefixed_directive(const char* src);
+    const char* re_almost_any_value_token(const char* src);
+
     // Match CSS '@' keywords.
     const char* at_keyword(const char* src);
     const char* kwd_import(const char* src);
@@ -263,6 +274,7 @@ namespace Sass {
 
     const char* kwd_null(const char* src);
 
+    const char* re_selector_list(const char* src);
     const char* re_type_selector(const char* src);
     const char* re_static_expression(const char* src);
 
@@ -333,6 +345,7 @@ namespace Sass {
 
     // Match SCSS variable names.
     const char* variable(const char* src);
+    const char* calc_fn_call(const char* src);
 
     // IE stuff
     const char* ie_progid(const char* src);

data/ext/libsass/src/remove_placeholders.cpp

@@ -68,13 +68,13 @@ namespace Sass {
     }
 
     void Remove_Placeholders::operator()(Media_Block* m) {
-        Block* b = m->block();
-        for (size_t i = 0, L = b->length(); i < L; ++i) {
-            if ((*b)[i]) (*b)[i]->perform(this);
-        }
+        operator()(m->block());
+    }
+    void Remove_Placeholders::operator()(Supports_Block* m) {
+        operator()(m->block());
     }
 
-    void Remove_Placeholders::operator()(At_Rule* a) {
+    void Remove_Placeholders::operator()(Directive* a) {
         if (a->block()) a->block()->perform(this);
     }
 

data/ext/libsass/src/remove_placeholders.hpp

@@ -17,7 +17,7 @@ namespace Sass {
 
         void fallback_impl(AST_Node* n) {}
 
-    private:
+    public:
       Selector_List* remove_placeholders(Selector_List*);
 
     public:
@@ -27,7 +27,8 @@ namespace Sass {
         void operator()(Block*);
         void operator()(Ruleset*);
         void operator()(Media_Block*);
-        void operator()(At_Rule*);
+        void operator()(Supports_Block*);
+        void operator()(Directive*);
 
         template <typename U>
         void fallback(U x) { return fallback_impl(x); }

data/ext/libsass/src/sass.cpp

@@ -11,18 +11,42 @@
 extern "C" {
   using namespace Sass;
 
+  // Allocate libsass heap memory
+  // Don't forget string termination!
+  void* ADDCALL sass_alloc_memory(size_t size)
+  {
+    void* ptr = malloc(size);
+    if (ptr == NULL)
+      out_of_memory();
+    return ptr;
+  }
+
+  char* ADDCALL sass_copy_c_string(const char* str)
+  {
+    size_t len = strlen(str) + 1;
+    char* cpy = (char*) sass_alloc_memory(len);
+    std::memcpy(cpy, str, len);
+    return cpy;
+  }
+
+  // Deallocate libsass heap memory
+  void ADDCALL sass_free_memory(void* ptr)
+  {
+    if (ptr) free (ptr);
+  }
+
   // caller must free the returned memory
   char* ADDCALL sass_string_quote (const char *str, const char quote_mark)
   {
     std::string quoted = quote(str, quote_mark);
-    return sass_strdup(quoted.c_str());
+    return sass_copy_c_string(quoted.c_str());
   }
 
   // caller must free the returned memory
   char* ADDCALL sass_string_unquote (const char *str)
   {
     std::string unquoted = unquote(str);
-    return sass_strdup(unquoted.c_str());
+    return sass_copy_c_string(unquoted.c_str());
   }
 
   // Make sure to free the returned value!
@@ -30,7 +54,7 @@ extern "C" {
   char* ADDCALL sass_resolve_file (const char* file, const char* paths[])
   {
     std::string resolved(File::find_file(file, paths));
-    return sass_strdup(resolved.c_str());
+    return sass_copy_c_string(resolved.c_str());
   }
 
   // Get compiled libsass version
@@ -39,4 +63,10 @@ extern "C" {
     return LIBSASS_VERSION;
   }
 
+  // Get compiled libsass version
+  const char* ADDCALL libsass_language_version(void)
+  {
+    return LIBSASS_LANGUAGE_VERSION;
+  }
+
 }

data/ext/libsass/src/sass2scss.cpp

@@ -528,6 +528,13 @@ namespace Sass
 			// reset converter state
 			converter.selector = false;
 
+			// looks like some undocumented behavior ...
+			// https://github.com/mgreter/sass2scss/issues/29
+			if (sass.substr(pos_left, 1) == "\\") {
+				converter.selector = true;
+				sass[pos_left] = ' ';
+			}
+
 			// check if we have sass property syntax
 			if (sass.substr(pos_left, 1) == ":" && sass.substr(pos_left, 2) != "::")
 			{

data/ext/libsass/src/sass_context.cpp

@@ -28,7 +28,7 @@ extern "C" {
   #define IMPLEMENT_SASS_OPTION_STRING_ACCESSOR(type, option, def) \
     type ADDCALL sass_option_get_##option (struct Sass_Options* options) { return safe_str(options->option, def); } \
     void ADDCALL sass_option_set_##option (struct Sass_Options* options, type option) \
-    { free(options->option); options->option = option || def ? sass_strdup(option ? option : def) : 0; }
+    { free(options->option); options->option = option || def ? sass_copy_c_string(option ? option : def) : 0; }
 
   #define IMPLEMENT_SASS_CONTEXT_GETTER(type, option) \
     type ADDCALL sass_context_get_##option (struct Sass_Context* ctx) { return ctx->option; }
@@ -36,7 +36,7 @@ extern "C" {
     type sass_context_take_##option (struct Sass_Context* ctx) \
     { type foo = ctx->option; ctx->option = 0; return foo; }
 
-  static int handle_errors(Sass_Context* c_ctx) {
+  static int handle_error(Sass_Context* c_ctx) {
     try {
      throw;
     }
@@ -105,11 +105,11 @@ extern "C" {
       json_append_member(json_err, "message", json_mkstring(e.what()));
       json_append_member(json_err, "formatted", json_mkstring(msg_stream.str().c_str()));
 
-      c_ctx->error_json = json_stringify(json_err, "  ");;
-      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
-      c_ctx->error_text = sass_strdup(e.what());
+      try { c_ctx->error_json = json_stringify(json_err, "  "); } catch(...) {}
+      c_ctx->error_message = sass_copy_c_string(msg_stream.str().c_str());
+      c_ctx->error_text = sass_copy_c_string(e.what());
       c_ctx->error_status = 1;
-      c_ctx->error_file = sass_strdup(e.pstate.path);
+      c_ctx->error_file = sass_copy_c_string(e.pstate.path);
       c_ctx->error_line = e.pstate.line+1;
       c_ctx->error_column = e.pstate.column+1;
       c_ctx->error_src = e.pstate.src;
@@ -124,9 +124,9 @@ extern "C" {
       json_append_member(json_err, "status", json_mknumber(2));
       json_append_member(json_err, "message", json_mkstring(ba.what()));
       json_append_member(json_err, "formatted", json_mkstring(msg_stream.str().c_str()));
-      c_ctx->error_json = json_stringify(json_err, "  ");;
-      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
-      c_ctx->error_text = sass_strdup(ba.what());
+      try { c_ctx->error_json = json_stringify(json_err, "  "); } catch(...) {}
+      c_ctx->error_message = sass_copy_c_string(msg_stream.str().c_str());
+      c_ctx->error_text = sass_copy_c_string(ba.what());
       c_ctx->error_status = 2;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
@@ -139,9 +139,9 @@ extern "C" {
       json_append_member(json_err, "status", json_mknumber(3));
       json_append_member(json_err, "message", json_mkstring(e.what()));
       json_append_member(json_err, "formatted", json_mkstring(msg_stream.str().c_str()));
-      c_ctx->error_json = json_stringify(json_err, "  ");;
-      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
-      c_ctx->error_text = sass_strdup(e.what());
+      try { c_ctx->error_json = json_stringify(json_err, "  "); } catch(...) {}
+      c_ctx->error_message = sass_copy_c_string(msg_stream.str().c_str());
+      c_ctx->error_text = sass_copy_c_string(e.what());
       c_ctx->error_status = 3;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
@@ -154,9 +154,9 @@ extern "C" {
       json_append_member(json_err, "status", json_mknumber(4));
       json_append_member(json_err, "message", json_mkstring(e.c_str()));
       json_append_member(json_err, "formatted", json_mkstring(msg_stream.str().c_str()));
-      c_ctx->error_json = json_stringify(json_err, "  ");;
-      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
-      c_ctx->error_text = sass_strdup(e.c_str());
+      try { c_ctx->error_json = json_stringify(json_err, "  "); } catch(...) {}
+      c_ctx->error_message = sass_copy_c_string(msg_stream.str().c_str());
+      c_ctx->error_text = sass_copy_c_string(e.c_str());
       c_ctx->error_status = 4;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
@@ -169,9 +169,9 @@ extern "C" {
       json_append_member(json_err, "status", json_mknumber(4));
       json_append_member(json_err, "message", json_mkstring(e));
       json_append_member(json_err, "formatted", json_mkstring(msg_stream.str().c_str()));
-      c_ctx->error_json = json_stringify(json_err, "  ");;
-      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
-      c_ctx->error_text = sass_strdup(e);
+      try { c_ctx->error_json = json_stringify(json_err, "  "); } catch(...) {}
+      c_ctx->error_message = sass_copy_c_string(msg_stream.str().c_str());
+      c_ctx->error_text = sass_copy_c_string(e);
       c_ctx->error_status = 4;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
@@ -183,9 +183,9 @@ extern "C" {
       msg_stream << "Unknown error occurred" << std::endl;
       json_append_member(json_err, "status", json_mknumber(5));
       json_append_member(json_err, "message", json_mkstring("unknown"));
-      c_ctx->error_json = json_stringify(json_err, "  ");;
-      c_ctx->error_message = sass_strdup(msg_stream.str().c_str());
-      c_ctx->error_text = sass_strdup("unknown");
+      try { c_ctx->error_json = json_stringify(json_err, "  "); } catch(...) {}
+      c_ctx->error_message = sass_copy_c_string(msg_stream.str().c_str());
+      c_ctx->error_text = sass_copy_c_string("unknown");
       c_ctx->error_status = 5;
       c_ctx->output_string = 0;
       c_ctx->source_map_string = 0;
@@ -194,48 +194,18 @@ extern "C" {
     return c_ctx->error_status;
   }
 
+  // allow one error handler to throw another error
+  // this can happen with invalid utf8 and json lib
+  static int handle_errors(Sass_Context* c_ctx) {
+    try { return handle_error(c_ctx); }
+    catch (...) { return handle_error(c_ctx); }
+    return c_ctx->error_status;
+  }
+
   // generic compilation function (not exported, use file/data compile instead)
   static Sass_Compiler* sass_prepare_context (Sass_Context* c_ctx, Context* cpp_ctx) throw()
   {
     try {
-
-      // convert include path linked list to static array
-      struct string_list* inc = c_ctx->include_paths;
-      // very poor loop to get the length of the linked list
-      size_t inc_size = 0; while (inc) { inc_size ++; inc = inc->next; }
-      // create char* array to hold all paths plus null terminator
-      const char** include_paths = (const char**) calloc(inc_size + 1, sizeof(char*));
-      if (include_paths == 0) throw(std::bad_alloc());
-      // reset iterator
-      inc = c_ctx->include_paths;
-      // copy over the paths
-      for (size_t i = 0; inc; i++) {
-        include_paths[i] = inc->string;
-        inc = inc->next;
-      }
-
-      // convert plugin path linked list to static array
-      struct string_list* imp = c_ctx->plugin_paths;
-      // very poor loop to get the length of the linked list
-      size_t imp_size = 0; while (imp) { imp_size ++; imp = imp->next; }
-      // create char* array to hold all paths plus null terminator
-      const char** plugin_paths = (const char**) calloc(imp_size + 1, sizeof(char*));
-      if (plugin_paths == 0) {
-          free(include_paths); //free include_paths before throw
-          throw(std::bad_alloc());
-      }
-      // reset iterator
-      imp = c_ctx->plugin_paths;
-      // copy over the paths
-      for (size_t i = 0; imp; i++) {
-        plugin_paths[i] = imp->string;
-        imp = imp->next;
-      }
-
-      // free intermediate data
-      free(include_paths);
-      free(plugin_paths);
-
       // register our custom functions
       if (c_ctx->c_functions) {
         auto this_func_data = c_ctx->c_functions;
@@ -565,7 +535,7 @@ extern "C" {
   static void sass_clear_context (struct Sass_Context* ctx)
   {
     if (ctx == 0) return;
-    // release the allocated memory (mostly via sass_strdup)
+    // release the allocated memory (mostly via sass_copy_c_string)
     if (ctx->output_string)     free(ctx->output_string);
     if (ctx->source_map_string) free(ctx->source_map_string);
     if (ctx->error_message)     free(ctx->error_message);
@@ -695,7 +665,7 @@ extern "C" {
 
     struct string_list* include_path = (struct string_list*) calloc(1, sizeof(struct string_list));
     if (include_path == 0) return;
-    include_path->string = path ? sass_strdup(path) : 0;
+    include_path->string = path ? sass_copy_c_string(path) : 0;
     struct string_list* last = options->include_paths;
     if (!options->include_paths) {
       options->include_paths = include_path;
@@ -713,7 +683,7 @@ extern "C" {
 
     struct string_list* plugin_path = (struct string_list*) calloc(1, sizeof(struct string_list));
     if (plugin_path == 0) return;
-    plugin_path->string = path ? sass_strdup(path) : 0;
+    plugin_path->string = path ? sass_copy_c_string(path) : 0;
     struct string_list* last = options->plugin_paths;
     if (!options->plugin_paths) {
       options->plugin_paths = plugin_path;

data/ext/libsass/src/sass_functions.cpp

@@ -72,8 +72,8 @@ extern "C" {
   {
     Sass_Import* v = (Sass_Import*) calloc(1, sizeof(Sass_Import));
     if (v == 0) return 0;
-    v->imp_path = imp_path ? sass_strdup(imp_path) : 0;
-    v->abs_path = abs_path ? sass_strdup(abs_path) : 0;
+    v->imp_path = imp_path ? sass_copy_c_string(imp_path) : 0;
+    v->abs_path = abs_path ? sass_copy_c_string(abs_path) : 0;
     v->source = source;
     v->srcmap = srcmap;
     v->error = 0;
@@ -93,7 +93,7 @@ extern "C" {
   {
     if (import == 0) return 0;
     if (import->error) free(import->error);
-    import->error = error ? sass_strdup(error) : 0;
+    import->error = error ? sass_copy_c_string(error) : 0;
     import->line = line ? line : -1;
     import->column = col ? col : -1;
     return import;

data/ext/libsass/src/sass_values.cpp

@@ -91,7 +91,7 @@ extern "C" {
     if (v == 0) return 0;
     v->number.tag = SASS_NUMBER;
     v->number.value = val;
-    v->number.unit = unit ? sass_strdup(unit) : 0;
+    v->number.unit = unit ? sass_copy_c_string(unit) : 0;
     if (v->number.unit == 0) { free(v); return 0; }
     return v;
   }
@@ -114,7 +114,7 @@ extern "C" {
     if (v == 0) return 0;
     v->string.quoted = false;
     v->string.tag = SASS_STRING;
-    v->string.value = val ? sass_strdup(val) : 0;
+    v->string.value = val ? sass_copy_c_string(val) : 0;
     if (v->string.value == 0) { free(v); return 0; }
     return v;
   }
@@ -125,7 +125,7 @@ extern "C" {
     if (v == 0) return 0;
     v->string.quoted = true;
     v->string.tag = SASS_STRING;
-    v->string.value = val ? sass_strdup(val) : 0;
+    v->string.value = val ? sass_copy_c_string(val) : 0;
     if (v->string.value == 0) { free(v); return 0; }
     return v;
   }
@@ -166,7 +166,7 @@ extern "C" {
     union Sass_Value* v = (Sass_Value*) calloc(1, sizeof(Sass_Value));
     if (v == 0) return 0;
     v->error.tag = SASS_ERROR;
-    v->error.message = msg ? sass_strdup(msg) : 0;
+    v->error.message = msg ? sass_copy_c_string(msg) : 0;
     if (v->error.message == 0) { free(v); return 0; }
     return v;
   }
@@ -176,7 +176,7 @@ extern "C" {
     union Sass_Value* v = (Sass_Value*) calloc(1, sizeof(Sass_Value));
     if (v == 0) return 0;
     v->warning.tag = SASS_WARNING;
-    v->warning.message = msg ? sass_strdup(msg) : 0;
+    v->warning.message = msg ? sass_copy_c_string(msg) : 0;
     if (v->warning.message == 0) { free(v); return 0; }
     return v;
   }

data/ext/libsass/src/utf8/unchecked.h

@@ -32,13 +32,13 @@ DEALINGS IN THE SOFTWARE.
 
 namespace utf8
 {
-    namespace unchecked 
+    namespace unchecked
     {
         template <typename octet_iterator>
         octet_iterator append(uint32_t cp, octet_iterator result)
         {
             if (cp < 0x80)                        // one octet
-                *(result++) = static_cast<uint8_t>(cp);  
+                *(result++) = static_cast<uint8_t>(cp);
             else if (cp < 0x800) {                // two octets
                 *(result++) = static_cast<uint8_t>((cp >> 6)          | 0xc0);
                 *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
@@ -70,28 +70,28 @@ namespace utf8
                     cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f);
                     break;
                 case 3:
-                    ++it; 
+                    ++it;
                     cp = ((cp << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
                     ++it;
                     cp += (*it) & 0x3f;
                     break;
                 case 4:
                     ++it;
-                    cp = ((cp << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);                
+                    cp = ((cp << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);
                     ++it;
                     cp += (utf8::internal::mask8(*it) << 6) & 0xfff;
                     ++it;
-                    cp += (*it) & 0x3f; 
+                    cp += (*it) & 0x3f;
                     break;
             }
             ++it;
-            return cp;        
+            return cp;
         }
 
         template <typename octet_iterator>
         uint32_t peek_next(octet_iterator it)
         {
-            return utf8::unchecked::next(it);    
+            return utf8::unchecked::next(it);
         }
 
         template <typename octet_iterator>
@@ -121,14 +121,14 @@ namespace utf8
         distance (octet_iterator first, octet_iterator last)
         {
             typename std::iterator_traits<octet_iterator>::difference_type dist;
-            for (dist = 0; first < last; ++dist) 
+            for (dist = 0; first < last; ++dist)
                 utf8::unchecked::next(first);
             return dist;
         }
 
         template <typename u16bit_iterator, typename octet_iterator>
         octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
-        {       
+        {
             while (start != end) {
                 uint32_t cp = utf8::internal::mask16(*start++);
             // Take care of surrogate pairs first
@@ -138,7 +138,7 @@ namespace utf8
                 }
                 result = utf8::unchecked::append(cp, result);
             }
-            return result;         
+            return result;
         }
 
         template <typename u16bit_iterator, typename octet_iterator>
@@ -176,7 +176,7 @@ namespace utf8
 
         // The iterator class
         template <typename octet_iterator>
-          class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> { 
+          class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
             octet_iterator it;
             public:
             iterator () {}
@@ -188,15 +188,15 @@ namespace utf8
                 octet_iterator temp = it;
                 return utf8::unchecked::next(temp);
             }
-            bool operator == (const iterator& rhs) const 
-            { 
+            bool operator == (const iterator& rhs) const
+            {
                 return (it == rhs.it);
             }
             bool operator != (const iterator& rhs) const
             {
                 return !(operator == (rhs));
             }
-            iterator& operator ++ () 
+            iterator& operator ++ ()
             {
                 ::std::advance(it, utf8::internal::sequence_length(it));
                 return *this;
@@ -206,7 +206,7 @@ namespace utf8
                 iterator temp = *this;
                 ::std::advance(it, utf8::internal::sequence_length(it));
                 return temp;
-            }  
+            }
             iterator& operator -- ()
             {
                 utf8::unchecked::prior(it);
@@ -221,7 +221,7 @@ namespace utf8
           }; // class iterator
 
     } // namespace utf8::unchecked
-} // namespace utf8 
+} // namespace utf8
 
 
 #endif // header guard