aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/operation20
-rw-r--r--build/string-table86
-rw-r--r--build/string-table.txx33
3 files changed, 13 insertions, 126 deletions
diff --git a/build/operation b/build/operation
index 51c9f88..be483a9 100644
--- a/build/operation
+++ b/build/operation
@@ -11,8 +11,9 @@
#include <cstdint>
#include <functional> // reference_wrapper
+#include <butl/string-table>
+
#include <build/types>
-#include <build/string-table>
namespace build
{
@@ -213,26 +214,31 @@ namespace build
// Meta/operation tables.
//
- using meta_operation_table = string_table<
+ using meta_operation_table = butl::string_table<
meta_operation_id,
std::reference_wrapper<const meta_operation_info>>;
- using operation_table = string_table<
+ using operation_table = butl::string_table<
operation_id,
std::reference_wrapper<const operation_info>>;
+}
+namespace butl
+{
template <>
- struct string_table_traits<std::reference_wrapper<const meta_operation_info>>
+ struct string_table_traits<
+ std::reference_wrapper<const build::meta_operation_info>>
{
static const std::string&
- key (const meta_operation_info& x) {return x.name;}
+ key (const build::meta_operation_info& x) {return x.name;}
};
template <>
- struct string_table_traits<std::reference_wrapper<const operation_info>>
+ struct string_table_traits<
+ std::reference_wrapper<const build::operation_info>>
{
static const std::string&
- key (const operation_info& x) {return x.name;}
+ key (const build::operation_info& x) {return x.name;}
};
}
diff --git a/build/string-table b/build/string-table
deleted file mode 100644
index 0188c62..0000000
--- a/build/string-table
+++ /dev/null
@@ -1,86 +0,0 @@
-// file : build/string-table -*- C++ -*-
-// copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
-// license : MIT; see accompanying LICENSE file
-
-#ifndef BUILD_STRING_TABLE
-#define BUILD_STRING_TABLE
-
-#include <vector>
-#include <string>
-#include <unordered_map>
-
-#include <butl/multi-index>
-
-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;
-
- 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 ());}
-
- bool
- empty () const {return vec_.empty ();}
-
- private:
- using key_type = butl::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
deleted file mode 100644
index 7bd9864..0000000
--- a/build/string-table.txx
+++ /dev/null
@@ -1,33 +0,0 @@
-// file : build/string-table.txx -*- C++ -*-
-// copyright : Copyright (c) 2014-2015 Code Synthesis Ltd
-// 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;
- }
-}