Use unordered_map in KeywordTrie

src/data/keyword.cpp

@@ -9,6 +9,7 @@
 #include <util/prec.hpp>
 #include <data/keyword.hpp>
 #include <util/tagged_string.hpp>
+#include <unordered_map>
 
 class KeywordTrie;
 DECLARE_POINTER_TYPE(KeywordParamValue);
@@ -243,13 +244,21 @@ void Keyword::prepare(const vector<KeywordParamP>& param_types, bool force) {
 
 // ----------------------------------------------------------------------------- : KeywordTrie
 
+namespace std {
+  template <> struct hash<wxUniChar> {
+    inline size_t operator () (wxUniChar x) const {
+      return std::hash<wxUniChar::value_type>()(x.GetValue());
+    }
+  };
+}
+
 /// A node in a trie to match keywords
 class KeywordTrie {
 public:
   KeywordTrie();
   ~KeywordTrie();
   
-  map<wxUniChar, unique_ptr<KeywordTrie>> children; ///< children after a given character
+  unordered_map<wxUniChar, unique_ptr<KeywordTrie>> children; ///< children after a given character
   KeywordTrie* on_any_star; ///< children on /.*/ (owned or this)
   vector<const Keyword*> finished; ///< keywords that end in this node
   
@@ -395,12 +404,12 @@ String KeywordDatabase::expand(const String& text,
                                const ScriptValueP& match_condition,
                                const ScriptValueP& expand_default,
                                const ScriptValueP& combine_script,
-                               Context& ctx) const {
+                               Context& ctx,
+                               KeywordUsageStatistics* stat) const {
   assert(combine_script);
   assert_tagged(text);
   
   // Clean up usage statistics
-  KeywordUsageStatistics* stat = keyword_usage_statistics();
   Value* stat_key = value_being_updated();
   if (stat && stat_key) {
     for (size_t i = stat->size() - 1 ; i + 1 > 0 ; --i) { // loop backwards

src/data/keyword.hpp

@@ -133,7 +133,6 @@ inline String type_name(const vector<KeywordP>&) {
 
 /// Store keyword usage statistics here, using value_being_updated as the key
 typedef vector<pair<Value*, const Keyword*>> KeywordUsageStatistics;
-DECLARE_DYNAMIC_ARG(KeywordUsageStatistics*, keyword_usage_statistics);
 
 /// A database of keywords to allow for fast matching
 /** NOTE: keywords may not be altered after they are added to the database,
@@ -162,8 +161,9 @@ public:
    *  @param combine_script script function to combine keyword and reminder text in some way
    *  @param case_sensitive case sensitive matching of keywords?
    *  @param ctx            context for evaluation of scripts
+   *  @param stats          where to put keyword statistics
    */
-  String expand(const String& text, const ScriptValueP& match_condition, const ScriptValueP& expand_default, const ScriptValueP& combine_script, Context& ctx) const;
+  String expand(const String& text, const ScriptValueP& match_condition, const ScriptValueP& expand_default, const ScriptValueP& combine_script, Context& ctx, KeywordUsageStatistics* stats = nullptr) const;
   
 private:
   unique_ptr<KeywordTrie> root; ///< Data structure for finding keywords

src/script/functions/basic.cpp

@@ -672,9 +672,9 @@ SCRIPT_FUNCTION_WITH_DEP(expand_keywords) {
     db.add(set->game->keywords);
   }
   SCRIPT_OPTIONAL_PARAM_C_(CardP, card);
-  WITH_DYNAMIC_ARG(keyword_usage_statistics, card ? &card->keyword_usage : nullptr);
   try {
-    SCRIPT_RETURN(db.expand(input, match_condition, default_expand, combine, ctx));
+    KeywordUsageStatistics* stat = card ? &card->keyword_usage : nullptr;
+    SCRIPT_RETURN(db.expand(input, match_condition, default_expand, combine, ctx, stat));
   } catch (const Error& e) {
     throw ScriptError(_ERROR_2_("in function", e.what(), _("expand_keywords")));
   }