diff options
Diffstat (limited to 'vespalib/src/vespa/fastlib/text/normwordfolder.h')
| -rw-r--r-- | vespalib/src/vespa/fastlib/text/normwordfolder.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/vespalib/src/vespa/fastlib/text/normwordfolder.h b/vespalib/src/vespa/fastlib/text/normwordfolder.h index c596b0fd2b4..5a77fe73e01 100644 --- a/vespalib/src/vespa/fastlib/text/normwordfolder.h +++ b/vespalib/src/vespa/fastlib/text/normwordfolder.h @@ -35,8 +35,8 @@ public: * added together. */ static void Setup(uint32_t flags); - static ucs4_t lowercase_and_fold_ascii(ucs4_t c) noexcept { return _lowerCase[c]; } - static ucs4_t lowercase_ascii(ucs4_t c) noexcept { return _foldCase[c]; } + static ucs4_t lowercase_and_fold_ascii(ucs4_t c) noexcept { return _foldCase[c]; } + static ucs4_t lowercase_ascii(ucs4_t c) noexcept { return _lowerCase[c]; } static bool is_wordchar_ascii7bit(ucs4_t c) noexcept { return _isWord[c]; } static ucs4_t lowercase(ucs4_t c) { if (c < 767) @@ -104,20 +104,16 @@ public: switch(testchar) { case 0xc4: case 0xe4: // A/a with diaeresis + case 0xc6: + case 0xe6: // Letter/ligature AE/ae return "ae"; case 0xc5: case 0xe5: // A/a with ring return "aa"; - case 0xc6: - case 0xe6: // Letter/ligature AE/ae - return "ae"; - case 0xd6: case 0xf6: // O/o with diaeresis - return "oe"; - case 0xd8: case 0xf8: // O/o with stroke return "oe"; @@ -133,10 +129,6 @@ public: case 0xde: case 0xfe: // norse "thorn" return "th"; - - default: - return nullptr; - } } |