Merge branch 'master' into issue6636

34 files changed, 34 insertions, 34 deletions

diff --git a/test/regress/regress1/rels/addr_book_1.cvc b/test/regress/regress1/rels/addr_book_1.cvc
index 34176f274..8e7cdbd9d 100644
--- a/test/regress/regress1/rels/addr_book_1.cvc
+++ b/test/regress/regress1/rels/addr_book_1.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 Atom : TYPE;
 AtomTup : TYPE = [Atom];
 AtomBinTup : TYPE = [Atom, Atom];
diff --git a/test/regress/regress1/rels/addr_book_1_1.cvc b/test/regress/regress1/rels/addr_book_1_1.cvc
index 3273ade3a..c320d925f 100644
--- a/test/regress/regress1/rels/addr_book_1_1.cvc
+++ b/test/regress/regress1/rels/addr_book_1_1.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 Atom : TYPE;
 AtomTup : TYPE = [Atom];
 AtomBinTup : TYPE = [Atom, Atom];
diff --git a/test/regress/regress1/rels/bv1-unit.cvc b/test/regress/regress1/rels/bv1-unit.cvc
index 970ebdc8c..95fb5f02c 100644
--- a/test/regress/regress1/rels/bv1-unit.cvc
+++ b/test/regress/regress1/rels/bv1-unit.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 DATATYPE unit = u END;
 BvPair: TYPE = [BITVECTOR(1), unit, BITVECTOR(1)];
 x : SET OF BvPair;
diff --git a/test/regress/regress1/rels/bv1-unitb.cvc b/test/regress/regress1/rels/bv1-unitb.cvc
index 50a5bb48a..0a09614a7 100644
--- a/test/regress/regress1/rels/bv1-unitb.cvc
+++ b/test/regress/regress1/rels/bv1-unitb.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 DATATYPE unitb = ub(data : BITVECTOR(1)) END;
 BvPair: TYPE = [BITVECTOR(1), unitb, BITVECTOR(1)];
 x : SET OF BvPair;
diff --git a/test/regress/regress1/rels/bv1.cvc b/test/regress/regress1/rels/bv1.cvc
index 95e7419ba..7e0f18953 100644
--- a/test/regress/regress1/rels/bv1.cvc
+++ b/test/regress/regress1/rels/bv1.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 BvPair: TYPE = [BITVECTOR(1), BITVECTOR(1)];
 x : SET OF BvPair;
 y : SET OF BvPair;
diff --git a/test/regress/regress1/rels/bv1p-sat.cvc b/test/regress/regress1/rels/bv1p-sat.cvc
index 5eceb214c..a48cb6407 100644
--- a/test/regress/regress1/rels/bv1p-sat.cvc
+++ b/test/regress/regress1/rels/bv1p-sat.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 BvPair: TYPE = [BITVECTOR(1), BITVECTOR(1)];
 x : SET OF BvPair;
 y : SET OF BvPair;
diff --git a/test/regress/regress1/rels/bv1p.cvc b/test/regress/regress1/rels/bv1p.cvc
index 130ccae97..0e8803ce6 100644
--- a/test/regress/regress1/rels/bv1p.cvc
+++ b/test/regress/regress1/rels/bv1p.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 BvPair: TYPE = [BITVECTOR(1), BITVECTOR(1)];
 x : SET OF BvPair;
 y : SET OF BvPair;
diff --git a/test/regress/regress1/rels/bv2.cvc b/test/regress/regress1/rels/bv2.cvc
index d7162de7c..f3a729f2e 100644
--- a/test/regress/regress1/rels/bv2.cvc
+++ b/test/regress/regress1/rels/bv2.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 BvPair: TYPE = [BITVECTOR(2), BITVECTOR(2)];
 x : SET OF BvPair;
 y : SET OF BvPair;
diff --git a/test/regress/regress1/rels/iden_1_1.cvc b/test/regress/regress1/rels/iden_1_1.cvc
index 985a35a89..16bf42115 100644
--- a/test/regress/regress1/rels/iden_1_1.cvc
+++ b/test/regress/regress1/rels/iden_1_1.cvc
@@ -1,6 +1,6 @@
 % EXPECT: sat
 OPTION "sets-ext";
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 Atom:TYPE;
 AtomPair: TYPE = [Atom, Atom];
 x : SET OF AtomPair;
diff --git a/test/regress/regress1/rels/join-eq-structure-and.cvc b/test/regress/regress1/rels/join-eq-structure-and.cvc
index 177410b1e..329946c46 100644
--- a/test/regress/regress1/rels/join-eq-structure-and.cvc
+++ b/test/regress/regress1/rels/join-eq-structure-and.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
 y : SET OF IntPair;
diff --git a/test/regress/regress1/rels/join-eq-structure.cvc b/test/regress/regress1/rels/join-eq-structure.cvc
index e27d3811c..3cfb309c9 100644
--- a/test/regress/regress1/rels/join-eq-structure.cvc
+++ b/test/regress/regress1/rels/join-eq-structure.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
 y : SET OF IntPair;
diff --git a/test/regress/regress1/rels/joinImg_0_1.cvc b/test/regress/regress1/rels/joinImg_0_1.cvc
index 4e69394bd..789e36a92 100644
--- a/test/regress/regress1/rels/joinImg_0_1.cvc
+++ b/test/regress/regress1/rels/joinImg_0_1.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 OPTION "sets-ext";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
diff --git a/test/regress/regress1/rels/joinImg_0_2.cvc b/test/regress/regress1/rels/joinImg_0_2.cvc
index e15920804..89d767c7f 100644
--- a/test/regress/regress1/rels/joinImg_0_2.cvc
+++ b/test/regress/regress1/rels/joinImg_0_2.cvc
@@ -1,6 +1,6 @@
 % EXPECT: sat
 OPTION "sets-ext";
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
 y : SET OF IntPair;
diff --git a/test/regress/regress1/rels/joinImg_1.cvc b/test/regress/regress1/rels/joinImg_1.cvc
index 81f208fc4..1849ffb84 100644
--- a/test/regress/regress1/rels/joinImg_1.cvc
+++ b/test/regress/regress1/rels/joinImg_1.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 OPTION "sets-ext";
 Atom: TYPE;
 x : SET OF [Atom, Atom];
diff --git a/test/regress/regress1/rels/joinImg_1_1.cvc b/test/regress/regress1/rels/joinImg_1_1.cvc
index 003770a1b..748b57062 100644
--- a/test/regress/regress1/rels/joinImg_1_1.cvc
+++ b/test/regress/regress1/rels/joinImg_1_1.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 OPTION "sets-ext";
 Atom: TYPE;
 x : SET OF [Atom, Atom];
diff --git a/test/regress/regress1/rels/joinImg_2.cvc b/test/regress/regress1/rels/joinImg_2.cvc
index a4acfe6c6..2ce3f3f69 100644
--- a/test/regress/regress1/rels/joinImg_2.cvc
+++ b/test/regress/regress1/rels/joinImg_2.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 OPTION "sets-ext";
 Atom: TYPE;
 x : SET OF [Atom, Atom];
diff --git a/test/regress/regress1/rels/joinImg_2_1.cvc b/test/regress/regress1/rels/joinImg_2_1.cvc
index 03f88be37..0238b253f 100644
--- a/test/regress/regress1/rels/joinImg_2_1.cvc
+++ b/test/regress/regress1/rels/joinImg_2_1.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 OPTION "sets-ext";
 Atom: TYPE;
 x : SET OF [Atom, Atom];
diff --git a/test/regress/regress1/rels/prod-mod-eq.cvc b/test/regress/regress1/rels/prod-mod-eq.cvc
index 96ef2ffba..0e6a00fb4 100644
--- a/test/regress/regress1/rels/prod-mod-eq.cvc
+++ b/test/regress/regress1/rels/prod-mod-eq.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 IntPairPair: TYPE = [INT, INT, INT, INT];
 x : SET OF IntPair;
diff --git a/test/regress/regress1/rels/prod-mod-eq2.cvc b/test/regress/regress1/rels/prod-mod-eq2.cvc
index b9341a216..871b1b7d7 100644
--- a/test/regress/regress1/rels/prod-mod-eq2.cvc
+++ b/test/regress/regress1/rels/prod-mod-eq2.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 IntPairPair: TYPE = [INT, INT, INT, INT];
 x : SET OF IntPair;
diff --git a/test/regress/regress1/rels/rel_complex_3.cvc b/test/regress/regress1/rels/rel_complex_3.cvc
index 492c94432..94639eff0 100644
--- a/test/regress/regress1/rels/rel_complex_3.cvc
+++ b/test/regress/regress1/rels/rel_complex_3.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
 y : SET OF IntPair;
diff --git a/test/regress/regress1/rels/rel_complex_4.cvc b/test/regress/regress1/rels/rel_complex_4.cvc
index f473b00aa..d75bf0cd4 100644
--- a/test/regress/regress1/rels/rel_complex_4.cvc
+++ b/test/regress/regress1/rels/rel_complex_4.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
 y : SET OF IntPair;
diff --git a/test/regress/regress1/rels/rel_complex_5.cvc b/test/regress/regress1/rels/rel_complex_5.cvc
index d64817187..27225e72c 100644
--- a/test/regress/regress1/rels/rel_complex_5.cvc
+++ b/test/regress/regress1/rels/rel_complex_5.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 IntTup: TYPE = [INT];
 x : SET OF IntPair;
diff --git a/test/regress/regress1/rels/rel_mix_0_1.cvc b/test/regress/regress1/rels/rel_mix_0_1.cvc
index 723a9b2e2..75f4965f2 100644
--- a/test/regress/regress1/rels/rel_mix_0_1.cvc
+++ b/test/regress/regress1/rels/rel_mix_0_1.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 IntTup: TYPE = [INT];
 x : SET OF IntPair;
diff --git a/test/regress/regress1/rels/rel_pressure_0.cvc b/test/regress/regress1/rels/rel_pressure_0.cvc
index 0e9646f95..5648b7ba8 100644
--- a/test/regress/regress1/rels/rel_pressure_0.cvc
+++ b/test/regress/regress1/rels/rel_pressure_0.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
 y : SET OF IntPair;
diff --git a/test/regress/regress1/rels/rel_tc_10_1.cvc b/test/regress/regress1/rels/rel_tc_10_1.cvc
index 65686ef08..391b58bfb 100644
--- a/test/regress/regress1/rels/rel_tc_10_1.cvc
+++ b/test/regress/regress1/rels/rel_tc_10_1.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
 y : SET OF IntPair;
diff --git a/test/regress/regress1/rels/rel_tc_4.cvc b/test/regress/regress1/rels/rel_tc_4.cvc
index a32e8b66d..b194902cb 100644
--- a/test/regress/regress1/rels/rel_tc_4.cvc
+++ b/test/regress/regress1/rels/rel_tc_4.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
 y : SET OF IntPair;
diff --git a/test/regress/regress1/rels/rel_tc_4_1.cvc b/test/regress/regress1/rels/rel_tc_4_1.cvc
index 484d09ec3..6dae90f80 100644
--- a/test/regress/regress1/rels/rel_tc_4_1.cvc
+++ b/test/regress/regress1/rels/rel_tc_4_1.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
 y : SET OF IntPair;
diff --git a/test/regress/regress1/rels/rel_tc_5_1.cvc b/test/regress/regress1/rels/rel_tc_5_1.cvc
index a4b2fe1db..d49a19217 100644
--- a/test/regress/regress1/rels/rel_tc_5_1.cvc
+++ b/test/regress/regress1/rels/rel_tc_5_1.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
 y : SET OF IntPair;
diff --git a/test/regress/regress1/rels/rel_tc_6.cvc b/test/regress/regress1/rels/rel_tc_6.cvc
index 2bc552170..b751dc201 100644
--- a/test/regress/regress1/rels/rel_tc_6.cvc
+++ b/test/regress/regress1/rels/rel_tc_6.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
 y : SET OF IntPair;
diff --git a/test/regress/regress1/rels/rel_tc_9_1.cvc b/test/regress/regress1/rels/rel_tc_9_1.cvc
index 8a9e8eeca..af7bbb044 100644
--- a/test/regress/regress1/rels/rel_tc_9_1.cvc
+++ b/test/regress/regress1/rels/rel_tc_9_1.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
 y : SET OF IntPair;
diff --git a/test/regress/regress1/rels/rel_tp_2.cvc b/test/regress/regress1/rels/rel_tp_2.cvc
index 441e79c45..73702ea8e 100644
--- a/test/regress/regress1/rels/rel_tp_2.cvc
+++ b/test/regress/regress1/rels/rel_tp_2.cvc
@@ -1,5 +1,5 @@
 % EXPECT: unsat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
 y : SET OF IntPair;
diff --git a/test/regress/regress1/rels/rel_tp_join_2_1.cvc b/test/regress/regress1/rels/rel_tp_join_2_1.cvc
index 9a79582b7..51d6c1050 100644
--- a/test/regress/regress1/rels/rel_tp_join_2_1.cvc
+++ b/test/regress/regress1/rels/rel_tp_join_2_1.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [INT, INT];
 x : SET OF IntPair;
 y : SET OF IntPair;
diff --git a/test/regress/regress1/rels/set-strat.cvc b/test/regress/regress1/rels/set-strat.cvc
index 0dee0e84d..c56a2b16e 100644
--- a/test/regress/regress1/rels/set-strat.cvc
+++ b/test/regress/regress1/rels/set-strat.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [ INT, INT];
 SetIntPair: TYPE = [ SET OF IntPair, SET OF IntPair ];
 x : SET OF IntPair;
diff --git a/test/regress/regress1/rels/strat.cvc b/test/regress/regress1/rels/strat.cvc
index b91ddbbe8..dc5c2f37d 100644
--- a/test/regress/regress1/rels/strat.cvc
+++ b/test/regress/regress1/rels/strat.cvc
@@ -1,5 +1,5 @@
 % EXPECT: sat
-OPTION "logic" "ALL_SUPPORTED";
+OPTION "logic" "ALL";
 IntPair: TYPE = [ INT, INT];
 IntIntPair: TYPE = [ IntPair, IntPair];
 x : SET OF IntIntPair;