Function types and literals

grammar/src/expressions.grm

@@ -26,7 +26,9 @@ tupleLiteral
   ;
 
 functionLiteral
-  : "{" (parameter | SimpleName)* "=>" expression "}"
+  : "{" SimpleName "=>" expression "}"
+  : "{" functionTypeContents "=>" expression "}"
+  : "{" "(" parameter{","} ")" "=>" expression "}"
   ;
 
 constructorInvocation

grammar/src/types.grm

@@ -15,15 +15,27 @@ type
   ;
 
 userType
-  : name ("<" type{","} ">")?
+  : name ("<" (projectionSpecifier type){","} ">")?
+  ;
+
+projectionSpecifier
+  : "in"
+  : "out"
+  : empty
   ;
 
 functionType
-  : "{" type{","} "=>" type "}"
+  : "{" functionTypeContents "}"
+  ;
+
+functionTypeContents
+  : "(" (parameter | type){","} ")" ":" type
   ;
 
 tupleType
-  : "(" type"{","} ")"
+  : "(" type{","} ")"
   ;
 
 
+////////////////////////////////////////
+