voor de initialise-variable verandering

IBAF-cbs/IBAF/IBAF-Start/IBAF-Statements.cbs

@@ -2,6 +2,8 @@ Language "IBAFlang"
 
 # Statements
 
+Syntax Block: block ::= '{' statement* '}'
+
 Syntax Stmt: statement ::= block
                          | 'print' '(' exp ')' ';'
                          | 'int' id ';'
@@ -13,7 +15,6 @@ Syntax Stmt: statement ::= block
                          | 'while' '(' exp ')' block
                          | 'for' '(' 'int' id '=' exp ';' exp ')' block
 
-Syntax Block: block ::= '{' statement* '}'                    
 
 Syntax Params: params ::= id (',' params)?
 
@@ -32,8 +33,7 @@ Rule execute[[ 'if' '(' Exp ')' Block1 'else' Block2 ]] = if-else(eval-exp[[ Exp
 Rule execute[[ 'while' '(' Exp ')' Block ]] = while(eval-exp[[ Exp ]], execute-block[[ Block ]])
 Rule execute[[ 'for' '(' 'int' Id '=' Exp1 ';' Exp2 ')' Block ]] = scope(
     bind(id[[ Id ]], allocate-initialised-variable(integers, eval-exp[[ Exp1 ]])),
-    //    while(eval-exp[[ Exp2 ]], sequential(execute-block[[ Block ]], increment Id))
-    while(eval-exp[[ Exp2 ]], sequential(execute-block[[ Block ]], assign(bound id[[ Id ]], int-add(1,assigned bound id[[ Id ]]))))
+    while(eval-exp[[ Exp2 ]], sequential(execute-block[[ Block ]], assign(bound id[[ Id ]], int-add(1, assigned bound id[[ Id ]]))))
 )
 
 Rule execute[[ ]] = null
@@ -44,6 +44,8 @@ Rule execute-block[[ '{' Stmt* '}' ]] = scope(collateral(collect-declared-vars[[
 
 
 
+
+
 # Handling parameter declarations
 
 Semantics collect-params[[ Params:params ]] : (=>environments)+
@@ -69,6 +71,7 @@ Rule collect-declared-vars[[ 'fun' Id '(' Params ')' '{' Stmt* '}' ]] = bind(id[
         )
     )
 )
+
 Rule collect-declared-vars[[ ]] = map()
 Rule collect-declared-vars[[ Stmt ]] = map()
 Rule collect-declared-vars[[ Stmt1 Stmt2 Stmt* ]] = collect-declared-vars[[ Stmt1 ]], collect-declared-vars[[ Stmt2 ]], collect-declared-vars[[ Stmt* ]]