diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2018-03-23 15:23:00 -0500 |
---|---|---|
committer | Aina Niemetz <aina.niemetz@gmail.com> | 2018-03-23 13:23:00 -0700 |
commit | d13b2981520e3d39039e8eb2c3c844de473a1e7c (patch) | |
tree | 7be3fe248f9d009a71e1470e5d63641c4b33c5a4 /src/util | |
parent | f3d010e07f30dd658d4532a43b3813654376162d (diff) |
Remove abstract regular expression constant (#1698)
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/regexp.cpp | 4 | ||||
-rw-r--r-- | src/util/regexp.h | 29 | ||||
-rw-r--r-- | src/util/regexp.i | 10 |
3 files changed, 0 insertions, 43 deletions
diff --git a/src/util/regexp.cpp b/src/util/regexp.cpp index a7e5131ec..9aaad522a 100644 --- a/src/util/regexp.cpp +++ b/src/util/regexp.cpp @@ -404,8 +404,4 @@ std::ostream &operator<<(std::ostream &os, const String &s) { return os << "\"" << s.toString(true) << "\""; } -std::ostream &operator<<(std::ostream &out, const RegExp &s) { - return out << "regexp(" << s.getType() << ')'; -} - } // namespace CVC4 diff --git a/src/util/regexp.h b/src/util/regexp.h index efbb4579d..42d232259 100644 --- a/src/util/regexp.h +++ b/src/util/regexp.h @@ -197,35 +197,6 @@ struct CVC4_PUBLIC StringHashFunction { std::ostream& operator<<(std::ostream& os, const String& s) CVC4_PUBLIC; -class CVC4_PUBLIC RegExp { - public: - RegExp() : d_type(1) {} - explicit RegExp(const int t) : d_type(t) {} - - bool operator==(const RegExp& y) const { return d_type == y.d_type; } - bool operator!=(const RegExp& y) const { return d_type != y.d_type; } - bool operator<(const RegExp& y) const { return d_type < y.d_type; } - bool operator>(const RegExp& y) const { return d_type > y.d_type; } - bool operator<=(const RegExp& y) const { return d_type <= y.d_type; } - bool operator>=(const RegExp& y) const { return d_type >= y.d_type; } - - int getType() const { return d_type; } - - private: - int d_type; -}; /* class RegExp */ - -/** - * Hash function for the RegExp constants. - */ -struct CVC4_PUBLIC RegExpHashFunction { - inline size_t operator()(const RegExp& s) const { - return (size_t)s.getType(); - } -}; /* struct RegExpHashFunction */ - -std::ostream& operator<<(std::ostream& os, const RegExp& s) CVC4_PUBLIC; - } // namespace CVC4 #endif /* __CVC4__REGEXP_H */ diff --git a/src/util/regexp.i b/src/util/regexp.i index 9f9826663..afc51abd7 100644 --- a/src/util/regexp.i +++ b/src/util/regexp.i @@ -16,19 +16,9 @@ %rename(greater) CVC4::String::operator>(const String&) const; %rename(greaterEqual) CVC4::String::operator>=(const String&) const; -%rename(assign) CVC4::RegExp::operator=(const RegExp&); -%rename(equals) CVC4::RegExp::operator==(const RegExp&) const; -%ignore CVC4::RegExp::operator!=(const RegExp&) const; -%rename(less) CVC4::RegExp::operator<(const RegExp&) const; -%rename(lessEqual) CVC4::RegExp::operator<=(const RegExp&) const; -%rename(greater) CVC4::RegExp::operator>(const RegExp&) const; -%rename(greaterEqual) CVC4::RegExp::operator>=(const RegExp&) const; - %rename(apply) CVC4::strings::StringHashFunction::operator()(const ::CVC4::String&) const; -%rename(apply) CVC4::RegExpHashFunction::operator()(const RegExp&) const; %ignore CVC4::operator<<(std::ostream&, const String&); -%ignore CVC4::operator<<(std::ostream&, const RegExp&); %apply int &OUTPUT { int &c }; %include "util/regexp.h" |