Merge branch 'master' of git://github.com/hcatlin/libsass into python

Author: dahlia

document_parser.cpp

@@ -870,11 +870,13 @@ namespace Sass {
         result << parse_string();
         result.should_eval() = true;
       }
-      else if (lex< url_schema >()) {
+      else if (peek< sequence< url_schema, spaces_and_comments, exactly<')'> > >()) {
+        lex< url_schema >();
         result << Document::make_from_token(context, lexed, path, line).parse_url_schema();
         result.should_eval() = true;
       }
-      else if (lex< url_value >()) {
+      else if (peek< sequence< url_value, spaces_and_comments, exactly<')'> > >()) {
+        lex< url_value >();
         result << context.new_Node(Node::identifier, path, line, lexed);
       }
       else {

eval_apply.cpp

@@ -57,7 +57,7 @@ namespace Sass {
 
       case Node::ruleset: {
         // if the selector contains interpolants, eval it and re-parse
-        if (expr[0].type() == Node::selector_schema) {
+        if (!expr[0].is_null() && expr[0].type() == Node::selector_schema) {
           Node schema(expr[0]);
           string expansion;
           for (size_t i = 0, S = schema.size(); i < S; ++i) {
@@ -987,7 +987,7 @@ namespace Sass {
   // combine the various kinds of selectors.
   Node expand_selector(Node sel, Node pre, Node_Factory& new_Node)
   {
-    if (pre.is_null()) return sel;
+    if (pre.is_null() || sel.is_null()) return sel;
 
     if (sel.has_backref()) {
       if ((pre.type() == Node::selector_group) && (sel.type() == Node::selector_group)) {

node.hpp

@@ -349,6 +349,7 @@ namespace Sass {
     {
       children.push_back(n);
       has_children = true;
+      if (n.is_null()) return;
       switch (n.type())
       {
         case Node::comment:

prelexer.cpp

@@ -383,5 +383,32 @@ namespace Sass {
     const char* folders(const char* src) {
       return zero_plus< folder >(src);
     }
+
+    const char* chunk(const char* src) {
+      char inside_str = 0;
+      const char* p = src;
+      size_t depth = 0;
+      while (true) {
+        if (!*p) {
+          return 0;
+        }
+        else if (!inside_str && (*p == '"' || *p == '\'')) {
+          inside_str = *p;
+        }
+        else if (*p == inside_str && *(p-1) != '\\') {
+          inside_str = 0;
+        }
+        else if (*p == '(' && !inside_str) {
+          ++depth;
+        }
+        else if (*p == ')' && !inside_str) {
+          if (depth == 0) return p;
+          else            --depth;
+        }
+        ++p;
+      }
+      // unreachable
+      return 0;
+    }
   }
 }

prelexer.hpp

@@ -447,5 +447,7 @@ namespace Sass {
       }
       return counter;
     }
+
+    const char* chunk(const char* src);
   }
 }