fix a typo: --string-exp => --strings-exp; fix a signed int warning in antlr

1 files changed, 45 insertions, 45 deletions

diff --git a/src/theory/strings/regexp_operation.h b/src/theory/strings/regexp_operation.h
index 0513eeef4..d5606627f 100644
--- a/src/theory/strings/regexp_operation.h
+++ b/src/theory/strings/regexp_operation.h
@@ -33,64 +33,64 @@ namespace theory {
 namespace strings {

 

 class RegExpOpr {

-	typedef std::pair< Node, CVC4::String > PairNodeStr;

-	typedef std::set< Node > SetNodes;

-	typedef std::pair< Node, Node > PairNodes;

+  typedef std::pair< Node, CVC4::String > PairNodeStr;

+  typedef std::set< Node > SetNodes;

+  typedef std::pair< Node, Node > PairNodes;

 

 private:

-	unsigned d_card;

+  unsigned d_card;

   Node d_emptyString;

   Node d_true;

   Node d_false;

-	Node d_emptySingleton;

-	Node d_emptyRegexp;

-	Node d_zero;

-	Node d_one;

+  Node d_emptySingleton;

+  Node d_emptyRegexp;

+  Node d_zero;

+  Node d_one;

 

-	char d_char_start;

-	char d_char_end;

-	Node d_sigma;

-	Node d_sigma_star;

-	

-	std::map< PairNodes, Node > d_simpl_cache;

-	std::map< PairNodes, Node > d_simpl_neg_cache;

-	std::map< Node, std::pair< int, Node > > d_delta_cache;

-	std::map< PairNodeStr, Node > d_dv_cache;

-	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<unsigned>, std::set<Node> > > d_cset_cache;

-	std::map< Node, std::pair< std::set<unsigned>, std::set<Node> > > d_fset_cache;

-	std::map< PairNodes, Node > d_inter_cache;

-	std::map< Node, std::vector< PairNodes > > d_split_cache;

-	//bool checkStarPlus( Node t );

-	void simplifyPRegExp( Node s, Node r, std::vector< Node > &new_nodes );

-	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 );

+  char d_char_start;

+  char d_char_end;

+  Node d_sigma;

+  Node d_sigma_star;

 

-	void getCharSet( Node r, std::set<unsigned> &pcset, SetNodes &pvset );

-	Node intersectInternal( Node r1, Node r2, std::map< unsigned, std::set< PairNodes > > cache, bool &spflag );

-	void firstChars( Node r, std::set<unsigned> &pcset, SetNodes &pvset );

+  std::map< PairNodes, Node > d_simpl_cache;

+  std::map< PairNodes, Node > d_simpl_neg_cache;

+  std::map< Node, std::pair< int, Node > > d_delta_cache;

+  std::map< PairNodeStr, Node > d_dv_cache;

+  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<unsigned>, std::set<Node> > > d_cset_cache;

+  std::map< Node, std::pair< std::set<unsigned>, std::set<Node> > > d_fset_cache;

+  std::map< PairNodes, Node > d_inter_cache;

+  std::map< Node, std::vector< PairNodes > > d_split_cache;

+  //bool checkStarPlus( Node t );

+  void simplifyPRegExp( Node s, Node r, std::vector< Node > &new_nodes );

+  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 );

 

-	//TODO: for intersection

-	bool follow( Node r, CVC4::String c, std::vector< char > &vec_chars );

+  void getCharSet( Node r, std::set<unsigned> &pcset, SetNodes &pvset );

+  Node intersectInternal( Node r1, Node r2, std::map< unsigned, std::set< PairNodes > > cache, bool &spflag );

+  void firstChars( Node r, std::set<unsigned> &pcset, SetNodes &pvset );

+

+  //TODO: for intersection

+  bool follow( Node r, CVC4::String c, std::vector< char > &vec_chars );

 

 public:

-	RegExpOpr();

+  RegExpOpr();

 

-	bool checkConstRegExp( Node r );

+  bool checkConstRegExp( Node r );

   void simplify(Node t, std::vector< Node > &new_nodes, bool polarity);

-	int delta( Node r, Node &exp );

-	int derivativeS( Node r, CVC4::String c, Node &retNode );

-	Node derivativeSingle( Node r, CVC4::String c );

-	bool guessLength( Node r, int &co );

-	Node intersect(Node r1, Node r2, bool &spflag);

-	Node complement(Node r, int &ret);

-	void splitRegExp(Node r, std::vector< PairNodes > &pset);

+  int delta( Node r, Node &exp );

+  int derivativeS( Node r, CVC4::String c, Node &retNode );

+  Node derivativeSingle( Node r, CVC4::String c );

+  bool guessLength( Node r, int &co );

+  Node intersect(Node r1, Node r2, bool &spflag);

+  Node complement(Node r, int &ret);

+  void splitRegExp(Node r, std::vector< PairNodes > &pset);

 

-	std::string mkString( Node r );

+  std::string mkString( Node r );

 };

 

 }/* CVC4::theory::strings namespace */