From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 12/17] thread: inline and remove recurse_down logic
Date: Wed, 5 Oct 2016 23:57:17 +0000 [thread overview]
Message-ID: <20161005235722.14857-13-e@80x24.org> (raw)
In-Reply-To: <20161005235722.14857-1-e@80x24.org>
We no longer recurse, and it's too hard to come up with
a new name for a sub we will only use once.
---
lib/PublicInbox/SearchThread.pm | 55 +++++++++++++++++------------------------
1 file changed, 23 insertions(+), 32 deletions(-)
diff --git a/lib/PublicInbox/SearchThread.pm b/lib/PublicInbox/SearchThread.pm
index 2e7b79a..153eef2 100644
--- a/lib/PublicInbox/SearchThread.pm
+++ b/lib/PublicInbox/SearchThread.pm
@@ -145,42 +145,13 @@ sub remove_child {
}
sub has_descendent {
- my $self = shift;
- my $child = shift;
- die "Assertion failed: $child" unless eval {$child};
- my $there = 0;
- $self->recurse_down(sub { $there = 1 if $_[0] == $child });
-
- return $there;
-}
-
-sub children {
- my $self = shift;
- my @children;
- my $visitor = $self->{child};
- while ($visitor) {
- push @children, $visitor;
- $visitor = $visitor->{next};
- }
- \@children;
-}
-
-sub set_children {
- my ($self, $children) = @_;
- my $walk = $self->{child} = shift @$children;
- do {
- $walk = $walk->{next} = shift @$children;
- } while ($walk);
-}
-
-# non-recursive version of recurse_down to avoid stack depth warnings
-sub recurse_down {
- my ($self, $callback) = @_;
+ my ($self, $child) = @_;
my %seen;
my @q = ($self);
while (my $cont = shift @q) {
$seen{$cont} = 1;
- $callback->($cont);
+
+ return 1 if $cont == $child;
if (my $next = $cont->{next}) {
if ($seen{$next}) {
@@ -197,6 +168,26 @@ sub recurse_down {
}
}
}
+ 0;
+}
+
+sub children {
+ my $self = shift;
+ my @children;
+ my $visitor = $self->{child};
+ while ($visitor) {
+ push @children, $visitor;
+ $visitor = $visitor->{next};
+ }
+ \@children;
+}
+
+sub set_children {
+ my ($self, $children) = @_;
+ my $walk = $self->{child} = shift @$children;
+ do {
+ $walk = $walk->{next} = shift @$children;
+ } while ($walk);
}
sub order_children {
--
EW
next prev parent reply other threads:[~2016-10-05 23:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-05 23:57 [PATCH 0/17] remove Mail::Thread dependency Eric Wong
2016-10-05 23:57 ` [PATCH 01/17] view: remove "subject dummy" references Eric Wong
2016-10-05 23:57 ` [PATCH 02/17] thread: remove Mail::Thread dependency Eric Wong
2016-10-05 23:57 ` [PATCH 03/17] thread: pass array refs instead of entire arrays Eric Wong
2016-10-05 23:57 ` [PATCH 04/17] thread: remove accessor usage in internals Eric Wong
2016-10-05 23:57 ` [PATCH 05/17] inbox: deal with ghost smsg Eric Wong
2016-10-05 23:57 ` [PATCH 06/17] thread: remove Email::Abstract wrapping Eric Wong
2016-10-05 23:57 ` [PATCH 07/17] thread: remove rootset accessor method Eric Wong
2016-10-05 23:57 ` [PATCH 08/17] thread: simplify Eric Wong
2016-10-05 23:57 ` [PATCH 09/17] thread: remove iterate_down Eric Wong
2016-10-05 23:57 ` [PATCH 10/17] thread: avoid incrementing undefined value Eric Wong
2016-10-05 23:57 ` [PATCH 11/17] thread: order_children no longer cares about depth Eric Wong
2016-10-05 23:57 ` Eric Wong [this message]
2016-10-05 23:57 ` [PATCH 13/17] thread: fix sorting without topmost Eric Wong
2016-10-14 21:17 ` [PATCH] thread: reinstates stable ordering when ghosts are present Eric Wong
2016-10-05 23:57 ` [PATCH 14/17] thread: use hash + array instead of hand-rolled linked list Eric Wong
2016-10-05 23:57 ` [PATCH 15/17] view: remove redundant children array in thread views Eric Wong
2016-10-05 23:57 ` [PATCH 16/17] t/thread-cycle: test self-referential messages Eric Wong
2016-10-05 23:57 ` [PATCH 17/17] thread: remove weaken dependency Eric Wong
2016-10-06 8:22 ` [PATCH 0/17] remove Mail::Thread dependency Eric Wong
2016-10-13 3:59 ` [PATCH 0/2] thread: fix regressions from Mail::Thread removal Eric Wong
2016-10-13 3:59 ` [PATCH 1/2] thread: reduce indentation level Eric Wong
2016-10-13 3:59 ` [PATCH 2/2] thread: fix parent/child relationships Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161005235722.14857-13-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).