From f22ef75d3e9b9789a3fc068e9b42cd548ee68750 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Wed, 15 Oct 2025 20:51:40 +0200 Subject: [PATCH 1/3] update header Signed-off-by: Nikolaj Bjorner --- src/ast/rewriter/finite_set_rewriter.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/ast/rewriter/finite_set_rewriter.h b/src/ast/rewriter/finite_set_rewriter.h index 95651c815..1dc536946 100644 --- a/src/ast/rewriter/finite_set_rewriter.h +++ b/src/ast/rewriter/finite_set_rewriter.h @@ -33,7 +33,17 @@ where the signature is defined in finite_set_decl_plugin.h. \brief Cheap rewrite rules for finite sets */ class finite_set_rewriter { + friend class finite_set_rewriter_test; finite_set_util m_util; + + // Rewrite rules for set operations + br_status mk_union(unsigned num_args, expr *const *args, expr_ref &result); + br_status mk_intersect(unsigned num_args, expr *const *args, expr_ref &result); + br_status mk_difference(expr *arg1, expr *arg2, expr_ref &result); + br_status mk_subset(expr *arg1, expr *arg2, expr_ref &result); + br_status mk_singleton(expr *arg1, expr_ref &result); + br_status mk_in(expr *arg1, expr *arg2, expr_ref &result); + public: finite_set_rewriter(ast_manager & m, params_ref const & p = params_ref()): m_util(m) { @@ -43,15 +53,6 @@ public: family_id get_fid() const { return m_util.get_family_id(); } finite_set_util& util() { return m_util; } - br_status mk_app_core(func_decl * f, unsigned num_args, expr * const * args, expr_ref & result); - - // Rewrite rules for set operations - br_status mk_union(unsigned num_args, expr * const * args, expr_ref & result); - br_status mk_intersect(unsigned num_args, expr * const * args, expr_ref & result); - br_status mk_difference(expr * arg1, expr * arg2, expr_ref & result); - br_status mk_subset(expr * arg1, expr * arg2, expr_ref & result); - br_status mk_singleton(expr *arg1, expr_ref &result); - br_status mk_in(expr *arg1, expr *arg2, expr_ref &result); - + br_status mk_app_core(func_decl * f, unsigned num_args, expr * const * args, expr_ref & result); }; From e781648499ecbdce213add3e53b3ac2d739f2a35 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Wed, 15 Oct 2025 20:55:27 +0200 Subject: [PATCH 2/3] fix test Signed-off-by: Nikolaj Bjorner --- src/test/finite_set_rewriter.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/finite_set_rewriter.cpp b/src/test/finite_set_rewriter.cpp index ab014aa6f..b2d80ab98 100644 --- a/src/test/finite_set_rewriter.cpp +++ b/src/test/finite_set_rewriter.cpp @@ -22,6 +22,7 @@ Author: #include "ast/rewriter/finite_set_rewriter.h" class finite_set_rewriter_test { +public: void test_union_idempotent() { ast_manager m; reg_decl_plugins(m); From 2bb22c6489338546e6f4b4eba9683c0d291a45e6 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Oct 2025 21:47:32 +0200 Subject: [PATCH 3/3] Fix finite_set::is_fully_interp to check element sort interpretation (#7982) * Initial plan * Implement finite_set is_fully_interp to check element sort Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com> * Refine is_fully_interp implementation with SASSERT Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com> --- src/ast/finite_set_decl_plugin.cpp | 4 +++- src/test/finite_set.cpp | 33 ++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/ast/finite_set_decl_plugin.cpp b/src/ast/finite_set_decl_plugin.cpp index 002887905..4d669e12a 100644 --- a/src/ast/finite_set_decl_plugin.cpp +++ b/src/ast/finite_set_decl_plugin.cpp @@ -183,7 +183,9 @@ expr * finite_set_decl_plugin::get_some_value(sort * s) { } bool finite_set_decl_plugin::is_fully_interp(sort * s) const { - return false; + SASSERT(is_finite_set(s)); + sort* element_sort = get_element_sort(s); + return element_sort && m_manager->is_fully_interp(element_sort); } bool finite_set_decl_plugin::is_value(app * e) const { diff --git a/src/test/finite_set.cpp b/src/test/finite_set.cpp index ca6ae35bb..7c62e52c0 100644 --- a/src/test/finite_set.cpp +++ b/src/test/finite_set.cpp @@ -127,7 +127,40 @@ static void tst_finite_set_map_select() { ENSURE(selected_set->get_sort() == finite_set_int.get()); } +static void tst_finite_set_is_fully_interp() { + ast_manager m; + reg_decl_plugins(m); + + finite_set_util fsets(m); + arith_util arith(m); + + // Test with Int sort (should be fully interpreted) + sort_ref int_sort(arith.mk_int(), m); + parameter int_param(int_sort.get()); + sort_ref finite_set_int(m.mk_sort(fsets.get_family_id(), FINITE_SET_SORT, 1, &int_param), m); + + ENSURE(m.is_fully_interp(int_sort)); + ENSURE(m.is_fully_interp(finite_set_int)); + + // Test with Bool sort (should be fully interpreted) + sort_ref bool_sort(m.mk_bool_sort(), m); + parameter bool_param(bool_sort.get()); + sort_ref finite_set_bool(m.mk_sort(fsets.get_family_id(), FINITE_SET_SORT, 1, &bool_param), m); + + ENSURE(m.is_fully_interp(bool_sort)); + ENSURE(m.is_fully_interp(finite_set_bool)); + + // Test with uninterpreted sort (should not be fully interpreted) + sort_ref uninterp_sort(m.mk_uninterpreted_sort(symbol("U")), m); + parameter uninterp_param(uninterp_sort.get()); + sort_ref finite_set_uninterp(m.mk_sort(fsets.get_family_id(), FINITE_SET_SORT, 1, &uninterp_param), m); + + ENSURE(!m.is_fully_interp(uninterp_sort)); + ENSURE(!m.is_fully_interp(finite_set_uninterp)); +} + void tst_finite_set() { tst_finite_set_basic(); tst_finite_set_map_select(); + tst_finite_set_is_fully_interp(); }