Attributes on types

grammar/src/class.grm

@@ -42,7 +42,7 @@ typeParameter
   ;
 
 typeConstraint
-  : attributes userType ":" (userType | "this") // "this" for self-type 
+  : userType ":" (userType | "this") // "this" for self-type 
   // TODO: other constraints, maybe
   ;
 

grammar/src/class_members.grm

@@ -34,7 +34,7 @@ memberDeclaration
   : classObject
   : constructor
   : decomposer
-  : method
+  : function
   : property
   : class
   ;
@@ -68,7 +68,7 @@ decomposer  // TODO: consider other names
   : attributes "decomposer" SimpleName "(" (attributes SimpleName){","} ")" // Public properties only
   ;
 
-method
+function
   : modifiers "fun" functionRest
   ;
 

grammar/src/toplevel.grm

@@ -22,7 +22,7 @@ toplevelObject
   : namespace
   : class
   : extension
-  : method
+  : function
   : property
   ;
 

grammar/src/types.grm

@@ -13,10 +13,11 @@ type
   : userType
   : functionType
   : tupleType
+  : attributes type
   ;
 
 userType
-  : SimpleName{"."} ("<" (varianceSpecifier? type){","} ">")?
+  : SimpleName{"."} ("<" (modifiers type){","} ">")?
   ;
 
 functionType