minor additions

Makefile

@@ -23,3 +23,6 @@ clean:
 
 test: crispy
 	./run-tests.sh
+
+env:
+	eval $(opam env)

run-tests.sh

@@ -28,4 +28,4 @@ for f in tests/*.crspy tests/**/*.crspy; do
 
 done
 
-printf "\n%d/%d tests passed" $tests_passed $tests_total
+printf "%d/%d tests passed" $tests_passed $tests_total

src/lexer.mll

@@ -49,6 +49,7 @@ rule token = parse
 | "int"             { T_INT }
 | "bool"            { T_BOOL }
 | "str"             { T_STR }
+| ">>"              { T_FN }
 
 | "f"               { F }
 | "assert"          { ASSERT }

src/main.ml

@@ -36,7 +36,7 @@ let syntax_error_msg lexbuf =
   print_string post_error
 
 let eval_error_msg error =
-  Format.printf "Evaluation Error unimplemented";
+  Format.printf "%s" error;
   Format.print_flush ()
 let file_error_msg filename =
   Format.printf "%s not found" filename;
@@ -97,7 +97,6 @@ let interpret lexbuf (verbose: bool) =
       (* TODO: better handling *)
       error_msg ();
       eval_error_msg err;
-      print_string err;
       exit 2
   in
   good_msg ();

src/parser.mly

@@ -17,7 +17,7 @@
 %token <int> INT
 %token <bool> BOOL
 %token <string> STR ID
-%token T_INT T_BOOL T_STR
+%token T_INT T_BOOL T_STR T_FN
 %token LPAREN RPAREN LSQUARE RSQUARE LCURLY RCURLY
 %token ADD SUB MUL DIV EXP MOD
 %token EQ NE GT GE LT LE NOT AND OR
@@ -140,19 +140,28 @@ tuple:
   ;
 
 /* functions */
-vallist:
-  | v                                   { [$1] }
-  | v COMMA vallist                     { $1::$3 }
-
 arglist:
   | var                                 { [$1] }
   | var COMMA arglist                   { $1::$3 }
   ;
 
+vallist:
+  | v                                   { [$1] }
+  | v COMMA vallist                     { $1::$3 }
+
 
 /* types */
 typ:
+  | t_base                              { $1 }
+  | t_function                          { $1 }
+ /* | t_tuple                             { $1 } */
+  ;
+
+t_base:
   | T_INT                               { T_int }
   | T_BOOL                              { T_bool }
   | T_STR                               { T_str }
-  ;
+
+t_function:
+  | typ T_FN typ                        { $1 } 
+  ;

tests/functions/exp-args.crspy

@@ -0,0 +1,6 @@
+
+foo = f(x) {
+    x + 10
+};
+
+foo(20 + 30);