Value arguments fixed

grammar/src/class_members.grm

@@ -71,11 +71,11 @@ block
   ;
 
 decomposer  // TODO: consider other names
-  : attributes "decomposer" SimpleName "(" (attributes SimpleName){","} ")" // Public properties only
+  : attributes "decomposer" (type ".")? SimpleName "(" (attributes SimpleName){","} ")" // Public properties only
   ;
 
 function
-  : modifiers "fun" functionRest
+  : modifiers "fun" (type ".")? functionRest
   ;
 
 functionRest
@@ -88,7 +88,7 @@ functionBody
   ;
 
 property
-  : modifiers ("val" | "var") propertyRest
+  : modifiers ("val" | "var") (type ".")? propertyRest
   ;
 
 propertyRest

grammar/src/extension.grm

@@ -1,22 +0,0 @@
-extension
-  : completeExtension
-  : extensionMethod
-  : extensionProperty
-  : extensionDecomposer
-  ;
-
-completeExtension
-  : modifiers "extension" SimpleName? typeParameters? "for" type classBody? // properties cannot be lazy, cannot have backing fields
-  ;
-
-extensionMethod
-  : modifiers "fun" type "." functionRest
-  ;
-
-extensionProperty
-  : modifiers ("val" | "var") type "." propertyRest // Extension property cannot be lazy
-  ;
-
-extensionDecomposer
-  : attributes "decomposer" (type ".")? SimpleName "(" attributes SimpleName{","} ")" // Public properties only
-  ;

grammar/src/toplevel.grm

@@ -25,6 +25,7 @@ toplevelObject
   : function
   : property
   : typedef
+  : decomposer
   ;
 
 namespace
@@ -36,4 +37,8 @@ namespace
 
 typedef
   : modifiers "type" SimpleName typeParameters? "=" type
-  ;
+  ;
+
+extension
+  : modifiers "extension" SimpleName? typeParameters? "for" type classBody? // properties cannot be lazy, cannot have backing fields
+  ;