mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
Fixed dependencies for 'styling';
Fixed: specific character prefered over .* for keywords git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@306 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -361,13 +361,14 @@ String KeywordDatabase::expand(const String& text,
|
||||
}
|
||||
// find 'next' trie node set matching c
|
||||
FOR_EACH(kt, current) {
|
||||
if (kt->on_any_star) {
|
||||
next.push_back(kt->on_any_star);
|
||||
}
|
||||
map<Char,KeywordTrie*>::const_iterator it = kt->children.find(c);
|
||||
if (it != kt->children.end()) {
|
||||
next.push_back(it->second);
|
||||
}
|
||||
// TODO: on any star first or last?
|
||||
if (kt->on_any_star) {
|
||||
next.push_back(kt->on_any_star);
|
||||
}
|
||||
}
|
||||
// next becomes current
|
||||
swap(current, next);
|
||||
|
||||
Reference in New Issue
Block a user