diff options
Diffstat (limited to 'src/parser')
-rw-r--r-- | src/parser/antlr_input.h | 2 | ||||
-rw-r--r-- | src/parser/cvc/cvc_input.h | 2 | ||||
-rw-r--r-- | src/parser/smt1/smt1_input.h | 2 | ||||
-rw-r--r-- | src/parser/smt2/smt2.cpp | 11 | ||||
-rw-r--r-- | src/parser/smt2/smt2_input.h | 2 | ||||
-rw-r--r-- | src/parser/smt2/sygus_input.h | 2 | ||||
-rw-r--r-- | src/parser/tptp/tptp_input.h | 2 |
7 files changed, 17 insertions, 6 deletions
diff --git a/src/parser/antlr_input.h b/src/parser/antlr_input.h index d2bb8667d..422ad9796 100644 --- a/src/parser/antlr_input.h +++ b/src/parser/antlr_input.h @@ -234,7 +234,7 @@ protected: void setAntlr3Parser(pANTLR3_PARSER pParser); /** Set the Parser object for this input. */ - virtual void setParser(Parser& parser); + void setParser(Parser& parser) override; };/* class AntlrInput */ inline std::string AntlrInput::tokenText(pANTLR3_COMMON_TOKEN token) { diff --git a/src/parser/cvc/cvc_input.h b/src/parser/cvc/cvc_input.h index c35d8d963..c02c4f452 100644 --- a/src/parser/cvc/cvc_input.h +++ b/src/parser/cvc/cvc_input.h @@ -69,7 +69,7 @@ class CvcInput : public AntlrInput { * * @throws ParserException if an error is encountered during parsing. */ - Expr parseExpr(); + Expr parseExpr() override; private: /** Initialize the class. Called from the constructors once the input stream diff --git a/src/parser/smt1/smt1_input.h b/src/parser/smt1/smt1_input.h index 7577b7bff..cd285255f 100644 --- a/src/parser/smt1/smt1_input.h +++ b/src/parser/smt1/smt1_input.h @@ -74,7 +74,7 @@ public: * * @throws ParserException if an error is encountered during parsing. */ - Expr parseExpr(); + Expr parseExpr() override; private: /** diff --git a/src/parser/smt2/smt2.cpp b/src/parser/smt2/smt2.cpp index e4f6569b8..77b50af4c 100644 --- a/src/parser/smt2/smt2.cpp +++ b/src/parser/smt2/smt2.cpp @@ -61,6 +61,17 @@ void Smt2::addArithmeticOperators() { addOperator(kind::SINE, "sin"); addOperator(kind::COSINE, "cos"); addOperator(kind::TANGENT, "tan"); + addOperator(kind::COSECANT, "csc"); + addOperator(kind::SECANT, "sec"); + addOperator(kind::COTANGENT, "cot"); + addOperator(kind::ARCSINE, "arcsin"); + addOperator(kind::ARCCOSINE, "arccos"); + addOperator(kind::ARCTANGENT, "arctan"); + addOperator(kind::ARCCOSECANT, "arccsc"); + addOperator(kind::ARCSECANT, "arcsec"); + addOperator(kind::ARCCOTANGENT, "arccot"); + + addOperator(kind::SQRT, "sqrt"); } void Smt2::addBitvectorOperators() { diff --git a/src/parser/smt2/smt2_input.h b/src/parser/smt2/smt2_input.h index 0acb5462d..44187cd2d 100644 --- a/src/parser/smt2/smt2_input.h +++ b/src/parser/smt2/smt2_input.h @@ -85,7 +85,7 @@ class Smt2Input : public AntlrInput { * * @throws ParserException if an error is encountered during parsing. */ - Expr parseExpr(); + Expr parseExpr() override; };/* class Smt2Input */ diff --git a/src/parser/smt2/sygus_input.h b/src/parser/smt2/sygus_input.h index 0dca60a82..58d78fb76 100644 --- a/src/parser/smt2/sygus_input.h +++ b/src/parser/smt2/sygus_input.h @@ -82,7 +82,7 @@ class SygusInput : public AntlrInput { * * @throws ParserException if an error is encountered during parsing. */ - Expr parseExpr(); + Expr parseExpr() override; };/* class SygusInput */ diff --git a/src/parser/tptp/tptp_input.h b/src/parser/tptp/tptp_input.h index 5dd56034d..9a820f26d 100644 --- a/src/parser/tptp/tptp_input.h +++ b/src/parser/tptp/tptp_input.h @@ -82,7 +82,7 @@ class TptpInput : public AntlrInput { * * @throws ParserException if an error is encountered during parsing. */ - Expr parseExpr(); + Expr parseExpr() override; };/* class TptpInput */ |