ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bugfix: need also to init sub scopes

Browse source 
this is a consequence of b14943
we use now an explicit init() call, instead of preparing everything in the ctor
This commit is contained in:
Fischlurch 2015-11-01 04:12:55 +01:00
parent 9e7680d688
commit 83bea7c6ef
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/diff/tree-diff-application.hpp
View file

@ -70,6 +70,7 @@ namespace lib {
namespace diff{
using util::unConst;
using util::cStr;
using util::_Fmt;
using std::move;
using std::swap;
@ -329,13 +330,18 @@ namespace diff{
{
GenNode const& child = find_child (n.idi);
Rec const& childRecord = child.data.get<Rec>();
TRACE (diff, "tree-diff: ENTER scope %s", cStr(childRecord));
scopes_.emplace (mutateInPlace (unConst(childRecord)));
scopes_.top().init();
}
/** finish and leave child object scope, return to parent */
void
emu (GenNode const& n) override
{
TRACE (diff, "tree-diff: LEAVE scope %s", cStr(alteredRec()));
__expect_end_of_scope (n.idi);
scopes_.pop();
__expect_valid_parent_scope (n.idi);