make blocks

IBAF-Editor/syntax/cbs-gen/IBAF-Statements.sdf3

@@ -39,8 +39,8 @@ context-free syntax // Language
   // # Statements
                    
   
-  L-statement.L-statement--LBRACE-L-statement-S-RBRACE =
-    "{" L-statement* "}"
+  L-statement.L-statement--L-block =
+    L-block
   L-statement.L-statement--R-print-LPAREN-L-exp-RPAREN-SEMI =
     "print" "(" L-exp ")" ";"
   L-statement.L-statement--R-int-L-id-SEMI =
@@ -51,8 +51,11 @@ context-free syntax // Language
     "int" L-id "=" L-exp ";"
   L-statement.L-statement--R-return-L-exp-Q-SEMI =
     "return" L-exp? ";"
-  L-statement.L-statement--R-fun-L-id-LPAREN-L-params-RPAREN-LBRACE-L-statement-S-RBRACE =
-    "fun" L-id "(" L-params ")" "{" L-statement* "}"
+  L-statement.L-statement--R-fun-L-id-LPAREN-L-params-RPAREN-L-block =
+    "fun" L-id "(" L-params ")" L-block
+  
+  L-block.L-block--LBRACE-L-statement-S-RBRACE =
+    "{" L-statement* "}"
   
   L-params.L-params--L-id-C-COMMA-L-params-D-Q =
     L-id L-COMMA-L-params?
@@ -77,6 +80,8 @@ context-free syntax // Semantics
   
   FCT.T-execute =
     "execute" "[:" L-statement* ":]"
+  FCT.T-execute-block =
+    "execute-block" "[:" L-block ":]"
   
   // # Handling parameter declarations
                    
@@ -113,7 +118,10 @@ variables // Meta-variables
   L-statement? = "(:Stmt" [1-9]? "?:)" {prefer}
   L-statement* = "(:Stmt" [1-9]? "*:)" {prefer}
   L-statement+ = "(:Stmt" [1-9]? "+:)" {prefer}
-  L-statement* = "..." [1-9]? {prefer}
+  L-block = "(:Block" [1-9]? ":)" {prefer}
+  L-block? = "(:Block" [1-9]? "?:)" {prefer}
+  L-block* = "(:Block" [1-9]? "*:)" {prefer}
+  L-block+ = "(:Block" [1-9]? "+:)" {prefer}
   L-statement* = "..." [1-9]? {prefer}
   L-params = "(:Params" [1-9]? ":)" {prefer}
   L-params? = "(:Params" [1-9]? "?:)" {prefer}

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