diff options
Diffstat (limited to 'src/theory/strings/regexp_operation.h')
| -rw-r--r-- | src/theory/strings/regexp_operation.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/theory/strings/regexp_operation.h b/src/theory/strings/regexp_operation.h index d170bd17a..da84ed04c 100644 --- a/src/theory/strings/regexp_operation.h +++ b/src/theory/strings/regexp_operation.h @@ -39,7 +39,7 @@ class RegExpOpr { typedef std::pair< Node, Node > PairNodes; private: - const char d_lastchar; + const unsigned char d_lastchar; Node d_emptyString; Node d_true; Node d_false; @@ -49,8 +49,8 @@ private: Node d_one; CVC4::Rational RMAXINT; - char d_char_start; - char d_char_end; + unsigned char d_char_start; + unsigned char d_char_end; Node d_sigma; Node d_sigma_star; @@ -61,8 +61,8 @@ private: std::map< PairNodeStr, std::pair< Node, int > > d_deriv_cache; std::map< Node, std::pair< Node, int > > d_compl_cache; std::map< Node, bool > d_cstre_cache; - std::map< Node, std::pair< std::set<char>, std::set<Node> > > d_cset_cache; - std::map< Node, std::pair< std::set<char>, std::set<Node> > > d_fset_cache; + std::map< Node, std::pair< std::set<unsigned char>, std::set<Node> > > d_cset_cache; + std::map< Node, std::pair< std::set<unsigned char>, std::set<Node> > > d_fset_cache; std::map< PairNodes, Node > d_inter_cache; std::map< Node, Node > d_rm_inter_cache; std::map< Node, bool > d_norv_cache; @@ -72,20 +72,20 @@ private: void simplifyNRegExp( Node s, Node r, std::vector< Node > &new_nodes ); std::string niceChar( Node r ); int gcd ( int a, int b ); - Node mkAllExceptOne( char c ); + Node mkAllExceptOne( unsigned char c ); bool isPairNodesInSet(std::set< PairNodes > &s, Node n1, Node n2); - void getCharSet( Node r, std::set<char> &pcset, SetNodes &pvset ); + void getCharSet( Node r, std::set<unsigned char> &pcset, SetNodes &pvset ); bool containC2(unsigned cnt, Node n); Node convert1(unsigned cnt, Node n); void convert2(unsigned cnt, Node n, Node &r1, Node &r2); bool testNoRV(Node r); Node intersectInternal( Node r1, Node r2, std::map< PairNodes, Node > cache, unsigned cnt ); Node removeIntersection(Node r); - void firstChars( Node r, std::set<char> &pcset, SetNodes &pvset ); + void firstChars( Node r, std::set<unsigned char> &pcset, SetNodes &pvset ); //TODO: for intersection - bool follow( Node r, CVC4::String c, std::vector< char > &vec_chars ); + bool follow( Node r, CVC4::String c, std::vector< unsigned char > &vec_chars ); /*class CState { public: |