From b8ddf766460bfcf475e08ff52c889246e78f76cc Mon Sep 17 00:00:00 2001 From: Kshitij Bansal Date: Sun, 22 Jun 2014 01:17:27 -0400 Subject: Renaming of SMT2 operator names, kinds for set theory * SET_SINGLETON kind renamed to just SINGLETON * "setenum" smt2 opertor renamed to "singleton"[1] * "in" smt2 operator renamed to "member"[2] [1] It was anyhow accepting exactly one argument, so was bit misleading to call set enumerator. [2] The corresponding kind was called MEMBER, so this will also make them consistent. Only inconsistency now is for subset: kind is called SUBSET but operator is called "subseteq". --- test/regress/regress0/sets/jan27/deepmeas0.hs.fqout.cvc4.41.smt2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/regress/regress0/sets/jan27/deepmeas0.hs.fqout.cvc4.41.smt2') diff --git a/test/regress/regress0/sets/jan27/deepmeas0.hs.fqout.cvc4.41.smt2 b/test/regress/regress0/sets/jan27/deepmeas0.hs.fqout.cvc4.41.smt2 index 0aa6c88ae..8b84c9153 100644 --- a/test/regress/regress0/sets/jan27/deepmeas0.hs.fqout.cvc4.41.smt2 +++ b/test/regress/regress0/sets/jan27/deepmeas0.hs.fqout.cvc4.41.smt2 @@ -4,8 +4,8 @@ (define-sort Elt () Int) (define-sort mySet () (Set Elt )) (define-fun smt_set_emp () mySet (as emptyset mySet)) -(define-fun smt_set_mem ((x Elt) (s mySet)) Bool (in x s)) -(define-fun smt_set_add ((s mySet) (x Elt)) mySet (union s (setenum x))) +(define-fun smt_set_mem ((x Elt) (s mySet)) Bool (member x s)) +(define-fun smt_set_add ((s mySet) (x Elt)) mySet (union s (singleton x))) (define-fun smt_set_cup ((s1 mySet) (s2 mySet)) mySet (union s1 s2)) (define-fun smt_set_cap ((s1 mySet) (s2 mySet)) mySet (intersection s1 s2)) ;(define-fun smt_set_com ((s mySet)) mySet ((_ map not) s)) -- cgit v1.2.3