@@ -303,22 +303,22 @@ impl Construct for Discharge {
303303}
304304
305305impl Discharge {
306- fn fmt_param ( & self , param : ir:: ParamIdx , ctx : & ir :: Component ) -> String {
306+ fn fmt_param ( & self , param : ir:: ParamIdx ) -> String {
307307 match self . sol_base {
308308 // CVC5 does not correctly print out quoted SExps
309309 cmdline:: Solver :: Z3 => {
310- format ! ( "|{}@ param{}|" , ctx . display ( param ) , param. get( ) )
310+ format ! ( "|param{}|" , param. get( ) )
311311 }
312312 _ => {
313313 format ! ( "param{}" , param. get( ) )
314314 }
315315 }
316316 }
317317
318- fn fmt_event ( & self , event : ir:: EventIdx , ctx : & ir :: Component ) -> String {
318+ fn fmt_event ( & self , event : ir:: EventIdx ) -> String {
319319 match self . sol_base {
320320 cmdline:: Solver :: Z3 => {
321- format ! ( "|{}@ event{}|" , ctx . display ( event ) , event. get( ) )
321+ format ! ( "|event{}|" , event. get( ) )
322322 }
323323 _ => format ! ( "event{}" , event. get( ) ) ,
324324 }
@@ -591,7 +591,7 @@ impl Visitor for Discharge {
591591 for ( idx, _) in data. comp . params ( ) . iter ( ) {
592592 let sexp = self
593593 . sol
594- . declare_fun ( self . fmt_param ( idx, comp ) , vec ! [ ] , int)
594+ . declare_fun ( self . fmt_param ( idx) , vec ! [ ] , int)
595595 . unwrap ( ) ;
596596 self . overflow_assert ( sexp) ;
597597 self . param_map . push ( idx, sexp) ;
@@ -601,7 +601,7 @@ impl Visitor for Discharge {
601601 for ( idx, _) in data. comp . events ( ) . iter ( ) {
602602 let sexp = self
603603 . sol
604- . declare_fun ( self . fmt_event ( idx, comp ) , vec ! [ ] , int)
604+ . declare_fun ( self . fmt_event ( idx) , vec ! [ ] , int)
605605 . unwrap ( ) ;
606606 self . overflow_assert ( sexp) ;
607607 self . ev_map . push ( idx, sexp) ;
0 commit comments