Rename Each to EachRule

mgreter · mgreter · commit cdd51f4ed2e0 · 2019-11-03T01:52:01.000+01:00
diff --git a/src/ast.cpp b/src/ast.cpp
@@ -397,10 +397,10 @@ namespace Sass {
   /////////////////////////////////////////////////////////////////////////
   /////////////////////////////////////////////////////////////////////////
 
-  Each::Each(ParserState pstate, sass::vector<sass::string> vars, Expression_Obj lst, Block_Obj b)
+  EachRule::EachRule(ParserState pstate, sass::vector<sass::string> vars, Expression_Obj lst, Block_Obj b)
   : ParentStatement(pstate, b), variables_(vars), list_(lst)
   { statement_type(EACH); }
-  Each::Each(const Each* ptr)
+  EachRule::EachRule(const EachRule* ptr)
   : ParentStatement(ptr), variables_(ptr->variables_), list_(ptr->list_)
   { statement_type(EACH); }
 
@@ -920,7 +920,7 @@ namespace Sass {
   IMPLEMENT_AST_OPERATORS(Directive);
   IMPLEMENT_AST_OPERATORS(At_Root_Block);
   IMPLEMENT_AST_OPERATORS(WhileRule);
-  IMPLEMENT_AST_OPERATORS(Each);
+  IMPLEMENT_AST_OPERATORS(EachRule);
   IMPLEMENT_AST_OPERATORS(For);
   IMPLEMENT_AST_OPERATORS(If);
   IMPLEMENT_AST_OPERATORS(Mixin_Call);
diff --git a/src/ast.hpp b/src/ast.hpp
@@ -730,12 +730,12 @@ namespace Sass {
   //////////////////////////////////////
   // The Sass `@each` control directive.
   //////////////////////////////////////
-  class Each final : public ParentStatement {
+  class EachRule final : public ParentStatement {
     ADD_PROPERTY(sass::vector<sass::string>, variables)
     ADD_PROPERTY(Expression_Obj, list)
   public:
-    Each(ParserState pstate, sass::vector<sass::string> vars, Expression_Obj lst, Block_Obj b);
-    ATTACH_AST_OPERATIONS(Each)
+    EachRule(ParserState pstate, sass::vector<sass::string> vars, Expression_Obj lst, Block_Obj b);
+    ATTACH_AST_OPERATIONS(EachRule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
diff --git a/src/ast_fwd_decl.hpp b/src/ast_fwd_decl.hpp
@@ -52,7 +52,7 @@ namespace Sass {
 
   class If;
   class For;
-  class Each;
+  class EachRule;
   class WhileRule;
   class Return;
   class Content;
@@ -153,7 +153,7 @@ namespace Sass {
   IMPL_MEM_OBJ(ParentStatement);
   IMPL_MEM_OBJ(If);
   IMPL_MEM_OBJ(For);
-  IMPL_MEM_OBJ(Each);
+  IMPL_MEM_OBJ(EachRule);
   IMPL_MEM_OBJ(WhileRule);
   IMPL_MEM_OBJ(Return);
   IMPL_MEM_OBJ(Content);
diff --git a/src/check_nesting.cpp b/src/check_nesting.cpp
@@ -204,7 +204,7 @@ namespace Sass {
   // {
   //   for (auto pp : this->parents) {
   //     if (
-  //         Cast<Each>(pp) ||
+  //         Cast<EachRule>(pp) ||
   //         Cast<For>(pp) ||
   //         Cast<If>(pp) ||
   //         Cast<WhileRule>(pp) ||
@@ -229,7 +229,7 @@ namespace Sass {
   {
     for (Statement* pp : this->parents) {
       if (
-          Cast<Each>(pp) ||
+          Cast<EachRule>(pp) ||
           Cast<For>(pp) ||
           Cast<If>(pp) ||
           Cast<WhileRule>(pp) ||
@@ -246,7 +246,7 @@ namespace Sass {
   {
     for (Statement* pp : this->parents) {
       if (
-          Cast<Each>(pp) ||
+          Cast<EachRule>(pp) ||
           Cast<For>(pp) ||
           Cast<If>(pp) ||
           Cast<WhileRule>(pp) ||
@@ -262,7 +262,7 @@ namespace Sass {
   void CheckNesting::invalid_function_child(Statement* child)
   {
     if (!(
-        Cast<Each>(child) ||
+        Cast<EachRule>(child) ||
         Cast<For>(child) ||
         Cast<If>(child) ||
         Cast<WhileRule>(child) ||
@@ -283,7 +283,7 @@ namespace Sass {
   void CheckNesting::invalid_prop_child(Statement* child)
   {
     if (!(
-        Cast<Each>(child) ||
+        Cast<EachRule>(child) ||
         Cast<For>(child) ||
         Cast<If>(child) ||
         Cast<WhileRule>(child) ||
@@ -343,7 +343,7 @@ namespace Sass {
                              !is_at_root_node(grandparent);
 
     return Cast<Import>(parent) ||
-           Cast<Each>(parent) ||
+           Cast<EachRule>(parent) ||
            Cast<For>(parent) ||
            Cast<If>(parent) ||
            Cast<WhileRule>(parent) ||
diff --git a/src/cssize.hpp b/src/cssize.hpp
@@ -38,7 +38,7 @@ namespace Sass {
     // Statement* operator()(Comment*);
     // Statement* operator()(If*);
     // Statement* operator()(For*);
-    // Statement* operator()(Each*);
+    // Statement* operator()(EachRule*);
     // Statement* operator()(WhileRule*);
     // Statement* operator()(Return*);
     // Statement* operator()(ExtendRule*);
diff --git a/src/debugger.hpp b/src/debugger.hpp
@@ -673,9 +673,9 @@ inline void debug_ast(AST_Node* node, sass::string ind, Env* env)
     debug_ast(block->selector(), ind + "~", env);
     debug_ast(block->value(), ind + "+", env);
     if (block->block()) for(const Statement_Obj& i : block->block()->elements()) { debug_ast(i, ind + " ", env); }
-  } else if (Cast<Each>(node)) {
-    Each* block = Cast<Each>(node);
-    std::cerr << ind << "Each " << block;
+  } else if (Cast<EachRule>(node)) {
+    EachRule* block = Cast<EachRule>(node);
+    std::cerr << ind << "EachRule " << block;
     std::cerr << " (" << pstate_source_position(node) << ")";
     std::cerr << " " << block->tabs() << std::endl;
     if (block->block()) for(const Statement_Obj& i : block->block()->elements()) { debug_ast(i, ind + " ", env); }
diff --git a/src/eval.cpp b/src/eval.cpp
@@ -223,7 +223,7 @@ namespace Sass {
 
   // Eval does not create a new env scope
   // But iteration vars are reset afterwards
-  Expression* Eval::operator()(Each* e)
+  Expression* Eval::operator()(EachRule* e)
   {
     sass::vector<sass::string> variables(e->variables());
     Expression_Obj expr = e->list()->perform(this);
diff --git a/src/eval.hpp b/src/eval.hpp
@@ -44,7 +44,7 @@ namespace Sass {
     Expression* operator()(Assignment*);
     Expression* operator()(If*);
     Expression* operator()(For*);
-    Expression* operator()(Each*);
+    Expression* operator()(EachRule*);
     Expression* operator()(WhileRule*);
     Expression* operator()(Return*);
     Expression* operator()(WarningRule*);
diff --git a/src/expand.cpp b/src/expand.cpp
@@ -569,7 +569,7 @@ namespace Sass {
 
   // Eval does not create a new env scope
   // But iteration vars are reset afterwards
-  Statement* Expand::operator()(Each* e)
+  Statement* Expand::operator()(EachRule* e)
   {
     sass::vector<sass::string> variables(e->variables());
     Expression_Obj expr = e->list()->perform(&eval);
diff --git a/src/expand.hpp b/src/expand.hpp
@@ -81,7 +81,7 @@ namespace Sass {
     Statement* operator()(Comment*);
     Statement* operator()(If*);
     Statement* operator()(For*);
-    Statement* operator()(Each*);
+    Statement* operator()(EachRule*);
     Statement* operator()(WhileRule*);
     Statement* operator()(Return*);
     Statement* operator()(ExtendRule*);
diff --git a/src/inspect.cpp b/src/inspect.cpp
@@ -310,7 +310,7 @@ namespace Sass {
     loop->block()->perform(this);
   }
 
-  void Inspect::operator()(Each* loop)
+  void Inspect::operator()(EachRule* loop)
   {
     append_indentation();
     append_token("@each", loop);
diff --git a/src/inspect.hpp b/src/inspect.hpp
@@ -36,7 +36,7 @@ namespace Sass {
     virtual void operator()(Comment*);
     virtual void operator()(If*);
     virtual void operator()(For*);
-    virtual void operator()(Each*);
+    virtual void operator()(EachRule*);
     virtual void operator()(WhileRule*);
     virtual void operator()(Return*);
     virtual void operator()(ExtendRule*);
diff --git a/src/operation.hpp b/src/operation.hpp
@@ -68,7 +68,7 @@ namespace Sass {
     virtual T operator()(Comment* x)                = 0;
     virtual T operator()(If* x)                     = 0;
     virtual T operator()(For* x)                    = 0;
-    virtual T operator()(Each* x)                   = 0;
+    virtual T operator()(EachRule* x)                   = 0;
     virtual T operator()(WhileRule* x)                  = 0;
     virtual T operator()(Return* x)                 = 0;
     virtual T operator()(Content* x)                = 0;
@@ -154,7 +154,7 @@ namespace Sass {
     T operator()(Comment* x)                { return static_cast<D*>(this)->fallback(x); }
     T operator()(If* x)                     { return static_cast<D*>(this)->fallback(x); }
     T operator()(For* x)                    { return static_cast<D*>(this)->fallback(x); }
-    T operator()(Each* x)                   { return static_cast<D*>(this)->fallback(x); }
+    T operator()(EachRule* x)                   { return static_cast<D*>(this)->fallback(x); }
     T operator()(WhileRule* x)                  { return static_cast<D*>(this)->fallback(x); }
     T operator()(Return* x)                 { return static_cast<D*>(this)->fallback(x); }
     T operator()(Content* x)                { return static_cast<D*>(this)->fallback(x); }
diff --git a/src/parser.cpp b/src/parser.cpp
@@ -2085,7 +2085,7 @@ namespace Sass {
     return token;
   }
 
-  Each_Obj Parser::parse_each_directive()
+  EachRuleObj Parser::parse_each_directive()
   {
     stack.push_back(Scope::Control);
     ParserState each_source_position = pstate;
@@ -2101,7 +2101,7 @@ namespace Sass {
     Expression_Obj list = parse_list();
     Block_Obj body = parse_block(root);
     stack.pop_back();
-    return SASS_MEMORY_NEW(Each, each_source_position, vars, list, body);
+    return SASS_MEMORY_NEW(EachRule, each_source_position, vars, list, body);
   }
 
   // called after parsing `kwd_while_directive`
diff --git a/src/parser.hpp b/src/parser.hpp
@@ -302,7 +302,7 @@ namespace Sass {
     String_Obj parse_identifier_schema();
     If_Obj parse_if_directive(bool else_if = false);
     For_Obj parse_for_directive();
-    Each_Obj parse_each_directive();
+    EachRuleObj parse_each_directive();
     WhileRuleObj parse_while_directive();
     MediaRule_Obj parseMediaRule();
     sass::vector<CssMediaQuery_Obj> parseCssMediaQueries();

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ namespace Sass {`
`223`	`223`
`224`	`224`	`// Eval does not create a new env scope`
`225`	`225`	`// But iteration vars are reset afterwards`
`226`		`- Expression* Eval::operator()(Each* e)`
	`226`	`+ Expression* Eval::operator()(EachRule* e)`
`227`	`227`	`{`
`228`	`228`	`sass::vector<sass::string> variables(e->variables());`
`229`	`229`	`Expression_Obj expr = e->list()->perform(this);`
Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,7 @@ namespace Sass {`
`569`	`569`
`570`	`570`	`// Eval does not create a new env scope`
`571`	`571`	`// But iteration vars are reset afterwards`
`572`		`- Statement* Expand::operator()(Each* e)`
	`572`	`+ Statement* Expand::operator()(EachRule* e)`
`573`	`573`	`{`
`574`	`574`	`sass::vector<sass::string> variables(e->variables());`
`575`	`575`	`Expression_Obj expr = e->list()->perform(&eval);`