mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 03:45:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'journalcase' into 'master'

Browse source 
Remove dialogue related instances of getRefIdString

See merge request OpenMW/openmw!2999
This commit is contained in:
elsid 2023-05-07 14:49:49 +00:00
commit 188de0d8d4
10 changed files with 50 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
View file

@ -408,12 +408,12 @@ namespace MWDialogue
updateActorKnownTopics();
std::list<std::string> keywordList;
const auto& store = MWBase::Environment::get().getESMStore()->get<ESM::Dialogue>();
for (const auto& [topic, topicInfo] : mActorKnownTopics)
{
// does the player know the topic?
if (mKnownTopics.count(topic))
keywordList.push_back(topic.getRefIdString());
if (mKnownTopics.contains(topic))
keywordList.push_back(store.find(topic)->mStringId);
}
// sort again, because the previous sort was case-sensitive

7
apps/openmw/mwdialogue/hypertextparser.cpp
View file

@ -50,13 +50,12 @@ namespace MWDialogue
const auto& keywordSearch
= MWBase::Environment::get().getESMStore()->get<ESM::Dialogue>().getDialogIdKeywordSearch();
std::vector<KeywordSearch<std::string, int /*unused*/>::Match> matches;
std::vector<KeywordSearch<int /*unused*/>::Match> matches;
keywordSearch.highlightKeywords(text.begin(), text.end(), matches);
for (std::vector<KeywordSearch<std::string, int /*unused*/>::Match>::const_iterator it = matches.begin();
it != matches.end(); ++it)
for (const auto& match : matches)
{
tokens.emplace_back(std::string(it->mBeg, it->mEnd), Token::ImplicitKeyword);
tokens.emplace_back(std::string(match.mBeg, match.mEnd), Token::ImplicitKeyword);
}
}

45
apps/openmw/mwdialogue/keywordsearch.hpp
View file

@ -13,11 +13,11 @@
namespace MWDialogue
{
template <typename string_t, typename value_t>
template <typename value_t>
class KeywordSearch
{
public:
typedef typename string_t::const_iterator Point;
using Point = std::string::const_iterator;
struct Match
{
@ -26,11 +26,11 @@ namespace MWDialogue
value_t mValue;
};
void seed(string_t keyword, value_t value)
void seed(std::string_view keyword, value_t value)
{
if (keyword.empty())
return;
seed_impl(std::move(keyword), std::move(value), 0, mRoot);
seed_impl(keyword, std::move(value), 0, mRoot);
}
void clear()
@ -39,23 +39,21 @@ namespace MWDialogue
mRoot.mKeyword.clear();
}
bool containsKeyword(const string_t& keyword, value_t& value)
bool containsKeyword(std::string_view keyword, value_t& value)
{
typename Entry::childen_t::iterator current;
typename Entry::childen_t::iterator next;
current = mRoot.mChildren.find(Misc::StringUtils::toLower(*keyword.begin()));
auto it = keyword.begin();
auto current = mRoot.mChildren.find(Misc::StringUtils::toLower(*it));
if (current == mRoot.mChildren.end())
return false;
else if (current->second.mKeyword.size() && Misc::StringUtils::ciEqual(current->second.mKeyword, keyword))
else if (Misc::StringUtils::ciEqual(current->second.mKeyword, keyword))
{
value = current->second.mValue;
return true;
}
for (Point i = ++keyword.begin(); i != keyword.end(); ++i)
for (++it; it != keyword.end(); ++it)
{
next = current->second.mChildren.find(Misc::StringUtils::toLower(*i));
auto next = current->second.mChildren.find(Misc::StringUtils::toLower(*it));
if (next == current->second.mChildren.end())
return false;
if (Misc::StringUtils::ciEqual(next->second.mKeyword, keyword))
@ -116,14 +114,12 @@ namespace MWDialogue
// candidates first
std::reverse(candidates.begin(), candidates.end());
for (typename std::vector<std::pair<int, typename Entry::childen_t::const_iterator>>::iterator it
= candidates.begin();
it != candidates.end(); ++it)
for (const auto& [pos, c] : candidates)
{
candidate = it->second;
candidate = c;
// try to match the rest of the keyword
Point k = i + it->first;
typename string_t::const_iterator t = candidate->second.mKeyword.begin() + (k - i);
Point k = i + pos;
Point t = candidate->second.mKeyword.begin() + (k - i);
while (k != end && t != candidate->second.mKeyword.end())
{
@ -196,12 +192,12 @@ namespace MWDialogue
{
typedef std::map<wchar_t, Entry> childen_t;
string_t mKeyword;
std::string mKeyword;
value_t mValue;
childen_t mChildren;
};
void seed_impl(string_t keyword, value_t value, size_t depth, Entry& entry)
void seed_impl(std::string_view keyword, value_t value, size_t depth, Entry& entry)
{
int ch = Misc::StringUtils::toLower(keyword.at(depth));
@ -210,7 +206,7 @@ namespace MWDialogue
if (j == entry.mChildren.end())
{
entry.mChildren[ch].mValue = std::move(value);
entry.mChildren[ch].mKeyword = std::move(keyword);
entry.mChildren[ch].mKeyword = keyword;
}
else
{
@ -219,22 +215,21 @@ namespace MWDialogue
if (keyword == j->second.mKeyword)
throw std::runtime_error("duplicate keyword inserted");
value_t pushValue = j->second.mValue;
string_t pushKeyword = j->second.mKeyword;
const auto& pushKeyword = j->second.mKeyword;
if (depth >= pushKeyword.size())
throw std::runtime_error("unexpected");
if (depth + 1 < pushKeyword.size())
{
seed_impl(std::move(pushKeyword), std::move(pushValue), depth + 1, j->second);
seed_impl(pushKeyword, j->second.mValue, depth + 1, j->second);
j->second.mKeyword.clear();
}
}
if (depth + 1 == keyword.size())
j->second.mKeyword = value;
else // depth+1 < keyword.size()
seed_impl(std::move(keyword), std::move(value), depth + 1, j->second);
seed_impl(keyword, std::move(value), depth + 1, j->second);
}
}

2
apps/openmw/mwdialogue/scripttest.cpp
View file

@ -156,7 +156,7 @@ namespace MWDialogue
else
{
errorHandler.reset();
errorHandler.setContext(info.mId.getRefIdString() + " in " + topic.mId.getRefIdString());
errorHandler.setContext(info.mId.getRefIdString() + " in " + topic.mStringId);
if (!test(ptr, info, compiled, total, extensions, compilerContext, errorHandler))
Log(Debug::Error) << "Test failed for " << info.mId << " in " << topic.mId << '\n'
<< info.mResultScript;

2
apps/openmw/mwdialogue/topic.cpp
View file

@ -11,7 +11,7 @@ namespace MWDialogue
Topic::Topic(const ESM::RefId& topic)
: mTopic(topic)
, mName(MWBase::Environment::get().getESMStore()->get<ESM::Dialogue>().find(topic)->mId.getRefIdString())
, mName(MWBase::Environment::get().getESMStore()->get<ESM::Dialogue>().find(topic)->mStringId)
{
}

2
apps/openmw/mwgui/dialogue.hpp
View file

@ -108,7 +108,7 @@ namespace MWGui
void activated() override;
};
typedef MWDialogue::KeywordSearch<std::string, intptr_t> KeywordSearchT;
typedef MWDialogue::KeywordSearch<intptr_t> KeywordSearchT;
struct DialogueText
{

6
apps/openmw/mwgui/journalviewmodel.cpp
View file

@ -21,7 +21,7 @@ namespace MWGui
struct JournalViewModelImpl : JournalViewModel
{
typedef MWDialogue::KeywordSearch<std::string, intptr_t> KeywordSearchT;
typedef MWDialogue::KeywordSearch<intptr_t> KeywordSearchT;
mutable bool mKeywordSearchLoaded;
mutable KeywordSearchT mKeywordSearch;
@ -56,7 +56,7 @@ namespace MWGui
MWBase::Journal* journal = MWBase::Environment::get().getJournal();
for (MWBase::Journal::TTopicIter i = journal->topicBegin(); i != journal->topicEnd(); ++i)
mKeywordSearch.seed(i->first.getRefIdString(), intptr_t(&i->second));
mKeywordSearch.seed(i->second.getName(), intptr_t(&i->second));
mKeywordSearchLoaded = true;
}
@ -312,7 +312,7 @@ namespace MWGui
for (MWBase::Journal::TTopicIter i = journal->topicBegin(); i != journal->topicEnd(); ++i)
{
Utf8Stream stream(i->first.getRefIdString().c_str());
Utf8Stream stream(i->second.getName());
Utf8Stream::UnicodeChar first = Utf8Stream::toLowerUtf8(stream.peek());
if (first != Utf8Stream::toLowerUtf8(character))

4
apps/openmw/mwworld/store.cpp
View file

@ -1142,7 +1142,7 @@ namespace MWWorld
list.push_back(dialogue->mId);
}
const MWDialogue::KeywordSearch<std::string, int>& Store<ESM::Dialogue>::getDialogIdKeywordSearch() const
const MWDialogue::KeywordSearch<int>& Store<ESM::Dialogue>::getDialogIdKeywordSearch() const
{
if (mKeywordSearchModFlag)
{
@ -1151,7 +1151,7 @@ namespace MWWorld
std::vector<std::string> keywordList;
keywordList.reserve(getSize());
for (const auto& it : *this)
keywordList.push_back(Misc::StringUtils::lowerCase(it.mId.getRefIdString()));
keywordList.push_back(Misc::StringUtils::lowerCase(it.mStringId));
sort(keywordList.begin(), keywordList.end());
for (const auto& it : keywordList)

4
apps/openmw/mwworld/store.hpp
View file

@ -512,7 +512,7 @@ namespace MWWorld
std::vector<ESM::Dialogue*> mShared;
mutable bool mKeywordSearchModFlag;
mutable MWDialogue::KeywordSearch<std::string, int /*unused*/> mKeywordSearch;
mutable MWDialogue::KeywordSearch<int /*unused*/> mKeywordSearch;
public:
Store();
@ -535,7 +535,7 @@ namespace MWWorld
void listIdentifier(std::vector<ESM::RefId>& list) const override;
const MWDialogue::KeywordSearch<std::string, int>& getDialogIdKeywordSearch() const;
const MWDialogue::KeywordSearch<int>& getDialogIdKeywordSearch() const;
};
template <>

28
apps/openmw_test_suite/mwdialogue/test_keywordsearch.cpp
View file

@ -12,14 +12,14 @@ protected:
TEST_F(KeywordSearchTest, keyword_test_conflict_resolution)
{
// test to make sure the longest keyword in a chain of conflicting keywords gets chosen
MWDialogue::KeywordSearch<std::string, int> search;
MWDialogue::KeywordSearch<int> search;
search.seed("foo bar", 0);
search.seed("bar lock", 0);
search.seed("lock switch", 0);
std::string text = "foo bar lock switch";
std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
std::vector<MWDialogue::KeywordSearch<int>::Match> matches;
search.highlightKeywords(text.begin(), text.end(), matches);
// Should contain: "foo bar", "lock switch"
@ -30,13 +30,13 @@ TEST_F(KeywordSearchTest, keyword_test_conflict_resolution)
TEST_F(KeywordSearchTest, keyword_test_conflict_resolution2)
{
MWDialogue::KeywordSearch<std::string, int> search;
MWDialogue::KeywordSearch<int> search;
search.seed("the dwemer", 0);
search.seed("dwemer language", 0);
std::string text = "the dwemer language";
std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
std::vector<MWDialogue::KeywordSearch<int>::Match> matches;
search.highlightKeywords(text.begin(), text.end(), matches);
EXPECT_EQ(matches.size(), 1);
@ -47,14 +47,14 @@ TEST_F(KeywordSearchTest, keyword_test_conflict_resolution3)
{
// testing that the longest keyword is chosen, rather than maximizing the
// amount of highlighted characters by highlighting the first and last keyword
MWDialogue::KeywordSearch<std::string, int> search;
MWDialogue::KeywordSearch<int> search;
search.seed("foo bar", 0);
search.seed("bar lock", 0);
search.seed("lock so", 0);
std::string text = "foo bar lock so";
std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
std::vector<MWDialogue::KeywordSearch<int>::Match> matches;
search.highlightKeywords(text.begin(), text.end(), matches);
EXPECT_EQ(matches.size(), 1);
@ -64,7 +64,7 @@ TEST_F(KeywordSearchTest, keyword_test_conflict_resolution3)
TEST_F(KeywordSearchTest, keyword_test_utf8_word_begin)
{
// We make sure that the search works well even if the character is not ASCII
MWDialogue::KeywordSearch<std::string, int> search;
MWDialogue::KeywordSearch<int> search;
search.seed("états", 0);
search.seed("ïrradiés", 0);
search.seed("ça nous déçois", 0);
@ -74,7 +74,7 @@ TEST_F(KeywordSearchTest, keyword_test_utf8_word_begin)
= "les nations unis ont réunis le monde entier, états units inclus pour parler du problème des gens ïrradiés "
"et ça nous déçois";
std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
std::vector<MWDialogue::KeywordSearch<int>::Match> matches;
search.highlightKeywords(text.begin(), text.end(), matches);
EXPECT_EQ(matches.size(), 3);
@ -86,12 +86,12 @@ TEST_F(KeywordSearchTest, keyword_test_utf8_word_begin)
TEST_F(KeywordSearchTest, keyword_test_non_alpha_non_whitespace_word_begin)
{
// We make sure that the search works well even if the separator is not a whitespace
MWDialogue::KeywordSearch<std::string, int> search;
MWDialogue::KeywordSearch<int> search;
search.seed("Report to caius cosades", 0);
std::string text = "I was told to \"Report to caius cosades\"";
std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
std::vector<MWDialogue::KeywordSearch<int>::Match> matches;
search.highlightKeywords(text.begin(), text.end(), matches);
EXPECT_EQ(matches.size(), 1);
@ -101,13 +101,13 @@ TEST_F(KeywordSearchTest, keyword_test_non_alpha_non_whitespace_word_begin)
TEST_F(KeywordSearchTest, keyword_test_russian_non_ascii_before)
{
// We make sure that the search works well even if the separator is not a whitespace with russian chars
MWDialogue::KeywordSearch<std::string, int> search;
MWDialogue::KeywordSearch<int> search;
search.seed("Доложить Каю Косадесу", 0);
std::string text
= "Что? Да. Я Кай Косадес. То есть как это, вам велели «Доложить Каю Косадесу»? О чем вы говорите?";
std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
std::vector<MWDialogue::KeywordSearch<int>::Match> matches;
search.highlightKeywords(text.begin(), text.end(), matches);
EXPECT_EQ(matches.size(), 1);
@ -117,13 +117,13 @@ TEST_F(KeywordSearchTest, keyword_test_russian_non_ascii_before)
TEST_F(KeywordSearchTest, keyword_test_russian_ascii_before)
{
// We make sure that the search works well even if the separator is not a whitespace with russian chars
MWDialogue::KeywordSearch<std::string, int> search;
MWDialogue::KeywordSearch<int> search;
search.seed("Доложить Каю Косадесу", 0);
std::string text
= "Что? Да. Я Кай Косадес. То есть как это, вам велели 'Доложить Каю Косадесу'? О чем вы говорите?";
std::vector<MWDialogue::KeywordSearch<std::string, int>::Match> matches;
std::vector<MWDialogue::KeywordSearch<int>::Match> matches;
search.highlightKeywords(text.begin(), text.end(), matches);
EXPECT_EQ(matches.size(), 1);