sassc 2.0.1 → 2.1.0.pre1

data/ext/libsass/src/parser.hpp

@@ -1,6 +1,8 @@
 #ifndef SASS_PARSER_H
 #define SASS_PARSER_H
 
+#include "sass.hpp"
+
 #include <string>
 #include <vector>
 
@@ -38,7 +40,7 @@ namespace Sass {
     Context& ctx;
     std::vector<Block_Obj> block_stack;
     std::vector<Scope> stack;
-    Media_Block_Ptr last_media_block;
+    Media_Block* last_media_block;
     const char* source;
     const char* position;
     const char* end;
@@ -48,23 +50,24 @@ namespace Sass {
     Backtraces traces;
     size_t indentation;
     size_t nestings;
+    bool allow_parent;
 
     Token lexed;
 
-    Parser(Context& ctx, const ParserState& pstate, Backtraces traces)
+    Parser(Context& ctx, const ParserState& pstate, Backtraces traces, bool allow_parent = true)
     : ParserState(pstate), ctx(ctx), block_stack(), stack(0), last_media_block(),
       source(0), position(0), end(0), before_token(pstate), after_token(pstate),
-      pstate(pstate), traces(traces), indentation(0), nestings(0)
-    { 
+      pstate(pstate), traces(traces), indentation(0), nestings(0), allow_parent(allow_parent)
+    {
       stack.push_back(Scope::Root);
     }
 
     // static Parser from_string(const std::string& src, Context& ctx, ParserState pstate = ParserState("[STRING]"));
-    static Parser from_c_str(const char* src, Context& ctx, Backtraces, ParserState pstate = ParserState("[CSTRING]"), const char* source = 0);
-    static Parser from_c_str(const char* beg, const char* end, Context& ctx, Backtraces, ParserState pstate = ParserState("[CSTRING]"), const char* source = 0);
-    static Parser from_token(Token t, Context& ctx, Backtraces, ParserState pstate = ParserState("[TOKEN]"), const char* source = 0);
+    static Parser from_c_str(const char* src, Context& ctx, Backtraces, ParserState pstate = ParserState("[CSTRING]"), const char* source = nullptr, bool allow_parent = true);
+    static Parser from_c_str(const char* beg, const char* end, Context& ctx, Backtraces, ParserState pstate = ParserState("[CSTRING]"), const char* source = nullptr, bool allow_parent = true);
+    static Parser from_token(Token t, Context& ctx, Backtraces, ParserState pstate = ParserState("[TOKEN]"), const char* source = nullptr);
     // special static parsers to convert strings into certain selectors
-    static Selector_List_Obj parse_selector(const char* src, Context& ctx, Backtraces, ParserState pstate = ParserState("[SELECTOR]"), const char* source = 0);
+    static Selector_List_Obj parse_selector(const char* src, Context& ctx, Backtraces, ParserState pstate = ParserState("[SELECTOR]"), const char* source = nullptr, bool allow_parent = true);
 
 #ifdef __clang__
 
@@ -285,14 +288,13 @@ namespace Sass {
     Expression_Obj parse_value();
     Function_Call_Obj parse_calc_function();
     Function_Call_Obj parse_function_call();
-    Function_Call_Schema_Obj parse_function_call_schema();
+    Function_Call_Obj parse_function_call_schema();
     String_Obj parse_url_function_string();
     String_Obj parse_url_function_argument();
     String_Obj parse_interpolated_chunk(Token, bool constant = false, bool css = true);
     String_Obj parse_string();
-    String_Constant_Obj parse_static_value();
-    String_Schema_Obj parse_css_variable_value(bool top_level = true);
-    String_Schema_Obj parse_css_variable_value_token(bool top_level = true);
+    Value_Obj parse_static_value();
+    String_Schema_Obj parse_css_variable_value();
     String_Obj parse_ie_property();
     String_Obj parse_ie_keyword_arg();
     String_Schema_Obj parse_value_schema(const char* stop);
@@ -309,12 +311,12 @@ namespace Sass {
     Media_Query_Obj parse_media_query();
     Media_Query_Expression_Obj parse_media_expression();
     Supports_Block_Obj parse_supports_directive();
-    Supports_Condition_Obj parse_supports_condition();
+    Supports_Condition_Obj parse_supports_condition(bool top_level);
     Supports_Condition_Obj parse_supports_negation();
-    Supports_Condition_Obj parse_supports_operator();
+    Supports_Condition_Obj parse_supports_operator(bool top_level);
     Supports_Condition_Obj parse_supports_interpolation();
     Supports_Condition_Obj parse_supports_declaration();
-    Supports_Condition_Obj parse_supports_condition_in_parens();
+    Supports_Condition_Obj parse_supports_condition_in_parens(bool parens_required);
     At_Root_Block_Obj parse_at_root_block();
     At_Root_Query_Obj parse_at_root_query();
     String_Schema_Obj parse_almost_any_value();
@@ -325,6 +327,8 @@ namespace Sass {
     Error_Obj parse_error();
     Debug_Obj parse_debug();
 
+    Value* color_or_string(const std::string& lexed) const;
+
     // be more like ruby sass
     Expression_Obj lex_almost_any_value_token();
     Expression_Obj lex_almost_any_value_chars();
@@ -373,19 +377,19 @@ namespace Sass {
           return SASS_MEMORY_NEW(String_Constant, pstate, lexed);
         }
       }
-      return 0;
+      return {};
     }
 
   public:
-    static Number_Ptr lexed_number(const ParserState& pstate, const std::string& parsed);
-    static Number_Ptr lexed_dimension(const ParserState& pstate, const std::string& parsed);
-    static Number_Ptr lexed_percentage(const ParserState& pstate, const std::string& parsed);
-    static Expression_Ptr lexed_hex_color(const ParserState& pstate, const std::string& parsed);
+    static Number* lexed_number(const ParserState& pstate, const std::string& parsed);
+    static Number* lexed_dimension(const ParserState& pstate, const std::string& parsed);
+    static Number* lexed_percentage(const ParserState& pstate, const std::string& parsed);
+    static Value* lexed_hex_color(const ParserState& pstate, const std::string& parsed);
   private:
-    Number_Ptr lexed_number(const std::string& parsed) { return lexed_number(pstate, parsed); };
-    Number_Ptr lexed_dimension(const std::string& parsed) { return lexed_dimension(pstate, parsed); };
-    Number_Ptr lexed_percentage(const std::string& parsed) { return lexed_percentage(pstate, parsed); };
-    Expression_Ptr lexed_hex_color(const std::string& parsed) { return lexed_hex_color(pstate, parsed); };
+    Number* lexed_number(const std::string& parsed) { return lexed_number(pstate, parsed); };
+    Number* lexed_dimension(const std::string& parsed) { return lexed_dimension(pstate, parsed); };
+    Number* lexed_percentage(const std::string& parsed) { return lexed_percentage(pstate, parsed); };
+    Value* lexed_hex_color(const std::string& parsed) { return lexed_hex_color(pstate, parsed); };
 
     static const char* re_attr_sensitive_close(const char* src);
     static const char* re_attr_insensitive_close(const char* src);

data/ext/libsass/src/plugins.cpp

@@ -1,7 +1,11 @@
+// sass.hpp must go before all system headers to get the
+// __EXTENSIONS__ fix on Solaris.
 #include "sass.hpp"
+
 #include <iostream>
 #include "output.hpp"
 #include "plugins.hpp"
+#include "util.hpp"
 
 #ifdef _WIN32
 #include <windows.h>
@@ -154,7 +158,7 @@ namespace Sass {
           }
         }
       }
-      catch (utf8::invalid_utf8)
+      catch (utf8::invalid_utf8&)
       {
         // report the error to the console (should not happen)
         // implementors should make sure to provide valid utf8

data/ext/libsass/src/position.cpp

@@ -1,4 +1,7 @@
+// sass.hpp must go before all system headers to get the
+// __EXTENSIONS__ fix on Solaris.
 #include "sass.hpp"
+
 #include "position.hpp"
 
 namespace Sass {

data/ext/libsass/src/prelexer.cpp

@@ -1,4 +1,7 @@
+// sass.hpp must go before all system headers to get the
+// __EXTENSIONS__ fix on Solaris.
 #include "sass.hpp"
+
 #include <cctype>
 #include <iostream>
 #include <iomanip>
@@ -260,7 +263,7 @@ namespace Sass {
       >(src);
     }
 
-    // Match a line comment (/.*?(?=\n|\r\n?|\Z)/.
+    // Match a line comment (/.*?(?=\n|\r\n?|\f|\Z)/.
     const char* line_comment(const char* src)
     {
       return sequence<
@@ -1260,6 +1263,9 @@ namespace Sass {
     const char* kwd_lte(const char* src) {
       return exactly<lte>(src);
     }
+    const char* kwd_using(const char* src) {
+      return keyword<using_kwd>(src);
+    }
 
     // match specific IE syntax
     const char* ie_progid(const char* src) {
@@ -1394,7 +1400,7 @@ namespace Sass {
     }*/
 
     const char* H(const char* src) {
-      return std::isxdigit(*src) ? src+1 : 0;
+      return std::isxdigit(static_cast<unsigned char>(*src)) ? src+1 : 0;
     }
 
     const char* W(const char* src) {
@@ -1606,7 +1612,7 @@ namespace Sass {
       >(src);
     }
 
-    extern const char css_variable_url_top_level_negates[] = "()[]{}\"'#/;!";
+    extern const char css_variable_url_top_level_negates[] = "()[]{}\"'#/;";
     const char* css_variable_top_level_value(const char* src) {
       return sequence<
         alternatives<

data/ext/libsass/src/prelexer.hpp

@@ -25,6 +25,7 @@ namespace Sass {
     const char* kwd_gte(const char* src);
     const char* kwd_lt(const char* src);
     const char* kwd_lte(const char* src);
+    const char* kwd_using(const char* src);
 
     // Match standard control chars
     const char* kwd_at(const char* src);
@@ -64,16 +65,15 @@ namespace Sass {
       size_t level = 0;
       bool in_squote = false;
       bool in_dquote = false;
-      // bool in_braces = false;
-
-      while (*src) {
-
-        // check for abort condition
-        if (end && src >= end) break;
+      bool in_backslash_escape = false;
 
+      while ((end == nullptr || src < end) && *src != '\0') {
         // has escaped sequence?
-        if (*src == '\\') {
-          ++ src; // skip this (and next)
+        if (in_backslash_escape) {
+          in_backslash_escape = false;
+        }
+        else if (*src == '\\') {
+          in_backslash_escape = true;
         }
         else if (*src == '"') {
           in_dquote = ! in_dquote;
@@ -119,7 +119,7 @@ namespace Sass {
     // first start/opener must be consumed already!
     template<prelexer start, prelexer stop>
     const char* skip_over_scopes(const char* src) {
-      return skip_over_scopes<start, stop>(src, 0);
+      return skip_over_scopes<start, stop>(src, nullptr);
     }
 
     // Match a sequence of characters delimited by the supplied chars.

data/ext/libsass/src/remove_placeholders.cpp

@@ -1,4 +1,7 @@
+// sass.hpp must go before all system headers to get the
+// __EXTENSIONS__ fix on Solaris.
 #include "sass.hpp"
+
 #include "remove_placeholders.hpp"
 #include "context.hpp"
 #include "inspect.hpp"
@@ -9,16 +12,16 @@ namespace Sass {
     Remove_Placeholders::Remove_Placeholders()
     { }
 
-    void Remove_Placeholders::operator()(Block_Ptr b) {
+    void Remove_Placeholders::operator()(Block* b) {
         for (size_t i = 0, L = b->length(); i < L; ++i) {
-            Statement_Ptr st = b->at(i);
+            Statement* st = b->at(i);
             st->perform(this);
         }
     }
 
-    Selector_List_Ptr Remove_Placeholders::remove_placeholders(Selector_List_Ptr sl)
+    Selector_List* Remove_Placeholders::remove_placeholders(Selector_List* sl)
     {
-      Selector_List_Ptr new_sl = SASS_MEMORY_NEW(Selector_List, sl->pstate());
+      Selector_List* new_sl = SASS_MEMORY_NEW(Selector_List, sl->pstate());
 
       for (size_t i = 0, L = sl->length(); i < L; ++i) {
           if (!sl->at(i)->contains_placeholder()) {
@@ -31,7 +34,7 @@ namespace Sass {
     }
 
 
-    void Remove_Placeholders::operator()(Ruleset_Ptr r) {
+    void Remove_Placeholders::operator()(Ruleset* r) {
         // Create a new selector group without placeholders
         Selector_List_Obj sl = Cast<Selector_List>(r->selector());
 
@@ -43,9 +46,9 @@ namespace Sass {
             while (cs) {
               if (cs->head()) {
                 for (Simple_Selector_Obj& ss : cs->head()->elements()) {
-                  if (Wrapped_Selector_Ptr ws = Cast<Wrapped_Selector>(ss)) {
-                    if (Selector_List_Ptr wsl = Cast<Selector_List>(ws->selector())) {
-                      Selector_List_Ptr clean = remove_placeholders(wsl);
+                  if (Wrapped_Selector* ws = Cast<Wrapped_Selector>(ss)) {
+                    if (Selector_List* wsl = Cast<Selector_List>(ws->selector())) {
+                      Selector_List* clean = remove_placeholders(wsl);
                       // also clean superflous parent selectors
                       // probably not really the correct place
                       clean->remove_parent_selectors();
@@ -70,14 +73,14 @@ namespace Sass {
         }
     }
 
-    void Remove_Placeholders::operator()(Media_Block_Ptr m) {
+    void Remove_Placeholders::operator()(Media_Block* m) {
         operator()(m->block());
     }
-    void Remove_Placeholders::operator()(Supports_Block_Ptr m) {
+    void Remove_Placeholders::operator()(Supports_Block* m) {
         operator()(m->block());
     }
 
-    void Remove_Placeholders::operator()(Directive_Ptr a) {
+    void Remove_Placeholders::operator()(Directive* a) {
         if (a->block()) a->block()->perform(this);
     }
 

data/ext/libsass/src/remove_placeholders.hpp

@@ -11,23 +11,22 @@ namespace Sass {
 
     class Remove_Placeholders : public Operation_CRTP<void, Remove_Placeholders> {
 
-        void fallback_impl(AST_Node_Ptr n) {}
-
     public:
-      Selector_List_Ptr remove_placeholders(Selector_List_Ptr);
+      Selector_List* remove_placeholders(Selector_List*);
 
     public:
         Remove_Placeholders();
         ~Remove_Placeholders() { }
 
-        void operator()(Block_Ptr);
-        void operator()(Ruleset_Ptr);
-        void operator()(Media_Block_Ptr);
-        void operator()(Supports_Block_Ptr);
-        void operator()(Directive_Ptr);
+        void operator()(Block*);
+        void operator()(Ruleset*);
+        void operator()(Media_Block*);
+        void operator()(Supports_Block*);
+        void operator()(Directive*);
 
+      // ignore missed types
         template <typename U>
-        void fallback(U x) { return fallback_impl(x); }
+      void fallback(U x) {}
     };
 
 }

data/ext/libsass/src/sass.cpp

@@ -1,4 +1,7 @@
+// sass.hpp must go before all system headers to get the
+// __EXTENSIONS__ fix on Solaris.
 #include "sass.hpp"
+
 #include <cstdlib>
 #include <cstring>
 #include <vector>
@@ -7,6 +10,7 @@
 #include "sass.h"
 #include "file.hpp"
 #include "util.hpp"
+#include "context.hpp"
 #include "sass_context.hpp"
 #include "sass_functions.hpp"
 
@@ -33,8 +37,10 @@ extern "C" {
   void* ADDCALL sass_alloc_memory(size_t size)
   {
     void* ptr = malloc(size);
-    if (ptr == NULL)
-      out_of_memory();
+    if (ptr == NULL) {
+      std::cerr << "Out of memory.\n";
+      exit(EXIT_FAILURE);
+    }
     return ptr;
   }
 
@@ -146,4 +152,4 @@ namespace Sass {
     return sass_copy_c_string(str.c_str());
   }
 
-}
+}

data/ext/libsass/src/sass.hpp

@@ -14,11 +14,17 @@
 // aplies to MSVC and MinGW
 #ifdef _WIN32
 // we do not want the ERROR macro
-# define NOGDI
+# ifndef NOGDI
+#  define NOGDI
+# endif
 // we do not want the min/max macro
-# define NOMINMAX
+# ifndef NOMINMAX
+#  define NOMINMAX
+# endif
 // we do not want the IN/OUT macro
-# define _NO_W32_PSEUDO_MODIFIERS
+# ifndef _NO_W32_PSEUDO_MODIFIERS
+#  define _NO_W32_PSEUDO_MODIFIERS
+# endif
 #endif
 
 
@@ -90,13 +96,10 @@ struct Sass_Inspect_Options {
   // Precision for fractional numbers
   int precision;
 
-  // Do not compress colors in selectors
-  bool in_selector;
-
   // initialization list (constructor with defaults)
   Sass_Inspect_Options(Sass_Output_Style style = Sass::NESTED,
-                       int precision = 5, bool in_selector = false)
-  : output_style(style), precision(precision), in_selector(in_selector)
+                       int precision = 10)
+  : output_style(style), precision(precision)
   { }
 
 };
@@ -125,7 +128,7 @@ struct Sass_Output_Options : Sass_Inspect_Options {
 
   // initialization list (constructor with defaults)
   Sass_Output_Options(Sass_Output_Style style = Sass::NESTED,
-                      int precision = 5,
+                      int precision = 10,
                       const char* indent = "  ",
                       const char* linefeed = "\n",
                       bool source_comments = false)

data/ext/libsass/src/sass2scss.cpp

@@ -154,6 +154,21 @@ namespace Sass
 
 	}
 
+	static size_t findFirstCharacter (std::string& sass, size_t pos)
+	{
+		return sass.find_first_not_of(SASS2SCSS_FIND_WHITESPACE, pos);
+	}
+
+	static size_t findLastCharacter (std::string& sass, size_t pos)
+	{
+		return sass.find_last_not_of(SASS2SCSS_FIND_WHITESPACE, pos);
+	}
+
+	static bool isUrl (std::string& sass, size_t pos)
+	{
+		return sass[pos] == 'u' && sass[pos+1] == 'r' && sass[pos+2] == 'l' && sass[pos+3] == '(';
+	}
+
 	// check if there is some char data
 	// will ignore everything in comments
 	static bool hasCharData (std::string& sass)
@@ -587,6 +602,7 @@ namespace Sass
 				sass.substr(pos_left, 5) == "@warn" ||
 				sass.substr(pos_left, 6) == "@debug" ||
 				sass.substr(pos_left, 6) == "@error" ||
+				sass.substr(pos_left, 6) == "@value" ||
 				sass.substr(pos_left, 8) == "@charset" ||
 				sass.substr(pos_left, 10) == "@namespace"
 			) { sass = indent + sass.substr(pos_left); }
@@ -606,23 +622,38 @@ namespace Sass
 			{
 				// get positions for the actual import url
 				size_t pos_import = sass.find_first_of(SASS2SCSS_FIND_WHITESPACE, pos_left + 7);
-				size_t pos_quote = sass.find_first_not_of(SASS2SCSS_FIND_WHITESPACE, pos_import);
-				// leave proper urls untouched
-				if (sass.substr(pos_quote, 4) != "url(")
-				{
-					// check if the url appears to be already quoted
-					if (sass.substr(pos_quote, 1) != "\"" && sass.substr(pos_quote, 1) != "\'")
-					{
-						// get position of the last char on the line
-						size_t pos_end = sass.find_last_not_of(SASS2SCSS_FIND_WHITESPACE);
-						// assertion check for valid result
-						if (pos_end != std::string::npos)
-						{
-							// add quotes around the full line after the import statement
-							sass = sass.substr(0, pos_quote) + "\"" + sass.substr(pos_quote, pos_end - pos_quote + 1) + "\"";
+				size_t pos = sass.find_first_not_of(SASS2SCSS_FIND_WHITESPACE, pos_import);
+				size_t start = pos;
+				bool in_dqstr = false;
+				bool in_sqstr = false;
+				bool is_escaped = false;
+				do {
+					if (is_escaped) {
+						is_escaped = false;
+					}
+					else if (sass[pos] == '\\') {
+						is_escaped = true;
+					}
+					else if (sass[pos] == '"') {
+						if (!in_sqstr) in_dqstr = ! in_dqstr;
+					}
+					else if (sass[pos] == '\'') {
+						if (!in_dqstr) in_sqstr = ! in_sqstr;
+					}
+					else if (in_dqstr || in_sqstr) {
+						// skip over quoted stuff
+					}
+					else if (sass[pos] == ',' || sass[pos] == 0) {
+						if (sass[start] != '"' && sass[start] != '\'' && !isUrl(sass, start)) {
+							size_t end = findLastCharacter(sass, pos - 1) + 1;
+							sass = sass.replace(end, 0, "\"");
+							sass = sass.replace(start, 0, "\"");
+							pos += 2;
 						}
+						start = findFirstCharacter(sass, pos + 1);
 					}
 				}
+				while (sass[pos++] != 0);
 
 			}
 			else if (