From 050d650c95e92f0b1330184f03c0e25b4c0d19f1 Mon Sep 17 00:00:00 2001 From: Steve Hancock Date: Tue, 6 Oct 2020 06:04:18 -0700 Subject: [PATCH] improved efficiency of coding of IndentationItem.pm --- lib/Perl/Tidy/IndentationItem.pm | 94 +++++++++++--------------------- 1 file changed, 31 insertions(+), 63 deletions(-) diff --git a/lib/Perl/Tidy/IndentationItem.pm b/lib/Perl/Tidy/IndentationItem.pm index f31ebff8..4c2bd199 100644 --- a/lib/Perl/Tidy/IndentationItem.pm +++ b/lib/Perl/Tidy/IndentationItem.pm @@ -39,7 +39,7 @@ sub AUTOLOAD { # some diagnostic information. This sub should never be called # except for a programming error. our $AUTOLOAD; - return if ( $AUTOLOAD =~/\bDESTROY$/ ); + return if ( $AUTOLOAD =~ /\bDESTROY$/ ); my ( $pkg, $fname, $lno ) = caller(); print STDERR < # total leading white spaces # level => # the indentation 'level' @@ -102,21 +85,21 @@ sub new { # arrow_count => # how many =>'s my $self = []; - $self->[_spaces_] = $spaces; - $self->[_level_] = $level; - $self->[_ci_level_] = $ci_level; - $self->[_available_spaces_] = $available_spaces; - $self->[_closed_] = $closed; - $self->[_comma_count_] = $comma_count; - $self->[_sequence_number_] = $gnu_sequence_number; - $self->[_index_] = $index; - $self->[_have_child_] = $have_child; - $self->[_recoverable_spaces_] = $want_right_spaces; - $self->[_align_paren_] = $align_paren; - $self->[_marked_] = $marked; - $self->[_stack_depth_] = $stack_depth; - $self->[_starting_index_K_] = $starting_index_K; - $self->[_arrow_count_] = $arrow_count; + $self->[_spaces_] = $input_hash{spaces}; + $self->[_level_] = $input_hash{level}; + $self->[_ci_level_] = $input_hash{ci_level}; + $self->[_available_spaces_] = $input_hash{available_spaces}; + $self->[_closed_] = -1; + $self->[_comma_count_] = 0; + $self->[_sequence_number_] = $input_hash{gnu_sequence_number}; + $self->[_index_] = $input_hash{index}; + $self->[_have_child_] = 0; + $self->[_recoverable_spaces_] = 0; + $self->[_align_paren_] = $input_hash{align_paren}; + $self->[_marked_] = 0; + $self->[_stack_depth_] = $input_hash{stack_depth}; + $self->[_starting_index_K_] = $input_hash{starting_index_K}; + $self->[_arrow_count_] = 0; bless $self, $class; return $self; @@ -160,18 +143,15 @@ sub tentatively_decrease_available_spaces { } sub get_stack_depth { - my $self = shift; - return $self->[_stack_depth_]; + return $_[0]->[_stack_depth_]; } sub get_spaces { - my $self = shift; - return $self->[_spaces_]; + return $_[0]->[_spaces_]; } sub get_marked { - my $self = shift; - return $self->[_marked_]; + return $_[0]->[_marked_]; } sub set_marked { @@ -183,8 +163,7 @@ sub set_marked { } sub get_available_spaces { - my $self = shift; - return $self->[_available_spaces_]; + return $_[0]->[_available_spaces_]; } sub decrease_SPACES { @@ -204,13 +183,11 @@ sub decrease_available_spaces { } sub get_align_paren { - my $self = shift; - return $self->[_align_paren_]; + return $_[0]->[_align_paren_]; } sub get_recoverable_spaces { - my $self = shift; - return $self->[_recoverable_spaces_]; + return $_[0]->[_recoverable_spaces_]; } sub set_recoverable_spaces { @@ -230,28 +207,23 @@ sub increase_recoverable_spaces { } sub get_ci_level { - my $self = shift; - return $self->[_ci_level_]; + return $_[0]->[_ci_level_]; } sub get_level { - my $self = shift; - return $self->[_level_]; + return $_[0]->[_level_]; } sub get_sequence_number { - my $self = shift; - return $self->[_sequence_number_]; + return $_[0]->[_sequence_number_]; } sub get_index { - my $self = shift; - return $self->[_index_]; + return $_[0]->[_index_]; } sub get_starting_index_K { - my $self = shift; - return $self->[_starting_index_K_]; + return $_[0]->[_starting_index_K_]; } sub set_have_child { @@ -263,8 +235,7 @@ sub set_have_child { } sub get_have_child { - my $self = shift; - return $self->[_have_child_]; + return $_[0]->[_have_child_]; } sub set_arrow_count { @@ -276,8 +247,7 @@ sub set_arrow_count { } sub get_arrow_count { - my $self = shift; - return $self->[_arrow_count_]; + return $_[0]->[_arrow_count_]; } sub set_comma_count { @@ -289,8 +259,7 @@ sub set_comma_count { } sub get_comma_count { - my $self = shift; - return $self->[_comma_count_]; + return $_[0]->[_comma_count_]; } sub set_closed { @@ -302,7 +271,6 @@ sub set_closed { } sub get_closed { - my $self = shift; - return $self->[_closed_]; + return $_[0]->[_closed_]; } 1; -- 2.39.5