add parameters to functions

IBAF-cbs/IBAF/IBAF-Start/IBAF-Expressions.cbs

@@ -17,9 +17,11 @@ Syntax Exp:exp ::= id
                  | exp '>' exp
                  | exp '<=' exp
                  | exp '<' exp
-                 | id '(' ')'
+                 | id '(' paramvalues? ')'
                  | '(' exp ')'
 
+Syntax ParamValues: paramvalues ::= exp (',' paramvalues)?
+
 Semantics eval-exp[[ _:exp ]] : => values
 Rule eval-exp[[ Id ]] = assigned(bound(id[[ Id ]]))
 Rule eval-exp[[ Int ]] = int-val[[ Int ]]
@@ -37,9 +39,13 @@ Rule eval-exp[[ Exp1 '>=' Exp2 ]] = is-greater-or-equal(eval-exp[[ Exp1 ]], eval
 Rule eval-exp[[ Exp1 '>' Exp2 ]] = is-greater(eval-exp[[ Exp1 ]], eval-exp[[ Exp2]] )
 Rule eval-exp[[ Exp1 '<=' Exp2 ]] = is-less-or-equal(eval-exp[[ Exp1 ]], eval-exp[[ Exp2]] )
 Rule eval-exp[[ Exp1 '<' Exp2 ]] = is-less(eval-exp[[ Exp1 ]], eval-exp[[ Exp2]] )
-Rule eval-exp[[ Id '(' ')' ]] = handle-return apply(bound id[[ Id ]], null)
+Rule eval-exp[[ Id '(' ParamValues? ')' ]] = handle-return apply(bound id[[ Id ]], eval-params[[ ParamValues? ]])
 Rule eval-exp[[ '(' Exp ')' ]] = eval-exp[[ Exp ]]
 
+Semantics eval-params[[ _:paramvalues? ]] : lists(values)
+Rule eval-params[[ ]] = []
+Rule eval-params[[ Exp ]] = list(eval-exp[[ Exp ]])
+Rule eval-params[[ Exp ',' ParamValues ]] = cons(eval-exp[[ Exp ]], eval-params[[ ParamValues ]])
 
 
 Lexis Id:id ::= ('a'-'z' | 'A'-'Z') ('a'-'z' | 'A'-'Z' | '0'-'9')*

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

@@ -4,20 +4,24 @@ Language "IBAFlang"
 
 Syntax Stmt: statement ::= '{' statement* '}'
                     | 'print' '(' exp ')' ';'
-                    | id ';'
+                    | 'int' id ';'
                     | id '=' exp ';'
+                    | 'int' id '=' exp ';'
                     | 'return' exp? ';'
-                    | 'fun' id '(' ')' '{' statement* '}'
+                    | 'fun' id '(' params ')' '{' statement* '}'
+
+Syntax Params: params ::= id (',' params)?
 
 Semantics execute[[ Stmt*:statement* ]] : => null-type
 
 Rule execute[[ '{' Stmt* '}' ]] = scope(collateral(collect-declared-vars[[ Stmt* ]]), execute[[ Stmt* ]])
 Rule execute[[ 'print' '(' Exp ')' ';' ]] = print eval-exp[[ Exp ]]
-Rule execute[[ Id ';' ]] = assign(bound id[[ Id ]], 0)
+Rule execute[[ 'int' Id ';' ]] = assign(bound id[[ Id ]], 0)
 Rule execute[[ Id '=' Exp ';' ]] = assign(bound id[[ Id ]], eval-exp[[ Exp ]])
+Rule execute[[ 'int' Id '=' Exp ';' ]] = assign(bound id[[ Id ]], eval-exp[[ Exp ]])
 Rule execute[[ 'return' Exp ';' ]] = return eval-exp[[ Exp ]]
 Rule execute[[ 'return' ';' ]] = return null
-Rule execute[[ 'fun' Id '(' ')' '{' Stmt* '}' ]] = null
+Rule execute[[ 'fun' Id '(' Params ')' '{' Stmt* '}' ]] = null
 
 Rule execute[[ ]] = null
 Rule execute[[ Stmt Stmt+ ]] = sequential(execute[[ Stmt ]], execute[[ Stmt+ ]])
@@ -25,18 +29,32 @@ Rule execute[[ Stmt Stmt+ ]] = sequential(execute[[ Stmt ]], execute[[ Stmt+ ]])
 
 
 
+# Handling parameter declarations
+
+Semantics collect-params[[ Params:params ]] : (=>environments)+
+Rule collect-params[[ Id ]] = bind(
+        id[[ Id ]], 
+        allocate-initialised-variable(integers, checked head given)
+    )
+Rule collect-params[[ Id ',' Params ]] = collect-params[[ Id ]], give(checked tail given, collect-params[[ Params ]])
+
 # Handling variable declarations
 
 Semantics collect-declared-vars[[ Stmt*:statement* ]] : (=>environments)+
 
-Rule collect-declared-vars[[ Id '=' Exp ';' ]] = bind(id[[ Id ]], 
+Rule collect-declared-vars[[ 'int' Id '=' Exp ';' ]] = bind(id[[ Id ]], 
     allocate-variable(integers)
 )
-Rule collect-declared-vars[[ Id ';' ]] = bind(id[[ Id ]], 
+Rule collect-declared-vars[[ 'int' Id ';' ]] = bind(id[[ Id ]], 
     allocate-variable(integers)
 )
-Rule collect-declared-vars[[ 'fun' Id '(' ')' '{' Stmt* '}' ]] = bind(id[[ Id ]], 
-    function abstraction(execute[[ '{' Stmt* '}' ]])
+Rule collect-declared-vars[[ 'fun' Id '(' Params ')' '{' Stmt* '}' ]] = bind(id[[ Id ]], 
+    function abstraction(
+        scope(
+            collateral(collect-declared-vars[[ Stmt* ]], collect-params[[ Params ]]), 
+            execute[[ Stmt* ]]
+        )
+    )
 )
 Rule collect-declared-vars[[ ]] = map()
 Rule collect-declared-vars[[ Stmt ]] = map()