Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert Quint empty tuples into uninterpreted types/values #2869

Merged
merged 3 commits into from
Mar 21, 2024
Merged

Convert Quint empty tuples into uninterpreted types/values #2869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c46f9b1
Convert Quint empty tuples into uninterpreted types/values
bugarela Mar 21, 2024
1cf2a58
Add CHANGELOG entry
bugarela Mar 21, 2024
6124007
Consider one more case for empty tuple conversion
bugarela Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .unreleased/bug-fixes/converting-unit-types.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Convert Quint empty tuples as uninterpreted types/values (#2869)
9 changes: 8 additions & 1 deletion tla-io/src/main/scala/at/forsyte/apalache/io/quint/Quint.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,14 @@ class Quint(quintOutput: QuintOutput) {
})

// Tuples
case "Tup" => variadicApp(args => tla.tuple(args: _*))
case "Tup" =>
if (quintArgs.isEmpty) {
// Translate empty tuples to values of type UNIT
(_) => Reader((_) => tla.const("U", ConstT1(("UNIT"))))
} else {
variadicApp(args => tla.tuple(args: _*))
}

// product projection is just function application on TLA
case "item" => binaryApp(opName, tla.app)
case "tuples" => variadicApp(tla.times)
Expand Down
8 changes: 5 additions & 3 deletions tla-io/src/main/scala/at/forsyte/apalache/io/quint/QuintTypeConverter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,10 @@ private class QuintTypeConverter extends LazyLogging {
case QuintSeqT(elem) => SeqT1(convert(elem))
case QuintFunT(arg, res) => FunT1(convert(arg), convert(res))
case QuintOperT(args, res) => OperT1(args.map(convert), convert(res))
case QuintTupleT(row) => rowToTupleT1(row)
case QuintRecordT(row) => RecRowT1(rowToRowT1(row))
case QuintSumT(row) => VariantT1(rowToRowT1(row))
case QuintTupleT(Row.Nil() | Row.Cell(Seq(), _)) =>
ConstT1("UNIT") // Use the Unit type for empty tuples, since they are the unit type in Quint
case QuintTupleT(row) => rowToTupleT1(row)
case QuintRecordT(row) => RecRowT1(rowToRowT1(row))
case QuintSumT(row) => VariantT1(rowToRowT1(row))
}
}
4 changes: 4 additions & 0 deletions tla-io/src/test/scala/at/forsyte/apalache/io/quint/TestQuintEx.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,10 @@ class TestQuintEx extends AnyFunSuite {
assert(convert(Q.app("tuples", Q.intSet, Q.intSet, Q.intSet)(typ)) == "{1, 2, 3} × {1, 2, 3} × {1, 2, 3}")
}

test("can convert builtin empty Tup operator application to uninterpreted value") {
assert(convert(Q.app("Tup")(QuintTupleT.ofTypes())) == "\"U_OF_UNIT\"")
}

/// SUM TYPES

test("can convert builtin variant operator application") {
Expand Down
7 changes: 6 additions & 1 deletion tla-io/src/test/scala/at/forsyte/apalache/io/quint/TestQuintTypes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import org.scalatest.funsuite.AnyFunSuite
import org.scalatestplus.junit.JUnitRunner
import at.forsyte.apalache.io.quint.QuintType._
import at.forsyte.apalache.tla.lir.{
FunT1, IntT1, RecRowT1, RowT1, SparseTupT1, StrT1, TlaType1, TupT1, VarT1, VariantT1,
ConstT1, FunT1, IntT1, RecRowT1, RowT1, SparseTupT1, StrT1, TlaType1, TupT1, VarT1, VariantT1,
}

/**
Expand Down Expand Up @@ -33,6 +33,11 @@ class TestQuintTypes extends AnyFunSuite {
assert(translate(tuple) == TupT1(IntT1, StrT1))
}

test("empty Quint tuple types are converted to the UNIT uninterpreted type") {
val tuple = QuintTupleT(Row.Nil())
assert(translate(tuple) == ConstT1("UNIT"))
}

test("Polymorphic Quint tuples types are converted to sparse tuples") {
val tuple =
// i.e.: (int, string | r)
Expand Down
Loading