Rename Placeholder_Selector to PlaceholderSelector

Author: mgreter

src/ast_fwd_decl.hpp

@@ -100,7 +100,7 @@ namespace Sass {
 
 
   class Selector_Schema;
-  class Placeholder_Selector;
+  class PlaceholderSelector;
   class TypeSelector;
   class ClassSelector;
   class IDSelector;
@@ -197,7 +197,7 @@ namespace Sass {
   IMPL_MEM_OBJ(Selector);
   IMPL_MEM_OBJ(Selector_Schema);
   IMPL_MEM_OBJ(SimpleSelector);
-  IMPL_MEM_OBJ(Placeholder_Selector);
+  IMPL_MEM_OBJ(PlaceholderSelector);
   IMPL_MEM_OBJ(TypeSelector);
   IMPL_MEM_OBJ(ClassSelector);
   IMPL_MEM_OBJ(IDSelector);

src/ast_sel_cmp.cpp

@@ -329,9 +329,9 @@ namespace Sass {
     return sel ? *this == *sel : false;
   }
 
-  bool Placeholder_Selector::operator== (const SimpleSelector& rhs) const
+  bool PlaceholderSelector::operator== (const SimpleSelector& rhs) const
   {
-    auto sel = Cast<Placeholder_Selector>(&rhs);
+    auto sel = Cast<PlaceholderSelector>(&rhs);
     return sel ? *this == *sel : false;
   }
 
@@ -355,7 +355,7 @@ namespace Sass {
     return name() == rhs.name();
   }
 
-  bool Placeholder_Selector::operator== (const Placeholder_Selector& rhs) const
+  bool PlaceholderSelector::operator== (const PlaceholderSelector& rhs) const
   {
     // Placeholder has no namespacing
     return name() == rhs.name();

src/ast_selectors.cpp

@@ -174,17 +174,17 @@ namespace Sass {
   /////////////////////////////////////////////////////////////////////////
   /////////////////////////////////////////////////////////////////////////
 
-  Placeholder_Selector::Placeholder_Selector(ParserState pstate, sass::string n)
+  PlaceholderSelector::PlaceholderSelector(ParserState pstate, sass::string n)
   : SimpleSelector(pstate, n)
   { simple_type(PLACEHOLDER_SEL); }
-  Placeholder_Selector::Placeholder_Selector(const Placeholder_Selector* ptr)
+  PlaceholderSelector::PlaceholderSelector(const PlaceholderSelector* ptr)
   : SimpleSelector(ptr)
   { simple_type(PLACEHOLDER_SEL); }
-  unsigned long Placeholder_Selector::specificity() const
+  unsigned long PlaceholderSelector::specificity() const
   {
     return Constants::Specificity_Base;
   }
-  bool Placeholder_Selector::has_placeholder() {
+  bool PlaceholderSelector::has_placeholder() {
     return true;
   }
 
@@ -1019,7 +1019,7 @@ namespace Sass {
   /////////////////////////////////////////////////////////////////////////
 
   IMPLEMENT_AST_OPERATORS(Selector_Schema);
-  IMPLEMENT_AST_OPERATORS(Placeholder_Selector);
+  IMPLEMENT_AST_OPERATORS(PlaceholderSelector);
   IMPLEMENT_AST_OPERATORS(AttributeSelector);
   IMPLEMENT_AST_OPERATORS(TypeSelector);
   IMPLEMENT_AST_OPERATORS(ClassSelector);

src/ast_selectors.hpp

@@ -144,15 +144,15 @@ namespace Sass {
   /////////////////////////////////////////////////////////////////////////
   // Placeholder selectors (e.g., "%foo") for use in extend-only selectors.
   /////////////////////////////////////////////////////////////////////////
-  class Placeholder_Selector final : public SimpleSelector {
+  class PlaceholderSelector final : public SimpleSelector {
   public:
-    Placeholder_Selector(ParserState pstate, sass::string n);
+    PlaceholderSelector(ParserState pstate, sass::string n);
     bool isInvisible() const override { return true; }
     virtual unsigned long specificity() const override;
     virtual bool has_placeholder() override;
     bool operator==(const SimpleSelector& rhs) const override;
-    ATTACH_CMP_OPERATIONS(Placeholder_Selector)
-    ATTACH_AST_OPERATIONS(Placeholder_Selector)
+    ATTACH_CMP_OPERATIONS(PlaceholderSelector)
+    ATTACH_AST_OPERATIONS(PlaceholderSelector)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 

src/debugger.hpp

@@ -462,10 +462,10 @@ inline void debug_ast(AST_Node* node, sass::string ind, Env* env)
     std::cerr << " <<" << selector->ns_name() << ">>";
     std::cerr << " <" << prettyprint(selector->pstate().token.ws_before()) << ">";
     std::cerr << std::endl;
-  } else if (Cast<Placeholder_Selector>(node)) {
+  } else if (Cast<PlaceholderSelector>(node)) {
 
-    Placeholder_Selector* selector = Cast<Placeholder_Selector>(node);
-    std::cerr << ind << "Placeholder_Selector [" << selector->ns_name() << "] " << selector;
+    PlaceholderSelector* selector = Cast<PlaceholderSelector>(node);
+    std::cerr << ind << "PlaceholderSelector [" << selector->ns_name() << "] " << selector;
     std::cerr << " (" << pstate_source_position(selector) << ")"
       << " <" << selector->hash() << ">"
       << (selector->isInvisible() ? " [isInvisible]" : " -")

src/eval.hpp

@@ -89,7 +89,7 @@ namespace Sass {
     ClassSelector* operator()(ClassSelector* s) { return s; };
     TypeSelector* operator()(TypeSelector* s) { return s; };
     AttributeSelector* operator()(AttributeSelector* s) { return s; };
-    Placeholder_Selector* operator()(Placeholder_Selector* s) { return s; };
+    PlaceholderSelector* operator()(PlaceholderSelector* s) { return s; };
 
     // actual evaluated selectors
     SelectorList* operator()(Selector_Schema*);

src/inspect.cpp

@@ -934,7 +934,7 @@ namespace Sass {
     append_string("&");
   }
 
-  void Inspect::operator()(Placeholder_Selector* s)
+  void Inspect::operator()(PlaceholderSelector* s)
   {
     append_token(s->name(), s);
 

src/inspect.hpp

@@ -81,7 +81,7 @@ namespace Sass {
     virtual void operator()(Arguments*);
     // selectors
     virtual void operator()(Selector_Schema*);
-    virtual void operator()(Placeholder_Selector*);
+    virtual void operator()(PlaceholderSelector*);
     virtual void operator()(TypeSelector*);
     virtual void operator()(ClassSelector*);
     virtual void operator()(IDSelector*);

src/operation.hpp

@@ -110,7 +110,7 @@ namespace Sass {
     virtual T operator()(Arguments* x)              = 0;
     // selectors
     virtual T operator()(Selector_Schema* x)        = 0;
-    virtual T operator()(Placeholder_Selector* x)   = 0;
+    virtual T operator()(PlaceholderSelector* x)   = 0;
     virtual T operator()(TypeSelector* x)       = 0;
     virtual T operator()(ClassSelector* x)         = 0;
     virtual T operator()(IDSelector* x)            = 0;
@@ -196,7 +196,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()(Placeholder_Selector* x)   { return static_cast<D*>(this)->fallback(x); }
+    T operator()(PlaceholderSelector* x)   { return static_cast<D*>(this)->fallback(x); }
     T operator()(TypeSelector* x)       { return static_cast<D*>(this)->fallback(x); }
     T operator()(ClassSelector* x)         { return static_cast<D*>(this)->fallback(x); }
     T operator()(IDSelector* x)            { return static_cast<D*>(this)->fallback(x); }

src/parser.cpp

@@ -698,7 +698,7 @@ namespace Sass {
       return parse_attribute_selector();
     }
     else if (lex< placeholder >()) {
-      return SASS_MEMORY_NEW(Placeholder_Selector, pstate, lexed);
+      return SASS_MEMORY_NEW(PlaceholderSelector, pstate, lexed);
     }
     else {
       css_error("Invalid CSS", " after ", ": expected selector, was ");