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

1 files changed, 65 insertions, 65 deletions

diff --git a/src/util/regexp.h b/src/util/regexp.h
index 1ae01343d..b7eea929d 100644
--- a/src/util/regexp.h
+++ b/src/util/regexp.h
@@ -61,13 +61,13 @@ private:
 
   //guarded
   char hexToDec(char c) {
-	  if(isdigit(c)) {
-		  return c - '0';
-	  } else if (c >= 'a' && c >= 'f') {
-		  return c - 'a' + 10;
-	  } else {
-		  return c - 'A' + 10;
-	  }
+    if(isdigit(c)) {
+      return c - '0';
+    } else if (c >= 'a' && c >= 'f') {
+      return c - 'a' + 10;
+    } else {
+      return c - 'A' + 10;
+    }
   }
 
   void toInternal(const std::string &s);
@@ -164,11 +164,11 @@ public:
   }
 
   bool isEmptyString() const {
-	  return ( d_str.size() == 0 );
+    return ( d_str.size() == 0 );
   }
 
   unsigned int operator[] (const unsigned int i) const {
-	//Assert( i < d_str.size() && i >= 0);
+  //Assert( i < d_str.size() && i >= 0);
     return d_str[i];
   }
   /*
@@ -185,54 +185,54 @@ public:
   }
 
   bool isRepeated() const {
-	if(d_str.size() > 1) {
-		unsigned int f = d_str[0];
-		for(unsigned i=1; i<d_str.size(); ++i) {
-			if(f != d_str[i]) return false;
-		}
-	}
-	return true;
+  if(d_str.size() > 1) {
+    unsigned int f = d_str[0];
+    for(unsigned i=1; i<d_str.size(); ++i) {
+      if(f != d_str[i]) return false;
+    }
+  }
+  return true;
   }
 
   bool tailcmp(const String &y, int &c) const {
-	  int id_x = d_str.size() - 1;
-	  int id_y = y.d_str.size() - 1;
-	  while(id_x>=0 && id_y>=0) {
-		  if(d_str[id_x] != y.d_str[id_y]) {
-			  c = id_x;
-			  return false;
-		  }
-		  --id_x; --id_y;
-	  }
-	  c = id_x == -1 ? ( - (id_y+1) ) : (id_x + 1);
-	  return true;
+    int id_x = d_str.size() - 1;
+    int id_y = y.d_str.size() - 1;
+    while(id_x>=0 && id_y>=0) {
+      if(d_str[id_x] != y.d_str[id_y]) {
+        c = id_x;
+        return false;
+      }
+      --id_x; --id_y;
+    }
+    c = id_x == -1 ? ( - (id_y+1) ) : (id_x + 1);
+    return true;
   }
 
   std::size_t find(const String &y, const int start = 0) const {
-	  if(d_str.size() < y.d_str.size() + (std::size_t) start) return std::string::npos;
-	  if(y.d_str.size() == 0) return (std::size_t) start;
-	  if(d_str.size() == 0) return std::string::npos;
-	  std::size_t ret = std::string::npos;
-	  for(int i = start; i <= (int) d_str.size() - (int) y.d_str.size(); i++) {
-		  if(d_str[i] == y.d_str[0]) {
-			  std::size_t j=0;
-			  for(; j<y.d_str.size(); j++) {
-				  if(d_str[i+j] != y.d_str[j]) break;
-			  }
-			  if(j == y.d_str.size()) {
-				  ret = (std::size_t) i;
-				  break;
-			  }
-		  }
-	  }
-	  return ret;
+    if(d_str.size() < y.d_str.size() + (std::size_t) start) return std::string::npos;
+    if(y.d_str.size() == 0) return (std::size_t) start;
+    if(d_str.size() == 0) return std::string::npos;
+    std::size_t ret = std::string::npos;
+    for(int i = start; i <= (int) d_str.size() - (int) y.d_str.size(); i++) {
+      if(d_str[i] == y.d_str[0]) {
+        std::size_t j=0;
+        for(; j<y.d_str.size(); j++) {
+          if(d_str[i+j] != y.d_str[j]) break;
+        }
+        if(j == y.d_str.size()) {
+          ret = (std::size_t) i;
+          break;
+        }
+      }
+    }
+    return ret;
   }
 
   String replace(const String &s, const String &t) const {
     std::size_t ret = find(s);
     if( ret != std::string::npos ) {
       std::vector<unsigned int> vec;
-      vec.insert(vec.begin(), d_str.begin(), d_str.begin() + ret); 
+      vec.insert(vec.begin(), d_str.begin(), d_str.begin() + ret);
       vec.insert(vec.end(), t.d_str.begin(), t.d_str.end());
       vec.insert(vec.end(), d_str.begin() + ret + s.d_str.size(), d_str.end());
       return String(vec);
@@ -255,34 +255,34 @@ public:
   }
 
   String prefix(unsigned i) const {
-	  return substr(0, i);
+    return substr(0, i);
   }
   String suffix(unsigned i) const {
-	  return substr(d_str.size() - i, i);
+    return substr(d_str.size() - i, i);
   }
   bool overlap(String &y) const;
 
   bool isNumber() const {
-	 if(d_str.size() == 0) return false;
-	 for(unsigned int i=0; i<d_str.size(); ++i) {
-	   char c = convertUnsignedIntToChar( d_str[i] );
-	   if(c<'0' || c>'9') {
-		   return false;
-	   }
-	 }
-	 return true;
+   if(d_str.size() == 0) return false;
+   for(unsigned int i=0; i<d_str.size(); ++i) {
+     char c = convertUnsignedIntToChar( d_str[i] );
+     if(c<'0' || c>'9') {
+       return false;
+     }
+   }
+   return true;
   }
   int toNumber() const {
-	 if(isNumber()) {
-		 int ret=0;
-		 for(unsigned int i=0; i<d_str.size(); ++i) {
-		   char c = convertUnsignedIntToChar( d_str[i] );
-		   ret = ret * 10 + (int)c - (int)'0';
-		 }
-		 return ret;
-	 } else {
-		 return -1;
-	 }
+   if(isNumber()) {
+     int ret=0;
+     for(unsigned int i=0; i<d_str.size(); ++i) {
+       char c = convertUnsignedIntToChar( d_str[i] );
+       ret = ret * 10 + (int)c - (int)'0';
+     }
+     return ret;
+   } else {
+     return -1;
+   }
   }
   void getCharSet(std::set<unsigned int> &cset) const;
 };/* class String */