From 31455af4fc58ced3e5677a8dfaf9f29de53b2112 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 25 Jul 2018 20:24:39 +0300
Subject: Move bpkg::package_name class to butl::project_name

---
 libbpkg/package-name.hxx | 196 +----------------------------------------------
 1 file changed, 2 insertions(+), 194 deletions(-)

(limited to 'libbpkg/package-name.hxx')

diff --git a/libbpkg/package-name.hxx b/libbpkg/package-name.hxx
index ecc9f3b..f478be3 100644
--- a/libbpkg/package-name.hxx
+++ b/libbpkg/package-name.hxx
@@ -5,206 +5,14 @@
 #ifndef LIBBPKG_PACKAGE_NAME_HXX
 #define LIBBPKG_PACKAGE_NAME_HXX
 
-#include <string>
-#include <utility> // move()
-#include <ostream>
-
-#include <libbutl/utility.mxx> // casecmp()
+#include <libbutl/project-name.mxx>
 
 #include <libbpkg/export.hxx>
 #include <libbpkg/version.hxx>
 
 namespace bpkg
 {
-  class LIBBPKG_EXPORT package_name
-  {
-  public:
-    // Create package name from string verifying that it complied with the
-    // specification and throwing std::invalid_argument if that's not the
-    // case. Note that in this case the passed value is guaranteed to be
-    // unchanged.
-    //
-    explicit
-    package_name (const std::string& s): package_name (std::string (s)) {}
-
-    explicit
-    package_name (std::string&&);
-
-    // Create a special empty package name.
-    //
-    package_name () = default;
-
-    // Create an arbitrary string that can be used in contexts that expect
-    // a package name. For example, a package name pattern for use in ODB query
-    // expressions.
-    //
-    enum raw_string_type {raw_string};
-    package_name (std::string s, raw_string_type): value_ (std::move (s)) {}
-
-    bool
-    empty () const noexcept {return value_.empty ();}
-
-    const std::string&
-    string () const& noexcept {return value_;}
-
-    // Moves the underlying package name string out of the package name object.
-    // The object becomes empty. Usage: std::move (name).string ().
-    //
-    std::string
-    string () && {std::string r; r.swap (this->value_); return r;}
-
-    // Package name base and extension (without the dot). If there is no
-    // extension, then the base name is the same as the full name and the
-    // returned extension is empty.
-    //
-    std::string
-    base () const;
-
-    std::string
-    extension () const;
-
-    // Package name sanitized to a canonical variable name. Specifically,
-    // '.', '-', and '+' are replaced with '_'.
-    //
-    std::string
-    variable () const;
-
-    // Compare ignoring case. Note that a string is not checked to be a valid
-    // package name.
-    //
-    int compare (const package_name& n) const {return compare (n.value_);}
-    int compare (const std::string& n) const {return compare (n.c_str ());}
-    int compare (const char* n) const {return butl::casecmp (value_, n);}
-
-  private:
-    std::string value_;
-  };
-
-  inline bool
-  operator< (const package_name& x, const package_name& y)
-  {
-    return x.compare (y) < 0;
-  }
-
-  inline bool
-  operator> (const package_name& x, const package_name& y)
-  {
-    return x.compare (y) > 0;
-  }
-
-  inline bool
-  operator== (const package_name& x, const package_name& y)
-  {
-    return x.compare (y) == 0;
-  }
-
-  inline bool
-  operator<= (const package_name& x, const package_name& y)
-  {
-    return x.compare (y) <= 0;
-  }
-
-  inline bool
-  operator>= (const package_name& x, const package_name& y)
-  {
-    return x.compare (y) >= 0;
-  }
-
-  inline bool
-  operator!= (const package_name& x, const package_name& y)
-  {
-    return x.compare (y) != 0;
-  }
-
-  template <typename T>
-  inline auto
-  operator< (const package_name& x, const T& y)
-  {
-    return x.compare (y) < 0;
-  }
-
-  template <typename T>
-  inline auto
-  operator> (const package_name& x, const T& y)
-  {
-    return x.compare (y) > 0;
-  }
-
-  template <typename T>
-  inline auto
-  operator== (const package_name& x, const T& y)
-  {
-    return x.compare (y) == 0;
-  }
-
-  template <typename T>
-  inline auto
-  operator<= (const package_name& x, const T& y)
-  {
-    return x.compare (y) <= 0;
-  }
-
-  template <typename T>
-  inline auto
-  operator>= (const package_name& x, const T& y)
-  {
-    return x.compare (y) >= 0;
-  }
-
-  template <typename T>
-  inline auto
-  operator!= (const package_name& x, const T& y)
-  {
-    return x.compare (y) != 0;
-  }
-
-  template <typename T>
-  inline auto
-  operator< (const T& x, const package_name& y)
-  {
-    return y > x;
-  }
-
-  template <typename T>
-  inline auto
-  operator> (const T& x, const package_name& y)
-  {
-    return y < x;
-  }
-
-  template <typename T>
-  inline auto
-  operator== (const T& x, const package_name& y)
-  {
-    return y == x;
-  }
-
-  template <typename T>
-  inline auto
-  operator<= (const T& x, const package_name& y)
-  {
-    return y >= x;
-  }
-
-  template <typename T>
-  inline auto
-  operator>= (const T& x, const package_name& y)
-  {
-    return y <= x;
-  }
-
-  template <typename T>
-  inline auto
-  operator!= (const T& x, const package_name& y)
-  {
-    return y != x;
-  }
-
-  inline std::ostream&
-  operator<< (std::ostream& os, const package_name& v)
-  {
-    return os << v.string ();
-  }
+  using package_name = butl::project_name;
 }
 
 #endif // LIBBPKG_PACKAGE_NAME_HXX
-- 
cgit v1.1