From b8675479c76bb4ec7f8f3dce155cc7cc0a4c65c4 Mon Sep 17 00:00:00 2001 From: Steve Hancock <perltidy@users.sourceforge.net> Date: Sun, 2 Jun 2024 07:40:23 -0700 Subject: [PATCH] bump to version 20240511.03 --- CHANGES.md | 12 +++++++++++- bin/perltidy | 2 +- lib/Perl/Tidy.pm | 2 +- lib/Perl/Tidy.pod | 2 +- lib/Perl/Tidy/Debugger.pm | 2 +- lib/Perl/Tidy/Diagnostics.pm | 2 +- lib/Perl/Tidy/FileWriter.pm | 2 +- lib/Perl/Tidy/Formatter.pm | 18 ++++++++---------- lib/Perl/Tidy/HtmlWriter.pm | 2 +- lib/Perl/Tidy/IOScalar.pm | 2 +- lib/Perl/Tidy/IOScalarArray.pm | 2 +- lib/Perl/Tidy/IndentationItem.pm | 2 +- lib/Perl/Tidy/Logger.pm | 2 +- lib/Perl/Tidy/Tokenizer.pm | 2 +- lib/Perl/Tidy/VerticalAligner.pm | 2 +- lib/Perl/Tidy/VerticalAligner/Alignment.pm | 2 +- lib/Perl/Tidy/VerticalAligner/Line.pm | 2 +- 17 files changed, 34 insertions(+), 26 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 9303b5a9..6f9a7fc3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,16 @@ # Perltidy Change Log -## 2024 05 11.02 +## 2024 05 11.03 + + - A option was added to filter unimplemented parameters from perltidy + configuration files, suggested in git #146. If a line in the config + file begins with three dashes followed by a parameter name + (rather than two), then the line will be removed if the parameter is + unknown. Otherwise, a dash will be removed to make the line valid. + + - Parameters --dump-mismatched-args (or -dma) and + --warn-mismatched-arg (or -wma) have been updated to catch more + arg count issues. - Fix issue git #143, extend -add-trailing-commas to apply to a list with just a fat comma. diff --git a/bin/perltidy b/bin/perltidy index e74020d7..000a4355 100755 --- a/bin/perltidy +++ b/bin/perltidy @@ -6658,7 +6658,7 @@ The perltidy binary uses the Perl::Tidy module and is installed when that module =head1 VERSION -This man page documents perltidy version 20240511.02 +This man page documents perltidy version 20240511.03 =head1 BUG REPORTS diff --git a/lib/Perl/Tidy.pm b/lib/Perl/Tidy.pm index 1ca0a425..cb7d8b38 100644 --- a/lib/Perl/Tidy.pm +++ b/lib/Perl/Tidy.pm @@ -131,7 +131,7 @@ BEGIN { # then the Release version must be bumped, and it is probably past time for # a release anyway. - $VERSION = '20240511.02'; + $VERSION = '20240511.03'; } ## end BEGIN sub DESTROY { diff --git a/lib/Perl/Tidy.pod b/lib/Perl/Tidy.pod index 1013ded2..f909341b 100644 --- a/lib/Perl/Tidy.pod +++ b/lib/Perl/Tidy.pod @@ -469,7 +469,7 @@ The module 'Perl::Tidy' comes with a binary 'perltidy' which is installed when t =head1 VERSION -This man page documents Perl::Tidy version 20240511.02 +This man page documents Perl::Tidy version 20240511.03 =head1 LICENSE diff --git a/lib/Perl/Tidy/Debugger.pm b/lib/Perl/Tidy/Debugger.pm index 3f247ead..5c0fb243 100644 --- a/lib/Perl/Tidy/Debugger.pm +++ b/lib/Perl/Tidy/Debugger.pm @@ -8,7 +8,7 @@ package Perl::Tidy::Debugger; use strict; use warnings; use English qw( -no_match_vars ); -our $VERSION = '20240511.02'; +our $VERSION = '20240511.03'; use constant EMPTY_STRING => q{}; use constant SPACE => q{ }; diff --git a/lib/Perl/Tidy/Diagnostics.pm b/lib/Perl/Tidy/Diagnostics.pm index af98709e..987079d1 100644 --- a/lib/Perl/Tidy/Diagnostics.pm +++ b/lib/Perl/Tidy/Diagnostics.pm @@ -18,7 +18,7 @@ package Perl::Tidy::Diagnostics; use strict; use warnings; use English qw( -no_match_vars ); -our $VERSION = '20240511.02'; +our $VERSION = '20240511.03'; use constant EMPTY_STRING => q{}; diff --git a/lib/Perl/Tidy/FileWriter.pm b/lib/Perl/Tidy/FileWriter.pm index 05f3a562..e4250a2b 100644 --- a/lib/Perl/Tidy/FileWriter.pm +++ b/lib/Perl/Tidy/FileWriter.pm @@ -16,7 +16,7 @@ package Perl::Tidy::FileWriter; use strict; use warnings; -our $VERSION = '20240511.02'; +our $VERSION = '20240511.03'; use constant DEVEL_MODE => 0; use constant EMPTY_STRING => q{}; diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm index d1051e3c..610e0ba2 100644 --- a/lib/Perl/Tidy/Formatter.pm +++ b/lib/Perl/Tidy/Formatter.pm @@ -76,7 +76,7 @@ use constant BACKSLASH => q{\\}; use Carp; use English qw( -no_match_vars ); use List::Util qw( min max first ); # min, max first are in Perl 5.8 -our $VERSION = '20240511.02'; +our $VERSION = '20240511.03'; # The Tokenizer will be loaded with the Formatter ##use Perl::Tidy::Tokenizer; # for is_keyword() @@ -14137,17 +14137,15 @@ EOM my $type_mm = $rLL->[$K_mm]->[_TYPE_]; my $token_mm = $rLL->[$K_mm]->[_TOKEN_]; + my $seqno_mm = $rLL->[$K_mm]->[_TYPE_SEQUENCE_]; # check for $self in parens, like ($self)=shift - if ( $token_mm eq ')' ) { - my $seqno_mm = $rLL->[$K_mm]->[_TYPE_SEQUENCE_]; - if ($seqno_mm) { - my $Ko = $K_opening_container->{$seqno_mm}; - $K_mm = $self->K_next_code($Ko); - if ($K_mm) { - $type_mm = $rLL->[$K_mm]->[_TYPE_]; - $token_mm = $rLL->[$K_mm]->[_TOKEN_]; - } + if ( $seqno_mm && $token_mm eq ')' ) { + my $Ko = $K_opening_container->{$seqno_mm}; + $K_mm = $self->K_next_code($Ko); + if ($K_mm) { + $type_mm = $rLL->[$K_mm]->[_TYPE_]; + $token_mm = $rLL->[$K_mm]->[_TOKEN_]; } } diff --git a/lib/Perl/Tidy/HtmlWriter.pm b/lib/Perl/Tidy/HtmlWriter.pm index 78cd3a23..aa695d59 100644 --- a/lib/Perl/Tidy/HtmlWriter.pm +++ b/lib/Perl/Tidy/HtmlWriter.pm @@ -7,7 +7,7 @@ package Perl::Tidy::HtmlWriter; use strict; use warnings; -our $VERSION = '20240511.02'; +our $VERSION = '20240511.03'; use Carp; use English qw( -no_match_vars ); diff --git a/lib/Perl/Tidy/IOScalar.pm b/lib/Perl/Tidy/IOScalar.pm index dd071b8d..841a4946 100644 --- a/lib/Perl/Tidy/IOScalar.pm +++ b/lib/Perl/Tidy/IOScalar.pm @@ -10,7 +10,7 @@ package Perl::Tidy::IOScalar; use strict; use warnings; use Carp; -our $VERSION = '20240511.02'; +our $VERSION = '20240511.03'; use constant DEVEL_MODE => 0; use constant EMPTY_STRING => q{}; diff --git a/lib/Perl/Tidy/IOScalarArray.pm b/lib/Perl/Tidy/IOScalarArray.pm index 297db363..f654c017 100644 --- a/lib/Perl/Tidy/IOScalarArray.pm +++ b/lib/Perl/Tidy/IOScalarArray.pm @@ -14,7 +14,7 @@ package Perl::Tidy::IOScalarArray; use strict; use warnings; use Carp; -our $VERSION = '20240511.02'; +our $VERSION = '20240511.03'; use constant DEVEL_MODE => 0; diff --git a/lib/Perl/Tidy/IndentationItem.pm b/lib/Perl/Tidy/IndentationItem.pm index 2cc05598..1ce26a8f 100644 --- a/lib/Perl/Tidy/IndentationItem.pm +++ b/lib/Perl/Tidy/IndentationItem.pm @@ -9,7 +9,7 @@ package Perl::Tidy::IndentationItem; use strict; use warnings; -our $VERSION = '20240511.02'; +our $VERSION = '20240511.03'; BEGIN { diff --git a/lib/Perl/Tidy/Logger.pm b/lib/Perl/Tidy/Logger.pm index ae8e8f91..b9c9c5f8 100644 --- a/lib/Perl/Tidy/Logger.pm +++ b/lib/Perl/Tidy/Logger.pm @@ -8,7 +8,7 @@ package Perl::Tidy::Logger; use strict; use warnings; -our $VERSION = '20240511.02'; +our $VERSION = '20240511.03'; use Carp; use English qw( -no_match_vars ); diff --git a/lib/Perl/Tidy/Tokenizer.pm b/lib/Perl/Tidy/Tokenizer.pm index c63e160b..610f1f10 100644 --- a/lib/Perl/Tidy/Tokenizer.pm +++ b/lib/Perl/Tidy/Tokenizer.pm @@ -33,7 +33,7 @@ use strict; use warnings; use English qw( -no_match_vars ); -our $VERSION = '20240511.02'; +our $VERSION = '20240511.03'; use Carp; diff --git a/lib/Perl/Tidy/VerticalAligner.pm b/lib/Perl/Tidy/VerticalAligner.pm index 72893d57..a0efa9a8 100644 --- a/lib/Perl/Tidy/VerticalAligner.pm +++ b/lib/Perl/Tidy/VerticalAligner.pm @@ -5,7 +5,7 @@ use Carp; { #<<< A non-indenting brace to contain all lexical variables -our $VERSION = '20240511.02'; +our $VERSION = '20240511.03'; use English qw( -no_match_vars ); use Scalar::Util 'refaddr'; use Perl::Tidy::VerticalAligner::Alignment; diff --git a/lib/Perl/Tidy/VerticalAligner/Alignment.pm b/lib/Perl/Tidy/VerticalAligner/Alignment.pm index 1d0c224a..ec611fd2 100644 --- a/lib/Perl/Tidy/VerticalAligner/Alignment.pm +++ b/lib/Perl/Tidy/VerticalAligner/Alignment.pm @@ -9,7 +9,7 @@ package Perl::Tidy::VerticalAligner::Alignment; use strict; use warnings; -our $VERSION = '20240511.02'; +our $VERSION = '20240511.03'; sub new { my ( $class, $rarg ) = @_; diff --git a/lib/Perl/Tidy/VerticalAligner/Line.pm b/lib/Perl/Tidy/VerticalAligner/Line.pm index 8a96e0f7..40964579 100644 --- a/lib/Perl/Tidy/VerticalAligner/Line.pm +++ b/lib/Perl/Tidy/VerticalAligner/Line.pm @@ -10,7 +10,7 @@ package Perl::Tidy::VerticalAligner::Line; use strict; use warnings; -our $VERSION = '20240511.02'; +our $VERSION = '20240511.03'; use English qw( -no_match_vars ); sub AUTOLOAD { -- 2.39.5