More cleanup in strings (#2138)

diff --git a/src/theory/strings/kinds b/src/theory/strings/kinds
index d931e99bcc16bd1006e1c96838827ee3389033e0..de4a013cda180e9c19ba608f68d52ea5d20c6786 100644 (file)
--- a/src/theory/strings/kinds
+++ b/src/theory/strings/kinds
@@ -28,13 +28,6 @@ operator STRING_ITOS 1 "integer to string"
 operator STRING_STOI 1 "string to integer (total function)"
 operator STRING_CODE 1 "string to code, returns the code of the first character of the string if it has length one, -1 otherwise"
 
-#sort CHAR_TYPE \
-#    Cardinality::INTEGERS \
-#    well-founded \
-#        "NodeManager::currentNM()->mkConst(::CVC4::String())" \
-#        "util/regexp.h" \
-#    "String type"
-
 sort STRING_TYPE \
     Cardinality::INTEGERS \
     well-founded \
@@ -53,10 +46,6 @@ enumerator STRING_TYPE \
     "::CVC4::theory::strings::StringEnumerator" \
     "theory/strings/type_enumerator.h"
 
-#enumerator REGEXP_TYPE \
-#    "::CVC4::theory::strings::RegExpEnumerator" \
-#    "theory/strings/type_enumerator.h"
-
 constant CONST_STRING \
     ::CVC4::String \
     ::CVC4::strings::StringHashFunction \

diff --git a/src/theory/strings/regexp_operation.cpp b/src/theory/strings/regexp_operation.cpp
index e130d5e4bdba5c6beb13ad6d50bc4c351c420556..d17e42ede59b01e03717a076b0333c6c5afd06a0 100644 (file)
--- a/src/theory/strings/regexp_operation.cpp
+++ b/src/theory/strings/regexp_operation.cpp
@@ -45,14 +45,6 @@ RegExpOpr::RegExpOpr()
 
 RegExpOpr::~RegExpOpr() {}
 
-int RegExpOpr::gcd ( int a, int b ) {
-  int c;
-  while ( a != 0 ) {
-     c = a; a = b%a;  b = c;
-  }
-  return b;
-}
-
 bool RegExpOpr::checkConstRegExp( Node r ) {
   Trace("strings-regexp-cstre") << "RegExp-CheckConstRegExp starts with /" << mkString( r ) << "/" << std::endl;
   bool ret = true;

diff --git a/src/theory/strings/regexp_operation.h b/src/theory/strings/regexp_operation.h
index d33a2b70cab98c215bade0ac7677a2ccccfe64f8..ecf294fc6395e5be1ba5fb3bdba2032b3e95c4ac 100644 (file)
--- a/src/theory/strings/regexp_operation.h
+++ b/src/theory/strings/regexp_operation.h
@@ -71,7 +71,6 @@ private:
   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( unsigned char c );
   bool isPairNodesInSet(std::set< PairNodes > &s, Node n1, Node n2);
 

diff --git a/src/theory/strings/theory_strings_rewriter.cpp b/src/theory/strings/theory_strings_rewriter.cpp
index b7cb22329f006ce9e527a9f68ffb11863dad5cb1..66514fde2b8689c11aa3a9688683af87161ae79c 100644 (file)
--- a/src/theory/strings/theory_strings_rewriter.cpp
+++ b/src/theory/strings/theory_strings_rewriter.cpp
@@ -382,302 +382,6 @@ Node TheoryStringsRewriter::rewriteConcat(Node node)
   return retNode;
 }
 
-
-void TheoryStringsRewriter::mergeInto(std::vector<Node> &t, const std::vector<Node> &s) {
-  for(std::vector<Node>::const_iterator itr=s.begin(); itr!=s.end(); itr++) {
-    if(std::find(t.begin(), t.end(), (*itr)) == t.end()) {
-      t.push_back( *itr );
-    }
-  }
-}
-
-void TheoryStringsRewriter::shrinkConVec(std::vector<Node> &vec) {
-  unsigned i = 0;
-  Node emptysingleton = NodeManager::currentNM()->mkNode( kind::STRING_TO_REGEXP, NodeManager::currentNM()->mkConst( CVC4::String("") ) );
-  while(i < vec.size()) {
-    if( vec[i] == emptysingleton ) {
-      vec.erase(vec.begin() + i);
-    } else if(vec[i].getKind()==kind::STRING_TO_REGEXP && i<vec.size()-1 && vec[i+1].getKind()==kind::STRING_TO_REGEXP) {
-      Node tmp = NodeManager::currentNM()->mkNode(kind::STRING_CONCAT, vec[i][0], vec[i+1][0]);
-      tmp = rewriteConcat(tmp);
-      vec[i] = NodeManager::currentNM()->mkNode(kind::STRING_TO_REGEXP, tmp);
-      vec.erase(vec.begin() + i + 1);
-    } else {
-      i++;
-    }
-  }
-}
-
-Node TheoryStringsRewriter::applyAX( TNode node ) {
-  Trace("regexp-ax") << "Regexp::AX start " << node << std::endl;
-  Node retNode = node;
-
-  int k = node.getKind();
-  switch( k ) {
-    case kind::REGEXP_UNION: {
-      std::vector<Node> vec_nodes;
-      for(unsigned i=0; i<node.getNumChildren(); i++) {
-        Node tmp = applyAX(node[i]);
-        if(tmp.getKind() == kind::REGEXP_UNION) {
-          for(unsigned j=0; j<tmp.getNumChildren(); j++) {
-            if(std::find(vec_nodes.begin(), vec_nodes.end(), tmp[j]) == vec_nodes.end()) {
-              vec_nodes.push_back(tmp[j]);
-            }
-          }
-        } else if(tmp.getKind() == kind::REGEXP_EMPTY) {
-          // do nothing
-        } else {
-          if(std::find(vec_nodes.begin(), vec_nodes.end(), tmp) == vec_nodes.end()) {
-            vec_nodes.push_back(tmp);
-          }
-        }
-      }
-      if(vec_nodes.empty()) {
-        std::vector< Node > nvec;
-        retNode = NodeManager::currentNM()->mkNode( kind::REGEXP_EMPTY, nvec );
-      } else {
-        retNode = vec_nodes.size() == 1 ? vec_nodes[0] : NodeManager::currentNM()->mkNode( kind::REGEXP_UNION, vec_nodes );
-      }
-      break;
-    }
-    case kind::REGEXP_CONCAT: {
-      std::vector< std::vector<Node> > vec_nodes;
-      bool emptyflag = false;
-      Node emptysingleton = NodeManager::currentNM()->mkNode( kind::STRING_TO_REGEXP, NodeManager::currentNM()->mkConst( CVC4::String("") ) );
-      for(unsigned i=0; i<node.getNumChildren(); i++) {
-        Node tmp = applyAX(node[i]);
-        if(tmp.getKind() == kind::REGEXP_EMPTY) {
-          emptyflag = true;
-          break;
-        } else if(tmp == emptysingleton) {
-          //do nothing
-        } else if(vec_nodes.empty()) {
-          if(tmp.getKind() == kind::REGEXP_UNION) {
-            for(unsigned j=0; j<tmp.getNumChildren(); j++) {
-              std::vector<Node> vtmp;
-              if(tmp[j].getKind() == kind::REGEXP_CONCAT) {
-                for(unsigned j2=0; j2<tmp[j].getNumChildren(); j2++) {
-                  vtmp.push_back(tmp[j][j2]);
-                }
-              } else {
-                vtmp.push_back(tmp[j]);
-              }
-              vec_nodes.push_back(vtmp);
-            }
-          } else if(tmp.getKind() == kind::REGEXP_CONCAT) {
-            std::vector<Node> vtmp;
-            for(unsigned j=0; j<tmp.getNumChildren(); j++) {
-              vtmp.push_back(tmp[j]);
-            }
-            vec_nodes.push_back(vtmp);
-          } else {
-            std::vector<Node> vtmp;
-            vtmp.push_back(tmp);
-            vec_nodes.push_back(vtmp);
-          }
-        } else {
-          //non-empty vec
-          if(tmp.getKind() == kind::REGEXP_UNION) {
-            unsigned cnt = vec_nodes.size();
-            for(unsigned i2=0; i2<cnt; i2++) {
-              //std::vector<Node> vleft( vec_nodes[i2] );
-              for(unsigned j=0; j<tmp.getNumChildren(); j++) {
-                if(tmp[j] == emptysingleton) {
-                  vec_nodes.push_back( vec_nodes[i2] );
-                } else {
-                  std::vector<Node> vt( vec_nodes[i2] );
-                  if(tmp[j].getKind() != kind::REGEXP_CONCAT) {
-                    vt.push_back( tmp[j] );
-                  } else {
-                    for(unsigned j2=0; j2<tmp[j].getNumChildren(); j2++) {
-                      vt.push_back(tmp[j][j2]);
-                    }
-                  }
-                  vec_nodes.push_back(vt);
-                }
-              }
-            }
-            vec_nodes.erase(vec_nodes.begin(), vec_nodes.begin() + cnt);
-          } else if(tmp.getKind() == kind::REGEXP_CONCAT) {
-            for(unsigned i2=0; i2<vec_nodes.size(); i2++) {
-              for(unsigned j=0; j<tmp.getNumChildren(); j++) {
-                vec_nodes[i2].push_back(tmp[j]);
-              }
-            }
-          } else {
-            for(unsigned i2=0; i2<vec_nodes.size(); i2++) {
-              vec_nodes[i2].push_back(tmp);
-            }
-          }
-        }
-      }
-      if(emptyflag) {
-        std::vector< Node > nvec;
-        retNode = NodeManager::currentNM()->mkNode( kind::REGEXP_EMPTY, nvec );
-      } else if(vec_nodes.empty()) {
-        retNode = emptysingleton;
-      } else if(vec_nodes.size() == 1) {
-        shrinkConVec(vec_nodes[0]);
-        retNode = vec_nodes[0].empty()? emptysingleton
-          : vec_nodes[0].size()==1? vec_nodes[0][0]
-          : NodeManager::currentNM()->mkNode(kind::REGEXP_CONCAT, vec_nodes[0]);
-      } else {
-        std::vector<Node> vtmp;
-        for(unsigned i=0; i<vec_nodes.size(); i++) {
-          shrinkConVec(vec_nodes[i]);
-          if(!vec_nodes[i].empty()) {
-            Node ntmp = vec_nodes[i].size()==1? vec_nodes[i][0]
-              : NodeManager::currentNM()->mkNode(kind::REGEXP_CONCAT, vec_nodes[i]);
-            vtmp.push_back(ntmp);
-          }
-        }
-        retNode = vtmp.empty()? emptysingleton
-          : vtmp.size()==1? vtmp[0] : NodeManager::currentNM()->mkNode(kind::REGEXP_UNION, vtmp);
-      }
-      break;
-    }
-    case kind::REGEXP_STAR: {
-      Node tmp = applyAX(node[0]);
-      Node emptysingleton = NodeManager::currentNM()->mkNode( kind::STRING_TO_REGEXP, NodeManager::currentNM()->mkConst( CVC4::String("") ) );
-      if(tmp.getKind() == kind::REGEXP_EMPTY || tmp == emptysingleton) {
-        retNode = emptysingleton;
-      } else {
-        if(tmp.getKind() == kind::REGEXP_UNION) {
-          std::vector<Node> vec;
-          for(unsigned i=0; i<tmp.getNumChildren(); i++) {
-            if(tmp[i] != emptysingleton) {
-              vec.push_back(tmp[i]);
-            }
-          }
-          if(vec.size() != tmp.getNumChildren()) {
-            tmp = vec.size()==1? vec[0] : NodeManager::currentNM()->mkNode( kind::REGEXP_UNION, vec) ;
-          }
-        } else if(tmp.getKind() == kind::REGEXP_STAR) {
-          tmp = tmp[0];
-        }
-        if(tmp != node[0]) {
-          retNode = NodeManager::currentNM()->mkNode( kind::REGEXP_STAR, tmp );
-        }
-      }
-      break;
-    }
-    case kind::REGEXP_INTER: {
-      std::vector< std::vector<Node> > vec_nodes;
-      bool emptyflag = false;
-      bool epsflag = false;
-      Node emptysingleton = NodeManager::currentNM()->mkNode( kind::STRING_TO_REGEXP, NodeManager::currentNM()->mkConst( CVC4::String("") ) );
-      for(unsigned i=0; i<node.getNumChildren(); i++) {
-        Node tmp = applyAX(node[i]);
-        if(tmp.getKind() == kind::REGEXP_EMPTY) {
-          emptyflag = true;
-          break;
-        } else if(vec_nodes.empty()) {
-          if(tmp.getKind() == kind::REGEXP_INTER) {
-            std::vector<Node> vtmp;
-            for(unsigned j=0; j<tmp.getNumChildren(); j++) {
-              vtmp.push_back(tmp[j]);
-            }
-            vec_nodes.push_back(vtmp);
-          } else if(tmp.getKind() == kind::REGEXP_UNION) {
-            for(unsigned j=0; j<tmp.getNumChildren(); j++) {
-              std::vector<Node> vtmp;
-              if(tmp[j].getKind() == kind::REGEXP_INTER) {
-                for(unsigned j2=0; j2<tmp[j].getNumChildren(); j2++) {
-                  vtmp.push_back(tmp[j][j2]);
-                }
-              } else {
-                vtmp.push_back(tmp[j]);
-              }
-              vec_nodes.push_back(vtmp);
-            }
-          } else {
-            if(tmp == emptysingleton) {
-              epsflag = true;
-            }
-            std::vector<Node> vtmp;
-            vtmp.push_back(tmp);
-            vec_nodes.push_back(vtmp);
-          }
-        } else {
-          //non-empty vec
-          if(tmp.getKind() == kind::REGEXP_INTER) {
-            for(unsigned j=0; j<tmp.getNumChildren(); j++) {
-              for(unsigned i2=0; i2<vec_nodes.size(); i2++) {
-                if(std::find(vec_nodes[i2].begin(), vec_nodes[i2].end(), tmp[j]) == vec_nodes[i2].end()) {
-                  vec_nodes[i2].push_back(tmp[j]);
-                }
-              }
-            }
-          } else if(tmp == emptysingleton) {
-            if(!epsflag) {
-              epsflag = true;
-              for(unsigned j=0; j<vec_nodes.size(); j++) {
-                vec_nodes[j].insert(vec_nodes[j].begin(), emptysingleton);
-              }
-            }
-          } else if(tmp.getKind() == kind::REGEXP_UNION) {
-            unsigned cnt = vec_nodes.size();
-            for(unsigned i2=0; i2<cnt; i2++) {
-              //std::vector<Node> vleft( vec_nodes[i2] );
-              for(unsigned j=0; j<tmp.getNumChildren(); j++) {
-                std::vector<Node> vt(vec_nodes[i2]);
-                if(tmp[j].getKind() != kind::REGEXP_INTER) {
-                  if(std::find(vt.begin(), vt.end(), tmp[j]) == vt.end()) {
-                    vt.push_back(tmp[j]);
-                  }
-                } else {
-                  std::vector<Node> vtmp;
-                  for(unsigned j2=0; j2<tmp[j].getNumChildren(); j2++) {
-                    vtmp.push_back(tmp[j][j2]);
-                  }
-                  mergeInto(vt, vtmp);
-                }
-                vec_nodes.push_back(vt);
-              }
-            }
-            vec_nodes.erase(vec_nodes.begin(), vec_nodes.begin() + cnt);
-          } else {
-            for(unsigned j=0; j<vec_nodes.size(); j++) {
-              if(std::find(vec_nodes[j].begin(), vec_nodes[j].end(), tmp) == vec_nodes[j].end()) {
-                vec_nodes[j].push_back(tmp);
-              }
-            }
-          }
-        }
-      }
-      if(emptyflag) {
-        std::vector< Node > nvec;
-        retNode = NodeManager::currentNM()->mkNode( kind::REGEXP_EMPTY, nvec );
-      } else if(vec_nodes.empty()) {
-        //to check?
-        retNode = emptysingleton;
-      } else if(vec_nodes.size() == 1) {
-        retNode = vec_nodes[0].empty() ? emptysingleton : vec_nodes[0].size() == 1 ? vec_nodes[0][0] : NodeManager::currentNM()->mkNode( kind::REGEXP_INTER, vec_nodes[0] );
-      } else {
-        std::vector<Node> vtmp;
-        for(unsigned i=0; i<vec_nodes.size(); i++) {
-          Node tmp = vec_nodes[i].empty()? emptysingleton : vec_nodes[i].size() == 1 ? vec_nodes[i][0] : NodeManager::currentNM()->mkNode( kind::REGEXP_INTER, vec_nodes[i] );
-          vtmp.push_back(tmp);
-        }
-        retNode = vtmp.size() == 1? vtmp[0] : NodeManager::currentNM()->mkNode( kind::REGEXP_UNION, vtmp );
-      }
-      break;
-    }
-    case kind::REGEXP_SIGMA: {
-      break;
-    }
-    case kind::REGEXP_EMPTY: {
-      break;
-    }
-    //default: {
-      //to check?
-    //}
-  }
-
-  Trace("regexp-ax") << "Regexp::AX end " << node << " to\n               " << retNode << std::endl;
-  return retNode;
-}
-
 Node TheoryStringsRewriter::prerewriteConcatRegExp( TNode node ) {
   Assert( node.getKind() == kind::REGEXP_CONCAT );
   Trace("strings-prerewrite") << "Strings::prerewriteConcatRegExp start " << node << std::endl;
@@ -1023,7 +727,7 @@ bool TheoryStringsRewriter::testConstStringInRegExp( CVC4::String &s, unsigned i
 Node TheoryStringsRewriter::rewriteMembership(TNode node) {
   Node retNode = node;
   Node x = node[0];
-  Node r = node[1];//applyAX(node[1]);
+  Node r = node[1];
 
   if(r.getKind() == kind::REGEXP_EMPTY) {
     retNode = NodeManager::currentNM()->mkConst( false );
@@ -1129,6 +833,7 @@ Node TheoryStringsRewriter::rewriteMembership(TNode node) {
 
 RewriteResponse TheoryStringsRewriter::postRewrite(TNode node) {
   Trace("strings-postrewrite") << "Strings::postRewrite start " << node << std::endl;
+  NodeManager* nm = NodeManager::currentNM();
   Node retNode = node;
   Node orig = retNode;
 
@@ -1177,7 +882,6 @@ RewriteResponse TheoryStringsRewriter::postRewrite(TNode node) {
   }
   else if (node.getKind() == kind::STRING_LT)
   {
-    NodeManager* nm = NodeManager::currentNM();
     // eliminate s < t ---> s != t AND s <= t
     retNode = nm->mkNode(AND,
                          node[0].eqNode(node[1]).negate(),
@@ -1209,16 +913,9 @@ RewriteResponse TheoryStringsRewriter::postRewrite(TNode node) {
     if(node[0].isConst()) {
       CVC4::String s = node[0].getConst<String>();
       if(s.isNumber()) {
-        std::string stmp = s.toString();
-        //TODO: leading zeros : when smt2 standard for strings is set, uncomment this if applicable
-        //if(stmp[0] == '0' && stmp.size() != 1) {
-          //retNode = NodeManager::currentNM()->mkConst(::CVC4::Rational(-1));
-        //} else {
-          CVC4::Rational r2(stmp.c_str());
-          retNode = NodeManager::currentNM()->mkConst( r2 );
-        //}
+        retNode = nm->mkConst(s.toNumber());
       } else {
-        retNode = NodeManager::currentNM()->mkConst(::CVC4::Rational(-1));
+        retNode = nm->mkConst(::CVC4::Rational(-1));
       }
     } else if(node[0].getKind() == kind::STRING_CONCAT) {
       for(unsigned i=0; i<node[0].getNumChildren(); ++i) {

diff --git a/src/theory/strings/theory_strings_rewriter.h b/src/theory/strings/theory_strings_rewriter.h
index 06e5cb0b1c36de747a43996a750835526e37d268..616e31017a1f3b1858fca6e7190d45b34834ac27 100644 (file)
--- a/src/theory/strings/theory_strings_rewriter.h
+++ b/src/theory/strings/theory_strings_rewriter.h
@@ -61,10 +61,6 @@ class TheoryStringsRewriter {
   static bool isConstRegExp( TNode t );
   static bool testConstStringInRegExp( CVC4::String &s, unsigned int index_start, TNode r );
 
-  static void mergeInto(std::vector<Node> &t, const std::vector<Node> &s);
-  static void shrinkConVec(std::vector<Node> &vec);
-  static Node applyAX( TNode node );
-
   static Node prerewriteConcatRegExp(TNode node);
   static Node prerewriteOrRegExp(TNode node);
   static Node prerewriteAndRegExp(TNode node);

diff --git a/src/util/regexp.cpp b/src/util/regexp.cpp
index 8589c6993067a8fd12a01fd77cbf95f0bf4021e3..93178b948ce6718d915846e3dca62335ae4701de 100644 (file)
--- a/src/util/regexp.cpp
+++ b/src/util/regexp.cpp
@@ -421,18 +421,11 @@ size_t String::maxSize()
 {
   return std::numeric_limits<size_t>::max();
 }
-
-int String::toNumber() const {
-  if (isNumber()) {
-    int ret = 0;
-    for (unsigned int i = 0; i < size(); ++i) {
-      unsigned char c = convertUnsignedIntToChar(d_str[i]);
-      ret = ret * 10 + (int)c - (int)'0';
-    }
-    return ret;
-  } else {
-    return -1;
-  }
+Rational String::toNumber() const
+{
+  // when smt2 standard for strings is set, this may change, based on the
+  // semantics of str.from.int for leading zeros
+  return Rational(toString());
 }
 
 unsigned char String::hexToDec(unsigned char c) {

diff --git a/src/util/regexp.h b/src/util/regexp.h
index e2d07111d29903bb0a8435eaac66f3e800c20ae8..e91ca61e2bc66552b6c5fa52a27f0c196906a4c5 100644 (file)
--- a/src/util/regexp.h
+++ b/src/util/regexp.h
@@ -25,6 +25,7 @@
 #include <ostream>
 #include <string>
 #include <vector>
+#include "util/rational.h"
 
 namespace CVC4 {
 
@@ -178,8 +179,14 @@ class CVC4_PUBLIC String {
   */
   std::size_t roverlap(const String& y) const;
 
+  /**
+   * Returns true if this string corresponds in text to a number, for example
+   * this returns true for strings "7", "12", "004", "0" and false for strings
+   * "abc", "4a", "-4", "".
+   */
   bool isNumber() const;
-  int toNumber() const;
+  /** Returns the corresponding rational for the text of this string. */
+  Rational toNumber() const;
 
   const std::vector<unsigned>& getVec() const { return d_str; }
   /** is the unsigned a digit?