From 7ec123d2c006b5432ac69fe0e8616b5494134ccd Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Thu, 20 Aug 2015 15:26:00 +0200
Subject: [PATCH] ScalaPrinter prints subsetOf correctly
---
src/main/scala/leon/purescala/ScalaPrinter.scala | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/scala/leon/purescala/ScalaPrinter.scala b/src/main/scala/leon/purescala/ScalaPrinter.scala
index 5fd883b94..6c5be9d2c 100644
--- a/src/main/scala/leon/purescala/ScalaPrinter.scala
+++ b/src/main/scala/leon/purescala/ScalaPrinter.scala
@@ -3,7 +3,6 @@
package leon
package purescala
-import Constructors._
import Extractors._
import PrinterHelpers._
import Common._
@@ -27,15 +26,18 @@ class ScalaPrinter(opts: PrinterOptions,
}))
case Not(Equals(l, r)) => optP { p"$l != $r" }
case Choose(pred) => p"choose($pred)"
+
case s @ FiniteSet(rss, t) => p"Set[$t](${rss.toSeq})"
- case m @ FiniteMap(els, k, v) => p"Map[$k,$v]($els)"
-
case ElementOfSet(e,s) => p"$s.contains(e)"
case SetUnion(l,r) => optP { p"$l ++ $r" }
- case MapUnion(l,r) => optP { p"$l ++ $r" }
case SetDifference(l,r) => optP { p"$l -- $r" }
case SetIntersection(l,r) => optP { p"$l & $r" }
case SetCardinality(s) => p"$s.size"
+ case SubsetOf(subset,superset) => p"$subset.subsetOf($superset)"
+
+ case MapUnion(l,r) => optP { p"$l ++ $r" }
+ case m @ FiniteMap(els, k, v) => p"Map[$k,$v]($els)"
+
case InfiniteIntegerLiteral(v) => p"BigInt($v)"
case a@FiniteArray(elems, oDef, size) =>
--
GitLab