diff options
| author | ajreynol <andrew.j.reynolds@gmail.com> | 2017-03-16 11:37:53 -0500 |
|---|---|---|
| committer | ajreynol <andrew.j.reynolds@gmail.com> | 2017-03-16 11:38:09 -0500 |
| commit | 966f38dc17ee316fdb069ec2a427c4f79f1f73b2 (patch) | |
| tree | 1a1b60435daffa8b59eea589ef04c26b50f8a724 /src/parser/cvc | |
| parent | 594301e6f2893ebe9baba5083ff084933b1e9da9 (diff) | |
Parsing support for SMT LIB 2.6. Minor fixes for printing datatypes. Fix for mkGroundTerm for parametric datatypes. Minor change to run_regression to allow regressions to override input language. Minor refactoring to Cvc.g.
Diffstat (limited to 'src/parser/cvc')
| -rw-r--r-- | src/parser/cvc/Cvc.g | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/parser/cvc/Cvc.g b/src/parser/cvc/Cvc.g index fb0304045..d72e1526e 100644 --- a/src/parser/cvc/Cvc.g +++ b/src/parser/cvc/Cvc.g @@ -1689,17 +1689,22 @@ bvNegTerm[CVC4::Expr& f] /* BV neg */ : BVNEG_TOK bvNegTerm[f] { f = MK_EXPR(CVC4::kind::BITVECTOR_NOT, f); } - | NOT_TOK bvNegTerm[f] + | relationTerm[f] + ; + +relationTerm[CVC4::Expr& f] + /* relation terms */ + : NOT_TOK relationTerm[f] { f = MK_EXPR(CVC4::kind::COMPLEMENT, f); } - | TRANSPOSE_TOK bvNegTerm[f] + | TRANSPOSE_TOK relationTerm[f] { f = MK_EXPR(CVC4::kind::TRANSPOSE, f); } - | TRANSCLOSURE_TOK bvNegTerm[f] + | TRANSCLOSURE_TOK relationTerm[f] { f = MK_EXPR(CVC4::kind::TCLOSURE, f); } - | TUPLE_TOK LPAREN bvNegTerm[f] RPAREN + | TUPLE_TOK LPAREN relationTerm[f] RPAREN { std::vector<Type> types; std::vector<Expr> args; args.push_back(f); - types.push_back(f.getType()); + types.push_back(f.getType()); DatatypeType t = EXPR_MANAGER->mkTupleType(types); const Datatype& dt = t.getDatatype(); args.insert( args.begin(), dt[0].getConstructor() ); |