removed unused subs and vars

diff --git a/lib/Perl/Tidy/VerticalAligner.pm b/lib/Perl/Tidy/VerticalAligner.pm
index b382c1800c2eee787e49e1772ee28e8e25140142..e23920b46974a5130396cfb9a5e47aa48f15ad6e 100644 (file)
--- a/lib/Perl/Tidy/VerticalAligner.pm
+++ b/lib/Perl/Tidy/VerticalAligner.pm
@@ -1370,7 +1370,7 @@ sub install_new_alignments {
 
         # create initial alignments for the new group
         my $alignment =
-          Perl::Tidy::VerticalAligner::Alignment->new( column => $col );
+          Perl::Tidy::VerticalAligner::Alignment->new( { column => $col } );
         $new_line->set_alignment( $j, $alignment );
     }
     return;

diff --git a/lib/Perl/Tidy/VerticalAligner/Alignment.pm b/lib/Perl/Tidy/VerticalAligner/Alignment.pm
index 74525b134cb8a5a3107361b94b093d8a6dbfbb69..b11f226df619d26c1b566c7ef26aa711b23ffa5b 100644 (file)
--- a/lib/Perl/Tidy/VerticalAligner/Alignment.pm
+++ b/lib/Perl/Tidy/VerticalAligner/Alignment.pm
@@ -13,24 +13,18 @@ use warnings;
 our $VERSION = '20201001.02';
 
 #    _column_          # the current column number
-#    _starting_column_ # column number when created
 #    _saved_column_    # a place for temporary storage
 my $i = 0;
 use constant {
-    _column_          => $i++,
-    _starting_column_ => $i++,
-    _saved_column_    => $i++,
+    _column_       => $i++,
+    _saved_column_ => $i++,
 };
 
 sub new {
-    my ( $class, %arg ) = @_;
+    my ( $class, $rarg ) = @_;
     my $self = bless [], $class;
-    $self->[_column_]          = $arg{column};
-    $self->[_starting_column_] = $arg{starting_column};
-    $self->[_saved_column_]    = $arg{saved_column};
-    if ( !defined( $self->[_starting_column_] ) ) {
-        $self->[_starting_column_] = $self->[_column_];
-    }
+    $self->[_column_]       = $rarg->{column};
+    $self->[_saved_column_] = $rarg->{saved_column};
     return $self;
 }
 
@@ -64,25 +58,8 @@ sub get_column {
     return $_[0]->[_column_];
 }
 
-sub get_starting_column {
-    return $_[0]->[_starting_column_];
-}
-
-sub set_column {
-    my ( $self, $val ) = @_;
-    $self->[_column_] = $val;
-    return;
-}
-
-sub set_starting_column {
-    my ( $self, $val ) = @_;
-    $self->[_starting_column_] = $val;
-    return;
-}
-
 sub increment_column {
-    my ( $self, $val ) = @_;
-    $self->[_column_] += $val;
+    $_[0]->[_column_] += $_[1];
     return;
 }
 

diff --git a/lib/Perl/Tidy/VerticalAligner/Line.pm b/lib/Perl/Tidy/VerticalAligner/Line.pm
index 73927fc44806ee2668a2aa0ea3995e042ee8ff72..2df910341a2dd213f024ac63432fc82586a02779 100644 (file)
--- a/lib/Perl/Tidy/VerticalAligner/Line.pm
+++ b/lib/Perl/Tidy/VerticalAligner/Line.pm
@@ -134,12 +134,6 @@ EOM
         return $_[0]->[_rvertical_tightness_flags_];
     }
 
-    sub set_column {
-        ## FIXME: does caller ever supply $val??
-        my ( $self, $j, $val ) = @_;
-        return $self->[_ralignments_]->[$j]->set_column($val);
-    }
-
     sub get_alignment {
         my ( $self, $j ) = @_;
         return $self->[_ralignments_]->[$j];
@@ -153,16 +147,6 @@ EOM
         return $alignment->get_column();
     }
 
-    sub get_starting_column {
-        my ( $self, $j ) = @_;
-        my $col;
-        my $alignment = $self->[_ralignments_]->[$j];
-        if ( defined($alignment) ) {
-            $col = $alignment->get_starting_column();
-        }
-        return $col;
-    }
-
     sub increment_column {
         my ( $self, $k, $pad ) = @_;
         my $alignment = $self->[_ralignments_]->[$k];
@@ -188,22 +172,6 @@ EOM
         }
     }
 
-    sub field_width_growth {
-        my ( $self, $j ) = @_;
-        return $self->get_column($j) - $self->get_starting_column($j);
-    }
-
-    sub starting_field_width {
-        my ( $self, $j ) = @_;
-        if ( $j == 0 ) {
-            return $self->get_starting_column($j);
-        }
-        else {
-            return $self->get_starting_column($j) -
-              $self->get_starting_column( $j - 1 );
-        }
-    }
-
     sub increase_field_width {
 
         my ( $self, $j, $pad ) = @_;