Skip to content

Commit 7309e24

Browse files
mgretermgreter
committed
Rename Pseudo_Selector to PseudoSelector 
1 parent 825f37a commit 7309e24

18 files changed

+74
-74
lines changed

‎src/ast_fwd_decl.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ namespace Sass {
106106
class IDSelector;
107107
class Attribute_Selector;
108108

109-
class Pseudo_Selector;
109+
class PseudoSelector;
110110

111111
class SelectorComponent;
112112
class SelectorCombinator;
@@ -202,7 +202,7 @@ namespace Sass {
202202
IMPL_MEM_OBJ(ClassSelector);
203203
IMPL_MEM_OBJ(IDSelector);
204204
IMPL_MEM_OBJ(Attribute_Selector);
205-
IMPL_MEM_OBJ(Pseudo_Selector);
205+
IMPL_MEM_OBJ(PseudoSelector);
206206

207207
IMPL_MEM_OBJ(SelectorComponent);
208208
IMPL_MEM_OBJ(SelectorCombinator);

‎src/ast_sel_cmp.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,9 @@ namespace Sass {
317317
return sel ? *this == *sel : false;
318318
}
319319

320-
bool Pseudo_Selector::operator== (const SimpleSelector& rhs) const
320+
bool PseudoSelector::operator== (const SimpleSelector& rhs) const
321321
{
322-
auto sel = Cast<Pseudo_Selector>(&rhs);
322+
auto sel = Cast<PseudoSelector>(&rhs);
323323
return sel ? *this == *sel : false;
324324
}
325325

@@ -375,7 +375,7 @@ namespace Sass {
375375
else { return false; }
376376
}
377377

378-
bool Pseudo_Selector::operator== (const Pseudo_Selector& rhs) const
378+
bool PseudoSelector::operator== (const PseudoSelector& rhs) const
379379
{
380380
if (is_ns_eq(rhs)) {
381381
if (name() != rhs.name()) return false;

‎src/ast_sel_super.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ namespace Sass {
3535
// Returns all pseudo selectors in [compound] that have
3636
// a selector argument, and that have the given [name].
3737
// ##########################################################################
38-
sass::vector<Pseudo_Selector_Obj> selectorPseudoNamed(
38+
sass::vector<PseudoSelectorObj> selectorPseudoNamed(
3939
CompoundSelectorObj compound, sass::string name)
4040
{
41-
sass::vector<Pseudo_Selector_Obj> rv;
41+
sass::vector<PseudoSelectorObj> rv;
4242
for (SimpleSelectorObj sel : compound->elements()) {
43-
if (Pseudo_Selector_Obj pseudo = Cast<Pseudo_Selector>(sel)) {
43+
if (PseudoSelectorObj pseudo = Cast<PseudoSelector>(sel)) {
4444
if (pseudo->isClass() && pseudo->selector()) {
4545
if (sel->name() == name) {
4646
rv.push_back(sel);
@@ -66,7 +66,7 @@ namespace Sass {
6666
return true;
6767
}
6868
// Some selector pseudoclasses can match normal selectors.
69-
if (const Pseudo_Selector* pseudo = Cast<Pseudo_Selector>(simple2)) {
69+
if (const PseudoSelector* pseudo = Cast<PseudoSelector>(simple2)) {
7070
if (pseudo->selector() && isSubselectorPseudo(pseudo->normalized())) {
7171
for (auto complex : pseudo->selector()->elements()) {
7272
// Make sure we have exacly one items
@@ -139,8 +139,8 @@ namespace Sass {
139139
// ##########################################################################
140140
// ##########################################################################
141141
bool pseudoIsSuperselectorOfPseudo(
142-
const Pseudo_Selector_Obj& pseudo1,
143-
const Pseudo_Selector_Obj& pseudo2,
142+
const PseudoSelectorObj& pseudo1,
143+
const PseudoSelectorObj& pseudo2,
144144
const ComplexSelectorObj& parent
145145
)
146146
{
@@ -156,7 +156,7 @@ namespace Sass {
156156
// ##########################################################################
157157
// ##########################################################################
158158
bool pseudoNotIsSuperselectorOfCompound(
159-
const Pseudo_Selector_Obj& pseudo1,
159+
const PseudoSelectorObj& pseudo1,
160160
const CompoundSelectorObj& compound2,
161161
const ComplexSelectorObj& parent)
162162
{
@@ -171,7 +171,7 @@ namespace Sass {
171171
if (idIsSuperselectorOfCompound(id2, compound1)) return true;
172172
}
173173
}
174-
else if (const Pseudo_Selector_Obj& pseudo2 = Cast<Pseudo_Selector>(simple2)) {
174+
else if (const PseudoSelectorObj& pseudo2 = Cast<PseudoSelector>(simple2)) {
175175
if (pseudoIsSuperselectorOfPseudo(pseudo1, pseudo2, parent)) return true;
176176
}
177177
}
@@ -189,7 +189,7 @@ namespace Sass {
189189
// parent selectors in the selector argument match [parents].
190190
// ##########################################################################
191191
bool selectorPseudoIsSuperselector(
192-
const Pseudo_Selector_Obj& pseudo1,
192+
const PseudoSelectorObj& pseudo1,
193193
const CompoundSelectorObj& compound2,
194194
// ToDo: is this really the most convenient way to do this?
195195
sass::vector<SelectorComponentObj>::const_iterator parents_from,
@@ -200,10 +200,10 @@ namespace Sass {
200200
sass::string name(Util::unvendor(pseudo1->name()));
201201

202202
if (name == "matches" || name == "any") {
203-
sass::vector<Pseudo_Selector_Obj> pseudos =
203+
sass::vector<PseudoSelectorObj> pseudos =
204204
selectorPseudoNamed(compound2, pseudo1->name());
205205
SelectorListObj selector1 = pseudo1->selector();
206-
for (Pseudo_Selector_Obj pseudo2 : pseudos) {
206+
for (PseudoSelectorObj pseudo2 : pseudos) {
207207
SelectorListObj selector = pseudo2->selector();
208208
if (selector1->isSuperselectorOf(selector)) {
209209
return true;
@@ -223,10 +223,10 @@ namespace Sass {
223223

224224
}
225225
else if (name == "has" || name == "host" || name == "host-context" || name == "slotted") {
226-
sass::vector<Pseudo_Selector_Obj> pseudos =
226+
sass::vector<PseudoSelectorObj> pseudos =
227227
selectorPseudoNamed(compound2, pseudo1->name());
228228
SelectorListObj selector1 = pseudo1->selector();
229-
for (Pseudo_Selector_Obj pseudo2 : pseudos) {
229+
for (PseudoSelectorObj pseudo2 : pseudos) {
230230
SelectorListObj selector = pseudo2->selector();
231231
if (selector1->isSuperselectorOf(selector)) {
232232
return true;
@@ -241,16 +241,16 @@ namespace Sass {
241241
return true;
242242
}
243243
else if (name == "current") {
244-
sass::vector<Pseudo_Selector_Obj> pseudos =
244+
sass::vector<PseudoSelectorObj> pseudos =
245245
selectorPseudoNamed(compound2, "current");
246-
for (Pseudo_Selector_Obj pseudo2 : pseudos) {
246+
for (PseudoSelectorObj pseudo2 : pseudos) {
247247
if (ObjEqualityFn(pseudo1, pseudo2)) return true;
248248
}
249249

250250
}
251251
else if (name == "nth-child" || name == "nth-last-child") {
252252
for (auto simple2 : compound2->elements()) {
253-
if (Pseudo_Selector_Obj pseudo2 = simple2->getPseudoSelector()) {
253+
if (PseudoSelectorObj pseudo2 = simple2->getPseudoSelector()) {
254254
if (pseudo1->name() != pseudo2->name()) continue;
255255
if (!ObjEqualityFn(pseudo1->argument(), pseudo2->argument())) continue;
256256
if (pseudo1->selector()->isSuperselectorOf(pseudo2->selector())) return true;
@@ -282,7 +282,7 @@ namespace Sass {
282282
// Every selector in [compound1.components] must have
283283
// a matching selector in [compound2.components].
284284
for (SimpleSelectorObj simple1 : compound1->elements()) {
285-
Pseudo_Selector_Obj pseudo1 = Cast<Pseudo_Selector>(simple1);
285+
PseudoSelectorObj pseudo1 = Cast<PseudoSelector>(simple1);
286286
if (pseudo1 && pseudo1->selector()) {
287287
if (!selectorPseudoIsSuperselector(pseudo1, compound2, parents_from, parents_to)) {
288288
return false;
@@ -295,7 +295,7 @@ namespace Sass {
295295
// [compound1] can't be a superselector of a selector
296296
// with pseudo-elements that [compound2] doesn't share.
297297
for (SimpleSelectorObj simple2 : compound2->elements()) {
298-
Pseudo_Selector_Obj pseudo2 = Cast<Pseudo_Selector>(simple2);
298+
PseudoSelectorObj pseudo2 = Cast<PseudoSelector>(simple2);
299299
if (pseudo2 && pseudo2->isElement()) {
300300
if (!simpleIsSuperselectorOfCompound(pseudo2, compound1)) {
301301
return false;

‎src/ast_sel_unify.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ namespace Sass {
156156
// ##########################################################################
157157
// This is implemented in `selector/pseudo.dart` as `PseudoSelector::unify`
158158
// ##########################################################################
159-
CompoundSelector* Pseudo_Selector::unifyWith(CompoundSelector* compound)
159+
CompoundSelector* PseudoSelector::unifyWith(CompoundSelector* compound)
160160
{
161161

162162
if (compound->length() == 1 && compound->first()->is_universal()) {
@@ -174,7 +174,7 @@ namespace Sass {
174174
bool addedThis = false;
175175
for (auto simple : compound->elements()) {
176176
// Make sure pseudo selectors always come last.
177-
if (Pseudo_Selector_Obj pseudo = simple->getPseudoSelector()) {
177+
if (PseudoSelectorObj pseudo = simple->getPseudoSelector()) {
178178
if (pseudo->isElement()) {
179179
// A given compound selector may only contain one pseudo element. If
180180
// [compound] has a different one than [this], unification fails.
@@ -197,7 +197,7 @@ namespace Sass {
197197
return result.detach();
198198

199199
}
200-
// EO Pseudo_Selector::unifyWith(CompoundSelector*
200+
// EO PseudoSelector::unifyWith(CompoundSelector*
201201

202202
// ##########################################################################
203203
// This is implemented in `extend/functions.dart` as `unifyUniversalAndElement`

‎src/ast_sel_weave.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Sass {
2525
bool isUnique(const SimpleSelector* simple)
2626
{
2727
if (Cast<IDSelector>(simple)) return true;
28-
if (const Pseudo_Selector * pseudo = Cast<Pseudo_Selector>(simple)) {
28+
if (const PseudoSelector * pseudo = Cast<PseudoSelector>(simple)) {
2929
if (pseudo->is_pseudo_element()) return true;
3030
}
3131
return false;

‎src/ast_selectors.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -265,15 +265,15 @@ namespace Sass {
265265
/////////////////////////////////////////////////////////////////////////
266266
/////////////////////////////////////////////////////////////////////////
267267

268-
Pseudo_Selector::Pseudo_Selector(ParserState pstate, sass::string name, bool element)
268+
PseudoSelector::PseudoSelector(ParserState pstate, sass::string name, bool element)
269269
: SimpleSelector(pstate, name),
270270
normalized_(Util::unvendor(name)),
271271
argument_({}),
272272
selector_({}),
273273
isSyntacticClass_(!element),
274274
isClass_(!element && !isFakePseudoElement(normalized_))
275275
{ simple_type(PSEUDO_SEL); }
276-
Pseudo_Selector::Pseudo_Selector(const Pseudo_Selector* ptr)
276+
PseudoSelector::PseudoSelector(const PseudoSelector* ptr)
277277
: SimpleSelector(ptr),
278278
normalized_(ptr->normalized()),
279279
argument_(ptr->argument()),
@@ -290,12 +290,12 @@ namespace Sass {
290290
// in CSS levels 1 and 2 (namely, :first-line, :first-letter, :before and
291291
// :after). This compatibility is not allowed for the new pseudo-elements
292292
// introduced in this specification.
293-
bool Pseudo_Selector::is_pseudo_element() const
293+
bool PseudoSelector::is_pseudo_element() const
294294
{
295295
return isElement();
296296
}
297297

298-
size_t Pseudo_Selector::hash() const
298+
size_t PseudoSelector::hash() const
299299
{
300300
if (hash_ == 0) {
301301
hash_combine(hash_, SimpleSelector::hash());
@@ -305,34 +305,34 @@ namespace Sass {
305305
return hash_;
306306
}
307307

308-
unsigned long Pseudo_Selector::specificity() const
308+
unsigned long PseudoSelector::specificity() const
309309
{
310310
if (is_pseudo_element())
311311
return Constants::Specificity_Element;
312312
return Constants::Specificity_Pseudo;
313313
}
314314

315-
Pseudo_Selector_Obj Pseudo_Selector::withSelector(SelectorListObj selector)
315+
PseudoSelectorObj PseudoSelector::withSelector(SelectorListObj selector)
316316
{
317-
Pseudo_Selector_Obj pseudo = SASS_MEMORY_COPY(this);
317+
PseudoSelectorObj pseudo = SASS_MEMORY_COPY(this);
318318
pseudo->selector(selector);
319319
return pseudo;
320320
}
321321

322-
bool Pseudo_Selector::empty() const
322+
bool PseudoSelector::empty() const
323323
{
324324
// Only considered empty if selector is
325325
// available but has no items in it.
326326
return selector() && selector()->empty();
327327
}
328328

329-
void Pseudo_Selector::cloneChildren()
329+
void PseudoSelector::cloneChildren()
330330
{
331331
if (selector().isNull()) selector({});
332332
else selector(SASS_MEMORY_CLONE(selector()));
333333
}
334334

335-
bool Pseudo_Selector::has_real_parent_ref() const {
335+
bool PseudoSelector::has_real_parent_ref() const {
336336
if (!selector()) return false;
337337
return selector()->has_real_parent_ref();
338338
}
@@ -858,7 +858,7 @@ namespace Sass {
858858
sass::vector<ComplexSelectorObj> rv;
859859

860860
for (SimpleSelectorObj simple : elements()) {
861-
if (Pseudo_Selector * pseudo = Cast<Pseudo_Selector>(simple)) {
861+
if (PseudoSelector * pseudo = Cast<PseudoSelector>(simple)) {
862862
if (SelectorList* sel = Cast<SelectorList>(pseudo->selector())) {
863863
if (parent) {
864864
pseudo->selector(sel->resolve_parent_refs(
@@ -1024,7 +1024,7 @@ namespace Sass {
10241024
IMPLEMENT_AST_OPERATORS(TypeSelector);
10251025
IMPLEMENT_AST_OPERATORS(ClassSelector);
10261026
IMPLEMENT_AST_OPERATORS(IDSelector);
1027-
IMPLEMENT_AST_OPERATORS(Pseudo_Selector);
1027+
IMPLEMENT_AST_OPERATORS(PseudoSelector);
10281028
IMPLEMENT_AST_OPERATORS(SelectorCombinator);
10291029
IMPLEMENT_AST_OPERATORS(CompoundSelector);
10301030
IMPLEMENT_AST_OPERATORS(ComplexSelector);

‎src/ast_selectors.hpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ namespace Sass {
119119
/* helper function for syntax sugar */
120120
virtual IDSelector* getIdSelector() { return NULL; }
121121
virtual TypeSelector* getTypeSelector() { return NULL; }
122-
virtual Pseudo_Selector* getPseudoSelector() { return NULL; }
122+
virtual PseudoSelector* getPseudoSelector() { return NULL; }
123123

124124
ComplexSelectorObj wrapInComplex();
125125
CompoundSelectorObj wrapInCompound();
@@ -222,14 +222,14 @@ namespace Sass {
222222
// Pseudo selectors -- e.g., :first-child, :nth-of-type(...), etc.
223223
//////////////////////////////////////////////////////////////////
224224
// Pseudo Selector cannot have any namespace?
225-
class Pseudo_Selector final : public SimpleSelector {
225+
class PseudoSelector final : public SimpleSelector {
226226
ADD_PROPERTY(sass::string, normalized)
227227
ADD_PROPERTY(String_Obj, argument)
228228
ADD_PROPERTY(SelectorListObj, selector)
229229
ADD_PROPERTY(bool, isSyntacticClass)
230230
ADD_PROPERTY(bool, isClass)
231231
public:
232-
Pseudo_Selector(ParserState pstate, sass::string n, bool element = false);
232+
PseudoSelector(ParserState pstate, sass::string n, bool element = false);
233233
virtual bool is_pseudo_element() const override;
234234
size_t hash() const override;
235235

@@ -246,13 +246,13 @@ namespace Sass {
246246
bool isSyntacticElement() const { return !isSyntacticClass(); }
247247

248248
virtual unsigned long specificity() const override;
249-
Pseudo_Selector_Obj withSelector(SelectorListObj selector);
249+
PseudoSelectorObj withSelector(SelectorListObj selector);
250250

251251
CompoundSelector* unifyWith(CompoundSelector*) override;
252-
Pseudo_Selector* getPseudoSelector() final override { return this; }
252+
PseudoSelector* getPseudoSelector() final override { return this; }
253253
bool operator==(const SimpleSelector& rhs) const final override;
254-
ATTACH_CMP_OPERATIONS(Pseudo_Selector)
255-
ATTACH_AST_OPERATIONS(Pseudo_Selector)
254+
ATTACH_CMP_OPERATIONS(PseudoSelector)
255+
ATTACH_AST_OPERATIONS(PseudoSelector)
256256
void cloneChildren() override;
257257
ATTACH_CRTP_PERFORM_METHODS()
258258
};

‎src/debugger.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -421,9 +421,9 @@ inline void debug_ast(AST_Node* node, sass::string ind, Env* env)
421421
std::cerr << " <" << selector->hash() << ">";
422422
std::cerr << " <" << prettyprint(selector->pstate().token.ws_before()) << ">" << std::endl;
423423

424-
} else if (Cast<Pseudo_Selector>(node)) {
425-
Pseudo_Selector* selector = Cast<Pseudo_Selector>(node);
426-
std::cerr << ind << "Pseudo_Selector " << selector;
424+
} else if (Cast<PseudoSelector>(node)) {
425+
PseudoSelector* selector = Cast<PseudoSelector>(node);
426+
std::cerr << ind << "PseudoSelector " << selector;
427427
std::cerr << " (" << pstate_source_position(node) << ")";
428428
std::cerr << " <" << selector->hash() << ">";
429429
std::cerr << " <<" << selector->ns_name() << ">>";

‎src/eval.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1528,7 +1528,7 @@ namespace Sass {
15281528
return s;
15291529
}
15301530

1531-
Pseudo_Selector* Eval::operator()(Pseudo_Selector* pseudo)
1531+
PseudoSelector* Eval::operator()(PseudoSelector* pseudo)
15321532
{
15331533
// ToDo: should we eval selector?
15341534
return pseudo;

‎src/eval.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ namespace Sass {
8282
CompoundSelector* operator()(CompoundSelector*);
8383
SelectorComponent* operator()(SelectorComponent*);
8484
SimpleSelector* operator()(SimpleSelector* s);
85-
Pseudo_Selector* operator()(Pseudo_Selector* s);
85+
PseudoSelector* operator()(PseudoSelector* s);
8686

8787
// they don't have any specific implementation (yet)
8888
IDSelector* operator()(IDSelector* s) { return s; };

0 commit comments

Comments
 (0)