Skip to content

Fix SMT naming #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
UnsignedByte wants to merge 3 commits into from
Closed

Fix SMT naming #483

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ba38aa
fix smt naming
UnsignedByte Jan 18, 2025
eecadd6
remove unused variable
UnsignedByte Jan 18, 2025
781de7a
Merge branch 'main' into SMT-varnames
UnsignedByte Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions crates/filament/src/ir_passes/discharge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,22 +303,22 @@ impl Construct for Discharge {
}

impl Discharge {
fn fmt_param(&self, param: ir::ParamIdx, ctx: &ir::Component) -> String {
fn fmt_param(&self, param: ir::ParamIdx) -> String {
match self.sol_base {
// CVC5 does not correctly print out quoted SExps
cmdline::Solver::Z3 => {
format!("|{}@param{}|", ctx.display(param), param.get())
format!("|param{}|", param.get())
}
_ => {
format!("param{}", param.get())
}
}
}

fn fmt_event(&self, event: ir::EventIdx, ctx: &ir::Component) -> String {
fn fmt_event(&self, event: ir::EventIdx) -> String {
match self.sol_base {
cmdline::Solver::Z3 => {
format!("|{}@event{}|", ctx.display(event), event.get())
format!("|event{}|", event.get())
}
_ => format!("event{}", event.get()),
}
Expand Down Expand Up @@ -585,13 +585,12 @@ impl Visitor for Discharge {
log::debug!("Checking {}", data.comp.display(fact.prop));
}

let comp = &data.comp;
// Declare all parameters
let int = self.sort();
for (idx, _) in data.comp.params().iter() {
let sexp = self
.sol
.declare_fun(self.fmt_param(idx, comp), vec![], int)
.declare_fun(self.fmt_param(idx), vec![], int)
.unwrap();
self.overflow_assert(sexp);
self.param_map.push(idx, sexp);
Expand All @@ -601,7 +600,7 @@ impl Visitor for Discharge {
for (idx, _) in data.comp.events().iter() {
let sexp = self
.sol
.declare_fun(self.fmt_event(idx, comp), vec![], int)
.declare_fun(self.fmt_event(idx), vec![], int)
.unwrap();
self.overflow_assert(sexp);
self.ev_map.push(idx, sexp);
Expand Down
Loading