Skip to content

Commit 80fd573

Browse files
mgretermgreter
committed
Rename element to type selector and type enums
1 parent 7a29ca8 commit 80fd573

16 files changed

+70
-71
lines changed

‎src/ast.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ namespace Sass {
131131
//////////////////////////////////////////////////////////////////////
132132
class Expression : public AST_Node {
133133
public:
134-
enum Concrete_Type {
134+
enum Type {
135135
NONE,
136136
BOOLEAN,
137137
NUMBER,
@@ -153,10 +153,10 @@ namespace Sass {
153153
ADD_PROPERTY(bool, is_delayed)
154154
ADD_PROPERTY(bool, is_expanded)
155155
ADD_PROPERTY(bool, is_interpolant)
156-
ADD_PROPERTY(Concrete_Type, concrete_type)
156+
ADD_PROPERTY(Type, concrete_type)
157157
public:
158158
Expression(ParserState pstate,
159-
bool d = false, bool e = false, bool i = false, Concrete_Type ct = NONE)
159+
bool d = false, bool e = false, bool i = false, Type ct = NONE)
160160
: AST_Node(pstate),
161161
is_delayed_(d),
162162
is_expanded_(e),
@@ -359,7 +359,7 @@ namespace Sass {
359359
/////////////////////////////////////////////////////////////////////////
360360
class Statement : public AST_Node {
361361
public:
362-
enum Statement_Type {
362+
enum Type {
363363
NONE,
364364
RULESET,
365365
MEDIA,
@@ -385,11 +385,11 @@ namespace Sass {
385385
IF
386386
};
387387
private:
388-
ADD_PROPERTY(Statement_Type, statement_type)
388+
ADD_PROPERTY(Type, statement_type)
389389
ADD_PROPERTY(size_t, tabs)
390390
ADD_PROPERTY(bool, group_end)
391391
public:
392-
Statement(ParserState pstate, Statement_Type st = NONE, size_t t = 0)
392+
Statement(ParserState pstate, Type st = NONE, size_t t = 0)
393393
: AST_Node(pstate), statement_type_(st), tabs_(t), group_end_(false)
394394
{ }
395395
Statement(const Statement* ptr)

‎src/ast_fwd_decl.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ namespace Sass {
239239
class Placeholder_Selector;
240240
typedef Placeholder_Selector* Placeholder_Selector_Ptr;
241241
typedef Placeholder_Selector const* Placeholder_Selector_Ptr_Const;
242-
class Element_Selector;
243-
typedef Element_Selector* Element_Selector_Ptr;
244-
typedef Element_Selector const* Element_Selector_Ptr_Const;
242+
class Type_Selector;
243+
typedef Type_Selector* Type_Selector_Ptr;
244+
typedef Type_Selector const* Type_Selector_Ptr_Const;
245245
class Class_Selector;
246246
typedef Class_Selector* Class_Selector_Ptr;
247247
typedef Class_Selector const* Class_Selector_Ptr_Const;
@@ -345,7 +345,7 @@ namespace Sass {
345345
IMPL_MEM_OBJ(Selector_Schema);
346346
IMPL_MEM_OBJ(Simple_Selector);
347347
IMPL_MEM_OBJ(Placeholder_Selector);
348-
IMPL_MEM_OBJ(Element_Selector);
348+
IMPL_MEM_OBJ(Type_Selector);
349349
IMPL_MEM_OBJ(Class_Selector);
350350
IMPL_MEM_OBJ(Id_Selector);
351351
IMPL_MEM_OBJ(Attribute_Selector);

‎src/ast_sel_cmp.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ namespace Sass {
535535
{
536536
switch (simple_type()) {
537537
case ID_SEL: return (const Id_Selector&) *this == rhs; break;
538-
case TYPE_SEL: return (const Element_Selector&) *this == rhs; break;
538+
case TYPE_SEL: return (const Type_Selector&) *this == rhs; break;
539539
case CLASS_SEL: return (const Class_Selector&) *this == rhs; break;
540540
case PARENT_SEL: return (const Parent_Selector&) *this == rhs; break;
541541
case PSEUDO_SEL: return (const Pseudo_Selector&) *this == rhs; break;
@@ -555,9 +555,9 @@ namespace Sass {
555555
return sel ? *this == *sel : false;
556556
}
557557

558-
bool Element_Selector::operator== (const Simple_Selector& rhs) const
558+
bool Type_Selector::operator== (const Simple_Selector& rhs) const
559559
{
560-
auto sel = Cast<Element_Selector>(&rhs);
560+
auto sel = Cast<Type_Selector>(&rhs);
561561
return sel ? *this == *sel : false;
562562
}
563563

@@ -606,7 +606,7 @@ namespace Sass {
606606
return name() == rhs.name();
607607
}
608608

609-
bool Element_Selector::operator== (const Element_Selector& rhs) const
609+
bool Type_Selector::operator== (const Type_Selector& rhs) const
610610
{
611611
return is_ns_eq(rhs) && name() == rhs.name();
612612
}
@@ -688,7 +688,7 @@ namespace Sass {
688688
{
689689
switch (simple_type()) {
690690
case ID_SEL: return (const Id_Selector&) *this < rhs; break;
691-
case TYPE_SEL: return (const Element_Selector&) *this < rhs; break;
691+
case TYPE_SEL: return (const Type_Selector&) *this < rhs; break;
692692
case CLASS_SEL: return (const Class_Selector&) *this < rhs; break;
693693
case PARENT_SEL: return (const Parent_Selector&) *this < rhs; break;
694694
case PSEUDO_SEL: return (const Pseudo_Selector&) *this < rhs; break;
@@ -719,7 +719,7 @@ namespace Sass {
719719
return *this < sel;
720720
}
721721

722-
bool Element_Selector::operator< (const Simple_Selector& rhs) const
722+
bool Type_Selector::operator< (const Simple_Selector& rhs) const
723723
{
724724
switch (rhs.simple_type()) {
725725
case ID_SEL: return 'e' < '#'; break;
@@ -731,8 +731,8 @@ namespace Sass {
731731
case PLACEHOLDER_SEL: return 'e' < '%'; break;
732732
case TYPE_SEL: /* let if fall through */ break;
733733
}
734-
const Element_Selector& sel =
735-
(const Element_Selector&) rhs;
734+
const Type_Selector& sel =
735+
(const Type_Selector&) rhs;
736736
return *this < sel;
737737
}
738738

@@ -847,7 +847,7 @@ namespace Sass {
847847
return name() < rhs.name();
848848
}
849849

850-
bool Element_Selector::operator< (const Element_Selector& rhs) const
850+
bool Type_Selector::operator< (const Type_Selector& rhs) const
851851
{
852852
if (is_ns_eq(rhs))
853853
{

‎src/ast_sel_unify.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ namespace Sass {
4343
return rhs;
4444
}
4545

46-
47-
Simple_Selector_Ptr Element_Selector::unify_with(Simple_Selector_Ptr rhs)
46+
Simple_Selector_Ptr Type_Selector::unify_with(Simple_Selector_Ptr rhs)
4847
{
4948
// check if ns can be extended
5049
// true for no ns or universal
@@ -75,7 +74,7 @@ namespace Sass {
7574
return this;
7675
}
7776

78-
Compound_Selector_Ptr Element_Selector::unify_with(Compound_Selector_Ptr rhs)
77+
Compound_Selector_Ptr Type_Selector::unify_with(Compound_Selector_Ptr rhs)
7978
{
8079
// TODO: handle namespaces
8180

@@ -89,10 +88,10 @@ namespace Sass {
8988
// otherwise, this is a tag name
9089
if (name() == "*")
9190
{
92-
if (typeid(*rhs_0) == typeid(Element_Selector))
91+
if (typeid(*rhs_0) == typeid(Type_Selector))
9392
{
9493
// if rhs is universal, just return this tagname + rhs's qualifiers
95-
Element_Selector_Ptr ts = Cast<Element_Selector>(rhs_0);
94+
Type_Selector_Ptr ts = Cast<Type_Selector>(rhs_0);
9695
rhs->at(0) = this->unify_with(ts);
9796
return rhs;
9897
}
@@ -107,7 +106,7 @@ namespace Sass {
107106
return rhs;
108107
}
109108

110-
if (typeid(*rhs_0) == typeid(Element_Selector))
109+
if (typeid(*rhs_0) == typeid(Type_Selector))
111110
{
112111
// if rhs is universal, just return this tagname + rhs's qualifiers
113112
if (rhs_0->name() != "*" && rhs_0->ns() != "*" && rhs_0->name() != name()) return 0;

‎src/ast_selectors.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ namespace Sass {
361361
Compound_Selector_Obj rh = last()->head();
362362
size_t i;
363363
size_t L = h->length();
364-
if (Cast<Element_Selector>(h->first())) {
364+
if (Cast<Type_Selector>(h->first())) {
365365
if (Class_Selector_Ptr cs = Cast<Class_Selector>(rh->last())) {
366366
Class_Selector_Ptr sqs = SASS_MEMORY_COPY(cs);
367367
sqs->name(sqs->name() + (*h)[0]->name());
@@ -376,8 +376,8 @@ namespace Sass {
376376
(*rh)[rh->length()-1] = sqs;
377377
rh->pstate(h->pstate());
378378
for (i = 1; i < L; ++i) rh->append((*h)[i]);
379-
} else if (Element_Selector_Ptr ts = Cast<Element_Selector>(rh->last())) {
380-
Element_Selector_Ptr tss = SASS_MEMORY_COPY(ts);
379+
} else if (Type_Selector_Ptr ts = Cast<Type_Selector>(rh->last())) {
380+
Type_Selector_Ptr tss = SASS_MEMORY_COPY(ts);
381381
tss->name(tss->name() + (*h)[0]->name());
382382
tss->pstate((*h)[0]->pstate());
383383
(*rh)[rh->length()-1] = tss;
@@ -899,7 +899,7 @@ namespace Sass {
899899
IMPLEMENT_AST_OPERATORS(Attribute_Selector);
900900
IMPLEMENT_AST_OPERATORS(Compound_Selector);
901901
IMPLEMENT_AST_OPERATORS(Complex_Selector);
902-
IMPLEMENT_AST_OPERATORS(Element_Selector);
902+
IMPLEMENT_AST_OPERATORS(Type_Selector);
903903
IMPLEMENT_AST_OPERATORS(Class_Selector);
904904
IMPLEMENT_AST_OPERATORS(Id_Selector);
905905
IMPLEMENT_AST_OPERATORS(Pseudo_Selector);

‎src/ast_selectors.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -319,14 +319,14 @@ namespace Sass {
319319
};
320320

321321
/////////////////////////////////////////////////////////////////////
322-
// Element selectors (and the universal selector) -- e.g., div, span, *.
322+
// Type selectors (and the universal selector) -- e.g., div, span, *.
323323
/////////////////////////////////////////////////////////////////////
324-
class Element_Selector final : public Simple_Selector {
324+
class Type_Selector final : public Simple_Selector {
325325
public:
326-
Element_Selector(ParserState pstate, std::string n)
326+
Type_Selector(ParserState pstate, std::string n)
327327
: Simple_Selector(pstate, n)
328328
{ simple_type(TYPE_SEL); }
329-
Element_Selector(const Element_Selector* ptr)
329+
Type_Selector(const Type_Selector* ptr)
330330
: Simple_Selector(ptr)
331331
{ simple_type(TYPE_SEL); }
332332
unsigned long specificity() const override
@@ -342,9 +342,9 @@ namespace Sass {
342342
Compound_Selector_Ptr unify_with(Compound_Selector_Ptr) override;
343343
bool operator<(const Simple_Selector& rhs) const final override;
344344
bool operator==(const Simple_Selector& rhs) const final override;
345-
bool operator<(const Element_Selector& rhs) const;
346-
bool operator==(const Element_Selector& rhs) const;
347-
ATTACH_AST_OPERATIONS(Element_Selector)
345+
bool operator<(const Type_Selector& rhs) const;
346+
bool operator==(const Type_Selector& rhs) const;
347+
ATTACH_AST_OPERATIONS(Type_Selector)
348348
ATTACH_CRTP_PERFORM_METHODS()
349349
};
350350

@@ -599,7 +599,7 @@ namespace Sass {
599599
Simple_Selector_Ptr base() const {
600600
if (length() == 0) return 0;
601601
// ToDo: why is this needed?
602-
if (Cast<Element_Selector>((*this)[0]))
602+
if (Cast<Type_Selector>((*this)[0]))
603603
return (*this)[0];
604604
return 0;
605605
}

‎src/ast_values.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace Sass {
3939
class PreValue : public Expression {
4040
public:
4141
PreValue(ParserState pstate,
42-
bool d = false, bool e = false, bool i = false, Concrete_Type ct = NONE)
42+
bool d = false, bool e = false, bool i = false, Type ct = NONE)
4343
: Expression(pstate, d, e, i, ct)
4444
{ }
4545
PreValue(const PreValue* ptr)
@@ -55,7 +55,7 @@ namespace Sass {
5555
class Value : public PreValue {
5656
public:
5757
Value(ParserState pstate,
58-
bool d = false, bool e = false, bool i = false, Concrete_Type ct = NONE)
58+
bool d = false, bool e = false, bool i = false, Type ct = NONE)
5959
: PreValue(pstate, d, e, i, ct)
6060
{ }
6161
Value(const Value* ptr)
@@ -530,7 +530,7 @@ namespace Sass {
530530
static std::string type_name() { return "string"; }
531531
virtual ~String() = 0;
532532
virtual void rtrim() = 0;
533-
virtual bool operator<(const Expression& rhs) const {
533+
virtual bool operator<(const Expression& rhs) const override {
534534
return this->to_string() < rhs.to_string();
535535
};
536536
ATTACH_VIRTUAL_AST_OPERATIONS(String);

‎src/debugger.hpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,9 @@ inline void debug_ast(AST_Node_Ptr node, std::string ind, Env* env)
235235
std::cerr << (selector->has_line_break() ? " [line-break]": " -");
236236
std::cerr << (selector->has_line_feed() ? " [line-feed]": " -");
237237
std::cerr << std::endl;
238-
} else if (Cast<Element_Selector>(node)) {
239-
Element_Selector_Ptr selector = Cast<Element_Selector>(node);
240-
std::cerr << ind << "Element_Selector " << selector;
238+
} else if (Cast<Type_Selector>(node)) {
239+
Type_Selector_Ptr selector = Cast<Type_Selector>(node);
240+
std::cerr << ind << "Type_Selector " << selector;
241241
std::cerr << " (" << pstate_source_position(node) << ")";
242242
std::cerr << " <" << selector->hash() << ">";
243243
std::cerr << " <<" << selector->ns_name() << ">>";
@@ -682,21 +682,21 @@ inline void debug_ast(AST_Node_Ptr node, std::string ind, Env* env)
682682
std::cerr << ind << "Expression " << expression;
683683
std::cerr << " (" << pstate_source_position(node) << ")";
684684
switch (expression->concrete_type()) {
685-
case Expression::Concrete_Type::NONE: std::cerr << " [NONE]"; break;
686-
case Expression::Concrete_Type::BOOLEAN: std::cerr << " [BOOLEAN]"; break;
687-
case Expression::Concrete_Type::NUMBER: std::cerr << " [NUMBER]"; break;
688-
case Expression::Concrete_Type::COLOR: std::cerr << " [COLOR]"; break;
689-
case Expression::Concrete_Type::STRING: std::cerr << " [STRING]"; break;
690-
case Expression::Concrete_Type::LIST: std::cerr << " [LIST]"; break;
691-
case Expression::Concrete_Type::MAP: std::cerr << " [MAP]"; break;
692-
case Expression::Concrete_Type::SELECTOR: std::cerr << " [SELECTOR]"; break;
693-
case Expression::Concrete_Type::NULL_VAL: std::cerr << " [NULL_VAL]"; break;
694-
case Expression::Concrete_Type::C_WARNING: std::cerr << " [C_WARNING]"; break;
695-
case Expression::Concrete_Type::C_ERROR: std::cerr << " [C_ERROR]"; break;
696-
case Expression::Concrete_Type::FUNCTION: std::cerr << " [FUNCTION]"; break;
697-
case Expression::Concrete_Type::NUM_TYPES: std::cerr << " [NUM_TYPES]"; break;
698-
case Expression::Concrete_Type::VARIABLE: std::cerr << " [VARIABLE]"; break;
699-
case Expression::Concrete_Type::FUNCTION_VAL: std::cerr << " [FUNCTION_VAL]"; break;
685+
case Expression::Type::NONE: std::cerr << " [NONE]"; break;
686+
case Expression::Type::BOOLEAN: std::cerr << " [BOOLEAN]"; break;
687+
case Expression::Type::NUMBER: std::cerr << " [NUMBER]"; break;
688+
case Expression::Type::COLOR: std::cerr << " [COLOR]"; break;
689+
case Expression::Type::STRING: std::cerr << " [STRING]"; break;
690+
case Expression::Type::LIST: std::cerr << " [LIST]"; break;
691+
case Expression::Type::MAP: std::cerr << " [MAP]"; break;
692+
case Expression::Type::SELECTOR: std::cerr << " [SELECTOR]"; break;
693+
case Expression::Type::NULL_VAL: std::cerr << " [NULL_VAL]"; break;
694+
case Expression::Type::C_WARNING: std::cerr << " [C_WARNING]"; break;
695+
case Expression::Type::C_ERROR: std::cerr << " [C_ERROR]"; break;
696+
case Expression::Type::FUNCTION: std::cerr << " [FUNCTION]"; break;
697+
case Expression::Type::NUM_TYPES: std::cerr << " [NUM_TYPES]"; break;
698+
case Expression::Type::VARIABLE: std::cerr << " [VARIABLE]"; break;
699+
case Expression::Type::FUNCTION_VAL: std::cerr << " [FUNCTION_VAL]"; break;
700700
case Expression::Type::PARENT: std::cerr << " [PARENT]"; break;
701701
}
702702
std::cerr << std::endl;

‎src/eval.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -745,8 +745,8 @@ namespace Sass {
745745
AST_Node_Obj lu = lhs;
746746
AST_Node_Obj ru = rhs;
747747

748-
Expression::Concrete_Type l_type;
749-
Expression::Concrete_Type r_type;
748+
Expression::Type l_type;
749+
Expression::Type r_type;
750750

751751
// Is one of the operands an interpolant?
752752
String_Schema_Obj s1 = Cast<String_Schema>(b->left());

‎src/eval.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ namespace Sass {
8787
Id_Selector_Ptr operator()(Id_Selector_Ptr s) { return s; };
8888
Class_Selector_Ptr operator()(Class_Selector_Ptr s) { return s; };
8989
Pseudo_Selector_Ptr operator()(Pseudo_Selector_Ptr s) { return s; };
90-
Element_Selector_Ptr operator()(Element_Selector_Ptr s) { return s; };
90+
Type_Selector_Ptr operator()(Type_Selector_Ptr s) { return s; };
9191
Attribute_Selector_Ptr operator()(Attribute_Selector_Ptr s) { return s; };
9292
Placeholder_Selector_Ptr operator()(Placeholder_Selector_Ptr s) { return s; };
9393

0 commit comments

Comments
 (0)