diff --git a/scripts/code.py b/scripts/code.py index 17a91599..bb004c3d 100755 --- a/scripts/code.py +++ b/scripts/code.py @@ -752,7 +752,7 @@ def table(Result, results, diff_results=None, *, for r in diff_results_ or []} names_ = [n for n in table_.keys() | diff_table_.keys() - if diff_results_ is None + if diff_results is None or all_ or any( types[k].ratio( @@ -820,7 +820,7 @@ def table(Result, results, diff_results=None, *, if name in table_ and depth_ > 1: table_recurse( getattr(r, Result._children), - getattr(diff_r, Result._children, None) or [], + getattr(diff_r, Result._children, None), depth_-1, (prefixes[2+(i==len(names_)-1)] + "|-> ", prefixes[2+(i==len(names_)-1)] + "'-> ", diff --git a/scripts/cov.py b/scripts/cov.py index 37ac7b72..65775e58 100755 --- a/scripts/cov.py +++ b/scripts/cov.py @@ -613,7 +613,7 @@ def table(Result, results, diff_results=None, *, for r in diff_results_ or []} names_ = [n for n in table_.keys() | diff_table_.keys() - if diff_results_ is None + if diff_results is None or all_ or any( types[k].ratio( @@ -681,7 +681,7 @@ def table(Result, results, diff_results=None, *, if name in table_ and depth_ > 1: table_recurse( getattr(r, Result._children), - getattr(diff_r, Result._children, None) or [], + getattr(diff_r, Result._children, None), depth_-1, (prefixes[2+(i==len(names_)-1)] + "|-> ", prefixes[2+(i==len(names_)-1)] + "'-> ", diff --git a/scripts/csv.py b/scripts/csv.py index b9d9e684..5c59bc9b 100755 --- a/scripts/csv.py +++ b/scripts/csv.py @@ -1888,7 +1888,7 @@ def table(Result, results, diff_results=None, *, for r in diff_results_ or []} names_ = [n for n in table_.keys() | diff_table_.keys() - if diff_results_ is None + if diff_results is None or all_ or any( types[k].ratio( @@ -1956,7 +1956,7 @@ def table(Result, results, diff_results=None, *, if name in table_ and depth_ > 1: table_recurse( getattr(r, Result._children), - getattr(diff_r, Result._children, None) or [], + getattr(diff_r, Result._children, None), depth_-1, (prefixes[2+(i==len(names_)-1)] + "|-> ", prefixes[2+(i==len(names_)-1)] + "'-> ", diff --git a/scripts/ctx.py b/scripts/ctx.py index b250c640..8a2fcb54 100755 --- a/scripts/ctx.py +++ b/scripts/ctx.py @@ -995,6 +995,7 @@ def table(Result, results, diff_results=None, *, def table_recurse(results_, diff_results_, depth_, prefixes=('', '', '', '')): + # build the children table at each layer table_ = { ','.join(str(getattr(r, k) @@ -1010,7 +1011,7 @@ def table(Result, results, diff_results=None, *, for r in diff_results_ or []} names_ = [n for n in table_.keys() | diff_table_.keys() - if diff_results_ is None + if diff_results is None or all_ or any( types[k].ratio( @@ -1078,7 +1079,7 @@ def table(Result, results, diff_results=None, *, if name in table_ and depth_ > 1: table_recurse( getattr(r, Result._children), - getattr(diff_r, Result._children, None) or [], + getattr(diff_r, Result._children, None), depth_-1, (prefixes[2+(i==len(names_)-1)] + "|-> ", prefixes[2+(i==len(names_)-1)] + "'-> ", diff --git a/scripts/data.py b/scripts/data.py index 00ad4ee0..3665d8cf 100755 --- a/scripts/data.py +++ b/scripts/data.py @@ -752,7 +752,7 @@ def table(Result, results, diff_results=None, *, for r in diff_results_ or []} names_ = [n for n in table_.keys() | diff_table_.keys() - if diff_results_ is None + if diff_results is None or all_ or any( types[k].ratio( @@ -820,7 +820,7 @@ def table(Result, results, diff_results=None, *, if name in table_ and depth_ > 1: table_recurse( getattr(r, Result._children), - getattr(diff_r, Result._children, None) or [], + getattr(diff_r, Result._children, None), depth_-1, (prefixes[2+(i==len(names_)-1)] + "|-> ", prefixes[2+(i==len(names_)-1)] + "'-> ", diff --git a/scripts/perf.py b/scripts/perf.py index e731dc63..4aa31f6a 100755 --- a/scripts/perf.py +++ b/scripts/perf.py @@ -1114,7 +1114,7 @@ def table(Result, results, diff_results=None, *, for r in diff_results_ or []} names_ = [n for n in table_.keys() | diff_table_.keys() - if diff_results_ is None + if diff_results is None or all_ or any( types[k].ratio( @@ -1182,7 +1182,7 @@ def table(Result, results, diff_results=None, *, if name in table_ and depth_ > 1: table_recurse( getattr(r, Result._children), - getattr(diff_r, Result._children, None) or [], + getattr(diff_r, Result._children, None), depth_-1, (prefixes[2+(i==len(names_)-1)] + "|-> ", prefixes[2+(i==len(names_)-1)] + "'-> ", diff --git a/scripts/perfbd.py b/scripts/perfbd.py index 30f6497d..645dda3c 100755 --- a/scripts/perfbd.py +++ b/scripts/perfbd.py @@ -1084,7 +1084,7 @@ def table(Result, results, diff_results=None, *, for r in diff_results_ or []} names_ = [n for n in table_.keys() | diff_table_.keys() - if diff_results_ is None + if diff_results is None or all_ or any( types[k].ratio( @@ -1152,7 +1152,7 @@ def table(Result, results, diff_results=None, *, if name in table_ and depth_ > 1: table_recurse( getattr(r, Result._children), - getattr(diff_r, Result._children, None) or [], + getattr(diff_r, Result._children, None), depth_-1, (prefixes[2+(i==len(names_)-1)] + "|-> ", prefixes[2+(i==len(names_)-1)] + "'-> ", diff --git a/scripts/stack.py b/scripts/stack.py index 75f191b1..405635e7 100755 --- a/scripts/stack.py +++ b/scripts/stack.py @@ -756,7 +756,7 @@ def table(Result, results, diff_results=None, *, for r in diff_results_ or []} names_ = [n for n in table_.keys() | diff_table_.keys() - if diff_results_ is None + if diff_results is None or all_ or any( types[k].ratio( @@ -824,7 +824,7 @@ def table(Result, results, diff_results=None, *, if name in table_ and depth_ > 1: table_recurse( getattr(r, Result._children), - getattr(diff_r, Result._children, None) or [], + getattr(diff_r, Result._children, None), depth_-1, (prefixes[2+(i==len(names_)-1)] + "|-> ", prefixes[2+(i==len(names_)-1)] + "'-> ", diff --git a/scripts/structs.py b/scripts/structs.py index ae885b32..93a1d760 100755 --- a/scripts/structs.py +++ b/scripts/structs.py @@ -830,7 +830,7 @@ def table(Result, results, diff_results=None, *, for r in diff_results_ or []} names_ = [n for n in table_.keys() | diff_table_.keys() - if diff_results_ is None + if diff_results is None or all_ or any( types[k].ratio( @@ -898,7 +898,7 @@ def table(Result, results, diff_results=None, *, if name in table_ and depth_ > 1: table_recurse( getattr(r, Result._children), - getattr(diff_r, Result._children, None) or [], + getattr(diff_r, Result._children, None), depth_-1, (prefixes[2+(i==len(names_)-1)] + "|-> ", prefixes[2+(i==len(names_)-1)] + "'-> ",