From: Matt S Trout Date: Sun, 22 Apr 2018 18:32:24 +0000 (+0000) Subject: use the correct trace format type for failure_dependencies X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=72304627b100c7e3ff434c7a9d2e057b861fb776;p=scpubgit%2FDX.git use the correct trace format type for failure_dependencies --- diff --git a/fragment.output/btdemo b/fragment.output/btdemo index 45a087d..e0a5ff3 100644 --- a/fragment.output/btdemo +++ b/fragment.output/btdemo @@ -321,11 +321,19 @@ backtrack { decision { for eq XValue 2 } non_relevant decision { for member_at Y ?YKey ?YValue } - failure_dependencies { CONTENTS_OF 0.Y; TYPE_OF 0.YKey; CONTENTS_OF 0.YValue } + failure_dependencies { + CONTENTS_OF 0.Y + TYPE_OF 0.YKey + CONTENTS_OF 0.YValue + } decision { for member_at X ?XKey ?XValue } non_relevant decision { for eq ?Y {{ d 1 e 2 f 3 }} } - failure_dependencies { CONTENTS_OF 0.Y; TYPE_OF 0.YKey; CONTENTS_OF 0.YValue } + failure_dependencies { + CONTENTS_OF 0.Y + TYPE_OF 0.YKey + CONTENTS_OF 0.YValue + } decision { for eq ?X {{ a 1 b 2 c 3 }} } non_relevant exhaustion diff --git a/lib/DX/Step/Backtrack.pm b/lib/DX/Step/Backtrack.pm index df74d92..81335ac 100644 --- a/lib/DX/Step/Backtrack.pm +++ b/lib/DX/Step/Backtrack.pm @@ -15,8 +15,8 @@ sub apply_to { [ symbol => 'backtrack' ], [ 'enter_block' ] ] ]; - trace backtrack => [ statement => [ - [ symbol => 'failure_dependencies' ], + trace backtrack => [ word_and_body => [ + 'failure_dependencies', format_deps($rspace->geometry_depends_on) ] ]; my $dmap = DX::DependencyMap->new_empty @@ -49,8 +49,8 @@ sub apply_to { $dmap = $dmap->with_dependencies_for( backtrack => $rspace_was->geometry_depends_on ); - trace backtrack => [ statement => [ - [ symbol => 'failure_dependencies' ], + trace backtrack => [ word_and_body => [ + 'failure_dependencies', format_deps(compact_deps($dmap->dependencies_for('backtrack'))) ] ]; next DECISION;