From dea0d0913711f23fff3b902e3aa6006c6b54905a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 23 Feb 2015 16:16:23 +0200
Subject: Clean up file names

---
 build/key-set                     |   2 +-
 build/prefix-map                  | 140 ++++++++++++++++++++++++++++++++++
 build/prefix-map.txx              |  42 ++++++++++
 build/prefix_map                  | 140 ----------------------------------
 build/prefix_map.txx              |  42 ----------
 build/rule                        |   2 +-
 tests/build/prefix-map/buildfile  |   1 +
 tests/build/prefix-map/driver.cxx | 156 ++++++++++++++++++++++++++++++++++++++
 tests/build/prefix_map/buildfile  |   1 -
 tests/build/prefix_map/driver.cxx | 156 --------------------------------------
 10 files changed, 341 insertions(+), 341 deletions(-)
 create mode 100644 build/prefix-map
 create mode 100644 build/prefix-map.txx
 delete mode 100644 build/prefix_map
 delete mode 100644 build/prefix_map.txx
 create mode 100644 tests/build/prefix-map/buildfile
 create mode 100644 tests/build/prefix-map/driver.cxx
 delete mode 100644 tests/build/prefix_map/buildfile
 delete mode 100644 tests/build/prefix_map/driver.cxx

diff --git a/build/key-set b/build/key-set
index 9cb7d6c..8c197b8 100644
--- a/build/key-set
+++ b/build/key-set
@@ -1,4 +1,4 @@
-// file      : build/key_set -*- C++ -*-
+// file      : build/key-set -*- C++ -*-
 // copyright : Copyright (c) 2014-2015 Code Synthesis Tools CC
 // license   : MIT; see accompanying LICENSE file
 
diff --git a/build/prefix-map b/build/prefix-map
new file mode 100644
index 0000000..d2ca9be
--- /dev/null
+++ b/build/prefix-map
@@ -0,0 +1,140 @@
+// file      : build/prefix-map -*- C++ -*-
+// copyright : Copyright (c) 2014-2015 Code Synthesis Tools CC
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BUILD_PREFIX_MAP
+#define BUILD_PREFIX_MAP
+
+#include <map>
+#include <string>
+#include <utility>   // move()
+#include <algorithm> // min()
+
+namespace build
+{
+  template <typename K>
+  struct compare_prefix;
+
+  template <typename C>
+  struct compare_prefix<std::basic_string<C>>
+  {
+    typedef std::basic_string<C> K;
+
+    typedef C char_type;
+    typedef typename K::size_type size_type;
+    typedef typename K::traits_type traits_type;
+
+    explicit
+    compare_prefix (C d): d_ (d) {}
+
+    bool
+    operator() (const K& x, const K& y) const
+    {
+      return compare (x.c_str (), x.size (), y.c_str (), y.size ()) < 0;
+    }
+
+    // Note: doesn't check for k.size () being at least p.size ().
+    //
+    bool
+    prefix (const K& p, const K& k) const
+    {
+      size_type pn (p.size ());
+      return compare (
+        p.c_str (), pn, k.c_str (), pn == k.size () ? pn : pn + 1) == 0;
+    }
+
+    int
+    compare (const C* x, size_type xn,
+             const C* y, size_type yn) const
+    {
+      size_type n (std::min (xn, yn));
+      int r (traits_type::compare (x, y, n));
+
+      if (r == 0)
+      {
+        // Pretend there is the delimiter characters at the end of the
+        // shorter string.
+        //
+        char xc (xn > n ? x[n] : (xn++, d_));
+        char yc (yn > n ? y[n] : (yn++, d_));
+        r = traits_type::compare (&xc, &yc, 1);
+
+        // If we are still equal, then compare the lengths.
+        //
+        if (r == 0)
+          r = (xn == yn ? 0 : (xn < yn ? -1 : 1));
+      }
+
+      return r;
+    }
+
+  private:
+    C d_;
+  };
+
+  // A map of hierarchical "paths", e.g., 'foo.bar' or 'foo/bar' with
+  // the ability to retrieve a range of entries that have a specific
+  // prefix. The '.' and '/' above are the delimiter characters.
+  //
+  // Implementation-wise, the idea is to pretend that each key ends
+  // with the delimiter. This way we automatically avoid matching
+  // 'foobar' as having a prefix 'foo'.
+  //
+  template <typename M>
+  struct prefix_map_common: M
+  {
+    typedef M map_type;
+    typedef typename map_type::key_type key_type;
+    typedef typename map_type::value_type value_type;
+    typedef typename map_type::key_compare compare_type;
+    typedef typename compare_type::char_type char_type;
+
+    typedef typename map_type::iterator iterator;
+    typedef typename map_type::const_iterator const_iterator;
+
+    explicit
+    prefix_map_common (char_type delimiter)
+      : map_type (compare_type (delimiter)) {}
+
+    prefix_map_common (std::initializer_list<value_type> init,
+                       char_type delimiter)
+      : map_type (std::move (init), compare_type (delimiter)) {}
+
+    std::pair<iterator, iterator>
+    find (const key_type&);
+
+    std::pair<const_iterator, const_iterator>
+    find (const key_type&) const;
+  };
+
+  template <typename M, typename prefix_map_common<M>::char_type D = 0>
+  struct prefix_map_impl: prefix_map_common<M>
+  {
+    typedef typename prefix_map_common<M>::value_type value_type;
+
+    prefix_map_impl (): prefix_map_common<M> (D) {}
+    prefix_map_impl (std::initializer_list<value_type> init)
+        : prefix_map_common<M> (std::move (init), D) {}
+  };
+
+  template <typename M>
+  struct prefix_map_impl<M, 0>: prefix_map_common<M>
+  {
+    using prefix_map_common<M>::prefix_map_common;
+  };
+
+  template <typename K,
+            typename T,
+            typename compare_prefix<K>::char_type D = 0>
+  using prefix_map = prefix_map_impl<std::map<K, T, compare_prefix<K>>, D>;
+
+  template <typename K,
+            typename T,
+            typename compare_prefix<K>::char_type D = 0>
+  using prefix_multimap =
+    prefix_map_impl<std::multimap<K, T, compare_prefix<K>>, D>;
+}
+
+#include <build/prefix-map.txx>
+
+#endif // BUILD_PREFIX_MAP
diff --git a/build/prefix-map.txx b/build/prefix-map.txx
new file mode 100644
index 0000000..0da911d
--- /dev/null
+++ b/build/prefix-map.txx
@@ -0,0 +1,42 @@
+// file      : build/prefix-map.txx -*- C++ -*-
+// copyright : Copyright (c) 2014-2015 Code Synthesis Tools CC
+// license   : MIT; see accompanying LICENSE file
+
+namespace build
+{
+  template <typename M>
+  auto prefix_map_common<M>::
+  find (const key_type& k) -> std::pair<iterator, iterator>
+  {
+    std::pair<iterator, iterator> r;
+    r.first = this->lower_bound (k);
+
+    for (r.second = r.first;
+         r.second != this->end ();
+         ++r.second)
+    {
+      if (!this->key_comp ().prefix (k, r.second->first))
+        break;
+    }
+
+    return r;
+  }
+
+  template <typename M>
+  auto prefix_map_common<M>::
+  find (const key_type& k) const -> std::pair<const_iterator, const_iterator>
+  {
+    std::pair<const_iterator, const_iterator> r;
+    r.first = this->lower_bound (k);
+
+    for (r.second = r.first;
+         r.second != this->end ();
+         ++r.second)
+    {
+      if (!this->key_comp ().prefix (k, r.second->first))
+        break;
+    }
+
+    return r;
+  }
+}
diff --git a/build/prefix_map b/build/prefix_map
deleted file mode 100644
index f911d26..0000000
--- a/build/prefix_map
+++ /dev/null
@@ -1,140 +0,0 @@
-// file      : build/prefix_map -*- C++ -*-
-// copyright : Copyright (c) 2014-2015 Code Synthesis Tools CC
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BUILD_PREFIX_MAP
-#define BUILD_PREFIX_MAP
-
-#include <map>
-#include <string>
-#include <utility>   // move()
-#include <algorithm> // min()
-
-namespace build
-{
-  template <typename K>
-  struct compare_prefix;
-
-  template <typename C>
-  struct compare_prefix<std::basic_string<C>>
-  {
-    typedef std::basic_string<C> K;
-
-    typedef C char_type;
-    typedef typename K::size_type size_type;
-    typedef typename K::traits_type traits_type;
-
-    explicit
-    compare_prefix (C d): d_ (d) {}
-
-    bool
-    operator() (const K& x, const K& y) const
-    {
-      return compare (x.c_str (), x.size (), y.c_str (), y.size ()) < 0;
-    }
-
-    // Note: doesn't check for k.size () being at least p.size ().
-    //
-    bool
-    prefix (const K& p, const K& k) const
-    {
-      size_type pn (p.size ());
-      return compare (
-        p.c_str (), pn, k.c_str (), pn == k.size () ? pn : pn + 1) == 0;
-    }
-
-    int
-    compare (const C* x, size_type xn,
-             const C* y, size_type yn) const
-    {
-      size_type n (std::min (xn, yn));
-      int r (traits_type::compare (x, y, n));
-
-      if (r == 0)
-      {
-        // Pretend there is the delimiter characters at the end of the
-        // shorter string.
-        //
-        char xc (xn > n ? x[n] : (xn++, d_));
-        char yc (yn > n ? y[n] : (yn++, d_));
-        r = traits_type::compare (&xc, &yc, 1);
-
-        // If we are still equal, then compare the lengths.
-        //
-        if (r == 0)
-          r = (xn == yn ? 0 : (xn < yn ? -1 : 1));
-      }
-
-      return r;
-    }
-
-  private:
-    C d_;
-  };
-
-  // A map of hierarchical "paths", e.g., 'foo.bar' or 'foo/bar' with
-  // the ability to retrieve a range of entries that have a specific
-  // prefix. The '.' and '/' above are the delimiter characters.
-  //
-  // Implementation-wise, the idea is to pretend that each key ends
-  // with the delimiter. This way we automatically avoid matching
-  // 'foobar' as having a prefix 'foo'.
-  //
-  template <typename M>
-  struct prefix_map_common: M
-  {
-    typedef M map_type;
-    typedef typename map_type::key_type key_type;
-    typedef typename map_type::value_type value_type;
-    typedef typename map_type::key_compare compare_type;
-    typedef typename compare_type::char_type char_type;
-
-    typedef typename map_type::iterator iterator;
-    typedef typename map_type::const_iterator const_iterator;
-
-    explicit
-    prefix_map_common (char_type delimiter)
-      : map_type (compare_type (delimiter)) {}
-
-    prefix_map_common (std::initializer_list<value_type> init,
-                       char_type delimiter)
-      : map_type (std::move (init), compare_type (delimiter)) {}
-
-    std::pair<iterator, iterator>
-    find (const key_type&);
-
-    std::pair<const_iterator, const_iterator>
-    find (const key_type&) const;
-  };
-
-  template <typename M, typename prefix_map_common<M>::char_type D = 0>
-  struct prefix_map_impl: prefix_map_common<M>
-  {
-    typedef typename prefix_map_common<M>::value_type value_type;
-
-    prefix_map_impl (): prefix_map_common<M> (D) {}
-    prefix_map_impl (std::initializer_list<value_type> init)
-        : prefix_map_common<M> (std::move (init), D) {}
-  };
-
-  template <typename M>
-  struct prefix_map_impl<M, 0>: prefix_map_common<M>
-  {
-    using prefix_map_common<M>::prefix_map_common;
-  };
-
-  template <typename K,
-            typename T,
-            typename compare_prefix<K>::char_type D = 0>
-  using prefix_map = prefix_map_impl<std::map<K, T, compare_prefix<K>>, D>;
-
-  template <typename K,
-            typename T,
-            typename compare_prefix<K>::char_type D = 0>
-  using prefix_multimap =
-    prefix_map_impl<std::multimap<K, T, compare_prefix<K>>, D>;
-}
-
-#include <build/prefix_map.txx>
-
-#endif // BUILD_PREFIX_MAP
diff --git a/build/prefix_map.txx b/build/prefix_map.txx
deleted file mode 100644
index 91f8e0a..0000000
--- a/build/prefix_map.txx
+++ /dev/null
@@ -1,42 +0,0 @@
-// file      : build/prefix_map.txx -*- C++ -*-
-// copyright : Copyright (c) 2014-2015 Code Synthesis Tools CC
-// license   : MIT; see accompanying LICENSE file
-
-namespace build
-{
-  template <typename M>
-  auto prefix_map_common<M>::
-  find (const key_type& k) -> std::pair<iterator, iterator>
-  {
-    std::pair<iterator, iterator> r;
-    r.first = this->lower_bound (k);
-
-    for (r.second = r.first;
-         r.second != this->end ();
-         ++r.second)
-    {
-      if (!this->key_comp ().prefix (k, r.second->first))
-        break;
-    }
-
-    return r;
-  }
-
-  template <typename M>
-  auto prefix_map_common<M>::
-  find (const key_type& k) const -> std::pair<const_iterator, const_iterator>
-  {
-    std::pair<const_iterator, const_iterator> r;
-    r.first = this->lower_bound (k);
-
-    for (r.second = r.first;
-         r.second != this->end ();
-         ++r.second)
-    {
-      if (!this->key_comp ().prefix (k, r.second->first))
-        break;
-    }
-
-    return r;
-  }
-}
diff --git a/build/rule b/build/rule
index 889c94c..cbaac04 100644
--- a/build/rule
+++ b/build/rule
@@ -11,7 +11,7 @@
 #include <unordered_map>
 
 #include <build/target>
-#include <build/prefix_map>
+#include <build/prefix-map>
 
 namespace build
 {
diff --git a/tests/build/prefix-map/buildfile b/tests/build/prefix-map/buildfile
new file mode 100644
index 0000000..a72d02f
--- /dev/null
+++ b/tests/build/prefix-map/buildfile
@@ -0,0 +1 @@
+exe{driver}: cxx{driver}
diff --git a/tests/build/prefix-map/driver.cxx b/tests/build/prefix-map/driver.cxx
new file mode 100644
index 0000000..fb5269c
--- /dev/null
+++ b/tests/build/prefix-map/driver.cxx
@@ -0,0 +1,156 @@
+// file      : tests/build/prefix-map/driver.cxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2015 Code Synthesis Tools CC
+// license   : MIT; see accompanying LICENSE file
+
+#include <string>
+#include <cassert>
+#include <iostream>
+
+#include <build/prefix-map>
+
+using namespace std;
+using namespace build;
+
+int
+main ()
+{
+  typedef prefix_map<string, int> pm;
+
+  {
+    const pm m ('.');
+
+    {
+      auto r (m.find (""));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("foo"));
+      assert (r.first == r.second);
+    }
+  }
+
+  {
+    pm m {{{"foo", 1}}, '.'};
+
+    {
+      auto r (m.find (""));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("fo"));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("fox"));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("fooo"));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("foo.bar"));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("foo"));
+      assert (r.first != r.second && r.first->second == 1 &&
+              ++r.first == r.second);
+    }
+  }
+
+  {
+    pm m {{{"foo", 1}, {"bar", 2}}, '.'};
+
+    {
+      auto r (m.find (""));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("fo"));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("fox"));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("fooo"));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("foo.bar"));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("foo"));
+      assert (r.first != r.second && r.first->second == 1 &&
+              ++r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("bar"));
+      assert (r.first != r.second && r.first->second == 2 &&
+              ++r.first == r.second);
+    }
+  }
+
+  {
+    pm m (
+      {{"boo", 1},
+       {"foo", 2}, {"fooa", 3}, {"foo.bar", 4}, {"foo.fox", 5},
+       {"xoo", 5}},
+      '.');
+
+    {
+      auto r (m.find (""));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("fo"));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("fox"));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("fooo"));
+      assert (r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("foo.bar"));
+      assert (r.first != r.second && r.first->second == 4 &&
+              ++r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("foo.fox"));
+      assert (r.first != r.second && r.first->second == 5 &&
+              ++r.first == r.second);
+    }
+
+    {
+      auto r (m.find ("foo"));
+      assert (r.first != r.second && r.first->second == 2 &&
+              ++r.first != r.second && r.first->second == 4 &&
+              ++r.first != r.second && r.first->second == 5 &&
+              ++r.first == r.second);
+    }
+  }
+}
diff --git a/tests/build/prefix_map/buildfile b/tests/build/prefix_map/buildfile
deleted file mode 100644
index a72d02f..0000000
--- a/tests/build/prefix_map/buildfile
+++ /dev/null
@@ -1 +0,0 @@
-exe{driver}: cxx{driver}
diff --git a/tests/build/prefix_map/driver.cxx b/tests/build/prefix_map/driver.cxx
deleted file mode 100644
index ba9478c..0000000
--- a/tests/build/prefix_map/driver.cxx
+++ /dev/null
@@ -1,156 +0,0 @@
-// file      : tests/build/prefix_map/driver.cxx -*- C++ -*-
-// copyright : Copyright (c) 2014-2015 Code Synthesis Tools CC
-// license   : MIT; see accompanying LICENSE file
-
-#include <string>
-#include <cassert>
-#include <iostream>
-
-#include <build/prefix_map>
-
-using namespace std;
-using namespace build;
-
-int
-main ()
-{
-  typedef prefix_map<string, int> pm;
-
-  {
-    const pm m ('.');
-
-    {
-      auto r (m.find (""));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("foo"));
-      assert (r.first == r.second);
-    }
-  }
-
-  {
-    pm m {{{"foo", 1}}, '.'};
-
-    {
-      auto r (m.find (""));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("fo"));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("fox"));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("fooo"));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("foo.bar"));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("foo"));
-      assert (r.first != r.second && r.first->second == 1 &&
-              ++r.first == r.second);
-    }
-  }
-
-  {
-    pm m {{{"foo", 1}, {"bar", 2}}, '.'};
-
-    {
-      auto r (m.find (""));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("fo"));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("fox"));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("fooo"));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("foo.bar"));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("foo"));
-      assert (r.first != r.second && r.first->second == 1 &&
-              ++r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("bar"));
-      assert (r.first != r.second && r.first->second == 2 &&
-              ++r.first == r.second);
-    }
-  }
-
-  {
-    pm m (
-      {{"boo", 1},
-       {"foo", 2}, {"fooa", 3}, {"foo.bar", 4}, {"foo.fox", 5},
-       {"xoo", 5}},
-      '.');
-
-    {
-      auto r (m.find (""));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("fo"));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("fox"));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("fooo"));
-      assert (r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("foo.bar"));
-      assert (r.first != r.second && r.first->second == 4 &&
-              ++r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("foo.fox"));
-      assert (r.first != r.second && r.first->second == 5 &&
-              ++r.first == r.second);
-    }
-
-    {
-      auto r (m.find ("foo"));
-      assert (r.first != r.second && r.first->second == 2 &&
-              ++r.first != r.second && r.first->second == 4 &&
-              ++r.first != r.second && r.first->second == 5 &&
-              ++r.first == r.second);
-    }
-  }
-}
-- 
cgit v1.1