Implement basic functions (no parameters yet)

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

@@ -66,6 +66,8 @@ context-free syntax // Language
     L-exp "<=" L-exp
   L-exp.L-exp--L-exp-LESS-L-exp =
     L-exp "<" L-exp
+  L-exp.L-exp--L-id-LPAREN-RPAREN =
+    L-id "(" ")"
   L-exp.L-exp--LPAREN-L-exp-RPAREN =
     "(" L-exp ")"
   

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

@@ -41,6 +41,10 @@ context-free syntax // Language
     L-type L-id "=" L-exp ";"
   L-statement.L-statement--L-id-EQUALS-L-exp-SEMI =
     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-RPAREN-LBRACE-L-statement-S-RBRACE =
+    "fun" L-id "(" ")" "{" L-statement* "}"
   
   L-type.L-type--R-int =
     "int"
@@ -88,6 +92,7 @@ variables // Meta-variables
   L-statement* = "(:Stmt" [1-9]? "*:)" {prefer}
   L-statement+ = "(:Stmt" [1-9]? "+:)" {prefer}
   L-statement* = "..." [1-9]? {prefer}
+  L-statement* = "..." [1-9]? {prefer}
   L-type = "(:Typ" [1-9]? ":)" {prefer}
   L-type? = "(:Typ" [1-9]? "?:)" {prefer}
   L-type* = "(:Typ" [1-9]? "*:)" {prefer}

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

@@ -76,6 +76,10 @@ to-funcons:
   |[ eval-exp[: (:Exp1:)<(:Exp2:) :] ]| ->
   |[ is-less (eval-exp[: (:Exp1:) :], 
              eval-exp[: (:Exp2:) :]) ]|
+to-funcons:
+  |[ eval-exp[: (:Id:)() :] ]| ->
+  |[ handle-return apply (bound id[: (:Id:) :], 
+                    null) ]|
 to-funcons:
   |[ eval-exp[: ((:Exp:)) :] ]| ->
   |[ eval-exp[: (:Exp:) :] ]|

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

@@ -18,7 +18,7 @@ rules
 
 to-funcons:
   |[ execute[: {(:Stmt*:)} :] ]| ->
-  |[ scope (collateral collect-declared-vars[: (:Stmt*:) :], 
+  |[ scope (collateral (collect-declared-vars[: (:Stmt*:) :]), 
              execute[: (:Stmt*:) :]) ]|
 to-funcons:
   |[ execute[: print((:Exp:)); :] ]| ->
@@ -34,6 +34,15 @@ to-funcons:
   |[ execute[: (:Id:)=(:Exp:); :] ]| ->
   |[ assign (bound id[: (:Id:) :], 
              eval-exp[: (:Exp:) :]) ]|
+to-funcons:
+  |[ execute[: return(:Exp:); :] ]| ->
+  |[ return eval-exp[: (:Exp:) :] ]|
+to-funcons:
+  |[ execute[: return; :] ]| ->
+  |[ return null ]|
+to-funcons:
+  |[ execute[: fun(:Id:)(){(:Stmt*:)} :] ]| ->
+  |[ null ]|
 to-funcons:
   |[ execute[:  :] ]| ->
   |[ null ]|
@@ -55,6 +64,10 @@ to-funcons:
   |[ bind (\"(:Id:)\", 
              allocate-initialised-variable (integers, 
                      0)) ]|
+to-funcons:
+  |[ collect-declared-vars[: fun(:Id:)(){(:Stmt*:)} :] ]| ->
+  |[ bind (\"(:Id:)\", 
+             function abstraction (execute[: {(:Stmt*:)} :])) ]|
 to-funcons:
   |[ collect-declared-vars[:  :] ]| ->
   |[ map () ]|