make blocks

IBAF-Editor/trans/cbs-gen/IBAF-Start.str

@@ -15,5 +15,5 @@ imports
 rules
 to-funcons:
   |[ start[: (:Stmt*:) :] ]| ->
-  |[ initialise-binding execute[: {(:Stmt*:)} :] ]|
+  |[ initialise-binding execute-block[: {(:Stmt*:)} :] ]|
 

IBAF-Editor/trans/cbs-gen/IBAF-Statements.str

@@ -17,9 +17,8 @@ rules
                  
 
 to-funcons:
-  |[ execute[: {(:Stmt*:)} :] ]| ->
-  |[ scope (collateral (collect-declared-vars[: (:Stmt*:) :]), 
-             execute[: (:Stmt*:) :]) ]|
+  |[ execute[: (:Block:) :] ]| ->
+  |[ execute-block[: (:Block:) :] ]|
 to-funcons:
   |[ execute[: print((:Exp:)); :] ]| ->
   |[ print eval-exp[: (:Exp:) :] ]|
@@ -42,7 +41,7 @@ to-funcons:
   |[ execute[: return; :] ]| ->
   |[ return null ]|
 to-funcons:
-  |[ execute[: fun(:Id:)((:Params:)){(:Stmt*:)} :] ]| ->
+  |[ execute[: fun(:Id:)((:Params:))(:Block:) :] ]| ->
   |[ null ]|
 to-funcons:
   |[ execute[:  :] ]| ->
@@ -51,6 +50,10 @@ to-funcons:
   |[ execute[: (:Stmt:)(:Stmt+:) :] ]| ->
   |[ sequential (execute[: (:Stmt:) :], 
              execute[: (:Stmt+:) :]) ]|
+to-funcons:
+  |[ execute-block[: {(:Stmt*:)} :] ]| ->
+  |[ scope (collateral (collect-declared-vars[: (:Stmt*:) :]), 
+             execute[: (:Stmt*:) :]) ]|
 
 // # Handling parameter declarations