Rename Id_Selector to IDSelector

Author: mgreter

src/ast_fwd_decl.hpp

@@ -103,7 +103,7 @@ namespace Sass {
   class Placeholder_Selector;
   class Type_Selector;
   class Class_Selector;
-  class Id_Selector;
+  class IDSelector;
   class Attribute_Selector;
 
   class Pseudo_Selector;
@@ -200,7 +200,7 @@ namespace Sass {
   IMPL_MEM_OBJ(Placeholder_Selector);
   IMPL_MEM_OBJ(Type_Selector);
   IMPL_MEM_OBJ(Class_Selector);
-  IMPL_MEM_OBJ(Id_Selector);
+  IMPL_MEM_OBJ(IDSelector);
   IMPL_MEM_OBJ(Attribute_Selector);
   IMPL_MEM_OBJ(Pseudo_Selector);
 

src/ast_sel_cmp.cpp

@@ -299,9 +299,9 @@ namespace Sass {
   /*#########################################################################*/
   /*#########################################################################*/
 
-  bool Id_Selector::operator== (const SimpleSelector& rhs) const
+  bool IDSelector::operator== (const SimpleSelector& rhs) const
   {
-    auto sel = Cast<Id_Selector>(&rhs);
+    auto sel = Cast<IDSelector>(&rhs);
     return sel ? *this == *sel : false;
   }
 
@@ -338,7 +338,7 @@ namespace Sass {
   /*#########################################################################*/
   /*#########################################################################*/
 
-  bool Id_Selector::operator== (const Id_Selector& rhs) const
+  bool IDSelector::operator== (const IDSelector& rhs) const
   {
     // ID has no namespacing
     return name() == rhs.name();

src/ast_sel_super.cpp

@@ -124,11 +124,11 @@ namespace Sass {
   // ##########################################################################
   // ##########################################################################
   bool idIsSuperselectorOfCompound(
-    const Id_Selector_Obj& id,
+    const IDSelectorObj& id,
     const CompoundSelectorObj& compound)
   {
     for (const SimpleSelectorObj& simple : compound->elements()) {
-      if (const Id_Selector_Obj& rhs = Cast<Id_Selector>(simple)) {
+      if (const IDSelectorObj& rhs = Cast<IDSelector>(simple)) {
         if (*id != *rhs) return true;
       }
     }
@@ -166,7 +166,7 @@ namespace Sass {
           if (typeIsSuperselectorOfCompound(type2, compound1)) return true;
         }
       }
-      else if (const Id_Selector_Obj& id2 = Cast<Id_Selector>(simple2)) {
+      else if (const IDSelectorObj& id2 = Cast<IDSelector>(simple2)) {
         if (const CompoundSelectorObj& compound1 = Cast<CompoundSelector>(parent->last())) {
           if (idIsSuperselectorOfCompound(id2, compound1)) return true;
         }

src/ast_sel_unify.cpp

@@ -143,10 +143,10 @@ namespace Sass {
   // ##########################################################################
   // This is implemented in `selector/id.dart` as `PseudoSelector::unify`
   // ##########################################################################
-  CompoundSelector* Id_Selector::unifyWith(CompoundSelector* rhs)
+  CompoundSelector* IDSelector::unifyWith(CompoundSelector* rhs)
   {
     for (const SimpleSelector* sel : rhs->elements()) {
-      if (const Id_Selector* id_sel = Cast<Id_Selector>(sel)) {
+      if (const IDSelector* id_sel = Cast<IDSelector>(sel)) {
         if (id_sel->name() != name()) return nullptr;
       }
     }

src/ast_sel_weave.cpp

@@ -24,7 +24,7 @@ namespace Sass {
   // ##########################################################################
   bool isUnique(const SimpleSelector* simple)
   {
-    if (Cast<Id_Selector>(simple)) return true;
+    if (Cast<IDSelector>(simple)) return true;
     if (const Pseudo_Selector * pseudo = Cast<Pseudo_Selector>(simple)) {
       if (pseudo->is_pseudo_element()) return true;
     }

src/ast_selectors.cpp

@@ -222,14 +222,14 @@ namespace Sass {
   /////////////////////////////////////////////////////////////////////////
   /////////////////////////////////////////////////////////////////////////
 
-  Id_Selector::Id_Selector(ParserState pstate, sass::string n)
+  IDSelector::IDSelector(ParserState pstate, sass::string n)
   : SimpleSelector(pstate, n)
   { simple_type(ID_SEL); }
-  Id_Selector::Id_Selector(const Id_Selector* ptr)
+  IDSelector::IDSelector(const IDSelector* ptr)
   : SimpleSelector(ptr)
   { simple_type(ID_SEL); }
 
-  unsigned long Id_Selector::specificity() const
+  unsigned long IDSelector::specificity() const
   {
     return Constants::Specificity_ID;
   }
@@ -1023,7 +1023,7 @@ namespace Sass {
   IMPLEMENT_AST_OPERATORS(Attribute_Selector);
   IMPLEMENT_AST_OPERATORS(Type_Selector);
   IMPLEMENT_AST_OPERATORS(Class_Selector);
-  IMPLEMENT_AST_OPERATORS(Id_Selector);
+  IMPLEMENT_AST_OPERATORS(IDSelector);
   IMPLEMENT_AST_OPERATORS(Pseudo_Selector);
   IMPLEMENT_AST_OPERATORS(SelectorCombinator);
   IMPLEMENT_AST_OPERATORS(CompoundSelector);

src/ast_selectors.hpp

@@ -117,7 +117,7 @@ namespace Sass {
     virtual CompoundSelector* unifyWith(CompoundSelector*);
 
     /* helper function for syntax sugar */
-    virtual Id_Selector* getIdSelector() { return NULL; }
+    virtual IDSelector* getIdSelector() { return NULL; }
     virtual Type_Selector* getTypeSelector() { return NULL; }
     virtual Pseudo_Selector* getPseudoSelector() { return NULL; }
 
@@ -188,15 +188,15 @@ namespace Sass {
   ////////////////////////////////////////////////
   // ID selectors -- i.e., #foo.
   ////////////////////////////////////////////////
-  class Id_Selector final : public SimpleSelector {
+  class IDSelector final : public SimpleSelector {
   public:
-    Id_Selector(ParserState pstate, sass::string n);
+    IDSelector(ParserState pstate, sass::string n);
     virtual unsigned long specificity() const override;
     CompoundSelector* unifyWith(CompoundSelector*) override;
-    Id_Selector* getIdSelector() final override { return this; }
+    IDSelector* getIdSelector() final override { return this; }
     bool operator==(const SimpleSelector& rhs) const final override;
-    ATTACH_CMP_OPERATIONS(Id_Selector)
-    ATTACH_AST_OPERATIONS(Id_Selector)
+    ATTACH_CMP_OPERATIONS(IDSelector)
+    ATTACH_AST_OPERATIONS(IDSelector)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 

src/debugger.hpp

@@ -447,9 +447,9 @@ inline void debug_ast(AST_Node* node, sass::string ind, Env* env)
     std::cerr << " <" << selector->hash() << ">";
     std::cerr << " <<" << selector->ns_name() << ">>";
     std::cerr << std::endl;
-  } else if (Cast<Id_Selector>(node)) {
-    Id_Selector* selector = Cast<Id_Selector>(node);
-    std::cerr << ind << "Id_Selector " << selector;
+  } else if (Cast<IDSelector>(node)) {
+    IDSelector* selector = Cast<IDSelector>(node);
+    std::cerr << ind << "IDSelector " << selector;
     std::cerr << " (" << pstate_source_position(node) << ")";
     std::cerr << " <" << selector->hash() << ">";
     std::cerr << " <<" << selector->ns_name() << ">>";

src/eval.hpp

@@ -85,7 +85,7 @@ namespace Sass {
     Pseudo_Selector* operator()(Pseudo_Selector* s);
 
     // they don't have any specific implementation (yet)
-    Id_Selector* operator()(Id_Selector* s) { return s; };
+    IDSelector* operator()(IDSelector* s) { return s; };
     Class_Selector* operator()(Class_Selector* s) { return s; };
     Type_Selector* operator()(Type_Selector* s) { return s; };
     Attribute_Selector* operator()(Attribute_Selector* s) { return s; };

src/inspect.cpp

@@ -950,7 +950,7 @@ namespace Sass {
     append_token(s->ns_name(), s);
   }
 
-  void Inspect::operator()(Id_Selector* s)
+  void Inspect::operator()(IDSelector* s)
   {
     append_token(s->ns_name(), s);
   }