Rename Directive to AtRule

mgreter · mgreter · commit 8fbd1ffa9b7b · 2019-11-03T01:52:20.000+01:00
diff --git a/src/ast.cpp b/src/ast.cpp
@@ -212,25 +212,25 @@ namespace Sass {
   /////////////////////////////////////////////////////////////////////////
   /////////////////////////////////////////////////////////////////////////
 
-  Directive::Directive(SourceSpan pstate, sass::string kwd, SelectorListObj sel, Block_Obj b, ExpressionObj val)
+  AtRule::AtRule(SourceSpan pstate, sass::string kwd, SelectorListObj sel, Block_Obj b, ExpressionObj val)
   : ParentStatement(pstate, b), keyword_(kwd), selector_(sel), value_(val) // set value manually if needed
   { statement_type(DIRECTIVE); }
-  Directive::Directive(const Directive* ptr)
+  AtRule::AtRule(const AtRule* ptr)
   : ParentStatement(ptr),
     keyword_(ptr->keyword_),
     selector_(ptr->selector_),
     value_(ptr->value_) // set value manually if needed
   { statement_type(DIRECTIVE); }
 
-  bool Directive::bubbles() { return is_keyframes() || is_media(); }
+  bool AtRule::bubbles() { return is_keyframes() || is_media(); }
 
-  bool Directive::is_media() {
+  bool AtRule::is_media() {
     return keyword_.compare("@-webkit-media") == 0 ||
             keyword_.compare("@-moz-media") == 0 ||
             keyword_.compare("@-o-media") == 0 ||
             keyword_.compare("@media") == 0;
   }
-  bool Directive::is_keyframes() {
+  bool AtRule::is_keyframes() {
     return keyword_.compare("@-webkit-keyframes") == 0 ||
             keyword_.compare("@-moz-keyframes") == 0 ||
             keyword_.compare("@-o-keyframes") == 0 ||
@@ -826,7 +826,7 @@ namespace Sass {
 
     if (s->statement_type() == Statement::DIRECTIVE)
     {
-      if (Directive_Obj dir = Cast<Directive>(s))
+      if (AtRuleObj dir = Cast<AtRule>(s))
       {
         sass::string keyword(dir->keyword());
         if (keyword.length() > 0) keyword.erase(0, 1);
@@ -845,7 +845,7 @@ namespace Sass {
     {
       return expression()->exclude("supports");
     }
-    if (Directive_Obj dir = Cast<Directive>(s))
+    if (AtRuleObj dir = Cast<AtRule>(s))
     {
       if (dir->is_keyframes()) return expression()->exclude("keyframes");
     }
@@ -917,7 +917,7 @@ namespace Sass {
   IMPLEMENT_AST_OPERATORS(CssMediaQuery);
   IMPLEMENT_AST_OPERATORS(Import);
   IMPLEMENT_AST_OPERATORS(Import_Stub);
-  IMPLEMENT_AST_OPERATORS(Directive);
+  IMPLEMENT_AST_OPERATORS(AtRule);
   IMPLEMENT_AST_OPERATORS(AtRootRule);
   IMPLEMENT_AST_OPERATORS(WhileRule);
   IMPLEMENT_AST_OPERATORS(EachRule);
diff --git a/src/ast.hpp b/src/ast.hpp
@@ -569,16 +569,16 @@ namespace Sass {
   // At-rules -- arbitrary directives beginning with "@" that may have an
   // optional statement block.
   ///////////////////////////////////////////////////////////////////////
-  class Directive final : public ParentStatement {
+  class AtRule final : public ParentStatement {
     ADD_CONSTREF(sass::string, keyword)
     ADD_PROPERTY(SelectorListObj, selector)
     ADD_PROPERTY(ExpressionObj, value)
   public:
-    Directive(SourceSpan pstate, sass::string kwd, SelectorListObj sel = {}, Block_Obj b = {}, ExpressionObj val = {});
+    AtRule(SourceSpan pstate, sass::string kwd, SelectorListObj sel = {}, Block_Obj b = {}, ExpressionObj val = {});
     bool bubbles() override;
     bool is_media();
     bool is_keyframes();
-    ATTACH_AST_OPERATIONS(Directive)
+    ATTACH_AST_OPERATIONS(AtRule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
diff --git a/src/ast_fwd_decl.hpp b/src/ast_fwd_decl.hpp
@@ -36,7 +36,7 @@ namespace Sass {
   class CssMediaQuery;
 
   class SupportsRule;
-  class Directive;
+  class AtRule;
 
   class Keyframe_Rule;
   class AtRootRule;
@@ -138,7 +138,7 @@ namespace Sass {
   IMPL_MEM_OBJ(CssMediaRule);
   IMPL_MEM_OBJ(CssMediaQuery);
   IMPL_MEM_OBJ(SupportsRule);
-  IMPL_MEM_OBJ(Directive);
+  IMPL_MEM_OBJ(AtRule);
   IMPL_MEM_OBJ(Keyframe_Rule);
   IMPL_MEM_OBJ(AtRootRule);
   IMPL_MEM_OBJ(Declaration);
diff --git a/src/check_nesting.cpp b/src/check_nesting.cpp
@@ -353,7 +353,7 @@ namespace Sass {
 
   bool CheckNesting::is_charset(Statement* n)
   {
-    Directive* d = Cast<Directive>(n);
+    AtRule* d = Cast<AtRule>(n);
     return d && d->keyword() == "charset";
   }
 
@@ -384,7 +384,7 @@ namespace Sass {
 
   bool CheckNesting::is_directive_node(Statement* n)
   {
-    return Cast<Directive>(n) ||
+    return Cast<AtRule>(n) ||
            Cast<Import>(n) ||
       Cast<MediaRule>(n) ||
       Cast<CssMediaRule>(n) ||
diff --git a/src/cssize.cpp b/src/cssize.cpp
@@ -80,7 +80,7 @@ namespace Sass {
     return 0;
   }
 
-  Statement* Cssize::operator()(Directive* r)
+  Statement* Cssize::operator()(AtRule* r)
   {
     if (!r->block() || !r->block()->length()) return r;
 
@@ -90,7 +90,7 @@ namespace Sass {
     }
 
     p_stack.push_back(r);
-    Directive_Obj rr = SASS_MEMORY_NEW(Directive,
+    AtRuleObj rr = SASS_MEMORY_NEW(AtRule,
                                   r->pstate(),
                                   r->keyword(),
                                   r->selector(),
@@ -107,15 +107,15 @@ namespace Sass {
         Bubble_Obj s_obj = Cast<Bubble>(s);
         s = s_obj->node();
         if (s->statement_type() != Statement::DIRECTIVE) directive_exists = false;
-        else directive_exists = (Cast<Directive>(s)->keyword() == rr->keyword());
+        else directive_exists = (Cast<AtRule>(s)->keyword() == rr->keyword());
       }
 
     }
 
     Block* result = SASS_MEMORY_NEW(Block, rr->pstate());
     if (!(directive_exists || rr->is_keyframes()))
     {
-      Directive* empty_node = Cast<Directive>(rr);
+      AtRule* empty_node = Cast<AtRule>(rr);
       empty_node->block(SASS_MEMORY_NEW(Block, rr->block() ? rr->block()->pstate() : rr->pstate()));
       result->append(empty_node);
     }
@@ -287,7 +287,7 @@ namespace Sass {
     return bubble(m);
   }
 
-  Statement* Cssize::bubble(Directive* m)
+  Statement* Cssize::bubble(AtRule* m)
   {
     Block* bb = SASS_MEMORY_NEW(Block, this->parent()->pstate());
     ParentStatementObj new_rule = Cast<ParentStatement>(SASS_MEMORY_COPY(this->parent()));
@@ -297,7 +297,7 @@ namespace Sass {
 
     Block_Obj wrapper_block = SASS_MEMORY_NEW(Block, m->block() ? m->block()->pstate() : m->pstate());
     wrapper_block->append(new_rule);
-    Directive_Obj mm = SASS_MEMORY_NEW(Directive,
+    AtRuleObj mm = SASS_MEMORY_NEW(AtRule,
                                   m->pstate(),
                                   m->keyword(),
                                   m->selector(),
diff --git a/src/cssize.hpp b/src/cssize.hpp
@@ -26,7 +26,7 @@ namespace Sass {
     Statement* operator()(CssMediaRule*);
     Statement* operator()(SupportsRule*);
     Statement* operator()(AtRootRule*);
-    Statement* operator()(Directive*);
+    Statement* operator()(AtRule*);
     Statement* operator()(Keyframe_Rule*);
     Statement* operator()(Trace*);
     Statement* operator()(Declaration*);
@@ -49,7 +49,7 @@ namespace Sass {
 
     Statement* parent();
     sass::vector<std::pair<bool, Block_Obj>> slice_by_bubble(Block*);
-    Statement* bubble(Directive*);
+    Statement* bubble(AtRule*);
     Statement* bubble(AtRootRule*);
     Statement* bubble(CssMediaRule*);
     Statement* bubble(SupportsRule*);
diff --git a/src/debugger.hpp b/src/debugger.hpp
@@ -665,9 +665,9 @@ inline void debug_ast(AST_Node* node, sass::string ind, Env* env)
     std::cerr << " " << ParentStatement->tabs() << std::endl;
     if (ParentStatement->name()) debug_ast(ParentStatement->name(), ind + "@");
     if (ParentStatement->block()) for(const Statement_Obj& i : ParentStatement->block()->elements()) { debug_ast(i, ind + " ", env); }
-  } else if (Cast<Directive>(node)) {
-    Directive* block = Cast<Directive>(node);
-    std::cerr << ind << "Directive " << block;
+  } else if (Cast<AtRule>(node)) {
+    AtRule* block = Cast<AtRule>(node);
+    std::cerr << ind << "AtRule " << block;
     std::cerr << " (" << pstate_source_position(node) << ")";
     std::cerr << " [" << block->keyword() << "] " << block->tabs() << std::endl;
     debug_ast(block->selector(), ind + "~", env);
diff --git a/src/expand.cpp b/src/expand.cpp
@@ -299,7 +299,7 @@ namespace Sass {
     return aa.detach();
   }
 
-  Statement* Expand::operator()(Directive* a)
+  Statement* Expand::operator()(AtRule* a)
   {
     LOCAL_FLAG(in_keyframes, a->is_keyframes());
     Block* ab = a->block();
@@ -310,7 +310,7 @@ namespace Sass {
     if (as) as = eval(as);
     popNullSelector();
     Block* bb = ab ? operator()(ab) : NULL;
-    Directive* aa = SASS_MEMORY_NEW(Directive,
+    AtRule* aa = SASS_MEMORY_NEW(AtRule,
                                   a->pstate(),
                                   a->keyword(),
                                   as,
diff --git a/src/expand.hpp b/src/expand.hpp
@@ -70,7 +70,7 @@ namespace Sass {
 
     Statement* operator()(SupportsRule*);
     Statement* operator()(AtRootRule*);
-    Statement* operator()(Directive*);
+    Statement* operator()(AtRule*);
     Statement* operator()(Declaration*);
     Statement* operator()(Assignment*);
     Statement* operator()(Import*);
diff --git a/src/inspect.cpp b/src/inspect.cpp
@@ -142,7 +142,7 @@ namespace Sass {
     if(at_root_block->block()) at_root_block->block()->perform(this);
   }
 
-  void Inspect::operator()(Directive* at_rule)
+  void Inspect::operator()(AtRule* at_rule)
   {
     append_indentation();
     append_token(at_rule->keyword(), at_rule);
diff --git a/src/inspect.hpp b/src/inspect.hpp
@@ -24,7 +24,7 @@ namespace Sass {
     virtual void operator()(Bubble*);
     virtual void operator()(SupportsRule*);
     virtual void operator()(AtRootRule*);
-    virtual void operator()(Directive*);
+    virtual void operator()(AtRule*);
     virtual void operator()(Keyframe_Rule*);
     virtual void operator()(Declaration*);
     virtual void operator()(Assignment*);
diff --git a/src/operation.hpp b/src/operation.hpp
@@ -56,7 +56,7 @@ namespace Sass {
     virtual T operator()(CssMediaRule* x) = 0;
     virtual T operator()(CssMediaQuery* x) = 0;
     virtual T operator()(AtRootRule* x)          = 0;
-    virtual T operator()(Directive* x)              = 0;
+    virtual T operator()(AtRule* x)              = 0;
     virtual T operator()(Keyframe_Rule* x)          = 0;
     virtual T operator()(Declaration* x)            = 0;
     virtual T operator()(Assignment* x)             = 0;
@@ -142,7 +142,7 @@ namespace Sass {
     T operator()(CssMediaRule* x) { return static_cast<D*>(this)->fallback(x); }
     T operator()(CssMediaQuery* x) { return static_cast<D*>(this)->fallback(x); }
     T operator()(AtRootRule* x)          { return static_cast<D*>(this)->fallback(x); }
-    T operator()(Directive* x)              { return static_cast<D*>(this)->fallback(x); }
+    T operator()(AtRule* x)              { return static_cast<D*>(this)->fallback(x); }
     T operator()(Keyframe_Rule* x)          { return static_cast<D*>(this)->fallback(x); }
     T operator()(Declaration* x)            { return static_cast<D*>(this)->fallback(x); }
     T operator()(Assignment* x)             { return static_cast<D*>(this)->fallback(x); }
diff --git a/src/output.cpp b/src/output.cpp
@@ -253,7 +253,7 @@ namespace Sass {
     }
   }
 
-  void Output::operator()(Directive* a)
+  void Output::operator()(AtRule* a)
   {
     sass::string      kwd   = a->keyword();
     Selector_Obj   s     = a->selector();
diff --git a/src/output.hpp b/src/output.hpp
@@ -30,7 +30,7 @@ namespace Sass {
     virtual void operator()(StyleRule*);
     virtual void operator()(SupportsRule*);
     virtual void operator()(CssMediaRule*);
-    virtual void operator()(Directive*);
+    virtual void operator()(AtRule*);
     virtual void operator()(Keyframe_Rule*);
     virtual void operator()(Import*);
     virtual void operator()(Comment*);
diff --git a/src/parser.cpp b/src/parser.cpp
@@ -2445,9 +2445,9 @@ namespace Sass {
     return cond;
   }
 
-  Directive_Obj Parser::parse_directive()
+  AtRuleObj Parser::parse_directive()
   {
-    Directive_Obj directive = SASS_MEMORY_NEW(Directive, pstate, lexed);
+    AtRuleObj directive = SASS_MEMORY_NEW(AtRule, pstate, lexed);
     String_Schema_Obj val = parse_almost_any_value();
     // strip left and right if they are of type string
     directive->value(val);
diff --git a/src/parser.hpp b/src/parser.hpp
@@ -324,7 +324,7 @@ namespace Sass {
     AtRootRuleObj parse_at_root_block();
     At_Root_Query_Obj parse_at_root_query();
     String_Schema_Obj parse_almost_any_value();
-    Directive_Obj parse_directive();
+    AtRuleObj parse_directive();
     WarningRuleObj parse_warning();
     ErrorRuleObj parse_error();
     DebugRuleObj parse_debug();
diff --git a/src/remove_placeholders.cpp b/src/remove_placeholders.cpp
@@ -78,7 +78,7 @@ namespace Sass {
       if (m->block()) operator()(m->block());
     }
 
-    void Remove_Placeholders::operator()(Directive* a)
+    void Remove_Placeholders::operator()(AtRule* a)
     {
       if (a->block()) a->block()->perform(this);
     }
diff --git a/src/remove_placeholders.hpp b/src/remove_placeholders.hpp
@@ -24,7 +24,7 @@ namespace Sass {
     void operator()(StyleRule*);
     void operator()(CssMediaRule*);
     void operator()(SupportsRule*);
-    void operator()(Directive*);
+    void operator()(AtRule*);
 
     // ignore missed types
     template <typename U>
diff --git a/src/util.cpp b/src/util.cpp
@@ -547,7 +547,7 @@ namespace Sass {
       bool hasPrintableChildBlocks = false;
       for (size_t i = 0, L = b->length(); i < L; ++i) {
         Statement_Obj stm = b->at(i);
-        if (Cast<Directive>(stm)) {
+        if (Cast<AtRule>(stm)) {
           return true;
         } else if (Declaration* d = Cast<Declaration>(stm)) {
           return isPrintable(d, style);
@@ -606,7 +606,7 @@ namespace Sass {
       bool hasPrintableChildBlocks = false;
       for (size_t i = 0, L = b->length(); i < L; ++i) {
         Statement_Obj stm = b->at(i);
-        if (Cast<Declaration>(stm) || Cast<Directive>(stm)) {
+        if (Cast<Declaration>(stm) || Cast<AtRule>(stm)) {
           hasDeclarations = true;
         }
         else if (ParentStatement* b = Cast<ParentStatement>(stm)) {
@@ -634,7 +634,7 @@ namespace Sass {
       if (m->empty()) return false;
       for (size_t i = 0, L = b->length(); i < L; ++i) {
         Statement_Obj stm = b->at(i);
-        if (Cast<Directive>(stm)) return true;
+        if (Cast<AtRule>(stm)) return true;
         else if (Cast<Declaration>(stm)) return true;
         else if (Comment* c = Cast<Comment>(stm)) {
           if (isPrintable(c, style)) {
@@ -686,7 +686,7 @@ namespace Sass {
 
       for (size_t i = 0, L = b->length(); i < L; ++i) {
         Statement_Obj stm = b->at(i);
-        if (Cast<Declaration>(stm) || Cast<Directive>(stm)) {
+        if (Cast<Declaration>(stm) || Cast<AtRule>(stm)) {
           return true;
         }
         else if (Comment* c = Cast<Comment>(stm)) {

Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ namespace Sass {`
`353`	`353`
`354`	`354`	`bool CheckNesting::is_charset(Statement* n)`
`355`	`355`	`{`
`356`		`- Directive* d = Cast<Directive>(n);`
	`356`	`+ AtRule* d = Cast<AtRule>(n);`
`357`	`357`	`return d && d->keyword() == "charset";`
`358`	`358`	`}`
`359`	`359`
`@@ -384,7 +384,7 @@ namespace Sass {`
`384`	`384`
`385`	`385`	`bool CheckNesting::is_directive_node(Statement* n)`
`386`	`386`	`{`
`387`		`- return Cast<Directive>(n) \|\|`
	`387`	`+ return Cast<AtRule>(n) \|\|`
`388`	`388`	`Cast<Import>(n) \|\|`
`389`	`389`	`Cast<MediaRule>(n) \|\|`
`390`	`390`	`Cast<CssMediaRule>(n) \|\|`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ namespace Sass {`
`80`	`80`	`return 0;`
`81`	`81`	`}`
`82`	`82`
`83`		`- Statement* Cssize::operator()(Directive* r)`
	`83`	`+ Statement* Cssize::operator()(AtRule* r)`
`84`	`84`	`{`
`85`	`85`	`if (!r->block() \|\| !r->block()->length()) return r;`
`86`	`86`
`@@ -90,7 +90,7 @@ namespace Sass {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`p_stack.push_back(r);`
`93`		`- Directive_Obj rr = SASS_MEMORY_NEW(Directive,`
	`93`	`+ AtRuleObj rr = SASS_MEMORY_NEW(AtRule,`
`94`	`94`	`r->pstate(),`
`95`	`95`	`r->keyword(),`
`96`	`96`	`r->selector(),`
`@@ -107,15 +107,15 @@ namespace Sass {`
`107`	`107`	`Bubble_Obj s_obj = Cast<Bubble>(s);`
`108`	`108`	`s = s_obj->node();`
`109`	`109`	`if (s->statement_type() != Statement::DIRECTIVE) directive_exists = false;`
`110`		`- else directive_exists = (Cast<Directive>(s)->keyword() == rr->keyword());`
	`110`	`+ else directive_exists = (Cast<AtRule>(s)->keyword() == rr->keyword());`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`Block* result = SASS_MEMORY_NEW(Block, rr->pstate());`
`116`	`116`	`if (!(directive_exists \|\| rr->is_keyframes()))`
`117`	`117`	`{`
`118`		`- Directive* empty_node = Cast<Directive>(rr);`
	`118`	`+ AtRule* empty_node = Cast<AtRule>(rr);`
`119`	`119`	`empty_node->block(SASS_MEMORY_NEW(Block, rr->block() ? rr->block()->pstate() : rr->pstate()));`
`120`	`120`	`result->append(empty_node);`
`121`	`121`	`}`
`@@ -287,7 +287,7 @@ namespace Sass {`
`287`	`287`	`return bubble(m);`
`288`	`288`	`}`
`289`	`289`
`290`		`- Statement* Cssize::bubble(Directive* m)`
	`290`	`+ Statement* Cssize::bubble(AtRule* m)`
`291`	`291`	`{`
`292`	`292`	`Block* bb = SASS_MEMORY_NEW(Block, this->parent()->pstate());`
`293`	`293`	`ParentStatementObj new_rule = Cast<ParentStatement>(SASS_MEMORY_COPY(this->parent()));`
`@@ -297,7 +297,7 @@ namespace Sass {`
`297`	`297`
`298`	`298`	`Block_Obj wrapper_block = SASS_MEMORY_NEW(Block, m->block() ? m->block()->pstate() : m->pstate());`
`299`	`299`	`wrapper_block->append(new_rule);`
`300`		`- Directive_Obj mm = SASS_MEMORY_NEW(Directive,`
	`300`	`+ AtRuleObj mm = SASS_MEMORY_NEW(AtRule,`
`301`	`301`	`m->pstate(),`
`302`	`302`	`m->keyword(),`
`303`	`303`	`m->selector(),`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ namespace Sass {`
`142`	`142`	`if(at_root_block->block()) at_root_block->block()->perform(this);`
`143`	`143`	`}`
`144`	`144`
`145`		`- void Inspect::operator()(Directive* at_rule)`
	`145`	`+ void Inspect::operator()(AtRule* at_rule)`
`146`	`146`	`{`
`147`	`147`	`append_indentation();`
`148`	`148`	`append_token(at_rule->keyword(), at_rule);`