sassc 1.1.2 → 1.2.0

data/ext/libsass/context.cpp

@@ -4,6 +4,13 @@
 #define PATH_SEP ':'
 #endif
 
+#include <string>
+#include <cstdlib>
+#include <cstring>
+#include <iomanip>
+#include <sstream>
+#include <iostream>
+
 #include "ast.hpp"
 #include "util.hpp"
 #include "sass.h"
@@ -29,13 +36,6 @@
 #include "prelexer.hpp"
 #include "emitter.hpp"
 
-#include <string>
-#include <cstdlib>
-#include <cstring>
-#include <iomanip>
-#include <sstream>
-#include <iostream>
-
 namespace Sass {
   using namespace Constants;
   using namespace File;
@@ -539,6 +539,8 @@ namespace Sass {
     // Misc Functions
     register_function(ctx, inspect_sig, inspect, env);
     register_function(ctx, unique_id_sig, unique_id, env);
+    // Selector functions
+    register_function(ctx, is_superselector_sig, is_superselector, env);
   }
 
   void register_c_functions(Context& ctx, Env* env, Sass_Function_List descrs)

data/ext/libsass/contextualize.cpp

@@ -32,12 +32,19 @@ namespace Sass {
     Selector_List* ss = 0;
     if (p) {
       ss = new (ctx.mem) Selector_List(s->pstate(), p->length() * s->length());
+      if (s->length() == 0) {
+          Complex_Selector* comb = static_cast<Complex_Selector*>(parent->perform(this));
+          if (parent->has_line_feed()) comb->has_line_feed(true);
+          if (comb) *ss << comb;
+          else cerr << "Warning: contextualize returned null" << endl;
+      }
       for (size_t i = 0, L = p->length(); i < L; ++i) {
         for (size_t j = 0, L = s->length(); j < L; ++j) {
           parent = (*p)[i];
           Complex_Selector* comb = static_cast<Complex_Selector*>((*s)[j]->perform(this));
           if (parent->has_line_feed()) comb->has_line_feed(true);
           if (comb) *ss << comb;
+          else cerr << "Warning: contextualize returned null" << endl;
         }
       }
     }

data/ext/libsass/contextualize_eval.cpp

@@ -64,7 +64,7 @@ namespace Sass {
     // the value might be interpolated; evaluate it
     String* v = s->value();
     if (v && eval) {
-     Eval* eval_with = eval->with(env, backtrace);
+     Eval* eval_with = eval->with(parent, env, backtrace);
      v = static_cast<String*>(v->perform(eval_with));
     }
     To_String toString;

data/ext/libsass/debugger.hpp

@@ -264,6 +264,9 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     cerr << ind << "If " << block;
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " " << block->tabs() << endl;
+    debug_ast(block->predicate(), ind + " = ");
+    debug_ast(block->consequent(), ind + " <>");
+    debug_ast(block->alternative(), ind + " ><");
   } else if (dynamic_cast<Return*>(node)) {
     Return* block = dynamic_cast<Return*>(node);
     cerr << ind << "Return " << block;
@@ -290,7 +293,7 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     cerr << ind << "Import " << block;
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " " << block->tabs() << endl;
-    debug_ast(block->media_queries(), ind + " @ ");
+    // debug_ast(block->media_queries(), ind + " @ ");
     // vector<string>         files_;
     for (auto imp : block->urls()) debug_ast(imp, "@ ", env);
   } else if (dynamic_cast<Assignment*>(node)) {
@@ -353,7 +356,9 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     if (block->block()) for(auto i : block->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Mixin_Call*>(node)) {
     Mixin_Call* block = dynamic_cast<Mixin_Call*>(node);
-    cerr << ind << "Mixin_Call " << block << " " << block->tabs() << endl;
+    cerr << ind << "Mixin_Call " << block << " " << block->tabs();
+    cerr << " [" <<  block->name() << "]" << endl;
+    debug_ast(block->arguments(), ind + " args: ");
     if (block->block()) for(auto i : block->block()->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Ruleset*>(node)) {
     Ruleset* ruleset = dynamic_cast<Ruleset*>(node);
@@ -380,9 +385,6 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     cerr << endl;
   } else if (dynamic_cast<Variable*>(node)) {
     Variable* expression = dynamic_cast<Variable*>(node);
-    cerr << ind << "Variable " << expression << " [" << expression->name() << "]";
-    if (expression->is_delayed()) cerr << " [delayed]";
-    cerr << endl;
     cerr << ind << "Variable " << expression;
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " [" << expression->name() << "]" << endl;
@@ -390,9 +392,6 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     if (env && env->has(name)) debug_ast(static_cast<Expression*>((*env)[name]), ind + " -> ", env);
   } else if (dynamic_cast<Function_Call_Schema*>(node)) {
     Function_Call_Schema* expression = dynamic_cast<Function_Call_Schema*>(node);
-    cerr << ind << "Function_Call_Schema " << expression << "]";
-    if (expression->is_delayed()) cerr << " [delayed]";
-    cerr << endl;
     cerr << ind << "Function_Call_Schema " << expression;
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << "" << endl;
@@ -400,29 +399,19 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     debug_ast(expression->arguments(), ind + " args: ", env);
   } else if (dynamic_cast<Function_Call*>(node)) {
     Function_Call* expression = dynamic_cast<Function_Call*>(node);
-    cerr << ind << "Function_Call " << expression << " [" << expression->name() << "]";
-    if (expression->is_delayed()) cerr << " [delayed]";
-    cerr << endl;
     cerr << ind << "Function_Call " << expression;
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " [" << expression->name() << "]" << endl;
     debug_ast(expression->arguments(), ind + " args: ", env);
   } else if (dynamic_cast<Arguments*>(node)) {
     Arguments* expression = dynamic_cast<Arguments*>(node);
-    cerr << ind << "Arguments " << expression << "]";
-    if (expression->is_delayed()) cerr << " [delayed]";
-    cerr << endl;
     cerr << ind << "Arguments " << expression;
+    if (expression->is_delayed()) cerr << " [delayed]";
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << endl;
     for(auto i : expression->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<Argument*>(node)) {
     Argument* expression = dynamic_cast<Argument*>(node);
-    cerr << ind << "Argument " << expression << " [" << expression->value() << "]";
-    if (expression->is_delayed()) cerr << " [delayed]";
-    if (expression->is_rest_argument()) cerr << " [is_rest_argument]";
-    if (expression->is_keyword_argument()) cerr << " [is_keyword_argument]";
-    cerr << endl;
     cerr << ind << "Argument " << expression;
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " [" << expression->value() << "]";
@@ -447,21 +436,15 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     cerr << " [rest: " << expression->is_rest_parameter() << "] " << endl;
   } else if (dynamic_cast<Unary_Expression*>(node)) {
     Unary_Expression* expression = dynamic_cast<Unary_Expression*>(node);
-    cerr << ind << "Unary_Expression " << expression << " [" << expression->type_name() << "]";
-    if (expression->is_delayed()) cerr << " [delayed]";
-    cerr << endl;
     cerr << ind << "Unary_Expression " << expression;
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " [" << expression->type() << "]" << endl;
     debug_ast(expression->operand(), ind + " operand: ", env);
   } else if (dynamic_cast<Binary_Expression*>(node)) {
     Binary_Expression* expression = dynamic_cast<Binary_Expression*>(node);
-    cerr << ind << "Binary_Expression " << expression << " [" << expression->type_name() << "]";
-    if (expression->is_delayed()) cerr << " [delayed]";
-    cerr << endl;
     cerr << ind << "Binary_Expression " << expression;
     cerr << " (" << pstate_source_position(node) << ")";
-    cerr << " [" << expression->type() << "]" << endl;
+    cerr << " [" << expression->type_name() << "]" << endl;
     debug_ast(expression->left(), ind + " left:  ", env);
     debug_ast(expression->right(), ind + " right: ", env);
   } else if (dynamic_cast<Map*>(node)) {
@@ -469,6 +452,10 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     cerr << ind << "Map " << expression;
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " [Hashed]" << endl;
+    // for (auto i : expression->elements()) {
+    //   debug_ast(i.first, ind + " key: ");
+    //   debug_ast(i.second, ind + " val: ");
+    // }
   } else if (dynamic_cast<List*>(node)) {
     List* expression = dynamic_cast<List*>(node);
     cerr << ind << "List " << expression;
@@ -476,9 +463,6 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     cerr << " (" << expression->length() << ") " <<
       (expression->separator() == Sass::List::Separator::COMMA ? "Comma " : "Space ") <<
       " [delayed: " << expression->is_delayed() << "] " <<
-      " [interpolant: " << expression->is_interpolant() << "]";
-    if (expression->is_arglist()) cerr << " [is_arglist]";
-    cerr << endl;
       " [interpolant: " << expression->is_interpolant() << "] " <<
       " [arglist: " << expression->is_arglist() << "] " <<
       endl;
@@ -490,79 +474,52 @@ inline void debug_ast(AST_Node* node, string ind = "", Env* env = 0)
     cerr << " [Statement]" << endl;
   } else if (dynamic_cast<Boolean*>(node)) {
     Boolean* expression = dynamic_cast<Boolean*>(node);
-    cerr << ind << "Boolean " << expression << " [" << expression->value() << "]";
-    if (expression->is_delayed()) cerr << " [delayed]";
-    cerr << endl;
     cerr << ind << "Boolean " << expression;
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " [" << expression->value() << "]" << endl;
   } else if (dynamic_cast<Color*>(node)) {
     Color* expression = dynamic_cast<Color*>(node);
-    cerr << ind << "Color " << expression << " [" << expression->r() << ":"  << expression->g() << ":" << expression->b() << "@" << expression->a() << "]";
-    if (expression->is_delayed()) cerr << " [delayed]";
-    cerr << endl;
     cerr << ind << "Color " << expression;
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " [" << expression->r() << ":"  << expression->g() << ":" << expression->b() << "@" << expression->a() << "]" << endl;
   } else if (dynamic_cast<Number*>(node)) {
     Number* expression = dynamic_cast<Number*>(node);
-    cerr << ind << "Number " << expression << " [" << expression->value() << expression->unit() << "]";
-    if (expression->is_delayed()) cerr << " [delayed]";
-    cerr << endl;
     cerr << ind << "Number " << expression;
     cerr << " (" << pstate_source_position(node) << ")";
     cerr << " [" << expression->value() << expression->unit() << "]" << endl;
   } else if (dynamic_cast<String_Quoted*>(node)) {
     String_Quoted* expression = dynamic_cast<String_Quoted*>(node);
-    cerr << ind << "String_Quoted : " << expression << " [";
-    cerr << prettyprint(expression->value()) << "]";
+    cerr << ind << "String_Quoted " << expression;
+    cerr << " (" << pstate_source_position(node) << ")";
+    cerr << " [" << prettyprint(expression->value()) << "]";
     if (expression->is_delayed()) cerr << " [delayed]";
     if (expression->sass_fix_1291()) cerr << " [sass_fix_1291]";
-    if (expression->quote_mark()) cerr << " [quote_mark]";
+    if (expression->quote_mark()) cerr << " [quote_mark: " << expression->quote_mark() << "]";
     cerr << " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << endl;
-    cerr << ind << "String_Quoted : " << expression;
-    cerr << " (" << pstate_source_position(node) << ")";
-    cerr << " [" << prettyprint(expression->value()) << "]" <<
-      (expression->is_delayed() ? " {delayed}" : "") <<
-      (expression->sass_fix_1291() ? " {sass_fix_1291}" : "") <<
-      (expression->quote_mark() != 0 ? " {qm:" + string(1, expression->quote_mark()) + "}" : "") <<
-      " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << endl;
   } else if (dynamic_cast<String_Constant*>(node)) {
     String_Constant* expression = dynamic_cast<String_Constant*>(node);
-    cerr << ind << "String_Constant : " << expression;
+    cerr << ind << "String_Constant " << expression;
+    cerr << " " << expression->concrete_type() <<
+    cerr << " (" << pstate_source_position(node) << ")";
     cerr << " [" << prettyprint(expression->value()) << "]";
     if (expression->is_delayed()) cerr << " [delayed]";
     if (expression->sass_fix_1291()) cerr << " [sass_fix_1291]";
-    cerr " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << endl;
-    cerr << ind << "String_Constant : " << expression;
-    cerr << " (" << pstate_source_position(node) << ")";
-    cerr << " [" << prettyprint(expression->value()) << "]" <<
-      (expression->is_delayed() ? " {delayed}" : "") <<
-      (expression->sass_fix_1291() ? " {sass_fix_1291}" : "") <<
-      (expression->quote_mark() != 0 ? " {qm:" + string(1, expression->quote_mark()) + "}" : "") <<
-      " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << endl;
+    cerr << " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << endl;
   } else if (dynamic_cast<String_Schema*>(node)) {
     String_Schema* expression = dynamic_cast<String_Schema*>(node);
-    cerr << ind << "String_Schema " << expression << " [" << expression->concrete_type() << "]";
+    cerr << ind << "String_Schema " << expression;
+    cerr << " " << expression->concrete_type();
     if (expression->is_delayed()) cerr << " [delayed]";
     if (expression->has_interpolants()) cerr << " [has_interpolants]";
-    cerr " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << endl;
-    cerr << ind << "String_Schema " << expression;
-    cerr << " (" << pstate_source_position(node) << ")";
-    cerr << " " << expression->concrete_type() <<
-      (expression->has_interpolants() ? " {has_interpolants}" : "") <<
-      endl;
+    cerr << " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << endl;
     for(auto i : expression->elements()) { debug_ast(i, ind + " ", env); }
   } else if (dynamic_cast<String*>(node)) {
     String* expression = dynamic_cast<String*>(node);
-    cerr << ind << "String " << expression << expression->concrete_type();
-    if (expression->sass_fix_1291()) cerr << " [sass_fix_1291]";
-    cerr " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << endl;
     cerr << ind << "String " << expression;
+    cerr << " " << expression->concrete_type();
     cerr << " (" << pstate_source_position(node) << ")";
-    cerr << expression->concrete_type() <<
-      " " << (expression->sass_fix_1291() ? "{sass_fix_1291}" : "") <<
-      endl;
+    if (expression->sass_fix_1291()) cerr << " [sass_fix_1291]";
+    cerr << " <" << prettyprint(expression->pstate().token.ws_before()) << ">" << endl;
   } else if (dynamic_cast<Expression*>(node)) {
     Expression* expression = dynamic_cast<Expression*>(node);
     cerr << ind << "Expression " << expression;

data/ext/libsass/emitter.cpp

@@ -18,7 +18,8 @@ namespace Sass {
     in_wrapped(false),
     in_media_block(false),
     in_declaration(false),
-    in_declaration_list(false)
+    in_space_array(false),
+    in_comma_array(false)
   { }
 
   // return buffer as string
@@ -191,7 +192,9 @@ namespace Sass {
   {
     if (output_style() != COMPRESSED && buffer().size()) {
       char lst = buffer().at(buffer().length() - 1);
-      if (!isspace(lst)) append_mandatory_space();
+      if (!isspace(lst) || scheduled_delimiter) {
+        append_mandatory_space();
+      }
     }
   }
 

data/ext/libsass/emitter.hpp

@@ -37,11 +37,17 @@ namespace Sass {
       bool scheduled_delimiter;
 
     public:
+      // output strings different in comments
       bool in_comment;
+      // selector list does not get linefeeds
       bool in_wrapped;
+      // lists always get a space after delimiter
       bool in_media_block;
+      // nested list must not have parentheses
       bool in_declaration;
-      bool in_declaration_list;
+      // nested lists need parentheses
+      bool in_space_array;
+      bool in_comma_array;
 
     public:
       // return buffer as string

data/ext/libsass/eval.cpp

@@ -1,3 +1,10 @@
+#include <cstdlib>
+#include <cmath>
+#include <iostream>
+#include <sstream>
+#include <iomanip>
+#include <typeinfo>
+
 #include "file.hpp"
 #include "eval.hpp"
 #include "ast.hpp"
@@ -11,12 +18,6 @@
 #include "prelexer.hpp"
 #include "parser.hpp"
 
-#include <cstdlib>
-#include <cmath>
-#include <iostream>
-#include <iomanip>
-#include <typeinfo>
-
 namespace Sass {
   using namespace std;
 
@@ -397,6 +398,13 @@ namespace Sass {
     for (auto key : m->keys()) {
       *mm << std::make_pair(key->perform(this), m->at(key)->perform(this));
     }
+
+    // check for duplicate keys
+    if (mm->has_duplicate_key()) {
+      To_String to_string(&ctx);
+      error("Duplicate key \"" + mm->get_duplicate_key()->perform(&to_string) + "\" in map " + m->perform(&to_string) + ".", m->pstate());
+    }
+
     mm->is_expanded(true);
     return mm;
   }
@@ -528,7 +536,9 @@ namespace Sass {
   Expression* Eval::operator()(Function_Call* c)
   {
     if (backtrace->parent != NULL && backtrace->depth() > Constants::MaxCallStack) {
-        error("Stack depth exceeded max of " + to_string(Constants::MaxCallStack), c->pstate(), backtrace);
+        ostringstream stm;
+        stm << "Stack depth exceeded max of " << Constants::MaxCallStack;
+        error(stm.str(), c->pstate(), backtrace);
     }
     string name(Util::normalize_underscores(c->name()));
     string full_name(name + "[f]");
@@ -876,6 +886,7 @@ namespace Sass {
       Expression* value = static_cast<Expression*>((*env)[name]);
       return evacuate_quotes(interpolation(value));
     } else if (Binary_Expression* var = dynamic_cast<Binary_Expression*>(s)) {
+      var->is_delayed(false);
       Expression* ex = var->perform(this);
       return evacuate_quotes(interpolation(ex));
     } else if (Function_Call* var = dynamic_cast<Function_Call*>(s)) {
@@ -901,9 +912,9 @@ namespace Sass {
   {
     string acc;
     for (size_t i = 0, L = s->length(); i < L; ++i) {
-      if (String_Quoted* str_quoted = dynamic_cast<String_Quoted*>((*s)[i])) {
-        if (!str_quoted->is_delayed()) str_quoted->value(string_eval_escapes(str_quoted->value()));
-      }
+      // if (String_Quoted* str_quoted = dynamic_cast<String_Quoted*>((*s)[i])) {
+        // if (!str_quoted->is_delayed()) str_quoted->value(string_eval_escapes(str_quoted->value()));
+      // }
       acc += interpolation((*s)[i]);
     }
     String_Quoted* str = new (ctx.mem) String_Quoted(s->pstate(), acc);
@@ -1014,8 +1025,7 @@ namespace Sass {
         is_rest_argument = false;
         is_keyword_argument = true;
       }
-      else
-      if(val->concrete_type() != Expression::LIST) {
+      else if(val->concrete_type() != Expression::LIST) {
         List* wrapper = new (ctx.mem) List(val->pstate(),
                                            0,
                                            List::COMMA,
@@ -1047,9 +1057,13 @@ namespace Sass {
 
   Expression* Eval::operator()(Parent_Selector* p)
   {
+    // no idea why both calls are needed
     Selector* s = p->perform(contextualize);
+    if (!s) s = p->selector()->perform(contextualize);
     // access to parent selector may return 0
     Selector_List* l = static_cast<Selector_List*>(s);
+    // some spec tests cause this (might be a valid case!)
+    // if (!s) { cerr << "Parent Selector eval error" << endl; }
     if (!s) { l = new (ctx.mem) Selector_List(p->pstate()); }
     return l->perform(listize);
   }
@@ -1186,7 +1200,7 @@ namespace Sass {
     } else {
       v->value(ops[op](lv, tmp.value()));
     }
-    // v->normalize();
+    v->normalize();
     return v;
   }
 

data/ext/libsass/expand.cpp

@@ -54,8 +54,8 @@ namespace Sass {
     }
 
     Contextualize_Eval* contextual = contextualize_eval->with(selector_stack.back(), env, backtrace);
-    if (old_in_at_root && !r->selector()->has_reference())
-      contextual = contextualize_eval->with(at_root_selector_stack.back(), env, backtrace);
+    // if (old_in_at_root && !r->selector()->has_reference())
+    //   contextual = contextualize_eval->with(selector_stack.back(), env, backtrace);
 
     Selector* sel_ctx = r->selector()->perform(contextual);
     if (sel_ctx == 0) throw "Cannot expand null selector";

data/ext/libsass/functions.cpp

@@ -1107,7 +1107,7 @@ namespace Sass {
 
       List* list = dynamic_cast<List*>(env["$list"]);
       return new (ctx.mem) Number(pstate,
-                                  list ? list->length() : 1);
+                                  list ? list->size() : 1);
     }
 
     Signature nth_sig = "nth($list, $n)";
@@ -1217,7 +1217,18 @@ namespace Sass {
       else if (sep_str == "comma") result->separator(List::COMMA);
       else if (sep_str != "auto") error("argument `$separator` of `" + string(sig) + "` must be `space`, `comma`, or `auto`", pstate);
       *result += l;
-      *result << v;
+      bool is_arglist = l->is_arglist();
+      result->is_arglist(is_arglist);
+      if (is_arglist) {
+        *result << new (ctx.mem) Argument(v->pstate(),
+                                          v,
+                                          "",
+                                          false,
+                                          false);
+
+      } else {
+        *result << v;
+      }
       return result;
     }
 
@@ -1345,13 +1356,10 @@ namespace Sass {
     {
       List* arglist = new (ctx.mem) List(*ARG("$args", List));
       Map* result = new (ctx.mem) Map(pstate, 1);
-      // The parser ensures the ordering of arguments so we can assert this
-      // isn't keyword argument list the first argument isn't a keyword argument
-      if (!(arglist->empty() || ((Argument*)(*arglist)[0])->is_keyword_argument())) return result;
-      for (size_t i = 0, L = arglist->length(); i < L; ++i) {
+      for (size_t i = arglist->size(), L = arglist->length(); i < L; ++i) {
         string name = string(((Argument*)(*arglist)[i])->name());
-        string sanitized_name = string(name, 1);
-        *result << make_pair(new (ctx.mem) String_Constant(pstate, sanitized_name),
+        name = name.erase(0, 1); // sanitize name (remove dollar sign)
+        *result << make_pair(new (ctx.mem) String_Constant(pstate, name),
                              ((Argument*)(*arglist)[i])->value());
       }
       return result;
@@ -1540,11 +1548,14 @@ namespace Sass {
       } else if (v->concrete_type() == Expression::STRING) {
         return v;
       } else {
+        bool parentheses = v->concrete_type() == Expression::MAP ||
+                           v->concrete_type() == Expression::LIST;
         Output_Style old_style;
         old_style = ctx.output_style;
         ctx.output_style = NESTED;
-        To_String to_string(&ctx);
+        To_String to_string(&ctx, false);
         string inspect = v->perform(&to_string);
+        if (inspect.empty() && parentheses) inspect = "()";
         ctx.output_style = old_style;
         return new (ctx.mem) String_Constant(pstate, inspect);
 
@@ -1553,6 +1564,20 @@ namespace Sass {
       // return v;
     }
 
+    Signature is_superselector_sig = "is-superselector($super, $sub)";
+    BUILT_IN(is_superselector)
+    {
+      To_String to_string(&ctx, false);
+      Expression*  ex_sup = ARG("$super", Expression);
+      Expression*  ex_sub = ARG("$sub", Expression);
+      string sup_src = ex_sup->perform(&to_string) + "{";
+      string sub_src = ex_sub->perform(&to_string) + "{";
+      Selector_List* sel_sup = Parser::parse_selector(sup_src.c_str(), ctx);
+      Selector_List* sel_sub = Parser::parse_selector(sub_src.c_str(), ctx);
+      bool result = sel_sup->is_superselector_of(sel_sub);
+      return new (ctx.mem) Boolean(pstate, result);
+    }
+
     Signature unique_id_sig = "unique-id()";
     BUILT_IN(unique_id)
     {