Rename the Type_Selector AST node to Element_Selector

xzyfer · xzyfer · commit c49c33921160 · 2016-05-29T00:38:16.000+10:00
This better matches the Ruby Sass implementation.
diff --git a/src/ast.cpp b/src/ast.cpp
@@ -411,7 +411,7 @@ namespace Sass {
     return cpy;
   }
 
-  Simple_Selector* Type_Selector::unify_with(Simple_Selector* rhs, Context& ctx)
+  Simple_Selector* Element_Selector::unify_with(Simple_Selector* rhs, Context& ctx)
   {
     // check if ns can be extended
     // true for no ns or universal
@@ -422,7 +422,7 @@ namespace Sass {
       if (!rhs->is_universal_ns())
       {
         // creaty the copy inside (avoid unnecessary copies)
-        Type_Selector* ts = SASS_MEMORY_NEW(ctx.mem, Type_Selector, *this);
+        Element_Selector* ts = SASS_MEMORY_NEW(ctx.mem, Element_Selector, *this);
         // overwrite the name if star is given as name
         if (ts->name() == "*") { ts->name(rhs->name()); }
         // now overwrite the namespace name and flag
@@ -436,7 +436,7 @@ namespace Sass {
     if (name() == "*" && rhs->name() != "*")
     {
       // creaty the copy inside (avoid unnecessary copies)
-      Type_Selector* ts = SASS_MEMORY_NEW(ctx.mem, Type_Selector, *this);
+      Element_Selector* ts = SASS_MEMORY_NEW(ctx.mem, Element_Selector, *this);
       // simply set the new name
       ts->name(rhs->name());
       // return copy
@@ -446,7 +446,7 @@ namespace Sass {
     return this;
   }
 
-  Compound_Selector* Type_Selector::unify_with(Compound_Selector* rhs, Context& ctx)
+  Compound_Selector* Element_Selector::unify_with(Compound_Selector* rhs, Context& ctx)
   {
     // TODO: handle namespaces
 
@@ -461,11 +461,11 @@ namespace Sass {
     // otherwise, this is a tag name
     if (name() == "*")
     {
-      if (typeid(*rhs_0) == typeid(Type_Selector))
+      if (typeid(*rhs_0) == typeid(Element_Selector))
       {
         // if rhs is universal, just return this tagname + rhs's qualifiers
         Compound_Selector* cpy = SASS_MEMORY_NEW(ctx.mem, Compound_Selector, *rhs);
-        Type_Selector* ts = static_cast<Type_Selector*>(rhs_0);
+        Element_Selector* ts = static_cast<Element_Selector*>(rhs_0);
         (*cpy)[0] = this->unify_with(ts, ctx);
         return cpy;
       }
@@ -484,7 +484,7 @@ namespace Sass {
       return rhs;
     }
 
-    if (typeid(*rhs_0) == typeid(Type_Selector))
+    if (typeid(*rhs_0) == typeid(Element_Selector))
     {
       // if rhs is universal, just return this tagname + rhs's qualifiers
       if (rhs_0->name() != "*" && rhs_0->ns() != "*" && rhs_0->name() != name()) return 0;
@@ -1036,14 +1036,14 @@ namespace Sass {
       } else if (last()->head_ && last()->head_->length()) {
         Compound_Selector* rh = last()->head();
         size_t i = 0, L = h->length();
-        if (dynamic_cast<Type_Selector*>(h->first())) {
+        if (dynamic_cast<Element_Selector*>(h->first())) {
           if (Selector_Qualifier* sq = dynamic_cast<Selector_Qualifier*>(rh->last())) {
             Selector_Qualifier* sqs = new Selector_Qualifier(*sq);
             sqs->name(sqs->name() + (*h)[0]->name());
             (*rh)[rh->length()-1] = sqs;
             for (i = 1; i < L; ++i) *rh << (*h)[i];
-          } else if (Type_Selector* ts = dynamic_cast<Type_Selector*>(rh->last())) {
-            Type_Selector* tss = new Type_Selector(*ts);
+          } else if (Element_Selector* ts = dynamic_cast<Element_Selector*>(rh->last())) {
+            Element_Selector* tss = new Element_Selector(*ts);
             tss->name(tss->name() + (*h)[0]->name());
             (*rh)[rh->length()-1] = tss;
             for (i = 1; i < L; ++i) *rh << (*h)[i];
diff --git a/src/ast.hpp b/src/ast.hpp
@@ -2048,17 +2048,17 @@ namespace Sass {
   };
 
   /////////////////////////////////////////////////////////////////////
-  // Type selectors (and the universal selector) -- e.g., div, span, *.
+  // Element selectors (and the universal selector) -- e.g., div, span, *.
   /////////////////////////////////////////////////////////////////////
-  class Type_Selector : public Simple_Selector {
+  class Element_Selector : public Simple_Selector {
   public:
-    Type_Selector(ParserState pstate, std::string n)
+    Element_Selector(ParserState pstate, std::string n)
     : Simple_Selector(pstate, n)
     { }
     virtual unsigned long specificity()
     {
       if (name() == "*") return 0;
-      else               return Constants::Specificity_Type;
+      else               return Constants::Specificity_Element;
     }
     virtual Simple_Selector* unify_with(Simple_Selector*, Context&);
     virtual Compound_Selector* unify_with(Compound_Selector*, Context&);
@@ -2082,7 +2082,7 @@ namespace Sass {
     {
       if (name()[0] == '#') return Constants::Specificity_ID;
       if (name()[0] == '.') return Constants::Specificity_Class;
-      else                  return Constants::Specificity_Type;
+      else                  return Constants::Specificity_Element;
     }
     virtual Compound_Selector* unify_with(Compound_Selector*, Context&);
     ATTACH_OPERATIONS()
@@ -2173,7 +2173,7 @@ namespace Sass {
     virtual unsigned long specificity()
     {
       if (is_pseudo_element())
-        return Constants::Specificity_Type;
+        return Constants::Specificity_Element;
       return Constants::Specificity_Pseudo;
     }
     bool operator==(const Simple_Selector& rhs) const;
@@ -2275,7 +2275,7 @@ namespace Sass {
     const Simple_Selector* base() const {
       if (length() == 0) return 0;
       // ToDo: why is this needed?
-      if (dynamic_cast<Type_Selector*>((*this)[0]))
+      if (dynamic_cast<Element_Selector*>((*this)[0]))
         return (*this)[0];
       return 0;
     }
diff --git a/src/ast_fwd_decl.hpp b/src/ast_fwd_decl.hpp
@@ -74,7 +74,7 @@ namespace Sass {
   class Selector;
   class Selector_Schema;
   class Selector_Placeholder;
-  class Type_Selector;
+  class Element_Selector;
   class Selector_Qualifier;
   class Attribute_Selector;
   class Pseudo_Selector;
diff --git a/src/constants.cpp b/src/constants.cpp
@@ -11,7 +11,7 @@ namespace Sass {
     // https://github.com/sass/sass/issues/1495#issuecomment-61189114
     extern const unsigned long Specificity_Star = 0;
     extern const unsigned long Specificity_Universal = 0;
-    extern const unsigned long Specificity_Type = 1;
+    extern const unsigned long Specificity_Element = 1;
     extern const unsigned long Specificity_Base = 1000;
     extern const unsigned long Specificity_Class = 1000;
     extern const unsigned long Specificity_Attr = 1000;
diff --git a/src/constants.hpp b/src/constants.hpp
@@ -11,7 +11,7 @@ namespace Sass {
     // The following list of selectors is by increasing specificity:
     extern const unsigned long Specificity_Star;
     extern const unsigned long Specificity_Universal;
-    extern const unsigned long Specificity_Type;
+    extern const unsigned long Specificity_Element;
     extern const unsigned long Specificity_Base;
     extern const unsigned long Specificity_Class;
     extern const unsigned long Specificity_Attr;
diff --git a/src/debugger.hpp b/src/debugger.hpp
@@ -199,9 +199,9 @@ inline void debug_ast(AST_Node* node, std::string ind, Env* env)
     std::cerr << (selector->has_line_break() ? " [line-break]": " -");
     std::cerr << (selector->has_line_feed() ? " [line-feed]": " -");
     std::cerr << std::endl;
-  } else if (dynamic_cast<Type_Selector*>(node)) {
-    Type_Selector* selector = dynamic_cast<Type_Selector*>(node);
-    std::cerr << ind << "Type_Selector " << selector;
+  } else if (dynamic_cast<Element_Selector*>(node)) {
+    Element_Selector* selector = dynamic_cast<Element_Selector*>(node);
+    std::cerr << ind << "Element_Selector " << selector;
     std::cerr << " (" << pstate_source_position(node) << ")";
     std::cerr << " <" << selector->hash() << ">";
     std::cerr << " <<" << selector->ns_name() << ">>";
diff --git a/src/eval.hpp b/src/eval.hpp
@@ -74,7 +74,7 @@ namespace Sass {
     Selector_List* operator()(Complex_Selector*);
     Attribute_Selector* operator()(Attribute_Selector*);
     // they don't have any specific implementatio (yet)
-    Type_Selector* operator()(Type_Selector* s) { return s; };
+    Element_Selector* operator()(Element_Selector* s) { return s; };
     Pseudo_Selector* operator()(Pseudo_Selector* s) { return s; };
     Wrapped_Selector* operator()(Wrapped_Selector* s) { return s; };
     Selector_Qualifier* operator()(Selector_Qualifier* s) { return s; };
diff --git a/src/extend.cpp b/src/extend.cpp
@@ -291,7 +291,7 @@ namespace Sass {
     // TODO: figure out a better way to create a Complex_Selector from scratch
     // TODO: There's got to be a better way. This got ugly quick...
     Position noPosition(-1, -1, -1);
-    Type_Selector fakeParent(ParserState("[FAKE]"), "temp");
+    Element_Selector fakeParent(ParserState("[FAKE]"), "temp");
     Compound_Selector fakeHead(ParserState("[FAKE]"), 1 /*size*/);
     fakeHead.elements().push_back(&fakeParent);
     Complex_Selector fakeParentContainer(ParserState("[FAKE]"), Complex_Selector::ANCESTOR_OF, &fakeHead /*head*/, NULL /*tail*/);
@@ -654,7 +654,7 @@ namespace Sass {
     // TODO: figure out a better way to create a Complex_Selector from scratch
     // TODO: There's got to be a better way. This got ugly quick...
     Position noPosition(-1, -1, -1);
-    Type_Selector fakeParent(ParserState("[FAKE]"), "temp");
+    Element_Selector fakeParent(ParserState("[FAKE]"), "temp");
     Compound_Selector fakeHead(ParserState("[FAKE]"), 1 /*size*/);
     fakeHead.elements().push_back(&fakeParent);
     Complex_Selector fakeParentContainer(ParserState("[FAKE]"), Complex_Selector::ANCESTOR_OF, &fakeHead /*head*/, NULL /*tail*/);
@@ -1976,7 +1976,7 @@ namespace Sass {
                 // special case for ruby ass
                 if (sl->empty()) {
                   // this seems inconsistent but it is how ruby sass seems to remove parentheses
-                  *cpy_head << SASS_MEMORY_NEW(ctx.mem, Type_Selector, hs->pstate(), ws->name());
+                  *cpy_head << SASS_MEMORY_NEW(ctx.mem, Element_Selector, hs->pstate(), ws->name());
                 }
                 // has wrapped selectors
                 else {
diff --git a/src/functions.cpp b/src/functions.cpp
@@ -1821,7 +1821,7 @@ namespace Sass {
             }
 
             // Cannot be a Universal selector
-            Type_Selector* pType = dynamic_cast<Type_Selector*>(childSeq->head()->first());
+            Element_Selector* pType = dynamic_cast<Element_Selector*>(childSeq->head()->first());
             if(pType && pType->name() == "*") {
               std::string msg("Can't append  `");
               msg += childSeq->to_string();
diff --git a/src/inspect.cpp b/src/inspect.cpp
@@ -887,7 +887,7 @@ namespace Sass {
 
   }
 
-  void Inspect::operator()(Type_Selector* s)
+  void Inspect::operator()(Element_Selector* s)
   {
     append_token(s->ns_name(), s);
   }
diff --git a/src/inspect.hpp b/src/inspect.hpp
@@ -82,7 +82,7 @@ namespace Sass {
     // selectors
     virtual void operator()(Selector_Schema*);
     virtual void operator()(Selector_Placeholder*);
-    virtual void operator()(Type_Selector*);
+    virtual void operator()(Element_Selector*);
     virtual void operator()(Selector_Qualifier*);
     virtual void operator()(Attribute_Selector*);
     virtual void operator()(Pseudo_Selector*);
diff --git a/src/operation.hpp b/src/operation.hpp
@@ -72,7 +72,7 @@ namespace Sass {
     // selectors
     virtual T operator()(Selector_Schema* x)        = 0;
     virtual T operator()(Selector_Placeholder* x)   = 0;
-    virtual T operator()(Type_Selector* x)          = 0;
+    virtual T operator()(Element_Selector* x)       = 0;
     virtual T operator()(Selector_Qualifier* x)     = 0;
     virtual T operator()(Attribute_Selector* x)     = 0;
     virtual T operator()(Pseudo_Selector* x)        = 0;
@@ -153,7 +153,7 @@ namespace Sass {
     // 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()(Type_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); }
     T operator()(Pseudo_Selector* x)        { return static_cast<D*>(this)->fallback(x); }
diff --git a/src/parser.cpp b/src/parser.cpp
@@ -771,7 +771,7 @@ namespace Sass {
       // parse type selector
       else if (lex< re_type_selector >(false))
       {
-        (*seq) << SASS_MEMORY_NEW(ctx.mem, Type_Selector, pstate, lexed);
+        (*seq) << SASS_MEMORY_NEW(ctx.mem, Element_Selector, pstate, lexed);
       }
       // peek for abort conditions
       else if (peek< spaces >()) break;
@@ -803,10 +803,10 @@ namespace Sass {
       return SASS_MEMORY_NEW(ctx.mem, Selector_Qualifier, pstate, lexed);
     }
     else if (lex< quoted_string >()) {
-      return SASS_MEMORY_NEW(ctx.mem, Type_Selector, pstate, unquote(lexed));
+      return SASS_MEMORY_NEW(ctx.mem, Element_Selector, pstate, unquote(lexed));
     }
     else if (lex< alternatives < variable, number, static_reference_combinator > >()) {
-      return SASS_MEMORY_NEW(ctx.mem, Type_Selector, pstate, lexed);
+      return SASS_MEMORY_NEW(ctx.mem, Element_Selector, pstate, lexed);
     }
     else if (peek< pseudo_not >()) {
       return parse_negated_selector();

Original file line number	Diff line number	Diff line change
`@@ -1821,7 +1821,7 @@ namespace Sass {`
`1821`	`1821`	`}`
`1822`	`1822`
`1823`	`1823`	`// Cannot be a Universal selector`
`1824`		`- Type_Selector* pType = dynamic_cast<Type_Selector*>(childSeq->head()->first());`
	`1824`	`+ Element_Selector* pType = dynamic_cast<Element_Selector*>(childSeq->head()->first());`
`1825`	`1825`	`if(pType && pType->name() == "*") {`
`1826`	`1826`	std::string msg("Can't append `");
`1827`	`1827`	`msg += childSeq->to_string();`
Original file line number	Diff line number	Diff line change
`@@ -887,7 +887,7 @@ namespace Sass {`
`887`	`887`
`888`	`888`	`}`
`889`	`889`
`890`		`- void Inspect::operator()(Type_Selector* s)`
	`890`	`+ void Inspect::operator()(Element_Selector* s)`
`891`	`891`	`{`
`892`	`892`	`append_token(s->ns_name(), s);`
`893`	`893`	`}`