Rename While to WhileRule

mgreter · mgreter · commit da17d827e744 · 2019-11-03T01:52:01.000+01:00
diff --git a/src/ast.cpp b/src/ast.cpp
@@ -407,10 +407,10 @@ namespace Sass {
   /////////////////////////////////////////////////////////////////////////
   /////////////////////////////////////////////////////////////////////////
 
-  While::While(ParserState pstate, Expression_Obj pred, Block_Obj b)
+  WhileRule::WhileRule(ParserState pstate, Expression_Obj pred, Block_Obj b)
   : ParentStatement(pstate, b), predicate_(pred)
   { statement_type(WHILE); }
-  While::While(const While* ptr)
+  WhileRule::WhileRule(const WhileRule* ptr)
   : ParentStatement(ptr), predicate_(ptr->predicate_)
   { statement_type(WHILE); }
 
@@ -919,7 +919,7 @@ namespace Sass {
   IMPLEMENT_AST_OPERATORS(Import_Stub);
   IMPLEMENT_AST_OPERATORS(Directive);
   IMPLEMENT_AST_OPERATORS(At_Root_Block);
-  IMPLEMENT_AST_OPERATORS(While);
+  IMPLEMENT_AST_OPERATORS(WhileRule);
   IMPLEMENT_AST_OPERATORS(Each);
   IMPLEMENT_AST_OPERATORS(For);
   IMPLEMENT_AST_OPERATORS(If);
diff --git a/src/ast.hpp b/src/ast.hpp
@@ -742,11 +742,11 @@ namespace Sass {
   ///////////////////////////////////////
   // The Sass `@while` control directive.
   ///////////////////////////////////////
-  class While final : public ParentStatement {
+  class WhileRule final : public ParentStatement {
     ADD_PROPERTY(Expression_Obj, predicate)
   public:
-    While(ParserState pstate, Expression_Obj pred, Block_Obj b);
-    ATTACH_AST_OPERATIONS(While)
+    WhileRule(ParserState pstate, Expression_Obj pred, Block_Obj b);
+    ATTACH_AST_OPERATIONS(WhileRule)
     ATTACH_CRTP_PERFORM_METHODS()
   };
 
diff --git a/src/ast_fwd_decl.hpp b/src/ast_fwd_decl.hpp
@@ -53,7 +53,7 @@ namespace Sass {
   class If;
   class For;
   class Each;
-  class While;
+  class WhileRule;
   class Return;
   class Content;
   class ExtendRule;
@@ -154,7 +154,7 @@ namespace Sass {
   IMPL_MEM_OBJ(If);
   IMPL_MEM_OBJ(For);
   IMPL_MEM_OBJ(Each);
-  IMPL_MEM_OBJ(While);
+  IMPL_MEM_OBJ(WhileRule);
   IMPL_MEM_OBJ(Return);
   IMPL_MEM_OBJ(Content);
   IMPL_MEM_OBJ(ExtendRule);
diff --git a/src/check_nesting.cpp b/src/check_nesting.cpp
@@ -207,7 +207,7 @@ namespace Sass {
   //         Cast<Each>(pp) ||
   //         Cast<For>(pp) ||
   //         Cast<If>(pp) ||
-  //         Cast<While>(pp) ||
+  //         Cast<WhileRule>(pp) ||
   //         Cast<Trace>(pp) ||
   //         Cast<Mixin_Call>(pp) ||
   //         is_mixin(pp)
@@ -232,7 +232,7 @@ namespace Sass {
           Cast<Each>(pp) ||
           Cast<For>(pp) ||
           Cast<If>(pp) ||
-          Cast<While>(pp) ||
+          Cast<WhileRule>(pp) ||
           Cast<Trace>(pp) ||
           Cast<Mixin_Call>(pp) ||
           is_mixin(pp)
@@ -249,7 +249,7 @@ namespace Sass {
           Cast<Each>(pp) ||
           Cast<For>(pp) ||
           Cast<If>(pp) ||
-          Cast<While>(pp) ||
+          Cast<WhileRule>(pp) ||
           Cast<Trace>(pp) ||
           Cast<Mixin_Call>(pp) ||
           is_mixin(pp)
@@ -265,7 +265,7 @@ namespace Sass {
         Cast<Each>(child) ||
         Cast<For>(child) ||
         Cast<If>(child) ||
-        Cast<While>(child) ||
+        Cast<WhileRule>(child) ||
         Cast<Trace>(child) ||
         Cast<Comment>(child) ||
         Cast<DebugRule>(child) ||
@@ -286,7 +286,7 @@ namespace Sass {
         Cast<Each>(child) ||
         Cast<For>(child) ||
         Cast<If>(child) ||
-        Cast<While>(child) ||
+        Cast<WhileRule>(child) ||
         Cast<Trace>(child) ||
         Cast<Comment>(child) ||
         Cast<Declaration>(child) ||
@@ -346,7 +346,7 @@ namespace Sass {
            Cast<Each>(parent) ||
            Cast<For>(parent) ||
            Cast<If>(parent) ||
-           Cast<While>(parent) ||
+           Cast<WhileRule>(parent) ||
            Cast<Trace>(parent) ||
            valid_bubble_node;
   }
diff --git a/src/cssize.hpp b/src/cssize.hpp
@@ -39,7 +39,7 @@ namespace Sass {
     // Statement* operator()(If*);
     // Statement* operator()(For*);
     // Statement* operator()(Each*);
-    // Statement* operator()(While*);
+    // Statement* operator()(WhileRule*);
     // Statement* operator()(Return*);
     // Statement* operator()(ExtendRule*);
     // Statement* operator()(Definition*);
diff --git a/src/debugger.hpp b/src/debugger.hpp
@@ -685,9 +685,9 @@ inline void debug_ast(AST_Node* node, sass::string ind, Env* env)
     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); }
-  } else if (Cast<While>(node)) {
-    While* block = Cast<While>(node);
-    std::cerr << ind << "While " << block;
+  } else if (Cast<WhileRule>(node)) {
+    WhileRule* block = Cast<WhileRule>(node);
+    std::cerr << ind << "WhileRule " << 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
@@ -307,7 +307,7 @@ namespace Sass {
     return val.detach();
   }
 
-  Expression* Eval::operator()(While* w)
+  Expression* Eval::operator()(WhileRule* w)
   {
     Expression_Obj pred = w->predicate();
     Block_Obj body = w->block();
diff --git a/src/eval.hpp b/src/eval.hpp
@@ -45,7 +45,7 @@ namespace Sass {
     Expression* operator()(If*);
     Expression* operator()(For*);
     Expression* operator()(Each*);
-    Expression* operator()(While*);
+    Expression* operator()(WhileRule*);
     Expression* operator()(Return*);
     Expression* operator()(WarningRule*);
     Expression* operator()(ErrorRule*);
diff --git a/src/expand.cpp b/src/expand.cpp
@@ -652,7 +652,7 @@ namespace Sass {
     return 0;
   }
 
-  Statement* Expand::operator()(While* w)
+  Statement* Expand::operator()(WhileRule* w)
   {
     Expression_Obj pred = w->predicate();
     Block* body = w->block();
diff --git a/src/expand.hpp b/src/expand.hpp
@@ -82,7 +82,7 @@ namespace Sass {
     Statement* operator()(If*);
     Statement* operator()(For*);
     Statement* operator()(Each*);
-    Statement* operator()(While*);
+    Statement* operator()(WhileRule*);
     Statement* operator()(Return*);
     Statement* operator()(ExtendRule*);
     Statement* operator()(Definition*);
diff --git a/src/inspect.cpp b/src/inspect.cpp
@@ -325,7 +325,7 @@ namespace Sass {
     loop->block()->perform(this);
   }
 
-  void Inspect::operator()(While* loop)
+  void Inspect::operator()(WhileRule* loop)
   {
     append_indentation();
     append_token("@while", loop);
diff --git a/src/inspect.hpp b/src/inspect.hpp
@@ -37,7 +37,7 @@ namespace Sass {
     virtual void operator()(If*);
     virtual void operator()(For*);
     virtual void operator()(Each*);
-    virtual void operator()(While*);
+    virtual void operator()(WhileRule*);
     virtual void operator()(Return*);
     virtual void operator()(ExtendRule*);
     virtual void operator()(Definition*);
diff --git a/src/operation.hpp b/src/operation.hpp
@@ -69,7 +69,7 @@ namespace Sass {
     virtual T operator()(If* x)                     = 0;
     virtual T operator()(For* x)                    = 0;
     virtual T operator()(Each* x)                   = 0;
-    virtual T operator()(While* x)                  = 0;
+    virtual T operator()(WhileRule* x)                  = 0;
     virtual T operator()(Return* x)                 = 0;
     virtual T operator()(Content* x)                = 0;
     virtual T operator()(ExtendRule* x)              = 0;
@@ -155,7 +155,7 @@ namespace Sass {
     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()(While* 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); }
     T operator()(ExtendRule* x)              { return static_cast<D*>(this)->fallback(x); }
diff --git a/src/parser.cpp b/src/parser.cpp
@@ -2105,12 +2105,12 @@ namespace Sass {
   }
 
   // called after parsing `kwd_while_directive`
-  While_Obj Parser::parse_while_directive()
+  WhileRuleObj Parser::parse_while_directive()
   {
     stack.push_back(Scope::Control);
     bool root = block_stack.back()->is_root();
     // create the initial while call object
-    While_Obj call = SASS_MEMORY_NEW(While, pstate, {}, {});
+    WhileRuleObj call = SASS_MEMORY_NEW(WhileRule, pstate, {}, {});
     // parse mandatory predicate
     Expression_Obj predicate = parse_list();
     List_Obj l = Cast<List>(predicate);
diff --git a/src/parser.hpp b/src/parser.hpp
@@ -303,7 +303,7 @@ namespace Sass {
     If_Obj parse_if_directive(bool else_if = false);
     For_Obj parse_for_directive();
     Each_Obj parse_each_directive();
-    While_Obj parse_while_directive();
+    WhileRuleObj parse_while_directive();
     MediaRule_Obj parseMediaRule();
     sass::vector<CssMediaQuery_Obj> parseCssMediaQueries();
     sass::string parseIdentifier();

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ namespace Sass {`
`307`	`307`	`return val.detach();`
`308`	`308`	`}`
`309`	`309`
`310`		`- Expression* Eval::operator()(While* w)`
	`310`	`+ Expression* Eval::operator()(WhileRule* w)`
`311`	`311`	`{`
`312`	`312`	`Expression_Obj pred = w->predicate();`
`313`	`313`	`Block_Obj body = w->block();`
Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,7 @@ namespace Sass {`
`652`	`652`	`return 0;`
`653`	`653`	`}`
`654`	`654`
`655`		`- Statement* Expand::operator()(While* w)`
	`655`	`+ Statement* Expand::operator()(WhileRule* w)`
`656`	`656`	`{`
`657`	`657`	`Expression_Obj pred = w->predicate();`
`658`	`658`	`Block* body = w->block();`