From 83bea7c6ef010e32cbbf03dcd07cca7e786fecc9 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sun, 1 Nov 2015 04:12:55 +0100 Subject: [PATCH] Bugfix: need also to init sub scopes this is a consequence of b14943 we use now an explicit init() call, instead of preparing everything in the ctor --- src/lib/diff/tree-diff-application.hpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lib/diff/tree-diff-application.hpp b/src/lib/diff/tree-diff-application.hpp index 53152f88c..5bc0d8912 100644 --- a/src/lib/diff/tree-diff-application.hpp +++ b/src/lib/diff/tree-diff-application.hpp @@ -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(); + + 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);