Add more obscure stuff for lulz

xenharmonic-devs · May 4, 2024 · 274daa7 · 274daa7
1 parent 58c3060
commit 274daa7
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/documentation/advanced-dsl.md b/documentation/advanced-dsl.md
@@ -416,10 +416,11 @@ Pitch can be declared as a period of oscillation, but it's coearced to Hz to pre
 E.g. `C4 = 10ms` has the same effect as `C4 = 100 Hz`.
 
 ### Obscure types
-| Type   | Literal | Meaning                                                |
-| ------ | ------- | ------------------------------------------------------ |
-| Second | `1s`    | Inverse of `1Hz` i.e. `1s * 1Hz` evaluates to `1`      |
-| Jorp   | `€`     | Geometric inverse of `c` i.e. `€` is equal to `<1200]` |
+| Type         | Literal | Meaning                                                |
+| ------------ | ------- | ------------------------------------------------------ |
+| Second       | `1s`    | Inverse of `1Hz` i.e. `1s * 1Hz` evaluates to `1`      |
+| Jorp         | `€`     | Geometric inverse of `c` i.e. `€` is equal to `<1200]` |
+| Pilcrowspoob | `¶`     | Geometric inverse of `logarithmic(1Hz)`                |
 
 ### Obscure operations
 | Name                      | Linear       | Result   | Logarithmic      | Result     |

diff --git a/src/ast.ts b/src/ast.ts
@@ -418,6 +418,7 @@ export function expressionToString(node: Expression) {
     case 'CentsLiteral':
     case 'CentLiteral':
     case 'ReciprocalCentLiteral':
+    case 'ReciprocalLogarithmicHertzLiteral':
     case 'FJS':
     case 'AspiringFJS':
     case 'AbsoluteFJS':

diff --git a/src/expression.ts b/src/expression.ts
@@ -144,6 +144,10 @@ export type SecondLiteral = {
   prefix: MetricPrefix | BinaryPrefix;
 };
 
+export type ReciprocalLogarithmicHertzLiteral = {
+  type: 'ReciprocalLogarithmicHertzLiteral';
+};
+
 export type FJS = {
   type: 'FJS';
   ups: number;
@@ -245,6 +249,7 @@ export type IntervalLiteral =
   | AspiringAbsoluteFJS
   | HertzLiteral
   | SecondLiteral
+  | ReciprocalLogarithmicHertzLiteral
   | MonzoLiteral
   | ValLiteral
   | SparseOffsetVal
@@ -958,6 +963,8 @@ export function literalToString(literal: IntervalLiteral) {
       return `${literal.real ? 'r' : ''}¢`;
     case 'ReciprocalCentLiteral':
       return '€';
+    case 'ReciprocalLogarithmicHertzLiteral':
+      return '¶';
     case 'FJS':
       return formatFJS(literal);
     case 'AbsoluteFJS':

diff --git a/src/grammars/sonic-weave.pegjs b/src/grammars/sonic-weave.pegjs
@@ -894,6 +894,7 @@ Quantity
   = WartsLiteral
   / SparseOffsetVal
   / ReciprocalCentLiteral
+  / ReciprocalLogarithmicHertzLiteral
   / MonzoLiteral
   / ValLiteral
   / DownExpression
@@ -1144,6 +1145,9 @@ SecondLiteral
 ReciprocalCentLiteral
   = '€' { return { type: 'ReciprocalCentLiteral' }; }
 
+ReciprocalLogarithmicHertzLiteral
+  = '¶' { return { type: 'ReciprocalLogarithmicHertzLiteral' }; }
+
 NoneLiteral
   = NoneToken { return { type: 'NoneLiteral' }; }
 

diff --git a/src/parser/__tests__/expression.spec.ts b/src/parser/__tests__/expression.spec.ts
@@ -2336,8 +2336,13 @@ describe('Poor grammar / Fun with "<"', () => {
     expect(sqrt2.valueOf()).toBeCloseTo(Math.SQRT2);
   });
 
-  it('has string representation for the geometric inverse of the Hertz', () => {
+  it('has string representation for the geometric inverse of the logarithmic Hertz', () => {
     const whatIsThis = evaluate('str(%logarithmic(1z))');
     expect(whatIsThis).toBe('withEquave(<1]@Hz, 1 Hz)');
   });
+
+  it('has a literal for the geometric inverse of the logarithmic Hertz', () => {
+    const {fraction} = parseSingle('¶ dot logarithmic(1z)');
+    expect(fraction).toBe('1');
+  });
 });
diff --git a/src/parser/expression.ts b/src/parser/expression.ts
@@ -172,6 +172,7 @@ const KIBI_MONZO = new TimeMonzo(ZERO, [F(10)]);
 const CENT_MONZO = new TimeMonzo(ZERO, [F(1, 1200)]);
 const CENT_REAL = new TimeReal(0, 1.0005777895065548);
 const RECIPROCAL_CENT_MONZO = new TimeMonzo(ZERO, [F(1200)]);
+const HERTZ_MONZO = new TimeMonzo(NEGATIVE_ONE, []);
 
 function typesCompatible(
   a: IntervalLiteral | undefined,
@@ -325,6 +326,10 @@ export class ExpressionVisitor {
         return new Val(RECIPROCAL_CENT_MONZO, TWO_MONZO, {
           type: 'ReciprocalCentLiteral',
         });
+      case 'ReciprocalLogarithmicHertzLiteral':
+        return new Val(HERTZ_MONZO, HERTZ_MONZO, {
+          type: 'ReciprocalLogarithmicHertzLiteral',
+        });
       case 'TrueLiteral':
         return true;
       case 'FalseLiteral':