Rename At_Root_Block to AtRootRule

Author: mgreter

src/ast.cpp

@@ -807,18 +807,18 @@ namespace Sass {
   /////////////////////////////////////////////////////////////////////////
   /////////////////////////////////////////////////////////////////////////
 
-  At_Root_Block::At_Root_Block(SourceSpan pstate, Block_Obj b, At_Root_Query_Obj e)
+  AtRootRule::AtRootRule(SourceSpan pstate, Block_Obj b, At_Root_Query_Obj e)
   : ParentStatement(pstate, b), expression_(e)
   { statement_type(ATROOT); }
-  At_Root_Block::At_Root_Block(const At_Root_Block* ptr)
+  AtRootRule::AtRootRule(const AtRootRule* ptr)
   : ParentStatement(ptr), expression_(ptr->expression_)
   { statement_type(ATROOT); }
 
-  bool At_Root_Block::bubbles() {
+  bool AtRootRule::bubbles() {
     return true;
   }
 
-  bool At_Root_Block::exclude_node(Statement_Obj s) {
+  bool AtRootRule::exclude_node(Statement_Obj s) {
     if (expression() == nullptr)
     {
       return s->statement_type() == Statement::RULESET;
@@ -918,7 +918,7 @@ namespace Sass {
   IMPLEMENT_AST_OPERATORS(Import);
   IMPLEMENT_AST_OPERATORS(Import_Stub);
   IMPLEMENT_AST_OPERATORS(Directive);
-  IMPLEMENT_AST_OPERATORS(At_Root_Block);
+  IMPLEMENT_AST_OPERATORS(AtRootRule);
   IMPLEMENT_AST_OPERATORS(WhileRule);
   IMPLEMENT_AST_OPERATORS(EachRule);
   IMPLEMENT_AST_OPERATORS(ForRule);

src/ast.hpp

@@ -1011,13 +1011,13 @@ namespace Sass {
   ///////////
   // At-root.
   ///////////
-  class At_Root_Block final : public ParentStatement {
+  class AtRootRule final : public ParentStatement {
     ADD_PROPERTY(At_Root_Query_Obj, expression)
   public:
-    At_Root_Block(SourceSpan pstate, Block_Obj b = {}, At_Root_Query_Obj e = {});
+    AtRootRule(SourceSpan pstate, Block_Obj b = {}, At_Root_Query_Obj e = {});
     bool bubbles() override;
     bool exclude_node(Statement_Obj s);
-    ATTACH_AST_OPERATIONS(At_Root_Block)
+    ATTACH_AST_OPERATIONS(AtRootRule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 

src/ast_fwd_decl.hpp

@@ -39,7 +39,7 @@ namespace Sass {
   class Directive;
 
   class Keyframe_Rule;
-  class At_Root_Block;
+  class AtRootRule;
   class Assignment;
 
   class Import;
@@ -140,7 +140,7 @@ namespace Sass {
   IMPL_MEM_OBJ(SupportsRule);
   IMPL_MEM_OBJ(Directive);
   IMPL_MEM_OBJ(Keyframe_Rule);
-  IMPL_MEM_OBJ(At_Root_Block);
+  IMPL_MEM_OBJ(AtRootRule);
   IMPL_MEM_OBJ(Declaration);
   IMPL_MEM_OBJ(Assignment);
   IMPL_MEM_OBJ(Import);

src/check_nesting.cpp

@@ -21,7 +21,7 @@ namespace Sass {
   {
     Statement* old_parent = this->parent;
 
-    if (At_Root_Block* root = Cast<At_Root_Block>(parent)) {
+    if (AtRootRule* root = Cast<AtRootRule>(parent)) {
       sass::vector<Statement*> old_parents = this->parents;
       sass::vector<Statement*> new_parents;
 
@@ -45,7 +45,7 @@ namespace Sass {
         }
       }
 
-      At_Root_Block* ar = Cast<At_Root_Block>(parent);
+      AtRootRule* ar = Cast<AtRootRule>(parent);
       Block* ret = ar->block();
 
       if (ret != NULL) {
@@ -379,7 +379,7 @@ namespace Sass {
 
   bool CheckNesting::is_at_root_node(Statement* n)
   {
-    return Cast<At_Root_Block>(n) != NULL;
+    return Cast<AtRootRule>(n) != NULL;
   }
 
   bool CheckNesting::is_directive_node(Statement* n)

src/cssize.cpp

@@ -259,7 +259,7 @@ namespace Sass {
     return debubble(mm->block(), mm);
   }
 
-  Statement* Cssize::operator()(At_Root_Block* m)
+  Statement* Cssize::operator()(AtRootRule* m)
   {
     bool tmp = false;
     for (size_t i = 0, L = p_stack.size(); i < L; ++i) {
@@ -308,7 +308,7 @@ namespace Sass {
     return bubble;
   }
 
-  Statement* Cssize::bubble(At_Root_Block* m)
+  Statement* Cssize::bubble(AtRootRule* m)
   {
     if (!m || !m->block()) return NULL;
     Block* bb = SASS_MEMORY_NEW(Block, this->parent()->pstate());
@@ -321,7 +321,7 @@ namespace Sass {
       wrapper_block->append(new_rule);
     }
 
-    At_Root_Block* mm = SASS_MEMORY_NEW(At_Root_Block,
+    AtRootRule* mm = SASS_MEMORY_NEW(AtRootRule,
                                         m->pstate(),
                                         wrapper_block,
                                         m->expression());

src/cssize.hpp

@@ -25,7 +25,7 @@ namespace Sass {
     // Statement* operator()(Bubble*);
     Statement* operator()(CssMediaRule*);
     Statement* operator()(SupportsRule*);
-    Statement* operator()(At_Root_Block*);
+    Statement* operator()(AtRootRule*);
     Statement* operator()(Directive*);
     Statement* operator()(Keyframe_Rule*);
     Statement* operator()(Trace*);
@@ -50,7 +50,7 @@ namespace Sass {
     Statement* parent();
     sass::vector<std::pair<bool, Block_Obj>> slice_by_bubble(Block*);
     Statement* bubble(Directive*);
-    Statement* bubble(At_Root_Block*);
+    Statement* bubble(AtRootRule*);
     Statement* bubble(CssMediaRule*);
     Statement* bubble(SupportsRule*);
 

src/debugger.hpp

@@ -341,9 +341,9 @@ inline void debug_ast(AST_Node* node, sass::string ind, Env* env)
     << " [name:" << trace->name() << ", type: " << trace->type() << "]"
     << std::endl;
     debug_ast(trace->block(), ind + " ", env);
-  } else if (Cast<At_Root_Block>(node)) {
-    At_Root_Block* root_block = Cast<At_Root_Block>(node);
-    std::cerr << ind << "At_Root_Block " << root_block;
+  } else if (Cast<AtRootRule>(node)) {
+    AtRootRule* root_block = Cast<AtRootRule>(node);
+    std::cerr << ind << "AtRootRule " << root_block;
     std::cerr << " (" << pstate_source_position(node) << ")";
     std::cerr << " " << root_block->tabs();
     std::cerr << std::endl;

src/expand.cpp

@@ -278,7 +278,7 @@ namespace Sass {
 
   }
 
-  Statement* Expand::operator()(At_Root_Block* a)
+  Statement* Expand::operator()(AtRootRule* a)
   {
     Block_Obj ab = a->block();
     ExpressionObj ae = a->expression();
@@ -292,7 +292,7 @@ namespace Sass {
                                        ;
 
     Block_Obj bb = ab ? operator()(ab) : NULL;
-    At_Root_Block_Obj aa = SASS_MEMORY_NEW(At_Root_Block,
+    AtRootRuleObj aa = SASS_MEMORY_NEW(AtRootRule,
                                         a->pstate(),
                                         bb,
                                         Cast<At_Root_Query>(ae));

src/expand.hpp

@@ -69,7 +69,7 @@ namespace Sass {
     // Statement* operator()(CssMediaRule*);
 
     Statement* operator()(SupportsRule*);
-    Statement* operator()(At_Root_Block*);
+    Statement* operator()(AtRootRule*);
     Statement* operator()(Directive*);
     Statement* operator()(Declaration*);
     Statement* operator()(Assignment*);

src/inspect.cpp

@@ -133,7 +133,7 @@ namespace Sass {
     feature_block->block()->perform(this);
   }
 
-  void Inspect::operator()(At_Root_Block* at_root_block)
+  void Inspect::operator()(AtRootRule* at_root_block)
   {
     append_indentation();
     append_token("@at-root ", at_root_block);