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".

1 files changed, 27 insertions, 27 deletions

diff --git a/test/regress/regress0/sets/fuzz15201.smt2 b/test/regress/regress0/sets/fuzz15201.smt2
index 8ddeb36d2..650c0ead1 100644
--- a/test/regress/regress0/sets/fuzz15201.smt2
+++ b/test/regress/regress0/sets/fuzz15201.smt2
@@ -33,37 +33,37 @@
 (let ((e20 (intersection e17 e18)))
 (let ((e21 (intersection v1 e16)))
 (let ((e22 (setminus e20 e16)))
-(let ((e23 (ite (p1 v2 e18 e21) (setenum 1) (setenum 0))))
+(let ((e23 (ite (p1 v2 e18 e21) (singleton 1) (singleton 0))))
 (let ((e24 (setminus e17 e23)))
 (let ((e25 (union v2 e22)))
 (let ((e26 (union e24 e18)))
-(let ((e27 (ite (p1 e20 e19 e25) (setenum 1) (setenum 0))))
+(let ((e27 (ite (p1 e20 e19 e25) (singleton 1) (singleton 0))))
 (let ((e28 (f1 e20)))
-(let ((e29 (in e14 e17)))
-(let ((e30 (in e13 e23)))
-(let ((e31 (in e11 e25)))
-(let ((e32 (in e6 v1)))
-(let ((e33 (in e9 v1)))
-(let ((e34 (in v0 e28)))
-(let ((e35 (in e9 e16)))
-(let ((e36 (in e4 e17)))
-(let ((e37 (in e9 e18)))
-(let ((e38 (in e14 e25)))
-(let ((e39 (in e14 v2)))
-(let ((e40 (in v0 v1)))
-(let ((e41 (in e4 e16)))
-(let ((e42 (in e15 e21)))
-(let ((e43 (in e7 e22)))
-(let ((e44 (in e11 v2)))
-(let ((e45 (in e14 e22)))
-(let ((e46 (in e11 e16)))
-(let ((e47 (in e15 e22)))
-(let ((e48 (in e10 e23)))
-(let ((e49 (in e4 e21)))
-(let ((e50 (in e5 e28)))
-(let ((e51 (in e6 e28)))
-(let ((e52 (in v0 e22)))
-(let ((e53 (in e14 e20)))
+(let ((e29 (member e14 e17)))
+(let ((e30 (member e13 e23)))
+(let ((e31 (member e11 e25)))
+(let ((e32 (member e6 v1)))
+(let ((e33 (member e9 v1)))
+(let ((e34 (member v0 e28)))
+(let ((e35 (member e9 e16)))
+(let ((e36 (member e4 e17)))
+(let ((e37 (member e9 e18)))
+(let ((e38 (member e14 e25)))
+(let ((e39 (member e14 v2)))
+(let ((e40 (member v0 v1)))
+(let ((e41 (member e4 e16)))
+(let ((e42 (member e15 e21)))
+(let ((e43 (member e7 e22)))
+(let ((e44 (member e11 v2)))
+(let ((e45 (member e14 e22)))
+(let ((e46 (member e11 e16)))
+(let ((e47 (member e15 e22)))
+(let ((e48 (member e10 e23)))
+(let ((e49 (member e4 e21)))
+(let ((e50 (member e5 e28)))
+(let ((e51 (member e6 e28)))
+(let ((e52 (member v0 e22)))
+(let ((e53 (member e14 e20)))
 (let ((e54 (f1 e21)))
 (let ((e55 (f1 e28)))
 (let ((e56 (f1 e27)))