From e0971c9cb9b08d769ff1c4cff51056a76edce369 Mon Sep 17 00:00:00 2001
From: Philippe Suter <philippe.suter@gmail.com>
Date: Thu, 8 Jul 2010 16:42:26 +0000
Subject: [PATCH] with multisets.
---
src/purescala/Trees.scala | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/purescala/Trees.scala b/src/purescala/Trees.scala
index f6b31f72d..561a1f715 100644
--- a/src/purescala/Trees.scala
+++ b/src/purescala/Trees.scala
@@ -183,17 +183,18 @@ object Trees {
case class SetMax(set: Expr) extends Expr
/* Multiset expressions */
- // case class EmptyMultiset(baseType: TypeTree) extends Expr
- // case class FiniteMultiset(elements: Seq[Expr]) extends Expr
- // case class Multiplicity(element: Expr, multiset: Expr) extends Expr
- // case class IsEmptyMultiset(multiset: Expr) extends Expr
- // case class MultisetEquals(multiset1: Expr, multiset2: Expr) extends Expr
- // case class MultisetCardinality(multiset: Expr) extends Expr
- // case class SubmultisetOf(multiset1: Expr, multiset2: Expr) extends Expr
- // case class MultisetIntersection(multiset1: Expr, multiset2: Expr) extends Expr
- // case class MultisetUnion(multiset1: Expr, multiset2: Expr) extends Expr
- // case class MultisetPlus(multiset1: Expr, multiset2: Expr) extends Expr // disjoint union
- // case class MultisetDifference(multiset1: Expr, multiset2: Expr) extends Expr
+ case class EmptyMultiset(baseType: TypeTree) extends Expr
+ case class FiniteMultiset(elements: Seq[Expr]) extends Expr
+ case class Multiplicity(element: Expr, multiset: Expr) extends Expr
+ case class IsEmptyMultiset(multiset: Expr) extends Expr
+ case class MultisetEquals(multiset1: Expr, multiset2: Expr) extends Expr
+ case class MultisetCardinality(multiset: Expr) extends Expr
+ case class SubmultisetOf(multiset1: Expr, multiset2: Expr) extends Expr
+ case class MultisetIntersection(multiset1: Expr, multiset2: Expr) extends Expr
+ case class MultisetUnion(multiset1: Expr, multiset2: Expr) extends Expr
+ case class MultisetPlus(multiset1: Expr, multiset2: Expr) extends Expr // disjoint union
+ case class MultisetDifference(multiset1: Expr, multiset2: Expr) extends Expr
+ case class MultisetToSet(multiset: Expr) extends Expr
/* Map operations. */
case class EmptyMap(fromType: TypeTree, toType: TypeTree) extends Expr
--
GitLab