aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-03-13 14:48:35 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-03-13 14:48:35 +0200
commit5b5aabc6d347ff209c35b2db7250d4caaf9fd643 (patch)
tree377c328ec4282572f019210c6e96bd979e9b1802
parent75d03492c0a42031a987969a6eb20dd2121f54d1 (diff)
Factor string_table into separate file
-rw-r--r--build/operation2
-rw-r--r--build/string-table90
-rw-r--r--build/string-table.txx33
-rw-r--r--build/utility95
4 files changed, 124 insertions, 96 deletions
diff --git a/build/operation b/build/operation
index 743458a..3d9c7e0 100644
--- a/build/operation
+++ b/build/operation
@@ -9,7 +9,7 @@
#include <cstdint>
#include <iosfwd>
-#include <build/utility> // string_table
+#include <build/string-table>
namespace build
{
diff --git a/build/string-table b/build/string-table
new file mode 100644
index 0000000..522476f
--- /dev/null
+++ b/build/string-table
@@ -0,0 +1,90 @@
+// file : build/string-table -*- C++ -*-
+// copyright : Copyright (c) 2014-2015 Code Synthesis Tools CC
+// license : MIT; see accompanying LICENSE file
+
+#ifndef BUILD_STRING_TABLE
+#define BUILD_STRING_TABLE
+
+#include <vector>
+#include <string>
+#include <unordered_map>
+
+#include <build/map-key>
+
+namespace build
+{
+ // A pool of strings and, optionally, other accompanying data in which
+ // each entry is assigned an individual index (or id) of type I (e.g.,
+ // uint8_t, uint16_t, etc., depending on how many entries are expected).
+ // Index value 0 is reserved to indicate the "no entry" condition.
+ //
+ template <typename I, typename D>
+ struct string_table_element
+ {
+ const I i;
+ const D d;
+ };
+
+ template <typename I>
+ struct string_table_element<I, std::string>
+ {
+ const I i;
+ const std::string d;
+ };
+
+ template <typename D>
+ struct string_table_traits
+ {
+ // By default, look for the key() function in D. But you can
+ // also specialize this class template.
+ //
+ static const std::string&
+ key (const D& d) {return d.key ();}
+ };
+
+ template <>
+ struct string_table_traits<std::string>
+ {
+ static const std::string&
+ key (const std::string& d) {return d;}
+ };
+
+ template <typename I, typename D = std::string>
+ struct string_table
+ {
+ // Insert new entry unless one already exists.
+ //
+ I
+ insert (const D&);
+
+ // Find existing.
+ //
+ I
+ find (const std::string& k) const
+ {
+ auto i (map_.find (key_type (&k)));
+ return i != map_.end () ? i->second.i : 0;
+ }
+
+ // Reverse lookup.
+ //
+ const D&
+ operator[] (I i) const {assert (i > 0); return vec_[i - 1]->second.d;}
+
+ I
+ size () const {return static_cast<I> (vec_.size ());}
+
+ private:
+ using key_type = map_key<std::string>;
+ using value_type = string_table_element<I, D>;
+ using map_type = std::unordered_map<key_type, value_type>;
+ using traits = string_table_traits<D>;
+
+ map_type map_;
+ std::vector<typename map_type::const_iterator> vec_;
+ };
+}
+
+#include <build/string-table.txx>
+
+#endif // BUILD_STRING_TABLE
diff --git a/build/string-table.txx b/build/string-table.txx
new file mode 100644
index 0000000..67d93c9
--- /dev/null
+++ b/build/string-table.txx
@@ -0,0 +1,33 @@
+// file : build/string-table.txx -*- C++ -*-
+// copyright : Copyright (c) 2014-2015 Code Synthesis Tools CC
+// license : MIT; see accompanying LICENSE file
+
+#include <limits> // numeric_limits
+#include <cstddef> // size_t
+#include <cassert>
+
+namespace build
+{
+ template <typename I, typename D>
+ I string_table<I, D>::
+ insert (const D& d)
+ {
+ std::size_t i (vec_.size () + 1);
+
+ // Note: move(d) would be tricky since key still points to it.
+ //
+ auto r (map_.emplace (
+ key_type (&traits::key (d)),
+ value_type {static_cast<I> (i), d}));
+
+ if (r.second)
+ {
+ assert (i <= std::numeric_limits<I>::max ());
+
+ r.first->first.p = &traits::key (r.first->second.d); // Update key.
+ vec_.push_back (r.first);
+ }
+
+ return r.first->second.i;
+ }
+}
diff --git a/build/utility b/build/utility
index 489a5eb..3196c81 100644
--- a/build/utility
+++ b/build/utility
@@ -6,17 +6,12 @@
#define BUILD_UTILITY
#include <tuple>
-#include <limits> // numeric_limits
#include <string>
-#include <vector>
#include <utility>
#include <cstring> // strcmp()
-#include <cassert>
#include <exception>
#include <unordered_set>
-#include <unordered_map>
-#include <build/map-key>
#include <build/path>
namespace build
@@ -129,96 +124,6 @@ namespace build
};
extern string_pool extension_pool;
-
- // A pool of strings and, optionally, other accompanying data in which
- // each entry is assigned an individual index (or id) of type I (e.g.,
- // uint8_t, uint16_t, etc., depending on how many entries are expected).
- // Index value 0 is reserved to indicate the no entry condition.
- //
- template <typename I, typename D>
- struct string_table_element
- {
- const I i;
- const D d;
- };
-
- template <typename I>
- struct string_table_element<I, std::string>
- {
- const I i;
- const std::string d;
- };
-
- template <typename D>
- struct string_table_traits
- {
- // By default, look for the key() function in D. But you can
- // also specialize this class template.
- //
- static const std::string&
- key (const D& d) {return d.key ();}
- };
-
- template <>
- struct string_table_traits<std::string>
- {
- static const std::string&
- key (const std::string& d) {return d;}
- };
-
- template <typename I, typename D = std::string>
- struct string_table
- {
- // Insert new entry unless one already exists.
- //
- I
- insert (const D& d)
- {
- std::size_t i (vec_.size () + 1);
-
- // Note: move(d) would be tricky since key still points to it.
- //
- auto r (map_.emplace (
- key_type (&traits::key (d)),
- value_type {static_cast<I> (i), d}));
-
- if (r.second)
- {
- assert (i <= std::numeric_limits<I>::max ());
-
- r.first->first.p = &traits::key (r.first->second.d); // Update key.
- vec_.push_back (r.first);
- }
-
- return r.first->second.i;
- }
-
- // Find existing.
- //
- I
- find (const std::string& k) const
- {
- auto i (map_.find (key_type (&k)));
- return i != map_.end () ? i->second.i : 0;
- }
-
- // Reverse lookup.
- //
- const D&
- operator[] (I i) const {assert (i > 0); return vec_[i - 1]->second.d;}
-
- I
- size () const {return static_cast<I> (vec_.size ());}
-
- private:
- using key_type = map_key<std::string>;
- using value_type = string_table_element<I, D>;
- using map_type = std::unordered_map<key_type, value_type>;
- using traits = string_table_traits<D>;
-
- map_type map_;
- std::vector<typename map_type::const_iterator> vec_;
- };
}
#endif // BUILD_UTILITY