sass#548 removing commented out code thanks @mgreter.

ast.hpp

@@ -87,7 +87,7 @@ namespace Sass {
       STRING,
       LIST,
       MAP,
-	  SELECTOR,
+      SELECTOR,
       NULL_VAL,
       NUM_TYPES
     };

contextualize_eval.cpp

@@ -14,7 +14,7 @@ namespace Sass {
   Contextualize_Eval::~Contextualize_Eval() { }
 
   Selector* Contextualize_Eval::fallback_impl(AST_Node* n)
-  { return Contextualize::parent; }
+  { return Contextualize::fallback_impl(n); }
 
   Contextualize_Eval* Contextualize_Eval::with(Selector* s, Env* e, Backtrace* bt, Selector* p, Selector* ex)
   {
@@ -26,7 +26,7 @@ namespace Sass {
   Selector* Contextualize_Eval::operator()(Selector_Schema* s)
   {
     To_String to_string;
-    string result_str(s->contents()->perform(eval)->perform(&to_string));  //->with(env, backtrace)
+    string result_str(s->contents()->perform(eval)->perform(&to_string));
     result_str += '{'; // the parser looks for a brace to end the selector
     Selector* result_sel = Parser::from_c_str(result_str.c_str(), ctx, s->pstate()).parse_selector_group();
     return result_sel->perform(this);
@@ -85,9 +85,4 @@ namespace Sass {
   {
     return Contextualize::operator ()(s);
   }
-
-  /*
-  Selector* Contextualize_Eval::operator()(Parent_Selector* p)
-  { error("amp", p->pstate()); return p->perform(eval->contextualize); }
-  */
 }

contextualize_eval.hpp

@@ -12,12 +12,9 @@ namespace Sass {
 
   typedef Environment<AST_Node*> Env;
 
-  class Contextualize_Eval : public Contextualize {//Operation_CRTP<Selector*, Contextualize_Eval> {
+  class Contextualize_Eval : public Contextualize {
 
-    //Context&   ctx;
     Eval*      eval;
-    //Env*       env;
-    //Backtrace* backtrace;
 
     Selector* fallback_impl(AST_Node* n);
 
@@ -38,7 +35,6 @@ namespace Sass {
     Selector* operator()(Type_Selector*);
     Selector* operator()(Selector_Placeholder*);
     Selector* operator()(Selector_Reference*);
-    //Selector* operator()(Parent_Selector* p);
 
     template <typename U>
     Selector* fallback(U x) { return fallback_impl(x); }

inspect.cpp

@@ -669,7 +669,7 @@ namespace Sass {
   {
     if (p->selector()) {
       p->selector()->perform(this);
-      append_string(";");
+      append_delimiter();
     }
     else {
       append_string("&");

parser.cpp

@@ -587,7 +587,7 @@ namespace Sass {
       (*seq) << new (ctx.mem) Selector_Reference(pstate);
       sawsomething = true;
       // if you see a space after a &, then you're done
-      if(peek< spaces >() || peek< exactly<';'> >()) {
+      if(peek< spaces >() || peek< alternatives < spaces, exactly<';'> > >()) {
         return seq;
       }
     }
@@ -1208,13 +1208,6 @@ namespace Sass {
       }
       return value;
     }
-/*    else if (lex <interpolant>()) {
-      const char* stop;
-      if ((stop = peek< value_schema >()))
-      { return Parser::from_token(lexed, ctx, pstate).parse_value_schema(stop); }
-      else{
-      return Parser::from_token(lexed, ctx, pstate).parse_value_schema(stop);}
-    }*/
     else if (peek< ie_property >()) {
       return parse_ie_property();
     }