Binding rules for while and do-while statements

crates/solidity/inputs/language/bindings/rules.msgb

@@ -621,6 +621,8 @@ attribute symbol_reference = symbol  => type = "push_symbol", symbol = symbol, i
 ;;; Control statements
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+;; If conditionals
+
 @stmt [Statement [IfStatement @body body: [Statement]]] {
   edge @body.lexical_scope -> @stmt.lexical_scope
   if (version-matches "< 0.5.0") {
@@ -635,9 +637,9 @@ attribute symbol_reference = symbol  => type = "push_symbol", symbol = symbol, i
   }
 }
 
-@stmt [Statement [ForStatement
-    @body body: [Statement]
-]] {
+;; For loops
+
+@stmt [Statement [ForStatement @body body: [Statement]]] {
   node @stmt.init_defs
 
   edge @body.lexical_scope -> @stmt.lexical_scope
@@ -666,6 +668,24 @@ attribute symbol_reference = symbol  => type = "push_symbol", symbol = symbol, i
   edge @cond_stmt.lexical_scope -> @stmt.init_defs
 }
 
+;; While loops
+
+@stmt [Statement [WhileStatement @body body: [Statement]]] {
+  edge @body.lexical_scope -> @stmt.lexical_scope
+  if (version-matches "< 0.5.0") {
+    edge @stmt.defs -> @body.defs
+  }
+}
+
+;; Do-while loops
+
+@stmt [Statement [DoWhileStatement @body body: [Statement]]] {
+  edge @body.lexical_scope -> @stmt.lexical_scope
+  if (version-matches "< 0.5.0") {
+    edge @stmt.defs -> @body.defs
+  }
+}
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; State Variables
@@ -879,6 +899,20 @@ attribute symbol_reference = symbol  => type = "push_symbol", symbol = symbol, i
   edge @iter_expr.lexical_scope -> @stmt.init_defs
 }
 
+;; Expressions in while conditions
+@stmt [Statement [WhileStatement
+    @condition condition: [Expression]
+]] {
+  edge @condition.lexical_scope -> @stmt.lexical_scope
+}
+
+;; Expressions in do-while conditions
+@stmt [Statement [DoWhileStatement
+    @condition condition: [Expression]
+]] {
+  edge @condition.lexical_scope -> @stmt.lexical_scope
+}
+
 ;; Expressions used for state variable declarations
 @state_var [StateVariableDefinition
     value: [StateVariableDefinitionValue @expr [Expression]]

crates/solidity/testing/snapshots/bindings_assertions/control/do_while.sol

@@ -0,0 +1,17 @@
+contract Test {
+    function test() public returns (int) {
+        int i = 1;
+        //  ^def:1
+        do {
+            int odd = i % 2;
+            //  ^def:2
+            //        ^ref:1
+            i *= 3;
+            //<ref:1
+        } while (i < 100);
+        //       ^ref:1
+        return odd;
+        //     ^ref:! (>= 0.5.0)
+        //     ^ref:2 (< 0.5.0)
+    }
+}

crates/solidity/testing/snapshots/bindings_assertions/control/while_stmt.sol

@@ -0,0 +1,17 @@
+contract Test {
+    function test() public returns (int) {
+        int i = 1;
+        //  ^def:1
+        while (i < 100) {
+            // ^ref:1
+            int odd = i % 2;
+            //  ^def:2
+            //        ^ref:1
+            i *= 3;
+            //<ref:1
+        }
+        return odd;
+        //     ^ref:! (>= 0.5.0)
+        //     ^ref:2 (< 0.5.0)
+    }
+}

crates/solidity/testing/snapshots/bindings_output/control/while_stmt/generated/0.4.11-success.txt

@@ -0,0 +1,21 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+References and definitions: 
+   ╭─[input.sol:1:1]
+   │
+ 1 │ contract Test {
+   │          ──┬─  
+   │            ╰─── def: 1
+ 2 │     function test() public {
+   │              ──┬─  
+   │                ╰─── def: 2
+ 3 │         int i = 1;
+   │             ┬  
+   │             ╰── def: 3
+ 4 │         while (i < 100) {
+   │                ┬  
+   │                ╰── ref: 3
+ 5 │             i *= 3;
+   │             ┬  
+   │             ╰── ref: 3
+───╯

crates/solidity/testing/snapshots/bindings_output/control/while_stmt/input.sol

@@ -0,0 +1,8 @@
+contract Test {
+    function test() public {
+        int i = 1;
+        while (i < 100) {
+            i *= 3;
+        }
+    }
+}