Reserve set literal syntax

xenharmonic-devs · Jun 18, 2024 · 066c7c5 · 066c7c5
1 parent 6eeda47
commit 066c7c5
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 2 deletions.
diff --git a/documentation/technical.md b/documentation/technical.md
@@ -194,7 +194,7 @@ The Basic Latin block is listed in full. Other blocks only where used.
 | U+0020         | *SP*  | Whitespace |
 | U+0021         | !     | *Reserved for future use* |
 | U+0022         | "     | String literals |
-| U+0023         | #     | Sharp accidental |
+| U+0023         | #     | Sharp accidental, record literals |
 | U+0024         | $     | Current scale |
 | U+0025         | %     | Unary inversion, binary division (loose binding) |
 | U+0026         | &     | MOS chroma up accidental |

diff --git a/src/ast.ts b/src/ast.ts
@@ -425,6 +425,11 @@ export type ArrayLiteral = {
   elements: Argument[];
 };
 
+export type SetLiteral = {
+  type: 'SetLiteral';
+  elements: Argument[];
+};
+
 export type RecordLiteral = {
   type: 'RecordLiteral';
   properties: [string | null, Expression][];
@@ -466,6 +471,7 @@ export type Expression =
   | Range
   | ArrayComprehension
   | ArrayLiteral
+  | SetLiteral
   | RecordLiteral
   | StringLiteral
   | HarmonicSegment;

diff --git a/src/grammars/sonic-weave.pegjs b/src/grammars/sonic-weave.pegjs
@@ -1044,6 +1044,7 @@ Primary
   / TemplateArgument
   / ArrayLiteral
   / RecordLiteral
+  / SetLiteral
   / StringLiteral
 
 UnitStepRange
@@ -1647,7 +1648,15 @@ ArrayLiteral
     return {
       type: 'ArrayLiteral',
       elements,
-    }
+    };
+  }
+
+SetLiteral
+  = '#[' _ elements: ArgumentList _ ']' {
+    return {
+      type: 'SetLiteral',
+      elements,
+    };
   }
 
 RecordLiteral

diff --git a/src/parser/__tests__/sonic-weave-ast.spec.ts b/src/parser/__tests__/sonic-weave-ast.spec.ts
@@ -1205,6 +1205,28 @@ describe('SonicWeave Abstract Syntax Tree parser', () => {
       expression: {type: 'ColorLiteral', value: 'rgba(255 50% 5 / .5)'},
     });
   });
+
+  it('parses set literals', () => {
+    const ast = parseSingle('#[1, 2]');
+    expect(ast).toEqual({
+      type: 'ExpressionStatement',
+      expression: {
+        type: 'SetLiteral',
+        elements: [
+          {
+            type: 'Argument',
+            spread: false,
+            expression: {type: 'IntegerLiteral', value: 1n},
+          },
+          {
+            type: 'Argument',
+            spread: false,
+            expression: {type: 'IntegerLiteral', value: 2n},
+          },
+        ],
+      },
+    });
+  });
 });
 
 describe('Automatic semicolon insertion', () => {

diff --git a/src/parser/expression.ts b/src/parser/expression.ts
@@ -417,6 +417,9 @@ export class ExpressionVisitor {
         return this.visitSquareSuperparticular(node);
       case 'TemplateArgument':
         return this.visitTemplateArgument(node);
+      case 'SetLiteral':
+        // This requires hashable Intervals and support in xen-dev-utils.
+        throw new Error('Set literals not implemented yet.');
     }
     node satisfies never;
   }