some tokenizer clean-ups, part 8

diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index 18ddaf8474541d709ee903d59424391ca0c3fbc5..053efcce711968cac47184f621e7aaada6e9f731 100644 (file)
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -1508,7 +1508,7 @@ EOM
 
     # FUTURE: if not a keyword, assume that it is an identifier
     foreach (@okw) {
-        if ( $Perl::Tidy::Tokenizer::is_keyword{$_} ) {
+        if ( Perl::Tidy::Tokenizer::is_keyword($_) ) {
             $outdent_keyword{$_} = 1;
         }
         else {

diff --git a/lib/Perl/Tidy/Logger.pm b/lib/Perl/Tidy/Logger.pm
index bbcc211acff7c4805bd0b6fb30202ca547de3d7e..857128daa28570ba8148c05617b183bc396afb9c 100644 (file)
--- a/lib/Perl/Tidy/Logger.pm
+++ b/lib/Perl/Tidy/Logger.pm
@@ -119,6 +119,7 @@ sub get_input_stream_name {
 sub set_last_input_line_number {
     my ( $self, $lno ) = @_;
     $self->{_last_input_line_number} = $lno;
+    return;
 }
 
 sub get_warning_count {

diff --git a/lib/Perl/Tidy/Tokenizer.pm b/lib/Perl/Tidy/Tokenizer.pm
index 150cfa51f8b6c735c7eb5546b9e1603a6a18785c..f48828473b3b214008cb9612ab9c1c7ff208ec22 100644 (file)
--- a/lib/Perl/Tidy/Tokenizer.pm
+++ b/lib/Perl/Tidy/Tokenizer.pm
@@ -87,45 +87,43 @@ use vars qw{
 
 # GLOBAL CONSTANTS for routines in this package,
 # Initialized in a BEGIN block.
-use vars qw{
-  %is_indirect_object_taker
-  %is_block_operator
-  %expecting_operator_token
-  %expecting_operator_types
-  %expecting_term_types
-  %expecting_term_token
-  %is_digraph
-  %can_start_digraph
-  %is_file_test_operator
-  %is_trigraph
-  %is_tetragraph
-  %is_valid_token_type
-  %is_keyword
-  %is_my_our_state
-  %is_code_block_token
-  %is_sort_map_grep_eval_do
-  %is_sort_map_grep
-  %is_grep_alias
-  %really_want_term
-  @opening_brace_names
-  @closing_brace_names
-  %is_keyword_taking_list
-  %is_keyword_taking_optional_arg
-  %is_keyword_rejecting_slash_as_pattern_delimiter
-  %is_keyword_rejecting_question_as_pattern_delimiter
-  %is_q_qq_qx_qr_s_y_tr_m
-  %is_q_qq_qw_qx_qr_s_y_tr_m
-  %is_sub
-  %is_package
-  %is_comma_question_colon
-  %is_if_elsif_unless
-  %is_if_elsif_unless_case_when
-  %other_line_endings
-  %is_END_DATA_format_sub
-  %is_semicolon_or_t
-  $code_skipping_pattern_begin
-  $code_skipping_pattern_end
-};
+my (
+    %is_indirect_object_taker,
+    %is_block_operator,
+    %expecting_operator_token,
+    %expecting_operator_types,
+    %expecting_term_types,
+    %expecting_term_token,
+    %is_digraph,
+    %can_start_digraph,
+    %is_file_test_operator,
+    %is_trigraph,
+    %is_tetragraph,
+    %is_valid_token_type,
+    %is_keyword,
+    %is_my_our_state,
+    %is_code_block_token,
+    %is_sort_map_grep_eval_do,
+    %is_sort_map_grep,
+    %is_grep_alias,
+    %really_want_term,
+    @opening_brace_names,
+    @closing_brace_names,
+    %is_keyword_taking_list,
+    %is_keyword_taking_optional_arg,
+    %is_keyword_rejecting_slash_as_pattern_delimiter,
+    %is_keyword_rejecting_question_as_pattern_delimiter,
+    %is_q_qq_qx_qr_s_y_tr_m,
+    %is_q_qq_qw_qx_qr_s_y_tr_m,
+    %is_sub,
+    %is_package,
+    %is_comma_question_colon,
+    %is_if_elsif_unless,
+    %is_if_elsif_unless_case_when,
+    %other_line_endings,
+    %is_END_DATA_format_sub,
+    %is_semicolon_or_t,
+);
 
 # GLOBAL VARIABLES which are constant after being configured by user-supplied
 # parameters.  They remain constant as a file is being processed.
@@ -537,6 +535,11 @@ sub get_unexpected_error_count {
     return $self->[_unexpected_error_count_];
 }
 
+sub is_keyword {
+    my ($str) = @_;
+    return $is_keyword{$str};
+}
+
 #-----------------------------------------
 # interface to Perl::Tidy::Logger routines
 #-----------------------------------------
@@ -8359,9 +8362,9 @@ BEGIN {
         # This routine now serves a a backup for sub scan_simple_identifier
         # which handles most identifiers.
 
-        my $self = shift;
-
         (
+            my $self,
+
             $i,         $id_scan_state, $identifier, $rtokens, $max_token_index,
             $expecting, $container_type
         ) = @_;