Merge pull request #7260 from tautschnig/cleanup/solver_text-const

Make propt::solver_text const

Author: tautschnig

src/solvers/prop/prop.h

@@ -93,7 +93,7 @@ class propt
   virtual bvt new_variables(std::size_t width);
 
   // solving
-  virtual const std::string solver_text()=0;
+  virtual std::string solver_text() const = 0;
   enum class resultt { P_SATISFIABLE, P_UNSATISFIABLE, P_ERROR };
   resultt prop_solve();
 

src/solvers/qbf/qbf_bdd_core.cpp

@@ -83,7 +83,7 @@ tvt qbf_bdd_coret::l_get(literalt a) const
   UNREACHABLE;
 }
 
-const std::string qbf_bdd_coret::solver_text()
+std::string qbf_bdd_coret::solver_text() const
 {
   return "QBF/BDD/CORE";
 }

src/solvers/qbf/qbf_bdd_core.h

@@ -31,12 +31,12 @@ class qbf_bdd_certificatet:public qdimacs_coret
 
 public:
   qbf_bdd_certificatet(void);
-  virtual ~qbf_bdd_certificatet(void);
+  ~qbf_bdd_certificatet(void) override;
 
-  virtual literalt new_variable(void);
+  literalt new_variable(void) override;
 
-  virtual tvt l_get(literalt a) const;
-  virtual const exprt f_get(literalt l);
+  tvt l_get(literalt a) const override;
+  const exprt f_get(literalt l) override;
 };
 
 
@@ -50,20 +50,20 @@ class qbf_bdd_coret:public qbf_bdd_certificatet
 
 public:
   qbf_bdd_coret();
-  virtual ~qbf_bdd_coret();
+  ~qbf_bdd_coret() override;
 
-  virtual literalt new_variable();
+  literalt new_variable() override;
 
-  virtual void lcnf(const bvt &bv);
-  virtual literalt lor(literalt a, literalt b);
-  virtual literalt lor(const bvt &bv);
+  void lcnf(const bvt &bv) override;
+  literalt lor(literalt a, literalt b) override;
+  literalt lor(const bvt &bv) override;
 
-  virtual const std::string solver_text();
-  virtual resultt prop_solve();
-  virtual tvt l_get(literalt a) const;
+  std::string solver_text() const override;
+  resultt prop_solve() override;
+  tvt l_get(literalt a) const override;
 
-  virtual bool is_in_core(literalt l) const;
-  virtual modeltypet m_get(literalt a) const;
+  bool is_in_core(literalt l) const override;
+  modeltypet m_get(literalt a) const override;
 
 protected:
   void compress_certificate(void);

src/solvers/qbf/qbf_quantor.cpp

@@ -27,7 +27,7 @@ tvt qbf_quantort::l_get(literalt) const
   UNREACHABLE;
 }
 
-const std::string qbf_quantort::solver_text()
+std::string qbf_quantort::solver_text() const
 {
   return "Quantor";
 }

src/solvers/qbf/qbf_quantor.h

@@ -16,11 +16,11 @@ class qbf_quantort:public qdimacs_cnft
 {
 public:
   explicit qbf_quantort(message_handlert &message_handler);
-  virtual ~qbf_quantort();
+  ~qbf_quantort() override;
 
-  virtual const std::string solver_text();
+  std::string solver_text() const override;
   virtual resultt prop_solve();
-  virtual tvt l_get(literalt a) const;
+  tvt l_get(literalt a) const override;
 };
 
 #endif // CPROVER_SOLVERS_QBF_QBF_QUANTOR_H

src/solvers/qbf/qbf_qube.cpp

@@ -29,7 +29,7 @@ tvt qbf_qubet::l_get(literalt) const
   UNREACHABLE;
 }
 
-const std::string qbf_qubet::solver_text()
+std::string qbf_qubet::solver_text() const
 {
   return "QuBE";
 }

src/solvers/qbf/qbf_qube.h

@@ -16,11 +16,11 @@ class qbf_qubet:public qdimacs_cnft
 {
 public:
   explicit qbf_qubet(message_handlert &message_handler);
-  virtual ~qbf_qubet();
+  ~qbf_qubet() override;
 
-  virtual const std::string solver_text();
+  std::string solver_text() const override;
   virtual resultt prop_solve();
-  virtual tvt l_get(literalt a) const;
+  tvt l_get(literalt a) const override;
 };
 
 #endif // CPROVER_SOLVERS_QBF_QBF_QUBE_H

src/solvers/qbf/qbf_qube_core.cpp

@@ -26,7 +26,7 @@ qbf_qube_coret::~qbf_qube_coret()
 {
 }
 
-const std::string qbf_qube_coret::solver_text()
+std::string qbf_qube_coret::solver_text() const
 {
   return "QuBE w/ toplevel assignments";
 }

src/solvers/qbf/qbf_qube_core.h

@@ -24,14 +24,14 @@ class qbf_qube_coret:public qdimacs_coret
 
 public:
   explicit qbf_qube_coret(message_handlert &message_handler);
-  virtual ~qbf_qube_coret();
+  ~qbf_qube_coret() override;
 
-  virtual const std::string solver_text();
+  std::string solver_text() const override;
   virtual resultt prop_solve();
 
-  virtual bool is_in_core(literalt l) const;
+  bool is_in_core(literalt l) const override;
 
-  virtual tvt l_get(literalt a) const
+  tvt l_get(literalt a) const override
   {
     unsigned v=a.var_no();
 
@@ -49,9 +49,9 @@ class qbf_qube_coret:public qdimacs_coret
     return tvt::unknown();
   }
 
-  virtual modeltypet m_get(literalt a) const;
+  modeltypet m_get(literalt a) const override;
 
-  virtual const exprt f_get(literalt)
+  const exprt f_get(literalt) override
   {
     INVARIANT(false, "qube does not support full certificates.");
   }

src/solvers/qbf/qbf_skizzo.cpp

@@ -29,7 +29,7 @@ tvt qbf_skizzot::l_get(literalt) const
   UNREACHABLE;
 }
 
-const std::string qbf_skizzot::solver_text()
+std::string qbf_skizzot::solver_text() const
 {
   return "Skizzo";
 }