Matches reorganized

examples/src/UpdfateOperation.jetl

@@ -1,13 +1,13 @@
 class Pair(x : Int, y : Int) {
   class object {
-    fun copy(from : Pair, x : int = from.x, y : Int = from.y) = new Pair(x, y)
+    fun copy(from : Pair, x : Int = from.x, y : Int = from.y) = new Pair(x, y)
   }
 }
 
 // One can say:
 val p = new Point(1, 2)
-val p1 = Point.Copy(p, x : 2)
-val p2 = Point.Copy(p1, y : -1)
+val p1 = Point.Copy(p, x = 2)
+val p2 = Point.Copy(p1, y = -1)
 val p3 = Point.Copy(p)
 
 // Such copy(...) methods can be automatically generated by the compiler

grammar/src/class_members.grm

@@ -33,11 +33,16 @@ class Example(a : Foo, i : Int) : Bar(i), Some {
 memberDeclaration
   : classObject
   : constructor
+  : decomposer
   : method
   : property
   : class
   ;
 
+decomposer  // TODO: consider other names
+  : "decomposer" SimpleName "(" SimpleName{","} ")" // Public properties only
+  ;
+
 classObject
   : "class" objectLiteral
   ;

grammar/src/expressions.grm

@@ -12,6 +12,7 @@ expression
   : expressionWithPrecedences
   : match
   : if
+  : "typeof"
   : "new" constructorInvocation // TODO: Do we need "new"?, see factory methods
   : objectLiteral
   : jump
@@ -87,7 +88,7 @@ typeArguments
   ;
 
 valueArguments
-  : "(" (SimpleName ":")? expression{","} ")"
+  : "(" (SimpleName "=")? expression{","} ")"
   ;
 
 infixFunctionCall

grammar/src/extension.grm

@@ -2,6 +2,7 @@ extension
   : completeExtension
   : extensionMethod
   : extensionProperty
+  : extensionDecomposer
   ;
 
 completeExtension
@@ -15,3 +16,7 @@ extensionMethod
 extensionProperty
   : accessModifier? propertyModifier? ("val" | "var") type "." propertyRest
   ;
+
+extensionDecomposer
+  : "decomposer" (type ".")? SimpleName "(" SimpleName{","} ")" // Public properties only
+  ;

grammar/src/match.grm

@@ -4,11 +4,24 @@ match
 
 matchEntry
   : "case" pattern "=>" expression // TODO: Consider other options than "=>"
-  : "else" "=>" expression // TODO: keyword
   ;
 
 pattern
-  : SimpleName
-  : expression
-  : // TODO: how to write the typeswitch?
+  : constantPattern // literal
+  : variablePattern // variable from the context
+  : tuplePattern
+  : bindingPattern
+  : decomposerPattern // labeled components are allowed
+  ;
+
+tuplePattern
+  : "(" ((SimpleName "=")? pattern{","})? ")"
+  ;
+
+bindingPattern
+  : "?" SimpleName? (":" pattern)?
+  ;
+
+decomposerPattern
+  : userType tuplePattern?
   ;