Changeset 4102 for trunk/yat/utility/utility.h

Timestamp:

Sep 22, 2021, 9:50:18 AM (2 years ago)

Author:

Peter

Message:

add wrapper function that calls std::string::contains, ::starts_with, and ::ends_with, if available; otherwise use home-brewed code. Add autoconf tests that check if these functions are available in CXX.

File:

• trunk/yat/utility/utility.h (modified) (6 diffs)

trunk/yat/utility/utility.h

@@ -166 +166 @@
 
   /**
+     \return true if string \a str contains \a s
+
+     \see https://en.cppreference.com/w/cpp/string/basic_string/comtains
+
+     \since New in yat 0.20
+   */
+  template<typename charT, class Traits, class Allocator>
+  bool contains(const std::basic_string<charT, Traits, Allocator>& str,
+                const std::basic_string<charT, Traits, Allocator>& substr);
+
+  /// since New in yat 0.20
+  template<typename charT, class Traits, class Allocator>
+  bool contains(const std::basic_string<charT, Traits, Allocator>& str,
+                charT substr);
+
+  /// since New in yat 0.20
+  template<typename charT, class Traits, class Allocator>
+  bool contains(const std::basic_string<charT, Traits, Allocator>& str,
+                const charT* substr);
+
+
+  /**
      \brief convert T to a string
 
@@ -220 +242 @@
    */
   std::string dirname(const std::string& fn);
+
+  /**
+     \return true if string \a str ends with \a suffix
+
+     \see https://en.cppreference.com/w/cpp/string/basic_string/ends_with
+
+     \since New in yat 0.20
+   */
+  template<typename charT, class Traits, class Allocator>
+  bool ends_with(const std::basic_string<charT, Traits, Allocator>& str,
+                 const std::basic_string<charT, Traits, Allocator>& suffix);
+
+  /// since New in yat 0.20
+  template<typename charT, class Traits, class Allocator>
+  bool ends_with(const std::basic_string<charT, Traits, Allocator>& str,
+                 charT suffix);
+
+  /// since New in yat 0.20
+  template<typename charT, class Traits, class Allocator>
+  bool ends_with(const std::basic_string<charT, Traits, Allocator>& str,
+                 const charT* suffix);
 
   /**
@@ -451 +494 @@
 
   /**
+     \return true if string \a str starts with \a prefix
+
+     \see https://en.cppreference.com/w/cpp/string/basic_string/starts_with
+
+     \since New in yat 0.20
+   */
+  template<typename charT, class Traits, class Allocator>
+  bool starts_with(const std::basic_string<charT, Traits, Allocator>& str,
+                   const std::basic_string<charT, Traits, Allocator>& prefix);
+
+  /// since New in yat 0.20
+  template<typename charT, class Traits, class Allocator>
+  bool starts_with(const std::basic_string<charT, Traits, Allocator>& str,
+                   charT prefix);
+
+  /// since New in yat 0.20
+  template<typename charT, class Traits, class Allocator>
+  bool starts_with(const std::basic_string<charT, Traits, Allocator>& str,
+                   const charT* prefix);
+
+  /**
      Calculate sum of weights in range [first, last). The complexity
      is linear except in the important case when \c Iterator is
@@ -570 +634 @@
 
 
+  template<typename charT, class Traits, class Allocator>
+  bool contains(const std::basic_string<charT, Traits, Allocator>& str,
+                const std::basic_string<charT, Traits, Allocator>& substr)
+  {
+    return str.find(substr)!=std::basic_string<charT, Traits,Allocator>::npos;
+  }
+
+
+  template<typename charT, class Traits, class Allocator>
+  bool contains(const std::basic_string<charT, Traits, Allocator>& str,
+                charT substr)
+  {
+    return str.find(substr)!=std::basic_string<charT, Traits,Allocator>::npos;
+  }
+
+
+  template<typename charT, class Traits, class Allocator>
+  bool contains(const std::basic_string<charT, Traits, Allocator>& str,
+                const charT* substr)
+  {
+    return str.find(substr)!=std::basic_string<charT, Traits,Allocator>::npos;
+  }
+
+
   template<typename T>
   std::string convert(T input)
@@ -587 +675 @@
                           std::string("\")"));
     return result;
+  }
+
+
+  template<typename charT, class Traits, class Allocator>
+  bool ends_with(const std::basic_string<charT, Traits, Allocator>& str,
+                 const std::basic_string<charT, Traits, Allocator>& suffix)
+  {
+#ifdef YAT_HAVE_FUNC_STRING_ENDS_WITH
+    return str.ends_with(suffix);
+#else
+    size_t n = suffix.size();
+    return n <= str.size() && !str.compare(str.size()-n, n, suffix);
+#endif
+  }
+
+
+  template<typename charT, class Traits, class Allocator>
+  bool ends_with(const std::basic_string<charT, Traits, Allocator>& str,
+                 charT suffix)
+  {
+#ifdef YAT_HAVE_FUNC_STRING_ENDS_WITH
+    return str.ends_with(suffix);
+#else
+    Traits traits;
+    return str.size() && traits.eq(str.back(), suffix);
+#endif
+  }
+
+
+  template<typename charT, class Traits, class Allocator>
+  bool ends_with(const std::basic_string<charT, Traits, Allocator>& str,
+                 const charT* suffix)
+  {
+#ifdef YAT_HAVE_FUNC_STRING_ENDS_WITH
+    return str.ends_with(suffix);
+#else
+    Traits traits;
+    size_t n = traits.length(suffix);
+    return n <= str.size() && !str.compare(str.size()-n, n, suffix);
+#endif
   }
 
@@ -647 +775 @@
       pusher(std::move(element), vec);
     }
+  }
+
+
+  template<typename charT, class Traits, class Allocator>
+  bool starts_with(const std::basic_string<charT, Traits, Allocator>& str,
+                   const std::basic_string<charT, Traits, Allocator>& prefix)
+  {
+#ifdef YAT_HAVE_FUNC_STRING_STARTS_WITH
+    return str.starts_with(prefix);
+#else
+    size_t n = prefix.size();
+    return n <= str.size() && !str.compare(0, n, prefix);
+#endif
+  }
+
+
+  template<typename charT, class Traits, class Allocator>
+  bool starts_with(const std::basic_string<charT, Traits, Allocator>& str,
+                   charT prefix)
+  {
+#ifdef YAT_HAVE_FUNC_STRING_STARTS_WITH
+    return str.starts_with(prefix);
+#else
+    Traits traits;
+    return str.size() && traits.eq(str[0], prefix);
+#endif
+  }
+
+
+  template<typename charT, class Traits, class Allocator>
+  bool starts_with(const std::basic_string<charT, Traits, Allocator>& str,
+                   const charT* prefix)
+  {
+#ifdef YAT_HAVE_FUNC_STRING_STARTS_WITH
+    return str.starts_with(prefix);
+#else
+    Traits traits;
+    size_t n = traits.length(prefix);
+    return n <= str.size() && !str.compare(0, n, prefix);
+#endif
   }