VSTR tags must be generated before checking if they are certain types

GrammarSoft · Nov 24, 2023 · 03ed80e · 03ed80e
1 parent 75ab52c
commit 03ed80e
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/src/GrammarApplicator_runRules.cpp b/src/GrammarApplicator_runRules.cpp
@@ -919,6 +919,12 @@ uint32_t GrammarApplicator::runRulesOnSingleWindow(SingleWindow& current, const
 			auto theTags = ss_taglist.get();
 			getTagList(*rule->maplist, theTags);
 
+			for (auto& tter : *theTags) {
+				if (tter->type & T_VSTR) {
+					VARSTRINGIFY(tter);
+				}
+			}
+
 			for (auto tter : *theTags) {
 				if(tter->type & T_WORDFORM) {
 					spacesInAddedWf = std::count_if(tter->tag.begin(), tter->tag.end(), [](UChar c){ return c == ' '; });
@@ -1414,6 +1420,12 @@ uint32_t GrammarApplicator::runRulesOnSingleWindow(SingleWindow& current, const
 				auto theTags = ss_taglist.get();
 				getTagList(*rule->maplist, theTags);
 
+				for (auto& tter : *theTags) {
+					if (tter->type & T_VSTR) {
+						VARSTRINGIFY(tter);
+					}
+				}
+
 				Tag* wf = nullptr;
 				for (auto tter : *theTags) {
 					if (tter->type & T_WORDFORM) {
@@ -1894,6 +1906,12 @@ uint32_t GrammarApplicator::runRulesOnSingleWindow(SingleWindow& current, const
 				auto theTags = ss_taglist.get();
 				getTagList(*rule->maplist, theTags);
 
+				for (auto& tter : *theTags) {
+					if (tter->type & T_VSTR) {
+						VARSTRINGIFY(tter);
+					}
+				}
+
 				for (auto tter : *theTags) {
 					VARSTRINGIFY(tter);
 					if (tter->type & T_BASEFORM) {