From 23b7e109bd86751c669febdaf3186f006060006f Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Wed, 18 Mar 2026 10:01:47 -0700 Subject: [PATCH] partial updates to test Signed-off-by: Nikolaj Bjorner --- src/smt/seq/seq_nielsen.h | 3 ++- src/test/seq_parikh.cpp | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/smt/seq/seq_nielsen.h b/src/smt/seq/seq_nielsen.h index 8b82ffe6c..ea5dd87d2 100644 --- a/src/smt/seq/seq_nielsen.h +++ b/src/smt/seq/seq_nielsen.h @@ -570,6 +570,7 @@ namespace seq { // Used for precise cycle detection with history-length-based progress. // Mirrors ZIPT LocalInfo.RegexOccurrence (LocalInfo.cs:34) std::map, unsigned> m_regex_occurrence; + public: nielsen_node(nielsen_graph& graph, unsigned id); @@ -749,7 +750,7 @@ namespace seq { ast_manager& m; seq_util& m_seq; euf::sgraph& m_sg; - region m_region; + // region m_region; ptr_vector m_nodes; ptr_vector m_edges; nielsen_node* m_root = nullptr; diff --git a/src/test/seq_parikh.cpp b/src/test/seq_parikh.cpp index cb237a28f..ed03fbce2 100644 --- a/src/test/seq_parikh.cpp +++ b/src/test/seq_parikh.cpp @@ -321,7 +321,8 @@ static void test_generate_constraints_ab_star() { expr_ref re = mk_ab_star(m, seq); euf::snode* regex = sg.mk(re); seq::dep_manager dm; - seq::dep_tracker dep = dm.mk_leaf({seq::dep_source::kind::mem, 0}); + sat::literal lit = sat::null_literal; // dummy literal for dependency tracking + seq::dep_tracker dep = dm.mk_leaf(lit); seq::str_mem mem(x, regex, nullptr, 0, dep); vector out; @@ -367,7 +368,7 @@ static void test_generate_constraints_bounded_loop() { expr_ref re(seq.re.mk_loop(ab, 1, 3), m); euf::snode* regex = sg.mk(re); seq::dep_manager dm; - seq::dep_tracker dep = dm.mk_leaf({seq::dep_source::kind::mem, 0}); + seq::dep_tracker dep = dm.mk_leaf(sat::null_literal); seq::str_mem mem(x, regex, nullptr, 0, dep); vector out; @@ -404,7 +405,7 @@ static void test_generate_constraints_stride_one() { expr_ref re(seq.re.mk_full_seq(str_sort), m); euf::snode* regex = sg.mk(re); seq::dep_manager dm; - seq::dep_tracker dep = dm.mk_leaf({seq::dep_source::kind::mem, 0}); + seq::dep_tracker dep = dm.mk_leaf(sat::null_literal); seq::str_mem mem(x, regex, nullptr, 0, dep); vector out; @@ -427,7 +428,7 @@ static void test_generate_constraints_fixed_length() { expr_ref re = mk_to_re_ab(m, seq); // fixed len 2 euf::snode* regex = sg.mk(re); seq::dep_manager dm; - seq::dep_tracker dep = dm.mk_leaf({seq::dep_source::kind::mem, 0}); + seq::dep_tracker dep = dm.mk_leaf(sat::null_literal); seq::str_mem mem(x, regex, nullptr, 0, dep); vector out; @@ -450,7 +451,8 @@ static void test_generate_constraints_dep_propagated() { expr_ref re = mk_ab_star(m, seq); euf::snode* regex = sg.mk(re); seq::dep_manager dm; - seq::dep_tracker dep = dm.mk_leaf({seq::dep_source::kind::mem, 7}); + sat::literal lit(7); + seq::dep_tracker dep = dm.mk_leaf(lit); seq::str_mem mem(x, regex, nullptr, 0, dep); vector out; @@ -463,7 +465,7 @@ static void test_generate_constraints_dep_propagated() { dm.linearize(ic.m_dep, vs); bool found = false; for (auto const& d : vs) - if (d.m_kind == seq::dep_source::kind::mem && d.index == 7) found = true; + if (std::get(d) == lit) found = true; SASSERT(found); } std::cout << " all constraints carry dep {mem,7}\n";