fixes

Author: jonhue

common/patterns.ts

@@ -53,6 +53,7 @@ export const struct_pattern = <RuleName extends string>(
 ) =>
   buildStruct(
     $,
+    'member',
     choice(
       $.member_pattern,
       alias($.binding_pattern, $.shorthand_member_pattern),
@@ -66,11 +67,11 @@ export const member_pattern = <RuleName extends string>(
 
 export const tuple_pattern = <RuleName extends string>(
   $: GrammarSymbols<RuleName>,
-) => buildTuple($, 'element', $._pattern, true)
+) => buildTuple($, 'element', $._pattern, true, false)
 
 export const list_pattern = <RuleName extends string>(
   $: GrammarSymbols<RuleName>,
-) => buildList($, $._pattern, true)
+) => buildList($, 'element', $._pattern, true)
 
 export const binding_pattern = <RuleName extends string>(
   $: GrammarSymbols<RuleName>,

common/terms.ts

@@ -431,18 +431,20 @@ export const struct = <RuleName extends string>($: GrammarSymbols<RuleName>) =>
     Prec.Term,
     buildStruct(
       $,
+      'member',
       choice($.member, alias($.identifier, $.shorthand_member), $.spread),
+      false,
     ),
   )
 
 export const member = <RuleName extends string>($: GrammarSymbols<RuleName>) =>
   buildMember($, $._term, $._term)
 
 export const tuple = <RuleName extends string>($: GrammarSymbols<RuleName>) =>
-  buildTuple($, 'element', $._element)
+  buildTuple($, 'element', $._element, false, false)
 
 export const list = <RuleName extends string>($: GrammarSymbols<RuleName>) =>
-  buildList($, $._element)
+  buildList($, 'element', $._element, false)
 
 export const _element = <RuleName extends string>(
   $: GrammarSymbols<RuleName>,

common/util.ts

@@ -28,41 +28,34 @@ const buildDataStructure = <RuleName extends string>(
 
 export const buildStruct = <RuleName extends string>(
   $: GrammarSymbols<RuleName>,
+  fieldName: string,
   member: Rule,
-  rest = false,
-) => seq('{', buildDataStructure($, field('member', member), rest), '}')
+  rest: boolean,
+) => seq('{', buildDataStructure($, field(fieldName, member), rest), '}')
 
 export const buildTuple = <RuleName extends string>(
   $: GrammarSymbols<RuleName>,
   fieldName: string,
   element: Rule,
-  rest = false,
-  allowSingle = false,
-  allowEmpty = true,
-) => {
-  const options: RuleOrLiteral[] = [
-    seq(
-      '(',
-      buildDataStructure(
-        $,
-        field(fieldName, element),
-        rest,
-        allowSingle ? commaSep1 : commaSep2,
-      ),
-      ')',
-    ),
-  ]
-
-  if (allowEmpty) options.push('()')
-
-  return choice(...options)
-}
+  rest: boolean,
+  allowSingle: boolean,
+) => choice(seq(
+  '(',
+  buildDataStructure(
+    $,
+    field(fieldName, element),
+    rest,
+    allowSingle ? commaSep1 : commaSep2,
+  ),
+  ')',
+), '()')
 
 export const buildList = <RuleName extends string>(
   $: GrammarSymbols<RuleName>,
+  fieldName: string,
   element: Rule,
-  rest = false,
-) => seq('[', buildDataStructure($, field('element', element), rest), ']')
+  rest: boolean,
+) => seq('[', buildDataStructure($, field(fieldName, element), rest), ']')
 
 export const buildMember = <RuleName extends string>(
   $: GrammarSymbols<RuleName>,
@@ -91,25 +84,6 @@ export const buildString = <RuleName extends string>(
 export const buildGenericType = (name: string, rule: Rule) =>
   seq('<', commaSep1(field(name, rule)), '>')
 
-export const buildTypeConstraint = <RuleName extends string>(
-  $: GrammarSymbols<RuleName>,
-) =>
-  seq(
-    '<:',
-    choice(
-      field('constraint', $._term),
-      seq('(', sep2(';')(field('constraint', $._term)), ')'),
-    ),
-  )
-
-export const buildTypeDeclaration = <RuleName extends string>(
-  $: GrammarSymbols<RuleName>,
-) =>
-  seq(
-    field('name', $.type),
-    optional(buildGenericType('parameter', $.type_variable_declaration)),
-  )
-
 export const buildBindingPattern = <RuleName extends string>(
   $: GrammarSymbols<RuleName>,
   allowDefaults: boolean,