diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2020-03-27 14:04:44 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-27 12:04:44 -0700 |
commit | 4b7fc20dcce9eefdf568937f5e2c54141c4f5c5b (patch) | |
tree | 70dc3d084b73f1ea313a214245a792295f75215d /src/theory/strings | |
parent | a64866663f10db4ffadd2d48500cda05c4831f0e (diff) |
Move string utility file (#4164)
Moves the string file to string.h. This is required since other required utilities will soon need to be added to regexp.h.
Diffstat (limited to 'src/theory/strings')
-rw-r--r-- | src/theory/strings/kinds | 10 | ||||
-rw-r--r-- | src/theory/strings/regexp_operation.h | 3 | ||||
-rw-r--r-- | src/theory/strings/regexp_solver.h | 2 | ||||
-rw-r--r-- | src/theory/strings/type_enumerator.cpp | 2 | ||||
-rw-r--r-- | src/theory/strings/word.cpp | 2 |
5 files changed, 9 insertions, 10 deletions
diff --git a/src/theory/strings/kinds b/src/theory/strings/kinds index 5b988061b..3f7abdb7c 100644 --- a/src/theory/strings/kinds +++ b/src/theory/strings/kinds @@ -37,15 +37,15 @@ operator STRING_REV 1 "string reverse" sort STRING_TYPE \ Cardinality::INTEGERS \ well-founded \ - "NodeManager::currentNM()->mkConst(::CVC4::String())" \ - "util/regexp.h" \ + "NodeManager::currentNM()->mkConst(::CVC4::String())" \ + "util/string.h" \ "String type" sort REGEXP_TYPE \ Cardinality::INTEGERS \ well-founded \ - "NodeManager::currentNM()->mkNode(REGEXP_EMPTY, std::vector<Node>() )" \ - "util/regexp.h" \ + "NodeManager::currentNM()->mkNode(REGEXP_EMPTY, std::vector<Node>() )" \ + "util/string.h" \ "RegExp type" enumerator STRING_TYPE \ @@ -55,7 +55,7 @@ enumerator STRING_TYPE \ constant CONST_STRING \ ::CVC4::String \ ::CVC4::strings::StringHashFunction \ - "util/regexp.h" \ + "util/string.h" \ "a string of characters" # equal equal / less than / output diff --git a/src/theory/strings/regexp_operation.h b/src/theory/strings/regexp_operation.h index b9dbedba5..7845b2e00 100644 --- a/src/theory/strings/regexp_operation.h +++ b/src/theory/strings/regexp_operation.h @@ -24,10 +24,9 @@ #include <algorithm> #include <climits> #include "util/hash.h" -#include "util/regexp.h" +#include "util/string.h" #include "theory/theory.h" #include "theory/rewriter.h" -//#include "context/cdhashmap.h" namespace CVC4 { namespace theory { diff --git a/src/theory/strings/regexp_solver.h b/src/theory/strings/regexp_solver.h index 4880af905..d18604752 100644 --- a/src/theory/strings/regexp_solver.h +++ b/src/theory/strings/regexp_solver.h @@ -27,7 +27,7 @@ #include "theory/strings/inference_manager.h" #include "theory/strings/regexp_operation.h" #include "theory/strings/solver_state.h" -#include "util/regexp.h" +#include "util/string.h" namespace CVC4 { namespace theory { diff --git a/src/theory/strings/type_enumerator.cpp b/src/theory/strings/type_enumerator.cpp index 7352ae5de..d24206860 100644 --- a/src/theory/strings/type_enumerator.cpp +++ b/src/theory/strings/type_enumerator.cpp @@ -15,7 +15,7 @@ #include "theory/strings/type_enumerator.h" #include "theory/strings/theory_strings_utils.h" -#include "util/regexp.h" +#include "util/string.h" namespace CVC4 { namespace theory { diff --git a/src/theory/strings/word.cpp b/src/theory/strings/word.cpp index dd573b68c..0faeffd99 100644 --- a/src/theory/strings/word.cpp +++ b/src/theory/strings/word.cpp @@ -14,7 +14,7 @@ #include "theory/strings/word.h" -#include "util/regexp.h" +#include "util/string.h" using namespace CVC4::kind; |