From 68275e7f5887569eb2ae3dd9bcf67c07c081c8b5 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sat, 8 Aug 2020 15:04:52 -0700 Subject: [PATCH] Simplify parser_keywords_is_reserved --- src/parser_keywords.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/parser_keywords.cpp b/src/parser_keywords.cpp index 6f4fe1eff..49b375127 100644 --- a/src/parser_keywords.cpp +++ b/src/parser_keywords.cpp @@ -76,9 +76,6 @@ bool parser_keywords_is_reserved(const wcstring &word) { results.insert(std::begin(reserved_keywords), std::end(reserved_keywords)); return results; })(); - const static auto max_len = list_max_length(search_list); - const static auto not_found = search_list.end(); - - // Everything above is executed only at startup, this is the actual optimized search routine: - return word.length() <= max_len && search_list.find(word) != not_found; + const static size_t max_len = list_max_length(search_list); + return word.length() <= max_len && search_list.count(word) > 0; }