1 files changed, 21 insertions, 4 deletions

diff --git a/src/parser.y b/src/parser.y
index 707d85d..3dfd737 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -155,7 +155,19 @@ cmpltExpr: expr ';'
                  | tokReturn '(' ')' ';' { bld.addNode( AstNode::tReturn ); }
                  | tokGoto '(' expr ')' ';' { bld.addNode( AstNode::tGoto ); }
                  | ifbase
-                 | tokFor tokEach forIterator tokIn expr tokDo '{' cmpltExprList '}'
+                 | tokFor tokEach {
+                                bld.addNode( AstNode::tForEach );
+                                bld.addNode( AstNode::tScope );
+                        } forIterator tokIn {
+                                bld.closeNode();
+                                bld.addNode( AstNode::tScope );
+                        } expr tokDo '{' {
+                                bld.closeNode();
+                                bld.addNode( AstNode::tScope );
+                        } cmpltExprList '}' {
+                                bld.closeNode();
+                                bld.closeNode();
+                        }
                  | tokWhile {
                                 bld.addNode( AstNode::tWhile );
                                 bld.addNode( AstNode::tScope );
@@ -168,8 +180,12 @@ cmpltExpr: expr ';'
                         }
                  ;
 
-forIterator: tokIdent
-                   | tokIdent ':' tokIdent
+forIterator: tokIdent { bld.addVarRef( *($1), sidLocal ); }
+                   | tokIdent ':' tokIdent {
+                                bld.addVarRef( *($1), sidLocal );
+                                bld.addVarRef( *($3), sidLocal );
+                        }
+                   ;
 
 ifbase: tokIf {
                         bld.addNode( AstNode::tIf );
@@ -226,7 +242,8 @@ expr: literal
         | expr tokLtEq expr { bld.addNode( AstNode::tCompLtEq ); }
         | expr tokGtEq expr { bld.addNode( AstNode::tCompGtEq ); }
         | '(' expr ')'
-        | expr '[' expr ']'
+        | expr '[' expr ']' { bld.addNode( AstNode::tIndex ); }
+        | expr '[' expr ']' '=' expr { bld.addNode( AstNode::tInsert ); }
         | '[' ']' { bld.addLiteral( Variable( Variable::tList ) ); }
         | '[' { bld.addLiteral( Variable( Variable::tList ) ); } listValues ']'
         | '{' '}' { bld.addLiteral( Variable( Variable::tDictionary ) ); }