diff --git a/grammar/src/control.grm b/grammar/src/control.grm
index d6cb3f0cdf6..84e5b1329d6 100644
--- a/grammar/src/control.grm
+++ b/grammar/src/control.grm
@@ -2,15 +2,6 @@ if
   : "if" "(" expression ")" expression ("else" expression)?
   ;
 
-match
-  : expression "match" "{" matchEntry+ "}"
-  ;
-
-matchEntry
-  : "case" pattern "=>" expression // TODO: Consider other options than "=>"
-  : "else" "=>" expression // TODO: keyword
-  ;
-
 for
   : "for" "(" valOrVar? (SimpleName | parameter) "in" expression ")" expression
   ;
diff --git a/grammar/src/match.grm b/grammar/src/match.grm
new file mode 100644
index 00000000000..4d461ebac11
--- /dev/null
+++ b/grammar/src/match.grm
@@ -0,0 +1,14 @@
+match
+  : expression "match" "{" matchEntry+ "}"
+  ;
+
+matchEntry
+  : "case" pattern "=>" expression // TODO: Consider other options than "=>"
+  : "else" "=>" expression // TODO: keyword
+  ;
+
+pattern
+  : SimpleName
+  : expression
+  : // TODO: how to write the typeswitch?
+  ;
\ No newline at end of file