added trailing comma for variants

ascandone · Jan 22, 2024 · 3b166ba · 3b166ba
1 parent e33a2dd
commit 3b166ba
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/src/__snapshots__/parser.test.ts.snap b/src/__snapshots__/parser.test.ts.snap
@@ -1259,6 +1259,28 @@ exports[`parse let block with two let stmts 1`] = `
 }
 `;
 
+exports[`type declarations > trailing comma after variants 1`] = `
+{
+  "declarations": [],
+  "typeDeclarations": [
+    {
+      "name": "T",
+      "type": "adt",
+      "variants": [
+        {
+          "args": [],
+          "name": "A",
+        },
+        {
+          "args": [],
+          "name": "B",
+        },
+      ],
+    },
+  ],
+}
+`;
+
 exports[`type declarations > type with a variant with complex args 1`] = `
 {
   "declarations": [],

diff --git a/src/parser.test.ts b/src/parser.test.ts
@@ -277,6 +277,11 @@ describe("type declarations", () => {
     const src = `type T { A, B }`;
     expect(unsafeParse(src)).toMatchSnapshot();
   });
+
+  test("trailing comma after variants", () => {
+    const src = `type T { A, B, }`;
+    expect(unsafeParse(src)).toMatchSnapshot();
+  });
 });
 
 function spanOf(src: string, substr: string = src): Span {

diff --git a/src/parser.ts b/src/parser.ts
@@ -188,7 +188,14 @@ semantics.addOperation<TypeVariant>("typeVariant()", {
 });
 
 semantics.addOperation<Statement>("statement()", {
-  TypeDeclaration_typeDef(_type, typeName, _lbracket, variants, _rbracket) {
+  TypeDeclaration_typeDef(
+    _type,
+    typeName,
+    _lbracket,
+    variants,
+    _trailingComma,
+    _rbracket,
+  ) {
     const variants_ = variants
       .asIteration()
       .children.map<TypeVariant>((n) => n.typeVariant());

diff --git a/src/parser/grammar.ohm b/src/parser/grammar.ohm
@@ -7,7 +7,7 @@ Program {
     = "let" ident (":" Type)? "=" Exp  -- letStmt
 
   TypeDeclaration
-    = "type" typeName "{" ListOf<TypeVariant, ","> "}" -- typeDef
+    = "type" typeName "{" ListOf<TypeVariant, ","> ","? "}" -- typeDef
 
   // --- Expressions