Changeset 1101 for trunk

Timestamp:

Jun 14, 2010, 4:05:02 AM (11 years ago)

Author:

Peter Johansson

Message:

remove out-commented code

File:

• trunk/lib/utility.cc (modified) (2 diffs)

trunk/lib/utility.cc

@@ -279 +279 @@
       }
       return regexp__(first1+1, last1, first2+1, last2, item+1);
-      /*
-      while (*first2 != ']') {
-        if (*first2==*first1) {
-          found = true;
-          vec.back() = *first1;
-          vec.push_back("");
-        }
-        ++first2;
-        assert(first2!=last2);
-      }
-      if (!found)
-        return false;
-      return regexp(first1+1, last1, first2+1, last2, vec);
-      */
     }
 
@@ -300 +286 @@
       return false;
     return regexp__(first1+1, last1, first2+1, last2, item);
-
-    /*
-
-
-
-    if (first1==last1)
-      return false;
-    if (*first1 != *first2)
-      return false;
-    return regexp(first1+1, last1, first2+1, last2, vec);
-    
-    /// hm
-    if (first1==last1 || first2==last2)
-      return false;
-
-    // then we take care of the real stuff
-    if (*first2 == '*'){
-      // trying '*' to consume another character
-      vec.back().append(1, *first1);
-      if (regexp(first1+1, last1, first2, last2, vec) )
-        return true;
-      assert(vec.back().size());
-      vec.back().resize(vec.back().size()-1);
-
-      // stepping away from the '*'
-      vec.push_back("");
-      if (regexp(first1, last1, first2+1, last2, vec)) 
-        return true;
-      vec.pop_back();
-      return false;
-    }
-    else if (*first2 == '?'){
-      // eating a character
-      vec.back() = std::string(first1, first1+1);
-      vec.push_back("");
-      if (regexp(first1+1, last1, first2+1, last2, vec) )
-        return true;
-      vec.pop_back();
-      // ? interpreted as zero characters
-      vec.back() = "";
-      vec.push_back("");
-      if (regexp(first1, last1, first2+1, last2, vec) )
-        return true;
-      vec.pop_back();
-      return false;
-    }
-    if (*first1 != *first2)
-      return false;
-    return regexp(++first1, last1, ++first2, last2, vec);
-    */
   }