Remove unused and obsolete code

Author: mgreter

src/ast.hpp

@@ -924,7 +924,6 @@ namespace Sass {
   typedef Environment<AST_Node_Obj> Env;
   typedef const char* Signature;
   typedef Expression_Ptr (*Native_Function)(Env&, Env&, Context&, Signature, ParserState, Backtrace*, std::vector<Selector_List_Obj>);
-  typedef const char* Signature;
   class Definition : public Has_Block {
   public:
     enum Type { MIXIN, FUNCTION };
@@ -2293,12 +2292,6 @@ namespace Sass {
     virtual void set_media_block(Media_Block_Ptr mb) {
       media_block(mb);
     }
-    virtual bool has_wrapped_selector() {
-      return false;
-    }
-    virtual bool has_placeholder() {
-      return false;
-    }
     virtual bool has_parent_ref() {
       return false;
     }
@@ -2414,6 +2407,10 @@ namespace Sass {
       return name_ == "*";
     }
 
+    virtual bool has_placeholder() {
+      return false;
+    }
+
     virtual ~Simple_Selector() = 0;
     virtual Compound_Selector_Ptr unify_with(Compound_Selector_Ptr, Context&);
     virtual bool has_parent_ref() { return false; };
@@ -2697,10 +2694,6 @@ namespace Sass {
       if (!selector()) return false;
       return selector()->has_real_parent_ref();
     }
-    virtual bool has_wrapped_selector()
-    {
-      return true;
-    }
     virtual unsigned long specificity()
     {
       return selector_ ? selector_->specificity() : 0;
@@ -2797,15 +2790,6 @@ namespace Sass {
       return sum;
     }
 
-    virtual bool has_wrapped_selector()
-    {
-      if (length() == 0) return false;
-      if (Simple_Selector_Obj ss = elements().front()) {
-        if (ss->has_wrapped_selector()) return true;
-      }
-      return false;
-    }
-
     virtual bool has_placeholder()
     {
       if (length() == 0) return false;
@@ -2939,11 +2923,6 @@ namespace Sass {
       if (tail_) tail_->set_media_block(mb);
       if (head_) head_->set_media_block(mb);
     }
-    virtual bool has_wrapped_selector() {
-      if (head_ && head_->has_wrapped_selector()) return true;
-      if (tail_ && tail_->has_wrapped_selector()) return true;
-      return false;
-    }
     virtual bool has_placeholder() {
       if (head_ && head_->has_placeholder()) return true;
       if (tail_ && tail_->has_placeholder()) return true;
@@ -3061,12 +3040,6 @@ namespace Sass {
         cs->set_media_block(mb);
       }
     }
-    virtual bool has_wrapped_selector() {
-      for (Complex_Selector_Obj cs : elements()) {
-        if (cs->has_wrapped_selector()) return true;
-      }
-      return false;
-    }
     virtual bool has_placeholder() {
       for (Complex_Selector_Obj cs : elements()) {
         if (cs->has_placeholder()) return true;

src/eval.cpp

@@ -54,11 +54,6 @@ namespace Sass {
   { }
   Eval::~Eval() { }
 
-  Context& Eval::context()
-  {
-    return ctx;
-  }
-
   Env* Eval::environment()
   {
     return exp.environment();
@@ -925,7 +920,7 @@ namespace Sass {
       } else if (sass_value_get_tag(c_val) == SASS_WARNING) {
         error("warning in C function " + c->name() + ": " + sass_warning_get_message(c_val), c->pstate(), backtrace());
       }
-      result = cval_to_astnode(c_val, ctx, backtrace(), c->pstate());
+      result = cval_to_astnode(c_val, backtrace(), c->pstate());
 
       exp.backtrace_stack.pop_back();
       sass_delete_value(c_args);
@@ -1590,7 +1585,7 @@ namespace Sass {
     return SASS_MEMORY_NEW(String_Constant, pstate ? *pstate : lhs.pstate(), lstr + sep + rstr);
   }
 
-  Expression_Ptr cval_to_astnode(union Sass_Value* v, Context& ctx, Backtrace* backtrace, ParserState pstate)
+  Expression_Ptr cval_to_astnode(union Sass_Value* v, Backtrace* backtrace, ParserState pstate)
   {
     using std::strlen;
     using std::strcpy;
@@ -1615,16 +1610,16 @@ namespace Sass {
       case SASS_LIST: {
         List_Ptr l = SASS_MEMORY_NEW(List, pstate, sass_list_get_length(v), sass_list_get_separator(v));
         for (size_t i = 0, L = sass_list_get_length(v); i < L; ++i) {
-          l->append(cval_to_astnode(sass_list_get_value(v, i), ctx, backtrace, pstate));
+          l->append(cval_to_astnode(sass_list_get_value(v, i), backtrace, pstate));
         }
         e = l;
       } break;
       case SASS_MAP: {
         Map_Ptr m = SASS_MEMORY_NEW(Map, pstate);
         for (size_t i = 0, L = sass_map_get_length(v); i < L; ++i) {
           *m << std::make_pair(
-            cval_to_astnode(sass_map_get_key(v, i), ctx, backtrace, pstate),
-            cval_to_astnode(sass_map_get_value(v, i), ctx, backtrace, pstate));
+            cval_to_astnode(sass_map_get_key(v, i), backtrace, pstate),
+            cval_to_astnode(sass_map_get_value(v, i), backtrace, pstate));
         }
         e = m;
       } break;

src/eval.hpp

@@ -27,9 +27,8 @@ namespace Sass {
     bool is_in_comment;
 
     Env* environment();
-    Context& context();
-    Selector_List_Obj selector();
     Backtrace* backtrace();
+    Selector_List_Obj selector();
 
     // for evaluating function bodies
     Expression_Ptr operator()(Block_Ptr);
@@ -103,7 +102,7 @@ namespace Sass {
 
   };
 
-  Expression_Ptr cval_to_astnode(union Sass_Value* v, Context& ctx, Backtrace* backtrace, ParserState pstate = ParserState("[AST]"));
+  Expression_Ptr cval_to_astnode(union Sass_Value* v, Backtrace* backtrace, ParserState pstate = ParserState("[AST]"));
 
 }
 

src/functions.cpp

@@ -170,23 +170,6 @@ namespace Sass {
       return Parser::parse_selector(exp_src.c_str(), ctx);
     }
 
-    template <>
-    Complex_Selector_Obj get_arg_sel(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtrace* backtrace, Context& ctx) {
-      Expression_Obj exp = ARG(argname, Expression);
-      if (exp->concrete_type() == Expression::NULL_VAL) {
-        std::stringstream msg;
-        msg << argname << ": null is not a valid selector: it must be a string,\n";
-        msg << "a list of strings, or a list of lists of strings for `" << function_name(sig) << "'";
-        error(msg.str(), pstate);
-      }
-      if (String_Constant_Ptr str = SASS_MEMORY_CAST(String_Constant, exp)) {
-        str->quote_mark(0);
-      }
-      std::string exp_src = exp->to_string(ctx.c_options) + "{";
-      Selector_List_Obj sel_list = Parser::parse_selector(exp_src.c_str(), ctx);
-      return (sel_list->length() > 0) ? &sel_list->first() : 0;
-    }
-
     template <>
     Compound_Selector_Obj get_arg_sel(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtrace* backtrace, Context& ctx) {
       Expression_Obj exp = ARG(argname, Expression);

src/parser.cpp

@@ -1016,16 +1016,6 @@ namespace Sass {
   {
     Expression_Obj key = parse_list();
     List_Obj map = SASS_MEMORY_NEW(List, pstate, 0, SASS_HASH);
-    if (String_Quoted_Ptr str = SASS_MEMORY_CAST(String_Quoted, key)) {
-      if (!str->quote_mark() && !str->is_delayed()) {
-        if (Color_Ptr_Const col = name_to_color(str->value())) {
-          Color_Ptr c = SASS_MEMORY_NEW(Color, col); // copy
-          c->pstate(str->pstate());
-          c->disp(str->value());
-          key = c;
-        }
-      }
-    }
 
     // it's not a map so return the lexed value as a list value
     if (!lex_css< exactly<':'> >())
@@ -1043,16 +1033,6 @@ namespace Sass {
       { break; }
 
       Expression_Obj key = parse_space_list();
-      if (String_Quoted_Ptr str = SASS_MEMORY_CAST(String_Quoted, key)) {
-        if (!str->quote_mark() && !str->is_delayed()) {
-          if (Color_Ptr_Const col = name_to_color(str->value())) {
-            Color_Ptr c = SASS_MEMORY_NEW(Color, col); // copy
-            c->pstate(str->pstate());
-            c->disp(str->value());
-            key = c;
-          }
-        }
-      }
 
       if (!(lex< exactly<':'> >()))
       { css_error("Invalid CSS", " after ", ": expected \":\", was "); }

src/util.cpp

@@ -438,22 +438,6 @@ namespace Sass {
       return normalized[0] == '.' ? normalized.insert(0, prefix) : normalized;
     }
 
-    // compress a color sixtuplet if possible
-    // input: "#CC9900" -> output: "#C90"
-    std::string normalize_sixtuplet(const std::string& col) {
-      if(
-        col.substr(1, 1) == col.substr(2, 1) &&
-        col.substr(3, 1) == col.substr(4, 1) &&
-        col.substr(5, 1) == col.substr(6, 1)
-      ) {
-        return std::string("#" + col.substr(1, 1)
-                          + col.substr(3, 1)
-                          + col.substr(5, 1));
-      } else {
-        return std::string(col);
-      }
-    }
-
     bool isPrintable(Ruleset_Ptr r, Sass_Output_Style style) {
       if (r == NULL) {
         return false;
@@ -647,27 +631,9 @@ namespace Sass {
       return false;
     }
 
-    std::string vecJoin(const std::vector<std::string>& vec, const std::string& sep)
-    {
-      switch (vec.size())
-      {
-        case 0:
-            return std::string("");
-        case 1:
-            return vec[0];
-        default:
-            std::ostringstream os;
-            os << vec[0];
-            for (size_t i = 1; i < vec.size(); i++) {
-              os << sep << vec[i];
-            }
-            return os.str();
-      }
+    bool isAscii(const char chr) {
+      return unsigned(chr) < 128;
     }
 
-     bool isAscii(const char chr) {
-       return unsigned(chr) < 128;
-     }
-
   }
 }

src/util.hpp

@@ -43,9 +43,6 @@ namespace Sass {
 
     std::string normalize_underscores(const std::string& str);
     std::string normalize_decimals(const std::string& str);
-    std::string normalize_sixtuplet(const std::string& col);
-
-    std::string vecJoin(const std::vector<std::string>& vec, const std::string& sep);
 
     bool isPrintable(Ruleset_Ptr r, Sass_Output_Style style = NESTED);
     bool isPrintable(Supports_Block_Ptr r, Sass_Output_Style style = NESTED);