Make smt2_convt inherit from stack_decision_proceduret directly

Author: peterschrammel

src/solvers/smt2/smt2_conv.h

@@ -31,7 +31,7 @@ class constant_exprt;
 class index_exprt;
 class member_exprt;
 
-class smt2_convt:public prop_convt
+class smt2_convt : public stack_decision_proceduret
 {
 public:
   enum class solvert
@@ -114,15 +114,13 @@ class smt2_convt:public prop_convt
   bool emit_set_logic;
 
   exprt handle(const exprt &expr) override;
-  literalt convert(const exprt &expr) override;
   void set_to(const exprt &expr, bool value) override;
   exprt get(const exprt &expr) const override;
   std::string decision_procedure_text() const override
   {
     return "SMT2";
   }
   void print_assignment(std::ostream &out) const override;
-  tvt l_get(literalt l) const override;
 
   /// Unimplemented
   void push() override;
@@ -183,6 +181,9 @@ class smt2_convt:public prop_convt
 
   std::string convert_identifier(const irep_idt &identifier);
 
+  literalt convert(const exprt &expr);
+  tvt l_get(literalt l) const;
+
   // auxiliary methods
   exprt prepare_for_convert_expr(const exprt &expr);
   exprt lower_byte_operators(const exprt &expr);