diff options
| author | ajreynol <andrew.j.reynolds@gmail.com> | 2017-07-29 04:33:27 -0500 |
|---|---|---|
| committer | ajreynol <andrew.j.reynolds@gmail.com> | 2017-07-29 04:33:27 -0500 |
| commit | 08a2bc7e1151d83fbe38a8b43c00b2f822ddfe38 (patch) | |
| tree | f5bdc7196036d46c4fd1a828ee3a94fe02779df8 | |
| parent | efd933d6cb90d094df911079960eab3121b2127e (diff) | |
Add support for charat in native language, minor cleanup.
| -rw-r--r-- | src/parser/cvc/Cvc.g | 2 | ||||
| -rw-r--r-- | src/theory/strings/theory_strings.cpp | 1 | ||||
| -rw-r--r-- | src/theory/strings/theory_strings.h | 2 | ||||
| -rw-r--r-- | test/regress/regress0/strings/Makefile.am | 3 | ||||
| -rw-r--r-- | test/regress/regress0/strings/strings-charat.cvc | 9 |
5 files changed, 13 insertions, 4 deletions
diff --git a/src/parser/cvc/Cvc.g b/src/parser/cvc/Cvc.g index a2e9e6f47..a137cece3 100644 --- a/src/parser/cvc/Cvc.g +++ b/src/parser/cvc/Cvc.g @@ -1997,6 +1997,8 @@ stringTerm[CVC4::Expr& f] { f = MK_EXPR(CVC4::kind::STRING_STRCTN, f, f2); } | STRING_SUBSTR_TOK LPAREN formula[f] COMMA formula[f2] COMMA formula[f3] RPAREN { f = MK_EXPR(CVC4::kind::STRING_SUBSTR, f, f2, f3); } + | STRING_CHARAT_TOK LPAREN formula[f] COMMA formula[f2] RPAREN + { f = MK_EXPR(CVC4::kind::STRING_CHARAT, f, f2); } | STRING_INDEXOF_TOK LPAREN formula[f] COMMA formula[f2] COMMA formula[f3] RPAREN { f = MK_EXPR(CVC4::kind::STRING_STRIDOF, f, f2, f3); } | STRING_REPLACE_TOK LPAREN formula[f] COMMA formula[f2] COMMA formula[f3] RPAREN diff --git a/src/theory/strings/theory_strings.cpp b/src/theory/strings/theory_strings.cpp index 15700decf..24358182f 100644 --- a/src/theory/strings/theory_strings.cpp +++ b/src/theory/strings/theory_strings.cpp @@ -68,7 +68,6 @@ TheoryStrings::TheoryStrings(context::Context* c, context::UserContext* u, d_infer(c), d_infer_exp(c), d_nf_pairs(c), - d_loop_antec(u), d_pregistered_terms_cache(u), d_registered_terms_cache(u), d_length_lemma_terms_cache(u), diff --git a/src/theory/strings/theory_strings.h b/src/theory/strings/theory_strings.h index 9c59f9c71..0bdaf7ab5 100644 --- a/src/theory/strings/theory_strings.h +++ b/src/theory/strings/theory_strings.h @@ -172,8 +172,6 @@ private: void addNormalFormPair( Node n1, Node n2 ); bool isNormalFormPair( Node n1, Node n2 ); bool isNormalFormPair2( Node n1, Node n2 ); - // loop ant - NodeSet d_loop_antec; // preReg cache NodeSet d_pregistered_terms_cache; NodeSet d_registered_terms_cache; diff --git a/test/regress/regress0/strings/Makefile.am b/test/regress/regress0/strings/Makefile.am index 5c89c8472..c47c10de0 100644 --- a/test/regress/regress0/strings/Makefile.am +++ b/test/regress/regress0/strings/Makefile.am @@ -88,7 +88,8 @@ TESTS = \ bug768.smt2 \ username_checker_min.smt2 \ repl-empty-sem.smt2 \ - bug799-min.smt2 + bug799-min.smt2 \ + strings-charat.cvc FAILING_TESTS = diff --git a/test/regress/regress0/strings/strings-charat.cvc b/test/regress/regress0/strings/strings-charat.cvc new file mode 100644 index 000000000..71114d39d --- /dev/null +++ b/test/regress/regress0/strings/strings-charat.cvc @@ -0,0 +1,9 @@ +% EXPECT: unsat + +x : STRING; +y : STRING; + +ASSERT x = CONCAT( "abcd", y ); +ASSERT CHARAT(x,0) = CHARAT(x,2); + +CHECKSAT; |