amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #67

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-06-02 19:48:43 +02:00
parent f5fb23da4d
commit 688a25eb83
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/keyword.cpp
+18 -16
View File
@@ -502,7 +502,7 @@ String expand_keywords(const String& tagged_str, vector<KeywordMatch> const& mat
if (is_tag(it, end, "<atom")) {
atom++;
} else if (is_tag(it, end, "</atom")) {
atom++;
atom--;
}
// keep tag in output
auto after = skip_tag(it, end);
@@ -519,21 +519,23 @@ String expand_keywords(const String& tagged_str, vector<KeywordMatch> const& mat
skip_tags_for_keyword(false, true);
if (it == end) break;
// is there a match here?
if (atom == 0) // don't expand keywords that are inside <atom> tags
while (match_it != matches.end() && match_it->pos <= untagged_pos) {
if (match_it->pos > untagged_pos) {
++match_it;
continue;
}
// try to expand
auto [match,new_it] = expand_keyword(it, end, *match_it, expand_type, out, options);
if (match) {
untagged_pos += untagged_length(it,new_it);
it = new_it;
++match_it;
goto after_match;
} else {
++match_it;
if (atom == 0) {
// don't expand keywords that are inside <atom> tags
while (match_it != matches.end() && match_it->pos <= untagged_pos) {
if (match_it->pos > untagged_pos) {
++match_it;
continue;
}
// try to expand
auto [match,new_it] = expand_keyword(it, end, *match_it, expand_type, out, options);
if (match) {
untagged_pos += untagged_length(it,new_it);
it = new_it;
++match_it;
goto after_match;
} else {
++match_it;
}
}
}
// No match, so there is at least one character not part of a keyword