From e20c81763bddf0045516fd356e97ddddeccf0172 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Tue, 9 Apr 2024 09:14:01 +0200
Subject: [PATCH] Alternative representation of dataspacePatterns

---
 schemas/dataspacePatterns.prs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/schemas/dataspacePatterns.prs b/schemas/dataspacePatterns.prs
index d3b1d13..b2bd5dd 100644
--- a/schemas/dataspacePatterns.prs
+++ b/schemas/dataspacePatterns.prs
@@ -6,14 +6,18 @@ embeddedType EntityRef.Cap .
 # One key difference is that Dataspace patterns are extensible, in that
 # they ignore fields not mentioned in DCompound patterns.
 
-Pattern = DDiscard / DBind / DLit / DCompound .
+Pattern =
+    / @discard <_>
+    / <bind @pattern Pattern>
+    / <lit @value AnyAtom>
+    / <g @type GroupType @entries { any: Pattern ...:... }>
+.
 
-DDiscard = <_>.
-DBind = <bind @pattern Pattern>.
-DLit = <lit @value AnyAtom>.
-DCompound = <rec @label any @fields { int: Pattern ...:... }>
-          / <arr @items { int: Pattern ...:... }>
-          / <dict @entries { any: Pattern ...:... }> .
+GroupType =
+    / <rec @label any>
+    / <arr>
+    / <dict>
+.
 
 AnyAtom =
     / @bool bool