Add fixes from previous code review

These changes address the comments from #1088 I had fixed all of these, but then merged the PR without pushing my fixes.
informalsystems · Aug 5, 2023 · 0db831a · 0db831a
1 parent bab46d9
commit 0db831a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 23 deletions.
diff --git a/quint/src/IRprinting.ts b/quint/src/IRprinting.ts
@@ -195,12 +195,12 @@ export function sumToString(s: QuintSumType): string {
   return s.fields.fields
     .map((f: RowField) => {
       if (isTheUnit(f.fieldType)) {
-        return `| ${f.fieldName}`
+        return `${f.fieldName}`
       } else {
-        return `| ${f.fieldName}(${typeToString(f.fieldType)})`
+        return `${f.fieldName}(${typeToString(f.fieldType)})`
       }
     })
-    .join('\n')
+    .join(' | ')
 }
 
 /**

diff --git a/quint/src/graphics.ts b/quint/src/graphics.ts
@@ -186,7 +186,7 @@ export function prettyQuintType(type: QuintType): Doc {
       return group([text('{ '), prettyRow(type.fields), text('}')])
     }
     case 'sum': {
-      return group([text('{ '), prettySumRow(type.fields), text('}')])
+      return prettySumRow(type.fields)
     }
     case 'union': {
       const records = type.records.map(rec => {

diff --git a/quint/src/parsing/ToIrListener.ts b/quint/src/parsing/ToIrListener.ts
@@ -400,7 +400,7 @@ export class ToIrListener implements QuintListener {
     // Check if we have an accompanying type, and if not, then synthesize the
     // unit type.
     //
-    // I.e., we interpert a variant `A` as `A({})`.
+    // I.e., we interpret a variant `A` as `A({})`.
     if (poppedType === undefined) {
       const id = this.idGen.nextId()
       this.sourceMap.set(id, this.loc(ctx))

diff --git a/quint/test/IRprinting.test.ts b/quint/test/IRprinting.test.ts
@@ -232,7 +232,7 @@ describe('typeToString', () => {
         other: { kind: 'empty' },
       },
     }
-    const expectedType = '| A(int)\n| B'
+    const expectedType = 'A(int) | B'
     assert.deepEqual(typeToString(type), expectedType)
   })
 

diff --git a/quint/test/parsing/quintParserFrontend.test.ts b/quint/test/parsing/quintParserFrontend.test.ts
@@ -131,24 +131,31 @@ describe('parsing', () => {
   })
 
   it('parses sum types', () => {
-    const mod = `
-    module SumTypes {
-      type T =
-        | A
-        | B(int)
+    const sumTypeIrIsFormedCorrectly: (mod: string) => void = mod => {
+      const result = parsePhase1fromText(newIdGenerator(), mod, 'test')
+      assert(result.isRight())
+      const typeDef = result.value.modules[0].defs[0]
+      assert(typeDef.kind === 'typedef')
+      const sumType = typeDef.type!
+      assert(sumType.kind === 'sum')
+      const [variantA, variantB] = sumType.fields.fields
+      assert(variantA.fieldName === 'A')
+      assert(isTheUnit(variantA.fieldType))
+      assert(variantB.fieldName === 'B')
+      assert(variantB.fieldType.kind === 'int')
     }
-    `
-    const result = parsePhase1fromText(newIdGenerator(), mod, 'test')
-    assert(result.isRight())
-    const typeDef = result.value.modules[0].defs[0]
-    assert(typeDef.kind === 'typedef')
-    const sumType = typeDef.type!
-    assert(sumType.kind === 'sum')
-    const [variantA, variantB] = sumType.fields.fields
-    assert(variantA.fieldName === 'A')
-    assert(isTheUnit(variantA.fieldType))
-    assert(variantB.fieldName === 'B')
-    assert(variantB.fieldType.kind === 'int')
+    sumTypeIrIsFormedCorrectly(`
+      module SumTypes {
+        type T =
+          | A
+          | B(int)
+      }
+    `)
+    sumTypeIrIsFormedCorrectly(`
+      module SumTypes {
+        type T = A | B(int)
+      }
+    `)
   })
 })