This fixes #713, silent bad codegen in an important C++17 feature.
The Boyer-Moore algorithm (published 1977) relies on a "delta2" table, but that paper didn't explain how to generate the table. Another paper by Knuth, Morris, and Pratt (also 1977) provided the algorithm for the delta2 table. Actually, it provided two algorithms producing tables compatible with the usage of delta2: a basic algorithm dd and an improved algorithm dd'. We implemented the latter, and properly translated it from 1-based indexing to 0-based indexing.
However, the published algorithm for dd' was incorrect! This was discovered and fixed by Rytter in 1980, which we weren't aware of until we received a bug report. While the "Rytter correction" was known in the computer science literature, I find it very curious that it isn't constantly mentioned when explaining Boyer-Moore (e.g. Wikipedia's page currently makes no mention of this).
This PR applies this 40-year-old bugfix and significantly expands our test coverage.
<functional>- Add top-level
constto_Shifts. (This is thedd'output array; I kept the name.) - Rename
_Pat_sizeto_Mxto follow the naming in the published algorithms. - Fix comment typo:
_RanItdoesn't exist, it's_RanItPat. - Add comments about the history for future programmer-archaeologists.
- Rename
_Suffix_fnto_Fx, again following the papers. Note that in the usage below, there is a semantic change:_Suffix_fnstored 0-based values, while_Fxstores 1-based values. This undoes a micro-optimization (_Suffix_fnavoided unnecessarily translating between the 0-based and 1-based domains), but with the increased usage offin the Rytter correction, I wanted greater correspondence with the published algorithms in order to verify the implementation. _Fxcan be top-levelconst(we don't reassign/reset theunique_ptr).- Obscure bugfix:
unique_ptr<T[]>usesdefault_delete<T[]>which usesdelete[], so we should usenew[]to match, not::new[]. (This makes a difference only for pathologically fancy_Difftypes.) - Change 0-based
_Idxto 1-based_Kx. - Change 0-based
_Suffixto 1-based_Tx. - Rename 1-based
_Idxto 1-based_Jx. (While the code was correct, I found it confusing that_Idxwas 0-based in other loops but 1-based in this loop.) - Note that after these changes, the code closely corresponds to the published algorithms, except that subscripting needs to adjust from 1-based to 0-based indexing.
- Implement the Rytter correction, which replaces the final loop of the KMP77 algorithm.
- For clarity and debug codegen, I extracted a repeated array access into
_Tempafter verifying that this doesn't disturb the algorithm.
- Add top-level
P0220R1_searchers/test.cpp- Add test cases to
test_boyer_moore_table2_construction()from Rytter's paper, and other repetitive patterns where the Rytter correction produces different results. Those patterns were "made from scratch" but for the results, I just used the output of the implementation and manually verified selected answers for the AB and ABC categories against my understanding of delta2's meaning (including the unused last entry, see <functional>: Boyer-Moore's delta_2 table contains an unnecessary last entry #714; I was able to understand why it's 10 for"aaaaaaaaaa", 2 for"abaabaabaa", and why it should be 1 for"ababababab"and"abcabcabc"). - Add the test case from <functional>: boyer_moore_searcher produces incorrect results #713, plus hand-selected test cases from the randomized testing below (selected for interesting-looking patterns).
- Add randomized test coverage for both Boyer-Moore and Boyer-Moore-Horspool (the latter is not known to have any bugs). This uses a fully-seeded
mt19937(for speed, instead of directly usingrandom_device). It prints out the needle/haystack for any failures, so we don't need the seed printing/reload machinery fromP0067R5_charconv/test.cpp. (I'm usingmt19937for 32-bit performance, since we don't need 64-bit values.) The randomized coverage uses alphabets from[a-b]to[a-f]; the former finds more examples of the bug being fixed here (as it's more likely to create highly repetitive patterns). Expanding the alphabet makes repetition unlikely, which is why I stop at[a-f]. The test does a few things to improve non-optimized debug performance (reusingneedleandhaystackto avoid repeated allocations, usingconst char *to avoid iterator overhead), although I didn't pursue this to the ultimate limit (e.g.uniform_int_distributionis somewhat costly and could be avoided at the expense of some bias). Finally, as with the other randomized coverage, I print out timing statistics if it takes a long time; on my i7-8700 it's tuned to take ~400 ms which seems reasonable (given the number of configurations, the performance of VMs, and the time needed for compilation).
- Add test cases to
While this changes the behavior of a function, it is ABI-safe. This doesn't require coordinated changes across functions - the rest of the Boyer-Moore machinery is unchanged, and the layout of the delta2 table is unchanged. We're simply filling it with different values. In the event of mismatch, the linker will either pick the correct or incorrect algorithm, so this can't make things any worse.