Revert "For loops (#21)"

This reverts commit 03488cb.

Author: dwightguth

src/solidity-syntax.md

@@ -168,7 +168,7 @@ In each code block, various statments and nested blocks can be present.
                         | VariableDeclarationStatement
                         | ExpressionStatement
                         | IfStatement
-                        | WhileStatement
+                        | ForStatement
                         | EmitStatement
                         | ReturnStatement
                         | RevertStatement
@@ -188,9 +188,10 @@ Following is a list of supported statements.
     syntax IfStatement ::= "if" "(" Expression ")" Statement [strict(1)]
                          | "if" "(" Expression ")" Statement "else" Statement [avoid, strict(1)]
 
-    syntax WhileStatement ::= "while" "(" Expression ")" Statement
-    syntax Block ::= "for" "(" VariableDeclarationStatement Expression ";" Expression ")" Statement [function]
-    rule for (Init Cond ; Post) Body => { Init while(Cond) { Body Post; } }
+    syntax ForStatement ::= "for" "(" InitStatement ConditionStatement PostLoopStatement ")" Statement
+    syntax InitStatement ::= VariableDeclarationStatement | ExpressionStatement | ";"
+    syntax ConditionStatement ::= ExpressionStatement | ";"
+    syntax PostLoopStatement ::= Expression | ""
 
     syntax EmitStatement ::= "emit" Expression "(" CallArgumentList ")" ";" [strict(2)]
 

src/statement.md

@@ -45,7 +45,4 @@ module SOLIDITY-STATEMENT
   rule <k> restoreEnv(E) => .K ...</k>
        <env> _ => E </env>
 
-  // while statement
-  rule while (Cond) Body => if (Cond) {Body while(Cond) Body} else {.Statements}
-
 endmodule

test/regression/for.ref

@@ -987,7 +987,7 @@
             .List
           </contract-fn-return-names>
           <contract-fn-body>
-            { uint256 i ;  while ( i < path . length - 1 ) { { address input = path [ i ] ;  address output = path [ i + 1 ] ;  address [ ] memory tokens = uniswapV2Library_sortTokens ( input , output , .TypedVals ) ;  uint256 amountOut = amounts [ i + 1 ] ;  uint256 amount0Out = input == tokens [ 0 ] ? uint256 ( 0 , .TypedVals ) : amountOut ;  uint256 amount1Out = input == tokens [ 0 ] ? amountOut : uint256 ( 0 , .TypedVals ) ;  address to = i < path . length - 2 ? uniswapV2Library_pairFor ( output , path [ i + 2 ] , .TypedVals ) : _to ;  UniswapV2Pair ( uniswapV2Library_pairFor ( input , output , .TypedVals ) , .TypedVals ) . swap ( amount0Out , amount1Out , to , .TypedVals ) ;  .Statements }  i ++ ;  .Statements }  .Statements }  .Statements
+            for ( uint256 i ; i < path . length - 1 ; i ++ ) { address input = path [ i ] ;  address output = path [ i + 1 ] ;  address [ ] memory tokens = uniswapV2Library_sortTokens ( input , output , .TypedVals ) ;  uint256 amountOut = amounts [ i + 1 ] ;  uint256 amount0Out = input == tokens [ 0 ] ? uint256 ( 0 , .TypedVals ) : amountOut ;  uint256 amount1Out = input == tokens [ 0 ] ? amountOut : uint256 ( 0 , .TypedVals ) ;  address to = i < path . length - 2 ? uniswapV2Library_pairFor ( output , path [ i + 2 ] , .TypedVals ) : _to ;  UniswapV2Pair ( uniswapV2Library_pairFor ( input , output , .TypedVals ) , .TypedVals ) . swap ( amount0Out , amount1Out , to , .TypedVals ) ;  .Statements }  .Statements
           </contract-fn-body>
         </contract-fn> <contract-fn>
           <contract-fn-id>
@@ -1213,7 +1213,7 @@
             ListItem ( amounts )
           </contract-fn-return-names>
           <contract-fn-body>
-            require ( path . length >= 2 , "UniswapV2Library: INVALID_PATH" , .TypedVals ) ;  amounts = new uint256 [ ] ( path . length , .TypedVals ) ;  amounts [ amounts . length - 1 ] = amountOut ;  { uint256 i = path . length - 1 ;  while ( i > 0 ) { { uint256 [ ] memory reserves = uniswapV2Library_getReserves ( path [ i - 1 ] , path [ i ] , .TypedVals ) ;  amounts [ i - 1 ] = uniswapV2Library_getAmountIn ( amounts [ i ] , reserves [ 0 ] , reserves [ 1 ] , .TypedVals ) ;  .Statements }  i -- ;  .Statements }  .Statements }  .Statements
+            require ( path . length >= 2 , "UniswapV2Library: INVALID_PATH" , .TypedVals ) ;  amounts = new uint256 [ ] ( path . length , .TypedVals ) ;  amounts [ amounts . length - 1 ] = amountOut ;  for ( uint256 i = path . length - 1 ; i > 0 ; i -- ) { uint256 [ ] memory reserves = uniswapV2Library_getReserves ( path [ i - 1 ] , path [ i ] , .TypedVals ) ;  amounts [ i - 1 ] = uniswapV2Library_getAmountIn ( amounts [ i ] , reserves [ 0 ] , reserves [ 1 ] , .TypedVals ) ;  .Statements }  .Statements
           </contract-fn-body>
         </contract-fn> <contract-fn>
           <contract-fn-id>
@@ -1237,7 +1237,7 @@
             ListItem ( amounts )
           </contract-fn-return-names>
           <contract-fn-body>
-            require ( path . length >= 2 , "UniswapV2Library: INVALID_PATH" , .TypedVals ) ;  amounts = new uint256 [ ] ( path . length , .TypedVals ) ;  amounts [ 0 ] = amountIn ;  { uint256 i ;  while ( i < path . length - 1 ) { { uint256 [ ] memory reserves = uniswapV2Library_getReserves ( path [ i ] , path [ i + 1 ] , .TypedVals ) ;  amounts [ i + 1 ] = uniswapV2Library_getAmountOut ( amounts [ i ] , reserves [ 0 ] , reserves [ 1 ] , .TypedVals ) ;  .Statements }  i ++ ;  .Statements }  .Statements }  .Statements
+            require ( path . length >= 2 , "UniswapV2Library: INVALID_PATH" , .TypedVals ) ;  amounts = new uint256 [ ] ( path . length , .TypedVals ) ;  amounts [ 0 ] = amountIn ;  for ( uint256 i ; i < path . length - 1 ; i ++ ) { uint256 [ ] memory reserves = uniswapV2Library_getReserves ( path [ i ] , path [ i + 1 ] , .TypedVals ) ;  amounts [ i + 1 ] = uniswapV2Library_getAmountOut ( amounts [ i ] , reserves [ 0 ] , reserves [ 1 ] , .TypedVals ) ;  .Statements }  .Statements
           </contract-fn-body>
         </contract-fn> <contract-fn>
           <contract-fn-id>