cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor. fix yet another bug (always return something)

Browse Source
This commit is contained in:
espie 2010-10-25 17:31:25 +00:00
parent 047bbb7432
commit cce4985d69
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
infrastructure/lib/DPB/Reporter.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4: # ex:ts=8 sw=4:
# $OpenBSD: Reporter.pm,v 1.3 2010/10/25 17:23:13 espie Exp $ # $OpenBSD: Reporter.pm,v 1.4 2010/10/25 17:31:25 espie Exp $
# #
# Copyright (c) 2010 Marc Espie <espie@openbsd.org> # Copyright (c) 2010 Marc Espie <espie@openbsd.org>
# #
@ -280,6 +280,25 @@ sub clear_clamped
} }
} }
sub do_line
{
my ($self, $new, $old) = @_;
# line didn't change: try to go down
if (defined $old && $old eq $new) {
if ($self->{down}) {
return $self->{down};
}
}
# adjust newline to correct length
if (defined $old && (length $old) > (length $new)) {
if ($self->{cleareol}) {
return $self->clear_clamped($new);
}
$new .= " "x ((length $old) - (length $new));
}
return $self->clamped($new);
}
sub lines sub lines
{ {
my ($self, @new) = @_; my ($self, @new) = @_;
@ -288,25 +307,8 @@ sub lines
my $r = ''; my $r = '';
while (@new > 0) { while (@new > 0) {
my $newline = shift @new;
my $oldline = shift @{$self->{oldlines}};
return $r if $n++ > $self->{height}; return $r if $n++ > $self->{height};
# line didn't change: try to go down $r .= $self->do_line(shift @new, shift @{$self->{oldlines}});
if (defined $oldline && $oldline eq $newline) {
if ($self->{down}) {
$r .= $self->{down};
next;
}
}
# adjust newline to correct length
if (defined $oldline && (length $oldline) > (length $newline)) {
if ($self->{cleareol}) {
$r .= $self->clear_clamped($newline);
next;
}
$newline .= " "x ((length $oldline) - (length $newline));
}
$r .= $self->clamped($newline);
} }
# extra lines must disappear # extra lines must disappear
while (@{$self->{oldlines}} > 0) { while (@{$self->{oldlines}} > 0) {
@ -317,7 +319,7 @@ sub lines
$line = " "x (length $line); $line = " "x (length $line);
$r .= $self->clamped($line); $r .= $self->clamped($line);
} }
return if $n++ > $self->{height}; last if $n++ > $self->{height};
} }
return $r; return $r;
} }