Skip to content

Commit 400c03e

Browse files
committed
Mark various QBF solver methods override
We should use `override` instead of `virtual`.
1 parent bbbd21f commit 400c03e

9 files changed

+55
-56
lines changed

src/solvers/qbf/qbf_bdd_core.h

+14-14
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ class qbf_bdd_certificatet:public qdimacs_coret
3131

3232
public:
3333
qbf_bdd_certificatet(void);
34-
virtual ~qbf_bdd_certificatet(void);
34+
~qbf_bdd_certificatet(void) override;
3535

36-
virtual literalt new_variable(void);
36+
literalt new_variable(void) override;
3737

38-
virtual tvt l_get(literalt a) const;
39-
virtual const exprt f_get(literalt l);
38+
tvt l_get(literalt a) const override;
39+
const exprt f_get(literalt l) override;
4040
};
4141

4242

@@ -50,20 +50,20 @@ class qbf_bdd_coret:public qbf_bdd_certificatet
5050

5151
public:
5252
qbf_bdd_coret();
53-
virtual ~qbf_bdd_coret();
53+
~qbf_bdd_coret() override;
5454

55-
virtual literalt new_variable();
55+
literalt new_variable() override;
5656

57-
virtual void lcnf(const bvt &bv);
58-
virtual literalt lor(literalt a, literalt b);
59-
virtual literalt lor(const bvt &bv);
57+
void lcnf(const bvt &bv) override;
58+
literalt lor(literalt a, literalt b) override;
59+
literalt lor(const bvt &bv) override;
6060

61-
virtual std::string solver_text() const;
62-
virtual resultt prop_solve();
63-
virtual tvt l_get(literalt a) const;
61+
std::string solver_text() const override;
62+
resultt prop_solve() override;
63+
tvt l_get(literalt a) const override;
6464

65-
virtual bool is_in_core(literalt l) const;
66-
virtual modeltypet m_get(literalt a) const;
65+
bool is_in_core(literalt l) const override;
66+
modeltypet m_get(literalt a) const override;
6767

6868
protected:
6969
void compress_certificate(void);

src/solvers/qbf/qbf_quantor.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ class qbf_quantort:public qdimacs_cnft
1616
{
1717
public:
1818
explicit qbf_quantort(message_handlert &message_handler);
19-
virtual ~qbf_quantort();
19+
~qbf_quantort() override;
2020

21-
virtual std::string solver_text() const;
21+
std::string solver_text() const override;
2222
virtual resultt prop_solve();
23-
virtual tvt l_get(literalt a) const;
23+
tvt l_get(literalt a) const override;
2424
};
2525

2626
#endif // CPROVER_SOLVERS_QBF_QBF_QUANTOR_H

src/solvers/qbf/qbf_qube.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ class qbf_qubet:public qdimacs_cnft
1616
{
1717
public:
1818
explicit qbf_qubet(message_handlert &message_handler);
19-
virtual ~qbf_qubet();
19+
~qbf_qubet() override;
2020

21-
virtual std::string solver_text() const;
21+
std::string solver_text() const override;
2222
virtual resultt prop_solve();
23-
virtual tvt l_get(literalt a) const;
23+
tvt l_get(literalt a) const override;
2424
};
2525

2626
#endif // CPROVER_SOLVERS_QBF_QBF_QUBE_H

src/solvers/qbf/qbf_qube_core.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ class qbf_qube_coret:public qdimacs_coret
2424

2525
public:
2626
explicit qbf_qube_coret(message_handlert &message_handler);
27-
virtual ~qbf_qube_coret();
27+
~qbf_qube_coret() override;
2828

29-
virtual std::string solver_text() const;
29+
std::string solver_text() const override;
3030
virtual resultt prop_solve();
3131

32-
virtual bool is_in_core(literalt l) const;
32+
bool is_in_core(literalt l) const override;
3333

34-
virtual tvt l_get(literalt a) const
34+
tvt l_get(literalt a) const override
3535
{
3636
unsigned v=a.var_no();
3737

@@ -49,9 +49,9 @@ class qbf_qube_coret:public qdimacs_coret
4949
return tvt::unknown();
5050
}
5151

52-
virtual modeltypet m_get(literalt a) const;
52+
modeltypet m_get(literalt a) const override;
5353

54-
virtual const exprt f_get(literalt)
54+
const exprt f_get(literalt) override
5555
{
5656
INVARIANT(false, "qube does not support full certificates.");
5757
}

src/solvers/qbf/qbf_skizzo.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ class qbf_skizzot:public qdimacs_cnft
1616
{
1717
public:
1818
explicit qbf_skizzot(message_handlert &message_handler);
19-
virtual ~qbf_skizzot();
19+
~qbf_skizzot() override;
2020

21-
virtual std::string solver_text() const;
21+
std::string solver_text() const override;
2222
virtual resultt prop_solve();
23-
virtual tvt l_get(literalt a) const;
23+
tvt l_get(literalt a) const override;
2424
};
2525

2626
#endif // CPROVER_SOLVERS_QBF_QBF_SKIZZO_H

src/solvers/qbf/qbf_skizzo_core.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ class qbf_skizzo_coret:public qbf_bdd_certificatet
1717
{
1818
public:
1919
qbf_skizzo_coret();
20-
virtual ~qbf_skizzo_coret();
20+
~qbf_skizzo_coret() override;
2121

22-
virtual std::string solver_text() const;
23-
virtual resultt prop_solve();
22+
std::string solver_text() const override;
23+
resultt prop_solve() override;
2424

25-
virtual bool is_in_core(literalt l) const;
26-
virtual modeltypet m_get(literalt a) const;
25+
bool is_in_core(literalt l) const override;
26+
modeltypet m_get(literalt a) const override;
2727

2828
protected:
2929
std::string qbf_tmp_file;

src/solvers/qbf/qbf_squolem.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ class qbf_squolemt:public qdimacs_cnft
2424

2525
public:
2626
qbf_squolemt();
27-
virtual ~qbf_squolemt();
27+
~qbf_squolemt() override;
2828

29-
virtual std::string solver_text() const;
30-
virtual resultt prop_solve();
31-
virtual tvt l_get(literalt a) const;
29+
std::string solver_text() const override;
30+
resultt prop_solve() override;
31+
tvt l_get(literalt a) const override;
3232

33-
virtual void lcnf(const bvt &bv);
34-
virtual void add_quantifier(const quantifiert &quantifier);
35-
virtual void set_quantifier(const quantifiert::typet type, const literalt l);
36-
virtual void set_no_variables(size_t no);
33+
void lcnf(const bvt &bv) override;
34+
void add_quantifier(const quantifiert &quantifier) override;
35+
void set_quantifier(const quantifiert::typet type, const literalt l) override;
36+
void set_no_variables(size_t no) override;
3737
virtual size_t no_clauses() const { return squolem.clauses(); }
3838
};
3939

src/solvers/qbf/qbf_squolem_core.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -24,29 +24,29 @@ class qbf_squolem_coret:public qdimacs_coret
2424

2525
public:
2626
qbf_squolem_coret();
27-
virtual ~qbf_squolem_coret();
27+
~qbf_squolem_coret() override;
2828

29-
virtual std::string solver_text() const;
30-
virtual resultt prop_solve();
29+
std::string solver_text() const override;
30+
resultt prop_solve() override;
3131

32-
virtual tvt l_get(literalt a) const;
33-
virtual bool is_in_core(literalt l) const;
32+
tvt l_get(literalt a) const override;
33+
bool is_in_core(literalt l) const override;
3434

3535
void set_debug_filename(const std::string &str);
3636

37-
virtual void lcnf(const bvt &bv);
38-
virtual void add_quantifier(const quantifiert &quantifier);
39-
virtual void set_quantifier(const quantifiert::typet type, const literalt l);
40-
virtual void set_no_variables(size_t no);
37+
void lcnf(const bvt &bv) override;
38+
void add_quantifier(const quantifiert &quantifier) override;
39+
void set_quantifier(const quantifiert::typet type, const literalt l) override;
40+
void set_no_variables(size_t no) override;
4141
virtual size_t no_clauses() const { return squolem->clauses(); }
4242

43-
virtual modeltypet m_get(literalt a) const;
43+
modeltypet m_get(literalt a) const override;
4444

45-
virtual void write_qdimacs_cnf(std::ostream &out);
45+
void write_qdimacs_cnf(std::ostream &out) override;
4646

4747
void reset(void);
4848

49-
virtual const exprt f_get(literalt l);
49+
const exprt f_get(literalt l) override;
5050

5151
private:
5252
typedef std::unordered_map<unsigned, exprt> function_cachet;

src/solvers/qbf/qdimacs_cnf.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ class qdimacs_cnft:public dimacs_cnft
2121
: dimacs_cnft(message_handler)
2222
{
2323
}
24-
virtual ~qdimacs_cnft() { }
2524

2625
virtual void write_qdimacs_cnf(std::ostream &out);
2726

2827
// dummy functions
2928

30-
virtual std::string solver_text() const
29+
std::string solver_text() const override
3130
{
3231
return "QDIMACS CNF";
3332
}

0 commit comments

Comments
 (0)