Update docs for new loops release

Author: rkalis

website/docs/compiler/grammar.md

@@ -52,34 +52,46 @@ block
     ;
 
 statement
+    : controlStatement
+    | nonControlStatement ';'
+    ;
+
+nonControlStatement
     : variableDefinition
     | tupleAssignment
     | assignStatement
     | timeOpStatement
     | requireStatement
-    | ifStatement
-    | loopStatement
     | consoleStatement
     ;
 
+controlStatement
+    : ifStatement
+    | loopStatement
+    ;
+
 variableDefinition
-    : typeName modifier* Identifier '=' expression ';'
+    : typeName modifier* Identifier '=' expression
     ;
 
 tupleAssignment
-    : typeName Identifier ',' typeName Identifier '=' expression ';'
+    : typeName Identifier ',' typeName Identifier '=' expression
     ;
 
 assignStatement
-    : Identifier '=' expression ';'
+    : Identifier '=' expression
     ;
 
 timeOpStatement
-    : 'require' '(' TxVar '>=' expression (',' requireMessage)? ')' ';'
+    : 'require' '(' TxVar '>=' expression (',' requireMessage)? ')'
     ;
 
 requireStatement
-    : 'require' '(' expression (',' requireMessage)? ')' ';'
+    : 'require' '(' expression (',' requireMessage)? ')'
+    ;
+
+consoleStatement
+    : 'console.log' consoleParameterList
     ;
 
 ifStatement
@@ -88,14 +100,25 @@ ifStatement
 
 loopStatement
     : doWhileStatement
+    | whileStatement
+    | forStatement
     ;
 
 doWhileStatement
     : 'do' block 'while' '(' expression ')' ';'
     ;
 
-consoleStatement
-    : 'console.log' consoleParameterList ';'
+whileStatement
+    : 'while' '(' expression ')' block
+    ;
+
+forStatement
+    : 'for' '(' forInit ';' expression ';' assignStatement ')' block
+    ;
+
+forInit
+    : variableDefinition
+    | assignStatement
     ;
 
 requireMessage

website/docs/language/contracts.md

@@ -151,12 +151,57 @@ contract OneOfTwo(bytes20 pkh1, bytes32 hash1, bytes20 pkh2, bytes32 hash2) {
 
 ### Loops (beta)
 
-Currently, CashScript only supports `do {} while ()` loops in the 0.13.0-next.0 pre-release. More advanced loop constructs will be added in the full 0.13.0 release. Keep in mind that in a `do {} while ()` loop, the condition is checked *after* the block of code within the loop is executed. This means that the block of code within the loop will be executed at least once, even if the condition is initially `false`.
+Currently, CashScript supports `for`, `while` and `do-while` loops in the `0.13.0-next` pre-release.
 
 :::caution
 Loops in CashScript are currently in beta and may not fully behave as expected with debugging and console.log statements. The syntax for loops may change in the future.
 :::
 
+#### for loop
+
+For loops are the main loop construct in CashScript and has a similar syntax to languages like JavaScript or C. The loop header consists of three parts: the initialization, the condition and the update. The initialization is executed only once before the loop starts. The condition is checked before each iteration of the loop. The update is executed after each iteration of the loop.
+
+#### Example
+```solidity
+pragma cashscript ^0.13.0;
+
+contract NoTokensAllowed() {
+    function spend() {
+        int inputIndex = 0;
+
+        // Loop over all inputs (variable length), and make sure that none of them contain tokens
+        for (int inputIndex = 0; inputIndex < tx.inputs.length; inputIndex = inputIndex + 1) {
+            require(tx.inputs[inputIndex].tokenCategory == 0x);
+        }
+    }
+}
+```
+
+#### while loop
+
+While loops are similar to for loops, but the initialization and update are not specified, so it it loops as long as the condition is true. The condition is checked *before* each iteration of the loop (unlike do-while loops).
+
+#### Example
+```solidity
+pragma cashscript ^0.13.0;
+
+contract NoTokensAllowed() {
+    function spend() {
+        int inputIndex = 0;
+
+        // Loop over all inputs (variable length), and make sure that none of them contain tokens
+        while (inputIndex < tx.inputs.length) {
+            require(tx.inputs[inputIndex].tokenCategory == 0x);
+            inputIndex = inputIndex + 1;
+        }
+    }
+}
+```
+
+#### do-while loop
+
+Do-while loops are similar to while loops, but the condition is checked *after* the block of code within the loop is executed. This means that the block of code within the loop will be executed at least once, even if the condition is initially `false`.
+
 #### Example
 ```solidity
 pragma cashscript ^0.13.0;

website/docs/releases/release-notes.md

@@ -2,24 +2,25 @@
 title: Release Notes
 ---
 
-## v0.13.0-next.4
+## v0.13.0-next.5
 
 This release contains several breaking changes, please refer to the [migration notes](/docs/releases/migration-notes) for more information.
 
 #### cashc compiler
-- :sparkles: Add support for `do {} while ()` loops.
+- :sparkles: Add support for `for`, `while` and `do-while` loops.
 - :sparkles: Add support for bitwise and arithmetic shift operators (`<<`, `>>`) and bitwise inversion (`~`).
 - :sparkles: Add `unsafe_bool()` and `unsafe_int()` casting for semantic-only casts.
 - :hammer_and_wrench: **BREAKING**: Function parameter types are now strictly enforced (bounded bytes and boolean values).
 - :hammer_and_wrench: Add compiler option to `cashc` (programmatic and CLI compilation) to allow for opting out of function parameter type enforcement.
+- :bug: Fix issue where casting bytes larger than `bytes8` to `int` was not allowed.
 - :bug: **BREAKING**: Fix issue where `bool()` casting did not change the value of the argument.
 - :boom: **BREAKING**: Rename `bytes4(int)` and `bytes(int, 4)` to `toPaddedBytes(int, 4)`.
 - :boom: **BREAKING**: Rename `bytes4(bytes)` to `unsafe_bytes4(bytes)`.
 - :racehorse: Add optimisations for negated number comparisons and boolean comparisons.
 
 #### CashScript SDK
 
-- :sparkles: Add support for `do {} while ()` loops in debug tooling.
+- :sparkles: Add support for loops in debug tooling.
 - :sparkles: Add support for `p2s` contract type.
 - :sparkles: Add `lockingBytecode` property to `Contract` class.
 - :sparkles: Add `getUtxosForLockingBytecode()` method to `ElectrumNetworkProvider` class and `MockNetworkProvider` interface.