Rename the Selector_Placeholder AST node to Placeholder_Selector

This better matches the Ruby Sass implementation.

Author: xzyfer

src/ast.cpp

@@ -1047,8 +1047,8 @@ namespace Sass {
             tss->name(tss->name() + (*h)[0]->name());
             (*rh)[rh->length()-1] = tss;
             for (i = 1; i < L; ++i) *rh << (*h)[i];
-          } else if (Selector_Placeholder* ps = dynamic_cast<Selector_Placeholder*>(rh->last())) {
-            Selector_Placeholder* pss = new Selector_Placeholder(*ps);
+          } else if (Placeholder_Selector* ps = dynamic_cast<Placeholder_Selector*>(rh->last())) {
+            Placeholder_Selector* pss = new Placeholder_Selector(*ps);
             pss->name(pss->name() + (*h)[0]->name());
             (*rh)[rh->length()-1] = pss;
             for (i = 1; i < L; ++i) *rh << (*h)[i];
@@ -1351,7 +1351,7 @@ namespace Sass {
   }
 
   /* not used anymore - remove?
-  Selector_Placeholder* Selector::find_placeholder()
+  Placeholder_Selector* Selector::find_placeholder()
   {
     return 0;
   }*/

src/ast.hpp

@@ -2033,17 +2033,17 @@ namespace Sass {
   /////////////////////////////////////////////////////////////////////////
   // Placeholder selectors (e.g., "%foo") for use in extend-only selectors.
   /////////////////////////////////////////////////////////////////////////
-  class Selector_Placeholder : public Simple_Selector {
+  class Placeholder_Selector : public Simple_Selector {
   public:
-    Selector_Placeholder(ParserState pstate, std::string n)
+    Placeholder_Selector(ParserState pstate, std::string n)
     : Simple_Selector(pstate, n)
     { has_placeholder(true); }
     virtual unsigned long specificity()
     {
       return Constants::Specificity_Base;
     }
-    // virtual Selector_Placeholder* find_placeholder();
-    virtual ~Selector_Placeholder() {};
+    // virtual Placeholder_Selector* find_placeholder();
+    virtual ~Placeholder_Selector() {};
     ATTACH_OPERATIONS()
   };
 
@@ -2265,7 +2265,7 @@ namespace Sass {
 
     Complex_Selector* to_complex(Memory_Manager& mem);
     Compound_Selector* unify_with(Compound_Selector* rhs, Context& ctx);
-    // virtual Selector_Placeholder* find_placeholder();
+    // virtual Placeholder_Selector* find_placeholder();
     virtual bool has_parent_ref();
     Simple_Selector* base()
     {
@@ -2408,7 +2408,7 @@ namespace Sass {
     virtual bool is_superselector_of(Compound_Selector* sub, std::string wrapping = "");
     virtual bool is_superselector_of(Complex_Selector* sub, std::string wrapping = "");
     virtual bool is_superselector_of(Selector_List* sub, std::string wrapping = "");
-    // virtual Selector_Placeholder* find_placeholder();
+    // virtual Placeholder_Selector* find_placeholder();
     Selector_List* unify_with(Complex_Selector* rhs, Context& ctx);
     Combinator clear_innermost();
     void append(Context&, Complex_Selector*);
@@ -2516,7 +2516,7 @@ namespace Sass {
     // basically unwraps parsed selectors
     virtual bool has_parent_ref();
     void remove_parent_selectors();
-    // virtual Selector_Placeholder* find_placeholder();
+    // virtual Placeholder_Selector* find_placeholder();
     Selector_List* resolve_parent_refs(Context& ctx, Selector_List* parents, bool implicit_parent = true);
     virtual bool is_superselector_of(Compound_Selector* sub, std::string wrapping = "");
     virtual bool is_superselector_of(Complex_Selector* sub, std::string wrapping = "");

src/ast_fwd_decl.hpp

@@ -73,7 +73,7 @@ namespace Sass {
   // selectors
   class Selector;
   class Selector_Schema;
-  class Selector_Placeholder;
+  class Placeholder_Selector;
   class Element_Selector;
   class Selector_Qualifier;
   class Attribute_Selector;

src/debugger.hpp

@@ -211,10 +211,10 @@ inline void debug_ast(AST_Node* node, std::string ind, Env* env)
     std::cerr << (selector->has_line_feed() ? " [line-feed]": " -");
     std::cerr << " <" << prettyprint(selector->pstate().token.ws_before()) << ">";
     std::cerr << std::endl;
-  } else if (dynamic_cast<Selector_Placeholder*>(node)) {
+  } else if (dynamic_cast<Placeholder_Selector*>(node)) {
 
-    Selector_Placeholder* selector = dynamic_cast<Selector_Placeholder*>(node);
-    std::cerr << ind << "Selector_Placeholder [" << selector->ns_name() << "] " << selector
+    Placeholder_Selector* selector = dynamic_cast<Placeholder_Selector*>(node);
+    std::cerr << ind << "Placeholder_Selector [" << selector->ns_name() << "] " << selector
       << " <" << selector->hash() << ">"
       << " [@media:" << selector->media_block() << "]"
       << (selector->is_optional() ? " [is_optional]": " -")

src/eval.hpp

@@ -78,7 +78,7 @@ namespace Sass {
     Pseudo_Selector* operator()(Pseudo_Selector* s) { return s; };
     Wrapped_Selector* operator()(Wrapped_Selector* s) { return s; };
     Selector_Qualifier* operator()(Selector_Qualifier* s) { return s; };
-    Selector_Placeholder* operator()(Selector_Placeholder* s) { return s; };
+    Placeholder_Selector* operator()(Placeholder_Selector* s) { return s; };
     // actual evaluated selectors
     Selector_List* operator()(Selector_Schema*);
     Expression* operator()(Parent_Selector*);

src/inspect.cpp

@@ -879,7 +879,7 @@ namespace Sass {
     append_string("&");
   }
 
-  void Inspect::operator()(Selector_Placeholder* s)
+  void Inspect::operator()(Placeholder_Selector* s)
   {
     append_token(s->name(), s);
     if (s->has_line_break()) append_optional_linefeed();

src/inspect.hpp

@@ -81,7 +81,7 @@ namespace Sass {
     virtual void operator()(Arguments*);
     // selectors
     virtual void operator()(Selector_Schema*);
-    virtual void operator()(Selector_Placeholder*);
+    virtual void operator()(Placeholder_Selector*);
     virtual void operator()(Element_Selector*);
     virtual void operator()(Selector_Qualifier*);
     virtual void operator()(Attribute_Selector*);

src/operation.hpp

@@ -71,7 +71,7 @@ namespace Sass {
     virtual T operator()(Arguments* x)              = 0;
     // selectors
     virtual T operator()(Selector_Schema* x)        = 0;
-    virtual T operator()(Selector_Placeholder* x)   = 0;
+    virtual T operator()(Placeholder_Selector* x)   = 0;
     virtual T operator()(Element_Selector* x)       = 0;
     virtual T operator()(Selector_Qualifier* x)     = 0;
     virtual T operator()(Attribute_Selector* x)     = 0;
@@ -152,7 +152,7 @@ namespace Sass {
     T operator()(Arguments* x)              { return static_cast<D*>(this)->fallback(x); }
     // selectors
     T operator()(Selector_Schema* x)        { return static_cast<D*>(this)->fallback(x); }
-    T operator()(Selector_Placeholder* x)   { return static_cast<D*>(this)->fallback(x); }
+    T operator()(Placeholder_Selector* x)   { return static_cast<D*>(this)->fallback(x); }
     T operator()(Element_Selector* x)       { return static_cast<D*>(this)->fallback(x); }
     T operator()(Selector_Qualifier* x)     { return static_cast<D*>(this)->fallback(x); }
     T operator()(Attribute_Selector* x)     { return static_cast<D*>(this)->fallback(x); }

src/parser.cpp

@@ -821,7 +821,7 @@ namespace Sass {
       return parse_attribute_selector();
     }
     else if (lex< placeholder >()) {
-      Selector_Placeholder* sel = SASS_MEMORY_NEW(ctx.mem, Selector_Placeholder, pstate, lexed);
+      Placeholder_Selector* sel = SASS_MEMORY_NEW(ctx.mem, Placeholder_Selector, pstate, lexed);
       sel->media_block(last_media_block);
       return sel;
     }