fix: wildcard in a destructor was failing

kayhide · Nov 5, 2024 · c56a25c · c56a25c
1 parent fabf1b9
commit c56a25c
Show file tree

Hide file tree

Showing 6 changed files with 21,033 additions and 20,951 deletions.
diff --git a/grammar/pat.js b/grammar/pat.js
@@ -1,4 +1,6 @@
-import { parens, braces, sep, brackets, snoc_brackets } from './util.js';
+import { parens, braces, sep, sep1, brackets, snoc_brackets } from './util.js';
+
+const sepFirstXOtherYs = (sep, firstRule, otherRule) => optional(seq(firstRule, repeat(seq(sep, otherRule))))
 
 export default {
 
@@ -7,15 +9,20 @@ export default {
     $.ticked_operator,
   ),
 
-  pat_at: $ => '@',
+  pat_at: _ => '@',
 
   pat_field: $ =>
     seq(
       $._field_name,
       optional(seq(':', $._pat))
     ),
 
-  pat_fields: $ => braces(sep($.comma, $.pat_field)),
+  // {foo} - ok
+  // {foo,_} - ok
+  // {foo,bar,_} - ok
+  // {_} - error
+  pat_fields: $ => braces(sepFirstXOtherYs($.comma, $.pat_field, choice($.wildcard, $.pat_field))),
+  // pat_fields: $ => braces(sep1($.comma, $.pat_field)),
 
   pat_record: $ => field('fields', $.pat_fields),
 

diff --git a/grammar/util.js b/grammar/util.js
@@ -16,7 +16,7 @@ export const quote = '\''
 
 export const qualified = ($, id) => seq($._qualifying_module, id)
 
-export const sep = (sep, rule) => optional(seq(rule, repeat(seq(sep, rule))))
+export const sep = (sep, rule) => optional(sep1(sep, rule))
 
 export const sep1 = (sep, rule) => seq(rule, repeat(seq(sep, rule)))
 

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json