c++: Fix up and tweak std-name-hint.gperf

When converting reflection metafunction evaluation into gperf, I had
a look at the other *.gperf files in gcc/cp/.
cfns.gperf doesn't have any hash conflicts, but std-name-hint.gperf
has 7, which I believe means that for 7 of the strings it falls back to some
slow loop over not sure how many entries.

Apparently, 2 out of the 7 conflicts are just because two lines are
identically duplicated in the file, the patch included below fixes that.

2025-10-30  Jakub Jelinek  <jakub@redhat.com>

	* std-name-hint.gperf: Remove duplicate entries for ispanstream
	and istringstream.
	* std-name-hint.h: Regenerate.

diff --git a/gcc/cp/std-name-hint.gperf b/gcc/cp/std-name-hint.gperf
index 3e06e61501d267d40c9fdc0ee3ec8c482db83636..641f3c5e7854be86ec8ad045a0cc210281f30c38 100644 (file)
--- a/gcc/cp/std-name-hint.gperf
+++ b/gcc/cp/std-name-hint.gperf
@@ -420,7 +420,6 @@ basic_ospanstream, "<spanstream>", cxx23
 basic_spanbuf, "<spanstream>", cxx23
 basic_spanstream, "<spanstream>", cxx23
 ispanstream, "<spanstream>", cxx23
-ispanstream, "<spanstream>", cxx23
 ospanstream, "<spanstream>", cxx23
 spanbuf, "<spanstream>", cxx23
 spanstream, "<spanstream>", cxx23
@@ -433,7 +432,6 @@ basic_ostringstream, "<sstream>", cxx98
 basic_stringbuf, "<sstream>", cxx98
 basic_stringstream, "<sstream>", cxx98
 istringstream, "<sstream>", cxx98
-istringstream, "<sstream>", cxx98
 ostringstream, "<sstream>", cxx98
 stringbuf, "<sstream>", cxx98
 stringstream, "<sstream>", cxx98

diff --git a/gcc/cp/std-name-hint.h b/gcc/cp/std-name-hint.h
index e354032a229bde3f0ae9818304778d45ffb05a10..8e64b56ebd31e3952bf6e416033ca141594aaa54 100644 (file)
--- a/gcc/cp/std-name-hint.h
+++ b/gcc/cp/std-name-hint.h
@@ -61,7 +61,7 @@ struct std_name_hint
   /* The dialect of C++ in which this was added.  */
   enum cxx_dialect min_dialect;
 };
-/* maximum key range = 2080, duplicates = 7 */
+/* maximum key range = 2080, duplicates = 5 */
 
 class std_name_hint_lookup
 {
@@ -135,7 +135,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 488,
+      TOTAL_KEYWORDS = 486,
       MIN_WORD_LENGTH = 2,
       MAX_WORD_LENGTH = 39,
       MIN_HASH_VALUE = 7,
@@ -148,7 +148,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"regular", "<concepts>", cxx20},
 #line 292 "std-name-hint.gperf"
       {"reverse_iterator", "<iterator>", cxx98},
-#line 454 "std-name-hint.gperf"
+#line 452 "std-name-hint.gperf"
       {"range_error", "<stdexcept>", cxx98},
 #line 408 "std-name-hint.gperf"
       {"set", "<set>", cxx98},
@@ -164,13 +164,13 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"formatter", "<format>", cxx20},
 #line 196 "std-name-hint.gperf"
       {"basic_filebuf", "<fstream>", cxx98},
-#line 575 "std-name-hint.gperf"
+#line 573 "std-name-hint.gperf"
       {"pair", "<utility>", cxx98},
 #line 276 "std-name-hint.gperf"
       {"begin", "<iterator>", cxx11},
 #line 179 "std-name-hint.gperf"
       {"formattable", "<format>", cxx23},
-#line 541 "std-name-hint.gperf"
+#line 539 "std-name-hint.gperf"
       {"bad_cast", "<typeinfo>", cxx98},
 #line 233 "std-name-hint.gperf"
       {"setiosflags", "<iomanip>", cxx98},
@@ -178,7 +178,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"print", "<print>", cxx23},
 #line 221 "std-name-hint.gperf"
       {"promise", "<future>", cxx11},
-#line 582 "std-name-hint.gperf"
+#line 580 "std-name-hint.gperf"
       {"bad_variant_access", "<variant>", cxx17},
 #line 328 "std-name-hint.gperf"
       {"to_address", "<memory>", cxx20},
@@ -196,9 +196,9 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"nouppercase", "<ios>", cxx98},
 #line 250 "std-name-hint.gperf"
       {"nounitbuf", "<ios>", cxx98},
-#line 433 "std-name-hint.gperf"
+#line 432 "std-name-hint.gperf"
       {"basic_stringbuf", "<sstream>", cxx98},
-#line 593 "std-name-hint.gperf"
+#line 591 "std-name-hint.gperf"
       {"vector", "<vector>", cxx98},
 #line 246 "std-name-hint.gperf"
       {"noshowbase", "<ios>", cxx98},
@@ -210,9 +210,9 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"pmr::get_default_resource", "<memory_resource>", cxx17},
 #line 343 "std-name-hint.gperf"
       {"pmr::set_default_resource", "<memory_resource>", cxx17},
-#line 455 "std-name-hint.gperf"
+#line 453 "std-name-hint.gperf"
       {"runtime_error", "<stdexcept>", cxx98},
-#line 516 "std-name-hint.gperf"
+#line 514 "std-name-hint.gperf"
       {"tuple", "<tuple>", cxx11},
 #line 132 "std-name-hint.gperf"
       {"regular_invocable", "<concepts>", cxx20},
@@ -224,15 +224,15 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"not_fn", "<functional>", cxx17},
 #line 142 "std-name-hint.gperf"
       {"byte", "<cstddef>", cxx17},
-#line 518 "std-name-hint.gperf"
+#line 516 "std-name-hint.gperf"
       {"tuple_element", "<tuple>", cxx11},
-#line 519 "std-name-hint.gperf"
+#line 517 "std-name-hint.gperf"
       {"tuple_element_t", "<tuple>", cxx14},
-#line 585 "std-name-hint.gperf"
+#line 583 "std-name-hint.gperf"
       {"variant", "<variant>", cxx17},
 #line 386 "std-name-hint.gperf"
       {"ends", "<ostream>", cxx98},
-#line 520 "std-name-hint.gperf"
+#line 518 "std-name-hint.gperf"
       {"tuple_size", "<tuple>", cxx11},
 #line 123 "std-name-hint.gperf"
       {"equality_comparable", "<concepts>", cxx20},
@@ -244,37 +244,37 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"noshowpos", "<ios>", cxx98},
 #line 388 "std-name-hint.gperf"
       {"flush_emit", "<ostream>", cxx20},
-#line 586 "std-name-hint.gperf"
+#line 584 "std-name-hint.gperf"
       {"variant_alternative", "<variant>", cxx17},
-#line 537 "std-name-hint.gperf"
+#line 535 "std-name-hint.gperf"
       {"void_t", "<type_traits>", cxx17},
-#line 587 "std-name-hint.gperf"
+#line 585 "std-name-hint.gperf"
       {"variant_alternative_t", "<variant>", cxx17},
 #line 134 "std-name-hint.gperf"
       {"relation", "<concepts>", cxx20},
-#line 461 "std-name-hint.gperf"
-      {"float32_t", "<stdfloat>", cxx23},
 #line 459 "std-name-hint.gperf"
+      {"float32_t", "<stdfloat>", cxx23},
+#line 457 "std-name-hint.gperf"
       {"float128_t", "<stdfloat>", cxx23},
 #line 381 "std-name-hint.gperf"
       {"nullopt", "<optional>", cxx17},
 #line 291 "std-name-hint.gperf"
       {"prev", "<iterator>", cxx11},
-#line 425 "std-name-hint.gperf"
+#line 424 "std-name-hint.gperf"
       {"spanbuf", "<spanstream>", cxx23},
-#line 513 "std-name-hint.gperf"
+#line 511 "std-name-hint.gperf"
       {"make_from_tuple", "<tuple>", cxx17},
 #line 253 "std-name-hint.gperf"
       {"right", "<ios>", cxx98},
 #line 210 "std-name-hint.gperf"
       {"mem_fn", "<functional>", cxx11},
-#line 515 "std-name-hint.gperf"
+#line 513 "std-name-hint.gperf"
       {"tie", "<tuple>", cxx11},
 #line 197 "std-name-hint.gperf"
       {"basic_fstream", "<fstream>", cxx98},
-#line 573 "std-name-hint.gperf"
+#line 571 "std-name-hint.gperf"
       {"move", "<utility>", cxx11},
-#line 462 "std-name-hint.gperf"
+#line 460 "std-name-hint.gperf"
       {"float64_t", "<stdfloat>", cxx23},
 #line 127 "std-name-hint.gperf"
       {"movable", "<concepts>", cxx20},
@@ -282,13 +282,13 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"front_inserter", "<iterator>", cxx98},
 #line 296 "std-name-hint.gperf"
       {"map", "<map>", cxx98},
-#line 460 "std-name-hint.gperf"
+#line 458 "std-name-hint.gperf"
       {"float16_t", "<stdfloat>", cxx23},
 #line 56 "std-name-hint.gperf"
       {"bitset", "<bitset>", cxx11},
 #line 205 "std-name-hint.gperf"
       {"bind_front", "<functional>", cxx20},
-#line 574 "std-name-hint.gperf"
+#line 572 "std-name-hint.gperf"
       {"move_if_noexcept", "<utility>", cxx11},
 #line 274 "std-name-hint.gperf"
       {"advance", "<iterator>", cxx98},
@@ -296,7 +296,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"move_iterator", "<iterator>", cxx11},
 #line 161 "std-name-hint.gperf"
       {"terminate", "<exception>", cxx98},
-#line 531 "std-name-hint.gperf"
+#line 529 "std-name-hint.gperf"
       {"negation", "<type_traits>", cxx17},
 #line 318 "std-name-hint.gperf"
       {"make_obj_using_allocator", "<memory>", cxx20},
@@ -310,7 +310,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"range_formatter", "<format>", cxx23},
 #line 299 "std-name-hint.gperf"
       {"addressof", "<memory>", cxx11},
-#line 571 "std-name-hint.gperf"
+#line 569 "std-name-hint.gperf"
       {"make_integer_sequence", "<utility>", cxx14},
 #line 184 "std-name-hint.gperf"
       {"range_format", "<format>", cxx23},
@@ -320,25 +320,25 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"basic_spanstream", "<spanstream>", cxx23},
 #line 257 "std-name-hint.gperf"
       {"showpos", "<ios>", cxx98},
-#line 550 "std-name-hint.gperf"
+#line 548 "std-name-hint.gperf"
       {"as_const", "<utility>", cxx17},
 #line 308 "std-name-hint.gperf"
       {"bad_weak_ptr", "<memory>", cxx11},
 #line 168 "std-name-hint.gperf"
       {"basic_format_context", "<format>", cxx20},
-#line 434 "std-name-hint.gperf"
+#line 433 "std-name-hint.gperf"
       {"basic_stringstream", "<sstream>", cxx98},
-#line 539 "std-name-hint.gperf"
+#line 537 "std-name-hint.gperf"
       {"type_index", "<typeindex>", cxx11},
 #line 169 "std-name-hint.gperf"
       {"basic_format_parse_context", "<format>", cxx20},
 #line 160 "std-name-hint.gperf"
       {"make_exception_ptr", "<exception>", cxx11},
-#line 468 "std-name-hint.gperf"
+#line 466 "std-name-hint.gperf"
       {"basic_streambuf", "<streambuf>", cxx98},
 #line 167 "std-name-hint.gperf"
       {"basic_format_args", "<format>", cxx20},
-#line 589 "std-name-hint.gperf"
+#line 587 "std-name-hint.gperf"
       {"variant_size", "<variant>", cxx17},
 #line 407 "std-name-hint.gperf"
       {"multiset", "<set>", cxx98},
@@ -350,23 +350,23 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"recursive_timed_mutex", "<mutex>", cxx11},
 #line 399 "std-name-hint.gperf"
       {"ranges::enable_borrowed_range", "<ranges>", cxx20},
-#line 533 "std-name-hint.gperf"
+#line 531 "std-name-hint.gperf"
       {"remove_cvref", "<type_traits>", cxx20},
 #line 206 "std-name-hint.gperf"
       {"function", "<functional>", cxx11},
-#line 532 "std-name-hint.gperf"
+#line 530 "std-name-hint.gperf"
       {"negation_v", "<type_traits>", cxx17},
-#line 534 "std-name-hint.gperf"
+#line 532 "std-name-hint.gperf"
       {"remove_cvref_t", "<type_traits>", cxx20},
 #line 289 "std-name-hint.gperf"
       {"ostream_iterator", "<iterator>", cxx98},
-#line 588 "std-name-hint.gperf"
+#line 586 "std-name-hint.gperf"
       {"variant_npos", "<variant>", cxx17},
 #line 244 "std-name-hint.gperf"
       {"left", "<ios>", cxx98},
 #line 200 "std-name-hint.gperf"
       {"fstream", "<fstream>", cxx98},
-#line 591 "std-name-hint.gperf"
+#line 589 "std-name-hint.gperf"
       {"visit", "<variant>", cxx17},
 #line 208 "std-name-hint.gperf"
       {"invoke", "<functional>", cxx17},
@@ -388,7 +388,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"pointer_traits", "<memory>", cxx11},
 #line 131 "std-name-hint.gperf"
       {"invocable", "<concepts>", cxx20},
-#line 426 "std-name-hint.gperf"
+#line 425 "std-name-hint.gperf"
       {"spanstream", "<spanstream>", cxx23},
 #line 182 "std-name-hint.gperf"
       {"make_format_args", "<format>", cxx20},
@@ -400,9 +400,9 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"skipws", "<ios>", cxx98},
 #line 241 "std-name-hint.gperf"
       {"hex", "<ios>", cxx98},
-#line 568 "std-name-hint.gperf"
+#line 566 "std-name-hint.gperf"
       {"index_sequence_for", "<utility>", cxx14},
-#line 567 "std-name-hint.gperf"
+#line 565 "std-name-hint.gperf"
       {"index_sequence", "<utility>", cxx14},
 #line 350 "std-name-hint.gperf"
       {"mutex", "<mutex>", cxx11},
@@ -412,7 +412,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"weak_ptr", "<memory>", cxx11},
 #line 173 "std-name-hint.gperf"
       {"format_context", "<format>", cxx20},
-#line 451 "std-name-hint.gperf"
+#line 449 "std-name-hint.gperf"
       {"logic_error", "<stdexcept>", cxx98},
 #line 372 "std-name-hint.gperf"
       {"numbers::ln2_v", "<numbers>", cxx20},
@@ -444,11 +444,11 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"pmr::polymorphic_allocator", "<memory_resource>", cxx17},
 #line 419 "std-name-hint.gperf"
       {"basic_ospanstream", "<spanstream>", cxx23},
-#line 572 "std-name-hint.gperf"
+#line 570 "std-name-hint.gperf"
       {"make_pair", "<utility>", cxx98},
 #line 172 "std-name-hint.gperf"
       {"format_args", "<format>", cxx20},
-#line 475 "std-name-hint.gperf"
+#line 473 "std-name-hint.gperf"
       {"stof", "<string>", cxx11},
 #line 339 "std-name-hint.gperf"
       {"pmr::monotonic_buffer_resource", "<memory_resource>", cxx17},
@@ -456,9 +456,9 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"pmr::pool_options", "<memory_resource>", cxx17},
 #line 256 "std-name-hint.gperf"
       {"showpoint", "<ios>", cxx98},
-#line 446 "std-name-hint.gperf"
+#line 444 "std-name-hint.gperf"
       {"stacktrace", "<stacktrace>", cxx23},
-#line 590 "std-name-hint.gperf"
+#line 588 "std-name-hint.gperf"
       {"variant_size_v", "<variant>", cxx17},
 #line 212 "std-name-hint.gperf"
       {"reference_wrapper", "<functional>", cxx11},
@@ -466,19 +466,19 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"cerr", "<iostream>", cxx98},
 #line 300 "std-name-hint.gperf"
       {"align", "<memory>", cxx11},
-#line 438 "std-name-hint.gperf"
+#line 436 "std-name-hint.gperf"
       {"stringbuf", "<sstream>", cxx98},
-#line 469 "std-name-hint.gperf"
+#line 467 "std-name-hint.gperf"
       {"streambuf", "<streambuf>", cxx98},
 #line 306 "std-name-hint.gperf"
       {"allocator_traits", "<memory>", cxx11},
 #line 183 "std-name-hint.gperf"
       {"make_wformat_args", "<format>", cxx20},
-#line 584 "std-name-hint.gperf"
+#line 582 "std-name-hint.gperf"
       {"monostate", "<variant>", cxx17},
 #line 387 "std-name-hint.gperf"
       {"flush", "<ostream>", cxx98},
-#line 527 "std-name-hint.gperf"
+#line 525 "std-name-hint.gperf"
       {"enable_if", "<type_traits>", cxx11},
 #line 352 "std-name-hint.gperf"
       {"recursive_mutex", "<mutex>", cxx11},
@@ -490,15 +490,15 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"pmr::memory_resource", "<memory_resource>", cxx17},
 #line 124 "std-name-hint.gperf"
       {"equality_comparable_with", "<concepts>", cxx20},
-#line 493 "std-name-hint.gperf"
+#line 491 "std-name-hint.gperf"
       {"errc", "<system_error>", cxx11},
 #line 344 "std-name-hint.gperf"
       {"pmr::synchronized_pool_resource", "<memory_resource>", cxx17},
 #line 385 "std-name-hint.gperf"
       {"endl", "<ostream>", cxx98},
-#line 495 "std-name-hint.gperf"
+#line 493 "std-name-hint.gperf"
       {"error_code", "<system_error>", cxx11},
-#line 528 "std-name-hint.gperf"
+#line 526 "std-name-hint.gperf"
       {"enable_if_t", "<type_traits>", cxx14},
 #line 390 "std-name-hint.gperf"
       {"ostream", "<ostream>", cxx98},
@@ -508,27 +508,27 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"numbers::log10e_v", "<numbers>", cxx20},
 #line 364 "std-name-hint.gperf"
       {"nothrow_t", "<new>", cxx98},
-#line 512 "std-name-hint.gperf"
+#line 510 "std-name-hint.gperf"
       {"ignore", "<tuple>", cxx11},
 #line 360 "std-name-hint.gperf"
       {"hardware_constructive_interference_size", "<new>", cxx17},
 #line 396 "std-name-hint.gperf"
       {"priority_queue", "<queue>", cxx98},
-#line 424 "std-name-hint.gperf"
+#line 423 "std-name-hint.gperf"
       {"ospanstream", "<spanstream>", cxx23},
 #line 316 "std-name-hint.gperf"
       {"enable_shared_from_this", "<memory>", cxx11},
 #line 265 "std-name-hint.gperf"
       {"cout", "<iostream>", cxx98},
-#line 552 "std-name-hint.gperf"
+#line 550 "std-name-hint.gperf"
       {"cmp_greater", "<utility>", cxx20},
-#line 490 "std-name-hint.gperf"
+#line 488 "std-name-hint.gperf"
       {"basic_string_view", "<string_view>", cxx17},
 #line 249 "std-name-hint.gperf"
       {"noskipws", "<ios>", cxx98},
 #line 177 "std-name-hint.gperf"
       {"format_to", "<format>", cxx20},
-#line 502 "std-name-hint.gperf"
+#line 500 "std-name-hint.gperf"
       {"make_error_code", "<system_error>", cxx11},
 #line 174 "std-name-hint.gperf"
       {"format_error", "<format>", cxx20},
@@ -542,7 +542,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"hexfloat", "<ios>", cxx11},
 #line 326 "std-name-hint.gperf"
       {"shared_ptr", "<memory>", cxx11},
-#line 569 "std-name-hint.gperf"
+#line 567 "std-name-hint.gperf"
       {"integer_sequence", "<utility>", cxx14},
 #line 271 "std-name-hint.gperf"
       {"istream", "<istream>", cxx98},
@@ -552,19 +552,17 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"unitbuf", "<ios>", cxx98},
 #line 294 "std-name-hint.gperf"
       {"list", "<list>", cxx98},
-#line 554 "std-name-hint.gperf"
+#line 552 "std-name-hint.gperf"
       {"cmp_less", "<utility>", cxx20},
 #line 422 "std-name-hint.gperf"
       {"ispanstream", "<spanstream>", cxx23},
-#line 423 "std-name-hint.gperf"
-      {"ispanstream", "<spanstream>", cxx23},
-#line 470 "std-name-hint.gperf"
+#line 468 "std-name-hint.gperf"
       {"wstreambuf", "<streambuf>", cxx98},
-#line 432 "std-name-hint.gperf"
+#line 431 "std-name-hint.gperf"
       {"basic_ostringstream", "<sstream>", cxx98},
-#line 503 "std-name-hint.gperf"
+#line 501 "std-name-hint.gperf"
       {"make_error_condition", "<system_error>", cxx11},
-#line 570 "std-name-hint.gperf"
+#line 568 "std-name-hint.gperf"
       {"make_index_sequence", "<utility>", cxx14},
 #line 405 "std-name-hint.gperf"
       {"counting_semaphore", "<semaphore>", cxx20},
@@ -578,17 +576,17 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"const_pointer_cast", "<memory>", cxx11},
 #line 45 "std-name-hint.gperf"
       {"make_any", "<any>", cxx17},
-#line 465 "std-name-hint.gperf"
+#line 463 "std-name-hint.gperf"
       {"stop_source", "<stop_token>", cxx20},
-#line 548 "std-name-hint.gperf"
+#line 546 "std-name-hint.gperf"
       {"unordered_set", "<unordered_set>", cxx11},
-#line 583 "std-name-hint.gperf"
+#line 581 "std-name-hint.gperf"
       {"holds_alternative", "<variant>", cxx17},
-#line 514 "std-name-hint.gperf"
+#line 512 "std-name-hint.gperf"
       {"make_tuple", "<tuple>", cxx11},
 #line 47 "std-name-hint.gperf"
       {"array", "<array>", cxx11},
-#line 517 "std-name-hint.gperf"
+#line 515 "std-name-hint.gperf"
       {"tuple_cat", "<tuple>", cxx11},
 #line 323 "std-name-hint.gperf"
       {"owner_less", "<memory>", cxx11},
@@ -598,15 +596,15 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"exception_ptr", "<exception>", cxx11},
 #line 207 "std-name-hint.gperf"
       {"hash", "<functional>", cxx11},
-#line 521 "std-name-hint.gperf"
+#line 519 "std-name-hint.gperf"
       {"tuple_size_v", "<tuple>", cxx17},
-#line 431 "std-name-hint.gperf"
+#line 430 "std-name-hint.gperf"
       {"basic_istringstream", "<sstream>", cxx98},
 #line 153 "std-name-hint.gperf"
       {"uintptr_t", "<cstdint>", cxx11},
-#line 476 "std-name-hint.gperf"
+#line 474 "std-name-hint.gperf"
       {"stoi", "<string>", cxx11},
-#line 466 "std-name-hint.gperf"
+#line 464 "std-name-hint.gperf"
       {"stop_token", "<stop_token>", cxx20},
 #line 151 "std-name-hint.gperf"
       {"uint_least8_t", "<cstdint>", cxx11},
@@ -622,7 +620,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"shared_mutex", "<shared_mutex>", cxx17},
 #line 375 "std-name-hint.gperf"
       {"numbers::phi_v", "<numbers>", cxx20},
-#line 499 "std-name-hint.gperf"
+#line 497 "std-name-hint.gperf"
       {"is_error_code_enum_v", "<system_error>", cxx17},
 #line 155 "std-name-hint.gperf"
       {"deque", "<deque>", cxx98},
@@ -630,7 +628,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"shared_timed_mutex", "<shared_mutex>", cxx14},
 #line 290 "std-name-hint.gperf"
       {"ostreambuf_iterator", "<iterator>", cxx98},
-#line 501 "std-name-hint.gperf"
+#line 499 "std-name-hint.gperf"
       {"is_error_condition_enum_v", "<system_error>", cxx17},
 #line 148 "std-name-hint.gperf"
       {"uint_least16_t", "<cstdint>", cxx11},
@@ -640,7 +638,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"numbers::e_v", "<numbers>", cxx20},
 #line 209 "std-name-hint.gperf"
       {"invoke_r", "<functional>", cxx23},
-#line 441 "std-name-hint.gperf"
+#line 439 "std-name-hint.gperf"
       {"wostringstream", "<sstream>", cxx98},
 #line 122 "std-name-hint.gperf"
       {"copy_constructible", "<concepts>", cxx20},
@@ -650,13 +648,13 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"convertible_to", "<concepts>", cxx20},
 #line 234 "std-name-hint.gperf"
       {"setprecision", "<iomanip>", cxx98},
-#line 498 "std-name-hint.gperf"
+#line 496 "std-name-hint.gperf"
       {"is_error_code_enum", "<system_error>", cxx11},
-#line 453 "std-name-hint.gperf"
+#line 451 "std-name-hint.gperf"
       {"overflow_error", "<stdexcept>", cxx98},
 #line 414 "std-name-hint.gperf"
       {"source_location", "<source_location>", cxx20},
-#line 500 "std-name-hint.gperf"
+#line 498 "std-name-hint.gperf"
       {"is_error_condition_enum", "<system_error>", cxx11},
 #line 400 "std-name-hint.gperf"
       {"ranges::enable_view", "<ranges>", cxx20},
@@ -672,7 +670,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"chrono::parse", "<chrono>", cxx20},
 #line 285 "std-name-hint.gperf"
       {"istreambuf_iterator", "<iterator>", cxx98},
-#line 473 "std-name-hint.gperf"
+#line 471 "std-name-hint.gperf"
       {"char_traits", "<string>", cxx98},
 #line 263 "std-name-hint.gperf"
       {"cin", "<iostream>", cxx98},
@@ -692,37 +690,37 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"chrono::get_tzdb", "<chrono>", cxx20},
 #line 302 "std-name-hint.gperf"
       {"allocate_shared_for_overwrite", "<memory>", cxx20},
-#line 547 "std-name-hint.gperf"
+#line 545 "std-name-hint.gperf"
       {"unordered_multiset", "<unordered_set>", cxx11},
 #line 194 "std-name-hint.gperf"
       {"forward_list", "<forward_list>", cxx11},
-#line 496 "std-name-hint.gperf"
+#line 494 "std-name-hint.gperf"
       {"error_condition", "<system_error>", cxx11},
-#line 542 "std-name-hint.gperf"
+#line 540 "std-name-hint.gperf"
       {"bad_typeid", "<typeinfo>", cxx98},
 #line 60 "std-name-hint.gperf"
       {"chrono::duration", "<chrono>", cxx11},
-#line 510 "std-name-hint.gperf"
+#line 508 "std-name-hint.gperf"
       {"apply", "<tuple>", cxx17},
 #line 95 "std-name-hint.gperf"
       {"chrono::zoned_time", "<chrono>", cxx20},
-#line 477 "std-name-hint.gperf"
+#line 475 "std-name-hint.gperf"
       {"stol", "<string>", cxx11},
-#line 479 "std-name-hint.gperf"
+#line 477 "std-name-hint.gperf"
       {"stoll", "<string>", cxx11},
-#line 480 "std-name-hint.gperf"
+#line 478 "std-name-hint.gperf"
       {"stoul", "<string>", cxx11},
-#line 481 "std-name-hint.gperf"
+#line 479 "std-name-hint.gperf"
       {"stoull", "<string>", cxx11},
 #line 220 "std-name-hint.gperf"
       {"packaged_task", "<future>", cxx11},
-#line 544 "std-name-hint.gperf"
+#line 542 "std-name-hint.gperf"
       {"unordered_map", "<unordered_map>", cxx11},
 #line 77 "std-name-hint.gperf"
       {"chrono::months", "<chrono>", cxx20},
 #line 76 "std-name-hint.gperf"
       {"chrono::minutes", "<chrono>", cxx11},
-#line 545 "std-name-hint.gperf"
+#line 543 "std-name-hint.gperf"
       {"unordered_multimap", "<unordered_map>", cxx11},
 #line 78 "std-name-hint.gperf"
       {"chrono::nanoseconds", "<chrono>", cxx11},
@@ -732,21 +730,21 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"binary_semaphore", "<semaphore>", cxx20},
 #line 281 "std-name-hint.gperf"
       {"end", "<iterator>", cxx11},
-#line 429 "std-name-hint.gperf"
+#line 428 "std-name-hint.gperf"
       {"wspanbuf", "<spanstream>", cxx23},
 #line 252 "std-name-hint.gperf"
       {"oct", "<ios>", cxx98},
 #line 245 "std-name-hint.gperf"
       {"noboolalpha", "<ios>", cxx98},
-#line 450 "std-name-hint.gperf"
+#line 448 "std-name-hint.gperf"
       {"length_error", "<stdexcept>", cxx98},
-#line 560 "std-name-hint.gperf"
+#line 558 "std-name-hint.gperf"
       {"in_place", "<utility>", cxx17},
-#line 563 "std-name-hint.gperf"
+#line 561 "std-name-hint.gperf"
       {"in_place_t", "<utility>", cxx17},
 #line 384 "std-name-hint.gperf"
       {"emit_on_flush", "<ostream>", cxx20},
-#line 440 "std-name-hint.gperf"
+#line 438 "std-name-hint.gperf"
       {"wistringstream", "<sstream>", cxx98},
 #line 327 "std-name-hint.gperf"
       {"static_pointer_cast", "<memory>", cxx11},
@@ -762,7 +760,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"wostream", "<ostream>", cxx98},
 #line 348 "std-name-hint.gperf"
       {"lock", "<mutex>", cxx11},
-#line 504 "std-name-hint.gperf"
+#line 502 "std-name-hint.gperf"
       {"system_category", "<system_error>", cxx11},
 #line 128 "std-name-hint.gperf"
       {"copyable", "<concepts>", cxx20},
@@ -770,21 +768,21 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"condition_variable", "<condition_variable>", cxx11},
 #line 240 "std-name-hint.gperf"
       {"fixed", "<ios>", cxx98},
-#line 553 "std-name-hint.gperf"
+#line 551 "std-name-hint.gperf"
       {"cmp_greater_equal", "<utility>", cxx20},
-#line 508 "std-name-hint.gperf"
+#line 506 "std-name-hint.gperf"
       {"thread", "<thread>", cxx11},
-#line 439 "std-name-hint.gperf"
+#line 437 "std-name-hint.gperf"
       {"stringstream", "<sstream>", cxx98},
 #line 58 "std-name-hint.gperf"
       {"chrono::clock_cast", "<chrono>", cxx20},
-#line 579 "std-name-hint.gperf"
+#line 577 "std-name-hint.gperf"
       {"unreachable", "<utility>", cxx23},
-#line 428 "std-name-hint.gperf"
+#line 427 "std-name-hint.gperf"
       {"wospanstream", "<spanstream>", cxx23},
 #line 330 "std-name-hint.gperf"
       {"unique_ptr", "<memory>", cxx11},
-#line 562 "std-name-hint.gperf"
+#line 560 "std-name-hint.gperf"
       {"in_place_index_t", "<utility>", cxx17},
 #line 363 "std-name-hint.gperf"
       {"nothrow", "<new>", cxx98},
@@ -800,7 +798,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"uint_fast32_t", "<cstdint>", cxx11},
 #line 87 "std-name-hint.gperf"
       {"chrono::time_point", "<chrono>", cxx11},
-#line 444 "std-name-hint.gperf"
+#line 442 "std-name-hint.gperf"
       {"stack", "<stack>", cxx98},
 #line 215 "std-name-hint.gperf"
       {"unwrap_reference", "<functional>", cxx20},
@@ -814,7 +812,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"optional", "<optional>", cxx17},
 #line 112 "std-name-hint.gperf"
       {"signed_integral", "<concepts>", cxx20},
-#line 456 "std-name-hint.gperf"
+#line 454 "std-name-hint.gperf"
       {"underflow_error", "<stdexcept>", cxx98},
 #line 239 "std-name-hint.gperf"
       {"defaultfloat", "<ios>", cxx11},
@@ -832,19 +830,19 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"uninitialized_construct_using_allocator", "<memory>", cxx20},
 #line 81 "std-name-hint.gperf"
       {"chrono::remote_version", "<chrono>", cxx20},
-#line 458 "std-name-hint.gperf"
+#line 456 "std-name-hint.gperf"
       {"bfloat16_t", "<stdfloat>", cxx23},
-#line 576 "std-name-hint.gperf"
+#line 574 "std-name-hint.gperf"
       {"piecewise_construct", "<utility>", cxx11},
-#line 577 "std-name-hint.gperf"
+#line 575 "std-name-hint.gperf"
       {"piecewise_construct_t", "<utility>", cxx11},
 #line 278 "std-name-hint.gperf"
       {"const_iterator", "<iterator>", cxx23},
-#line 484 "std-name-hint.gperf"
+#line 482 "std-name-hint.gperf"
       {"to_wstring", "<string>", cxx17},
 #line 356 "std-name-hint.gperf"
       {"try_lock", "<mutex>", cxx11},
-#line 561 "std-name-hint.gperf"
+#line 559 "std-name-hint.gperf"
       {"in_place_index", "<utility>", cxx17},
 #line 51 "std-name-hint.gperf"
       {"atomic_ref", "<atomic>", cxx20},
@@ -862,7 +860,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"uncaught_exceptions", "<exception>", cxx17},
 #line 331 "std-name-hint.gperf"
       {"uses_allocator", "<memory>", cxx11},
-#line 472 "std-name-hint.gperf"
+#line 470 "std-name-hint.gperf"
       {"basic_string", "<string>", cxx98},
 #line 311 "std-name-hint.gperf"
       {"default_delete", "<memory>", cxx11},
@@ -870,17 +868,17 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"expected", "<expected>", cxx23},
 #line 313 "std-name-hint.gperf"
       {"destroy_at", "<memory>", cxx20},
-#line 536 "std-name-hint.gperf"
+#line 534 "std-name-hint.gperf"
       {"type_identity_t", "<type_traits>", cxx20},
 #line 63 "std-name-hint.gperf"
       {"chrono::from_stream", "<chrono>", cxx20},
-#line 427 "std-name-hint.gperf"
+#line 426 "std-name-hint.gperf"
       {"wispanstream", "<spanstream>", cxx23},
 #line 52 "std-name-hint.gperf"
       {"atomic_signed_lock_free", "<atomic>", cxx11},
 #line 266 "std-name-hint.gperf"
       {"wcerr", "<iostream>", cxx98},
-#line 511 "std-name-hint.gperf"
+#line 509 "std-name-hint.gperf"
       {"forward_as_tuple", "<tuple>", cxx11},
 #line 187 "std-name-hint.gperf"
       {"vformat", "<format>", cxx20},
@@ -892,25 +890,25 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"destroy_n", "<memory>", cxx20},
 #line 226 "std-name-hint.gperf"
       {"get_time", "<iomanip>", cxx11},
-#line 555 "std-name-hint.gperf"
+#line 553 "std-name-hint.gperf"
       {"cmp_less_equal", "<utility>", cxx20},
 #line 80 "std-name-hint.gperf"
       {"chrono::reload_tzdb", "<chrono>", cxx20},
-#line 523 "std-name-hint.gperf"
+#line 521 "std-name-hint.gperf"
       {"conjunction", "<type_traits>", cxx17},
 #line 75 "std-name-hint.gperf"
       {"chrono::milliseconds", "<chrono>", cxx11},
 #line 59 "std-name-hint.gperf"
       {"chrono::days", "<chrono>", cxx20},
-#line 474 "std-name-hint.gperf"
+#line 472 "std-name-hint.gperf"
       {"stod", "<string>", cxx11},
-#line 478 "std-name-hint.gperf"
+#line 476 "std-name-hint.gperf"
       {"stold", "<string>", cxx11},
 #line 267 "std-name-hint.gperf"
       {"wcin", "<iostream>", cxx98},
-#line 529 "std-name-hint.gperf"
+#line 527 "std-name-hint.gperf"
       {"invoke_result", "<type_traits>", cxx17},
-#line 530 "std-name-hint.gperf"
+#line 528 "std-name-hint.gperf"
       {"invoke_result_t", "<type_traits>", cxx17},
 #line 50 "std-name-hint.gperf"
       {"atomic", "<atomic>", cxx11},
@@ -930,17 +928,17 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"chrono::hours", "<chrono>", cxx11},
 #line 109 "std-name-hint.gperf"
       {"common_reference_with", "<concepts>", cxx20},
-#line 483 "std-name-hint.gperf"
+#line 481 "std-name-hint.gperf"
       {"to_string", "<string>", cxx17},
-#line 524 "std-name-hint.gperf"
+#line 522 "std-name-hint.gperf"
       {"conjunction_v", "<type_traits>", cxx17},
-#line 578 "std-name-hint.gperf"
+#line 576 "std-name-hint.gperf"
       {"to_underlying", "<utility>", cxx23},
 #line 402 "std-name-hint.gperf"
       {"scoped_allocator_adaptor", "<scoped_allocator>", cxx11},
 #line 310 "std-name-hint.gperf"
       {"construct_at", "<memory>", cxx20},
-#line 564 "std-name-hint.gperf"
+#line 562 "std-name-hint.gperf"
       {"in_place_type", "<utility>", cxx17},
 #line 320 "std-name-hint.gperf"
       {"make_shared_for_overwrite", "<memory>", cxx20},
@@ -952,15 +950,15 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"chrono::local_t", "<chrono>", cxx20},
 #line 170 "std-name-hint.gperf"
       {"basic_format_string", "<format>", cxx20},
-#line 565 "std-name-hint.gperf"
+#line 563 "std-name-hint.gperf"
       {"in_place_type_t", "<utility>", cxx17},
 #line 279 "std-name-hint.gperf"
       {"counted_iterator", "<iterator>", cxx20},
-#line 448 "std-name-hint.gperf"
+#line 446 "std-name-hint.gperf"
       {"domain_error", "<stdexcept>", cxx98},
 #line 84 "std-name-hint.gperf"
       {"chrono::steady_clock", "<chrono>", cxx11},
-#line 580 "std-name-hint.gperf"
+#line 578 "std-name-hint.gperf"
       {"observable_checkpoint", "<utility>", cxx26},
 #line 188 "std-name-hint.gperf"
       {"vformat_to", "<format>", cxx20},
@@ -982,51 +980,49 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"unwrap_ref_decay_t", "<functional>", cxx20},
 #line 136 "std-name-hint.gperf"
       {"strict_weak_order", "<concepts>", cxx20},
-#line 437 "std-name-hint.gperf"
+#line 435 "std-name-hint.gperf"
       {"ostringstream", "<sstream>", cxx98},
 #line 317 "std-name-hint.gperf"
       {"get_deleter", "<memory>", cxx11},
 #line 367 "std-name-hint.gperf"
       {"numbers::egamma_v", "<numbers>", cxx20},
-#line 566 "std-name-hint.gperf"
+#line 564 "std-name-hint.gperf"
       {"in_range", "<utility>", cxx20},
-#line 558 "std-name-hint.gperf"
+#line 556 "std-name-hint.gperf"
       {"exchange", "<utility>", cxx14},
-#line 551 "std-name-hint.gperf"
+#line 549 "std-name-hint.gperf"
       {"cmp_equal", "<utility>", cxx20},
-#line 556 "std-name-hint.gperf"
+#line 554 "std-name-hint.gperf"
       {"cmp_not_equal", "<utility>", cxx20},
-#line 435 "std-name-hint.gperf"
-      {"istringstream", "<sstream>", cxx98},
-#line 436 "std-name-hint.gperf"
+#line 434 "std-name-hint.gperf"
       {"istringstream", "<sstream>", cxx98},
-#line 442 "std-name-hint.gperf"
+#line 440 "std-name-hint.gperf"
       {"wstringbuf", "<sstream>", cxx98},
 #line 225 "std-name-hint.gperf"
       {"get_money", "<iomanip>", cxx11},
 #line 191 "std-name-hint.gperf"
       {"wformat_parse_context", "<format>", cxx20},
-#line 482 "std-name-hint.gperf"
+#line 480 "std-name-hint.gperf"
       {"string", "<string>", cxx98},
 #line 280 "std-name-hint.gperf"
       {"distance", "<iterator>", cxx98},
-#line 557 "std-name-hint.gperf"
+#line 555 "std-name-hint.gperf"
       {"declval", "<utility>", cxx11},
 #line 254 "std-name-hint.gperf"
       {"scientific", "<ios>", cxx98},
 #line 98 "std-name-hint.gperf"
       {"strong_equality", "<compare>", cxx20},
-#line 487 "std-name-hint.gperf"
+#line 485 "std-name-hint.gperf"
       {"u8string", "<string>", cxx20},
 #line 190 "std-name-hint.gperf"
       {"wformat_context", "<format>", cxx20},
 #line 312 "std-name-hint.gperf"
       {"destroy", "<memory>", cxx20},
-#line 559 "std-name-hint.gperf"
+#line 557 "std-name-hint.gperf"
       {"forward", "<utility>", cxx11},
-#line 535 "std-name-hint.gperf"
+#line 533 "std-name-hint.gperf"
       {"type_identity", "<type_traits>", cxx20},
-#line 464 "std-name-hint.gperf"
+#line 462 "std-name-hint.gperf"
       {"stop_callback", "<stop_token>", cxx20},
 #line 86 "std-name-hint.gperf"
       {"chrono::tai_clock", "<chrono>", cxx20},
@@ -1038,7 +1034,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"chrono::tzdb", "<chrono>", cxx20},
 #line 126 "std-name-hint.gperf"
       {"totally_ordered_with", "<concepts>", cxx20},
-#line 525 "std-name-hint.gperf"
+#line 523 "std-name-hint.gperf"
       {"disjunction", "<type_traits>", cxx17},
 #line 110 "std-name-hint.gperf"
       {"common_with", "<concepts>", cxx20},
@@ -1058,23 +1054,23 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"weak_ordering", "<compare>", cxx20},
 #line 201 "std-name-hint.gperf"
       {"ifstream", "<fstream>", cxx98},
-#line 452 "std-name-hint.gperf"
+#line 450 "std-name-hint.gperf"
       {"out_of_range", "<stdexcept>", cxx98},
 #line 264 "std-name-hint.gperf"
       {"clog", "<iostream>", cxx98},
 #line 62 "std-name-hint.gperf"
       {"chrono::file_clock", "<chrono>", cxx20},
-#line 526 "std-name-hint.gperf"
+#line 524 "std-name-hint.gperf"
       {"disjunction_v", "<type_traits>", cxx17},
-#line 485 "std-name-hint.gperf"
+#line 483 "std-name-hint.gperf"
       {"u16string", "<string>", cxx11},
 #line 351 "std-name-hint.gperf"
       {"once_flag", "<mutex>", cxx11},
-#line 491 "std-name-hint.gperf"
+#line 489 "std-name-hint.gperf"
       {"string_view", "<string_view>", cxx17},
 #line 304 "std-name-hint.gperf"
       {"allocator_arg", "<memory>", cxx11},
-#line 486 "std-name-hint.gperf"
+#line 484 "std-name-hint.gperf"
       {"u32string", "<string>", cxx11},
 #line 213 "std-name-hint.gperf"
       {"unwrap_ref_decay", "<functional>", cxx20},
@@ -1086,11 +1082,11 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"derived_from", "<concepts>", cxx20},
 #line 99 "std-name-hint.gperf"
       {"strong_ordering", "<compare>", cxx20},
-#line 497 "std-name-hint.gperf"
+#line 495 "std-name-hint.gperf"
       {"generic_category", "<system_error>", cxx11},
 #line 125 "std-name-hint.gperf"
       {"totally_ordered", "<concepts>", cxx20},
-#line 494 "std-name-hint.gperf"
+#line 492 "std-name-hint.gperf"
       {"error_category", "<system_error>", cxx11},
 #line 82 "std-name-hint.gperf"
       {"chrono::round", "<chrono>", cxx17},
@@ -1098,15 +1094,15 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"unique_lock", "<mutex>", cxx11},
 #line 319 "std-name-hint.gperf"
       {"make_shared", "<memory>", cxx11},
-#line 507 "std-name-hint.gperf"
+#line 505 "std-name-hint.gperf"
       {"this_thread", "<thread>", cxx11},
-#line 449 "std-name-hint.gperf"
+#line 447 "std-name-hint.gperf"
       {"invalid_argument", "<stdexcept>", cxx98},
 #line 354 "std-name-hint.gperf"
       {"scoped_lock", "<mutex>", cxx17},
 #line 268 "std-name-hint.gperf"
       {"wclog", "<iostream>", cxx98},
-#line 506 "std-name-hint.gperf"
+#line 504 "std-name-hint.gperf"
       {"jthread", "<thread>", cxx20},
 #line 97 "std-name-hint.gperf"
       {"partial_ordering", "<compare>", cxx20},
@@ -1114,7 +1110,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
       {"chrono::high_resolution_clock", "<chrono>", cxx11},
 #line 307 "std-name-hint.gperf"
       {"assume_aligned", "<memory>", cxx20},
-#line 488 "std-name-hint.gperf"
+#line 486 "std-name-hint.gperf"
       {"wstring", "<string>", cxx98},
 #line 192 "std-name-hint.gperf"
       {"wformat_string", "<format>", cxx20},
@@ -1144,7 +1140,7 @@ std_name_hint_lookup::find (const char *str, size_t len)
          -1,    -1,    24,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    25,    26,    27,    -1,
          -1,    -1,    28,    29,    -1,    -1,    30,
-       -630,  -457,    -2,    33,    -1,    34,    -1,
+       -628,  -455,    -2,    33,    -1,    34,    -1,
          35,    -1,    36,    -1,    -1,    -1,    -1,
          37,    -1,    38,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    39,    -1,    -1,    -1,
@@ -1186,8 +1182,8 @@ std_name_hint_lookup::find (const char *str, size_t len)
          -1,   152,   153,    -1,    -1,    -1,    -1,
          -1,    -1,   154,    -1,   155,   156,    -1,
          -1,    -1,   157,    -1,    -1,   158,    -1,
-        159,   160,    -1,    -1,    -1,  -934,    -1,
-        163,   164,    -1,   165,  -327,    -2,    -1,
+        159,   160,    -1,    -1,    -1,  -932,    -1,
+        163,   164,    -1,   165,  -325,    -2,    -1,
          -1,   166,    -1,    -1,    -1,    -1,   167,
         168,    -1,   169,    -1,    -1,    -1,   170,
         171,   172,   173,    -1,    -1,    -1,   174,
@@ -1197,157 +1193,157 @@ std_name_hint_lookup::find (const char *str, size_t len)
          -1,   185,    -1,   186,   187,    -1,   188,
         189,   190,   191,   192,    -1,   193,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,   194,    -1, -1006,  -293,
+         -1,    -1,    -1,   194,    -1, -1004,  -291,
          -2,    -1,    -1,    -1,   197,    -1,    -1,
         198,   199,   200,   201,    -1,    -1,    -1,
         202,   203,    -1,    -1,    -1,    -1,   204,
-         -1,    -1, -1031,  -283,    -2,    -1,   207,
-         -1,    -1,    -1,   208,   209,    -1,    -1,
-         -1,   210,    -1,    -1,    -1,   211,    -1,
-        212,    -1,    -1,   213,    -1,    -1,   214,
-         -1,   215,    -1,   216,   217,    -1,   218,
-         -1,    -1,   219,    -1,    -1,    -1,   220,
-         -1,   221,    -1,   222,   223,   224,    -1,
-         -1,    -1,   225,    -1,   226,    -1,    -1,
-         -1,    -1,   227,    -1,   228,    -1,    -1,
-         -1,   229,   230,    -1,    -1,    -1,    -1,
-         -1,   231,    -1,   232,   233,    -1,    -1,
-         -1,    -1,   234,    -1,   235,   236,   237,
-        238,    -1,   239,    -1,   240,   241,   242,
-        243,    -1,    -1,   244,    -1,   245,    -1,
-        246,   247,   248,    -1,    -1,    -1,   249,
-         -1,    -1,    -1,    -1,   250,   251,    -1,
-         -1,    -1,    -1,    -1,    -1,    -1,   252,
-        253,   254,   255,    -1,    -1,   256,   257,
-        258,    -1,   259,   260,    -1,    -1,    -1,
-        261,    -1,    -1,    -1,    -1,    -1,   262,
-        263,    -1,   264,   265,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,    -1,   266,    -1,
-        267,    -1,   268,    -1,    -1,    -1,   269,
-         -1,   270,    -1,   271,    -1,    -1,   272,
-         -1,   273,    -1,    -1,    -1,    -1,   274,
-        275,   276,    -1,   277,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,    -1,   278,    -1,
-         -1,    -1,    -1,    -1,   279,   280,   281,
-      -1226,   284,  -206,    -2,    -1,    -1,    -1,
-         -1,   285,    -1,    -1,    -1,    -1,   286,
-        287,   288,    -1,    -1,   289,   290,   291,
-         -1,    -1,    -1,    -1,   292,    -1,    -1,
-         -1,    -1,   293,    -1,    -1,   294,    -1,
-        295,   296,   297,   298,    -1,    -1,    -1,
-         -1,    -1,    -1,   299,    -1,    -1,    -1,
-         -1,    -1,    -1,   300,   301,   302,    -1,
-         -1,    -1,    -1,   303,   304,    -1,    -1,
-        305,   306,    -1,    -1,    -1,   307,    -1,
-         -1,    -1,    -1,    -1,   308,    -1,    -1,
-        309,   310,    -1,    -1,    -1,    -1,   311,
-         -1,    -1,   312,   313,   314,    -1,    -1,
-         -1,   315,   316,    -1,   317,    -1,   318,
-         -1,    -1,   319,   320,   321,   322,    -1,
-        323,    -1,   324,   325,    -1,    -1,    -1,
-        326,   327,    -1,   328,   329,    -1,   330,
-         -1,    -1,   331,    -1,   332,    -1,    -1,
-         -1,    -1,   333,   334,   335,    -1,    -1,
-         -1,   336,    -1,    -1,   337,   338,    -1,
-         -1,    -1,    -1, -1368,  -149,    -2,    -1,
-        341,    -1,    -1,    -1,    -1,    -1,    -1,
-        342,    -1,    -1,   343,    -1,    -1,    -1,
-         -1,   344,   345,    -1,   346,    -1,    -1,
-         -1,   347,    -1,    -1,   348,   349,    -1,
-         -1,    -1,    -1,    -1,   350,   351,    -1,
-        352,   353,    -1,    -1,    -1,    -1,   354,
-         -1,   355,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,   356,    -1,   357,    -1,
-         -1,    -1,    -1,    -1,   358,    -1,    -1,
-         -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,    -1,   359,    -1,
-        360,   361,    -1,   362,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,   363,    -1,   364,
-         -1,   365,    -1,   366,    -1,    -1,    -1,
-        367,   368,   369,    -1,    -1,   370,    -1,
-         -1,    -1,    -1,   371,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,    -1,    -1,    -1,
-        372,    -1,   373,    -1,    -1,    -1,   374,
-         -1,    -1,    -1,    -1,   375,    -1,   376,
-         -1,    -1,    -1,   377,    -1,    -1,    -1,
-        378,    -1,   379,   380,    -1,    -1,    -1,
-        381,    -1,   382,    -1,   383,   384,    -1,
-         -1,   385,    -1,    -1,    -1,    -1,    -1,
-        386,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,    -1,   387,   388,
-         -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,   389,   390,    -1,
+         -1,    -1,   205,    -1,    -1,    -1,   206,
+         -1,    -1,    -1,   207,   208,    -1,    -1,
+         -1,   209,    -1,    -1,    -1,   210,    -1,
+        211,    -1,    -1,   212,    -1,    -1,   213,
+         -1,   214,    -1,   215,   216,    -1,   217,
+         -1,    -1,   218,    -1,    -1,    -1,   219,
+         -1,   220,    -1,   221,   222,   223,    -1,
+         -1,    -1,   224,    -1,   225,    -1,    -1,
+         -1,    -1,   226,    -1,   227,    -1,    -1,
+         -1,   228,   229,    -1,    -1,    -1,    -1,
+         -1,   230,    -1,   231,   232,    -1,    -1,
+         -1,    -1,   233,    -1,   234,   235,   236,
+        237,    -1,   238,    -1,   239,   240,   241,
+        242,    -1,    -1,   243,    -1,   244,    -1,
+        245,   246,   247,    -1,    -1,    -1,   248,
+         -1,    -1,    -1,    -1,   249,   250,    -1,
+         -1,    -1,    -1,    -1,    -1,    -1,   251,
+        252,   253,   254,    -1,    -1,   255,   256,
+        257,    -1,   258,   259,    -1,    -1,    -1,
+        260,    -1,    -1,    -1,    -1,    -1,   261,
+        262,    -1,   263,   264,    -1,    -1,    -1,
+         -1,    -1,    -1,    -1,    -1,   265,    -1,
+        266,    -1,   267,    -1,    -1,    -1,   268,
+         -1,   269,    -1,   270,    -1,    -1,   271,
+         -1,   272,    -1,    -1,    -1,    -1,   273,
+        274,   275,    -1,   276,    -1,    -1,    -1,
+         -1,    -1,    -1,    -1,    -1,   277,    -1,
+         -1,    -1,    -1,    -1,   278,   279,   280,
+      -1224,   283,  -205,    -2,    -1,    -1,    -1,
+         -1,   284,    -1,    -1,    -1,    -1,   285,
+        286,   287,    -1,    -1,   288,   289,   290,
+         -1,    -1,    -1,    -1,   291,    -1,    -1,
+         -1,    -1,   292,    -1,    -1,   293,    -1,
+        294,   295,   296,   297,    -1,    -1,    -1,
+         -1,    -1,    -1,   298,    -1,    -1,    -1,
+         -1,    -1,    -1,   299,   300,   301,    -1,
+         -1,    -1,    -1,   302,   303,    -1,    -1,
+        304,   305,    -1,    -1,    -1,   306,    -1,
+         -1,    -1,    -1,    -1,   307,    -1,    -1,
+        308,   309,    -1,    -1,    -1,    -1,   310,
+         -1,    -1,   311,   312,   313,    -1,    -1,
+         -1,   314,   315,    -1,   316,    -1,   317,
+         -1,    -1,   318,   319,   320,   321,    -1,
+        322,    -1,   323,   324,    -1,    -1,    -1,
+        325,   326,    -1,   327,   328,    -1,   329,
+         -1,    -1,   330,    -1,   331,    -1,    -1,
+         -1,    -1,   332,   333,   334,    -1,    -1,
+         -1,   335,    -1,    -1,   336,   337,    -1,
+         -1,    -1,    -1, -1366,  -148,    -2,    -1,
+        340,    -1,    -1,    -1,    -1,    -1,    -1,
+        341,    -1,    -1,   342,    -1,    -1,    -1,
+         -1,   343,   344,    -1,   345,    -1,    -1,
+         -1,   346,    -1,    -1,   347,   348,    -1,
+         -1,    -1,    -1,    -1,   349,   350,    -1,
+        351,   352,    -1,    -1,    -1,    -1,   353,
+         -1,   354,    -1,    -1,    -1,    -1,    -1,
+         -1,    -1,    -1,    -1,    -1,    -1,    -1,
+         -1,    -1,    -1,   355,    -1,   356,    -1,
+         -1,    -1,    -1,    -1,   357,    -1,    -1,
+         -1,    -1,    -1,    -1,    -1,    -1,    -1,
+         -1,    -1,    -1,    -1,    -1,   358,    -1,
+        359,   360,    -1,   361,    -1,    -1,    -1,
+         -1,    -1,    -1,    -1,   362,    -1,   363,
+         -1,   364,    -1,   365,    -1,    -1,    -1,
+        366,   367,   368,    -1,    -1,   369,    -1,
+         -1,    -1,    -1,   370,    -1,    -1,    -1,
+         -1,    -1,    -1,    -1,    -1,    -1,    -1,
+        371,    -1,   372,    -1,    -1,    -1,   373,
+         -1,    -1,    -1,    -1,   374,    -1,   375,
+         -1,    -1,    -1,   376,    -1,    -1,    -1,
+        377,    -1,   378,   379,    -1,    -1,    -1,
+        380,    -1,   381,    -1,   382,   383,    -1,
+         -1,   384,    -1,    -1,    -1,    -1,    -1,
+        385,    -1,    -1,    -1,    -1,    -1,    -1,
+         -1,    -1,    -1,    -1,    -1,   386,   387,
+         -1,    -1,    -1,    -1,    -1,    -1,    -1,
+         -1,    -1,    -1,    -1,   388,   389,    -1,
+         -1,    -1,    -1,    -1,    -1,   390,    -1,
          -1,    -1,    -1,    -1,    -1,   391,    -1,
-         -1,    -1,    -1,    -1,    -1,   392,    -1,
-         -1,    -1,    -1,    -1,   393,    -1,   394,
-         -1,    -1,    -1,    -1,    -1,    -1,   395,
-        396,   397,    -1,    -1,   398,   399,    -1,
-        400,   401,   402,   403,   404,   405,   406,
-        407,   408,   409,    -1,    -1,   410,   411,
-         -1,    -1,    -1,   412,    -1,    -1,    -1,
-         -1,   413,    -1,   414,    -1,    -1,   415,
+         -1,    -1,    -1,    -1,   392,    -1,   393,
+         -1,    -1,    -1,    -1,    -1,    -1,   394,
+        395,   396,    -1,    -1,   397,   398,    -1,
+        399,   400,   401,   402,   403,   404,   405,
+        406,   407,   408,    -1,    -1,   409,   410,
+         -1,    -1,    -1,   411,    -1,    -1,    -1,
+         -1,   412,    -1,   413,    -1,    -1,   414,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,   416,    -1,    -1,    -1,   417,    -1,
+         -1,   415,    -1,    -1,    -1,   416,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-        418,    -1,    -1,   419,    -1,    -1,   420,
+        417,    -1,    -1,   418,    -1,    -1,   419,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,   421,   422,    -1,    -1,
+         -1,    -1,    -1,   420,   421,    -1,    -1,
+         -1,    -1,    -1,    -1,   422,    -1,    -1,
          -1,    -1,    -1,    -1,   423,    -1,    -1,
-         -1,    -1,    -1,    -1,   424,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
+         -1,    -1,    -1,    -1,   424,    -1,    -1,
          -1,    -1,    -1,    -1,   425,    -1,    -1,
-         -1,    -1,    -1,    -1, -1705,   -62,    -2,
-         -1,    -1,    -1,    -1,   428,    -1,    -1,
-         -1,    -1,    -1,   429,    -1,    -1,    -1,
+         -1,    -1,    -1,    -1,   426,    -1,    -1,
+         -1,    -1,    -1,   427,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,   430,    -1,    -1,
+         -1,    -1,    -1,    -1,   428,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-        431,    -1,    -1,    -1,    -1,    -1,   432,
-         -1,    -1,    -1,    -1,   433,    -1,    -1,
-         -1,    -1,    -1,    -1,    -1,   434,    -1,
-         -1,    -1,    -1,   435,    -1,    -1,   436,
-         -1,    -1,    -1,    -1,    -1,    -1,   437,
-        438,    -1,    -1,   439,    -1,    -1,    -1,
-         -1,    -1,   440,   441,    -1,    -1,    -1,
-        442,    -1,   443,    -1,   444,    -1,    -1,
-        445,    -1,    -1,    -1,   446,    -1,    -1,
+        429,    -1,    -1,    -1,    -1,    -1,   430,
+         -1,    -1,    -1,    -1,   431,    -1,    -1,
+         -1,    -1,    -1,    -1,    -1,   432,    -1,
+         -1,    -1,    -1,   433,    -1,    -1,   434,
+         -1,    -1,    -1,    -1,    -1,    -1,   435,
+        436,    -1,    -1,   437,    -1,    -1,    -1,
+         -1,    -1,   438,   439,    -1,    -1,    -1,
+        440,    -1,   441,    -1,   442,    -1,    -1,
+        443,    -1,    -1,    -1,   444,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,    -1,    -1,   447,
-         -1,   448,    -1,    -1,    -1,    -1,    -1,
-        449,    -1,    -1,    -1,    -1,    -1,    -1,
+         -1,    -1,    -1,    -1,    -1,    -1,   445,
+         -1,   446,    -1,    -1,    -1,    -1,    -1,
+        447,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,   450,    -1,   451,    -1,
-         -1,    -1,    -1,    -1,   452,    -1,    -1,
-         -1,    -1,    -1,   453,    -1,    -1,    -1,
-         -1,    -1,   454,    -1,    -1,   455,    -1,
+         -1,    -1,    -1,   448,    -1,   449,    -1,
+         -1,    -1,    -1,    -1,   450,    -1,    -1,
+         -1,    -1,    -1,   451,    -1,    -1,    -1,
+         -1,    -1,   452,    -1,    -1,   453,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,   456,    -1,    -1,    -1,   457,    -1,
+         -1,   454,    -1,    -1,    -1,   455,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,   458,    -1,   459,   460,
-         -1,    -1,    -1,    -1,    -1,    -1,   461,
+         -1,    -1,    -1,   456,    -1,   457,   458,
+         -1,    -1,    -1,    -1,    -1,    -1,   459,
+         -1,    -1,    -1,    -1,   460,    -1,    -1,
+         -1,    -1,   461,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,   462,    -1,    -1,
-         -1,    -1,   463,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,   464,    -1,    -1,
-         -1,    -1,    -1,   465,    -1,    -1,    -1,
-         -1,    -1,    -1,   466,    -1,    -1,    -1,
+         -1,    -1,    -1,   463,    -1,    -1,    -1,
+         -1,    -1,    -1,   464,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,   467,    -1,    -1,
+         -1,    -1,    -1,    -1,   465,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,   468,    -1,    -1,    -1,   469,
+         -1,    -1,   466,    -1,    -1,    -1,   467,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,    -1,    -1,   470,
+         -1,    -1,    -1,    -1,    -1,    -1,   468,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -1356,22 +1352,22 @@ std_name_hint_lookup::find (const char *str, size_t len)
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,   471,    -1,    -1,    -1,    -1,    -1,
+         -1,   469,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,   472,    -1,   473,    -1,
+         -1,    -1,    -1,   470,    -1,   471,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,   474,    -1,    -1,    -1,    -1,
+         -1,    -1,   472,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,    -1,   475,    -1,
-         -1,   476,    -1,    -1,    -1,    -1,    -1,
+         -1,    -1,    -1,    -1,    -1,   473,    -1,
+         -1,   474,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-        477,    -1,    -1,    -1,    -1,    -1,    -1,
+        475,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -1382,14 +1378,14 @@ std_name_hint_lookup::find (const char *str, size_t len)
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,   478,    -1,    -1,
+         -1,    -1,    -1,    -1,   476,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,   479,   480,   481,    -1,
+         -1,    -1,    -1,   477,   478,   479,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,    -1,   482,    -1,
+         -1,    -1,    -1,    -1,    -1,   480,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -1404,12 +1400,12 @@ std_name_hint_lookup::find (const char *str, size_t len)
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,   483,    -1,    -1,    -1,    -1,    -1,
+         -1,   481,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,   484,    -1,    -1,    -1,
+         -1,    -1,    -1,   482,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -1417,12 +1413,12 @@ std_name_hint_lookup::find (const char *str, size_t len)
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-         -1,    -1,    -1,    -1,    -1,   485,    -1,
-         -1,    -1,    -1,    -1,    -1,   486,    -1,
+         -1,    -1,    -1,    -1,    -1,   483,    -1,
+         -1,    -1,    -1,    -1,    -1,   484,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
          -1,    -1,    -1,    -1,    -1,    -1,    -1,
-        487
+        485
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)