suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regex_replace invalidates iterators

Browse Source
This commit is contained in:
WandererFan 2016-07-02 09:00:49 -04:00 committed by wmayer
parent a68b6d068f
commit 57b79da3af
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/TechDraw/App/DrawSVGTemplate.cpp
View File

@ -191,6 +191,7 @@ App::DocumentObjectExecReturn * DrawSVGTemplate::execute(void)
inTemplate.close(); inTemplate.close();
string outfragment(copyTemplate.str()); string outfragment(copyTemplate.str());
std::string newfragment = outfragment;
// update EditableText SVG clauses with Property values // update EditableText SVG clauses with Property values
std::map<std::string, std::string> subs = EditableTexts.getValues(); std::map<std::string, std::string> subs = EditableTexts.getValues();
@ -203,12 +204,12 @@ App::DocumentObjectExecReturn * DrawSVGTemplate::execute(void)
boost::match_results<std::string::const_iterator> what; boost::match_results<std::string::const_iterator> what;
// Find editable texts // Find editable texts
while (boost::regex_search(begin, end, what, e1)) { while (boost::regex_search(begin, end, what, e1)) { //search in outfragment
// if we have a replacement value for the text we've found // if we have a replacement value for the text we've found
if (subs.count(what[1].str())) { if (subs.count(what[1].str())) {
// change it to specified value // change it to specified value
boost::regex e2 ("(<text.*?freecad:editable=\"" + what[1].str() + "\".*?<tspan.*?)>(.*?)(</tspan>)"); boost::regex e2 ("(<text.*?freecad:editable=\"" + what[1].str() + "\".*?<tspan.*?)>(.*?)(</tspan>)");
outfragment = boost::regex_replace(outfragment, e2, "$1>" + subs[what[1].str()] + "$3"); newfragment = boost::regex_replace(newfragment, e2, "$1>" + subs[what[1].str()] + "$3"); //replace in newfragment
} }
begin = what[0].second; begin = what[0].second;
} }
@ -218,7 +219,7 @@ App::DocumentObjectExecReturn * DrawSVGTemplate::execute(void)
// restoring linebreaks and saving the file // restoring linebreaks and saving the file
boost::regex e3 ("--endOfLine--"); boost::regex e3 ("--endOfLine--");
string fmt = "\\n"; string fmt = "\\n";
outfragment = boost::regex_replace(outfragment, e3, fmt); outfragment = boost::regex_replace(newfragment, e3, fmt);
const QString qsOut = QString::fromStdString(outfragment); const QString qsOut = QString::fromStdString(outfragment);
QDomDocument doc(QString::fromAscii("mydocument")); QDomDocument doc(QString::fromAscii("mydocument"));

1
src/Mod/TechDraw/App/DrawViewSymbol.cpp
View File

@ -91,6 +91,7 @@ App::DocumentObjectExecReturn *DrawViewSymbol::execute(void)
const std::vector<std::string>& editText = EditableTexts.getValues(); const std::vector<std::string>& editText = EditableTexts.getValues();
if (!editText.empty()) { if (!editText.empty()) {
//TODO: has this ever been run?
boost::regex e1 ("<text.*?freecad:editable=\"(.*?)\".*?<tspan.*?>(.*?)</tspan>"); boost::regex e1 ("<text.*?freecad:editable=\"(.*?)\".*?<tspan.*?>(.*?)</tspan>");
string::const_iterator begin, end; string::const_iterator begin, end;
begin = svg.begin(); begin = svg.begin();