Remove { ?, ?, true }-style notation. Closes #7.

robsimmons · Nov 19, 2023 · 3c209b7 · 3c209b7
1 parent ab2d14a
commit 3c209b7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/engine/choiceengine.test.ts b/src/engine/choiceengine.test.ts
@@ -119,11 +119,11 @@ test('Overlapping non-exhaustive and exhaustive choices', () => {
     a.
     b.
     c is { a, b, d, e } :- a.
-    c is { a, b, ?, c } :- a.
+    c is { a, b, c? } :- a.
     c is { a, c, d, e } :- b.
     c is { c? }.
-    c is { a, ? }.
-    c is { ?, f }.
+    c is { a? }.
+    c is { f? }.
     `);
   expect(solutionsToStrings(solutions)).toEqual(['a, b, c is a', 'a, b, c is d', 'a, b, c is e']);
 });

diff --git a/src/langauge/dusa-parser.test.ts b/src/langauge/dusa-parser.test.ts
@@ -26,7 +26,7 @@ test('Parser and pretty pretter idempotence', () => {
   expectRoundTripToParse('a is { ? }.');
   expectRoundTripToParse('a is { b? }.');
   expectRoundTripToParse('a is { b, c }.');
-  expectRoundTripToParse('a is { b, c, ? }.');
+  expectRoundTripToParse('a is { b, c? }.');
   expectRoundTripToParse('a is { b, c d }.');
   expectRoundTripToParse('a is { b, c ((d e)) }.', 'a is { b, c (d e) }.');
 });
diff --git a/src/langauge/dusa-parser.ts b/src/langauge/dusa-parser.ts
@@ -119,11 +119,7 @@ export function parseHeadValue(t: Istream<Token>): {
     }
     while ((tok = chomp(t, '}')) === null) {
       if (chomp(t, ',')) {
-        if (chomp(t, '?')) {
-          exhaustive = false;
-        } else {
-          values.push(forceFullTerm(t));
-        }
+        values.push(forceFullTerm(t));
       } else {
         force(t, '?');
         end = force(t, '}').loc.end;

diff --git a/src/langauge/syntax.ts b/src/langauge/syntax.ts
@@ -81,7 +81,7 @@ function headToString(head: Conclusion) {
   } else if (head.values.length !== 1 || !head.exhaustive) {
     return `${head.name}${args} is { ${head.values
       .map((term) => termToString(term, false))
-      .join(', ')}${head.exhaustive ? '' : head.values.length < 2 ? '?' : ', ?'} }`;
+      .join(', ')}${head.exhaustive ? '' : '?'} }`;
   } else if (head.values[0].type === 'triv') {
     return `${head.name}${args}`;
   } else {