Changeset 7371 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Apr 26, 2006, 2:12:45 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better completion-algos

Location:

trunk/src/lib/util

Files:

• helper_functions.cc (modified) (2 diffs)
• helper_functions.h (modified) (1 diff)

trunk/src/lib/util/helper_functions.cc

@@ -115 +115 @@
  * @param s2 second string
  */
-int nocase_cmp(const std::string& s1, const std::string& s2)
+int nocaseCmp(const std::string& s1, const std::string& s2)
 {
   std::string::const_iterator it1=s1.begin();
@@ -137 +137 @@
 }
 
+
+/**
+ * @brief compares two strings without ignoring the case
+ * @param s1 first string
+ * @param s2 second string
+ * @param len how far from the beginning to start.
+ */
+int nocaseCmp(const std::string& s1, const std::string& s2, unsigned int len)
+{
+  std::string::const_iterator it1=s1.begin();
+  std::string::const_iterator it2=s2.begin();
+
+  //stop when either string's end has been reached
+  while ( (it1!=s1.end()) && (it2!=s2.end()) && len-- > 0)
+  {
+    if(::toupper(*it1) != ::toupper(*it2)) //letters differ?
+     // return -1 to indicate smaller than, 1 otherwise
+      return (::toupper(*it1)  < ::toupper(*it2)) ? -1 : 1;
+    //proceed to the next character in each string
+    ++it1;
+    ++it2;
+  }
+  return 0;
+}
+

trunk/src/lib/util/helper_functions.h

@@ -21 +21 @@
 
 
-int           nocase_cmp(const std::string& s1, const std::string& s2);
+int           nocaseCmp(const std::string& s1, const std::string& s2);
+int           nocaseCmp(const std::string& s1, const std::string& s2, unsigned int len);