From: Steve Hancock Date: Sat, 10 Jun 2023 22:12:44 +0000 (-0700) Subject: bump vertion to 20230309.03 X-Git-Tag: 20230309.03^0 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=202b82cc98e5c09bd483dcc416aa8af80f9e6630;p=perltidy.git bump vertion to 20230309.03 --- diff --git a/CHANGES.md b/CHANGES.md index a6034161..a6c8ae4c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # Perltidy Change Log -## 2023 03 09.02 +## 2023 03 09.03 - Issue git #121. Added parameters -xbt, or --extended-block-tightness, and -xbtl=s, or --extended-block-tightness-list=s, to allow diff --git a/MANIFEST b/MANIFEST index a31cb2ac..b6683aa8 100644 --- a/MANIFEST +++ b/MANIFEST @@ -5,6 +5,7 @@ CHANGES.md COPYING docs/BugLog.html docs/ChangeLog.html +docs/ci_update.md docs/eos_flag.md docs/index.html docs/index.md diff --git a/bin/perltidy b/bin/perltidy index e643b705..af96bb9f 100755 --- a/bin/perltidy +++ b/bin/perltidy @@ -5716,7 +5716,7 @@ The perltidy binary uses the Perl::Tidy module and is installed when that module =head1 VERSION -This man page documents perltidy version 20230309.02 +This man page documents perltidy version 20230309.03 =head1 BUG REPORTS diff --git a/dev-bin/run_convergence_tests.pl.expect b/dev-bin/run_convergence_tests.pl.expect index 3a5ece73..2ccfed81 100644 --- a/dev-bin/run_convergence_tests.pl.expect +++ b/dev-bin/run_convergence_tests.pl.expect @@ -641,8 +641,7 @@ while ( sub bb { for ( my $i = $first, - my $j = - 0 ; + my $j = 0 ; $i <= $last ; ) @@ -656,8 +655,7 @@ sub bb { sub bB { for ( my $i = $first, - my $j = - 0 ; + my $j = 0 ; $i <= $last ; ) @@ -670,7 +668,7 @@ __END__ ==> b068 <== # State 1 for ($r[0]=0, - my $i + my $i = 1 ; $i<= @@ -681,7 +679,7 @@ __END__ for ( $r[0] = 0, - my $i + my $i = 1 ; $i<= @@ -1822,7 +1820,8 @@ my @boolfunc = "c" ] ] - => "SubField must have two parts" + => +"SubField must have two parts" ], ); @@ -1835,7 +1834,8 @@ my @boolfunc = "c" ] ] - => "SubField must have two parts" + => +"SubField must have two parts" ], ); @@ -1944,7 +1944,7 @@ like ( my @tail = ( @buf[ ( $i % ( -$p ) - + 1 ) + + 1 ) .. $#buf ], @buf[ 0 .. $i % ( -$p ) ] ); @@ -1952,7 +1952,7 @@ like ( # State 2 my @tail = ( @buf[ ( $i % ( -$p ) - + 1 ) + + 1 ) .. $#buf ], @buf[ 0 .. $i % ( -$p ) ] ); @@ -2626,10 +2626,10 @@ $term = [ curr_opt ( @beg[ 2, - 5 ] ), + 5 ] ), 1, @beg[ 0, 1, 3, - 4 ] ]; + 4 ] ]; } ==> b1090 <== @@ -3100,7 +3100,8 @@ foreach $port ( ==> b1105 <== foreach $port ( sort - ( @ARGV[ 1 .. $#ARGV ] ) ) + ( @ARGV[ 1 .. $#ARGV ] + ) ) __END__ foreach $port ( sort @@ -3909,16 +3910,16 @@ my @schedule = ( my $line_number= $self->{line_no} ->[@{$self - ->{line_no}} - - @{$self->{line}} - -1]; + ->{line_no}}- + @{$self->{line}}- + 1]; my $line_number= $self->{line_no} ->[@{$self - ->{line_no}} - - @{$self->{line}} - -1]; + ->{line_no}}- + @{$self->{line}}- + 1]; ==> b1147 <== @summary= @@ -3933,19 +3934,19 @@ my @schedule = ( ==> b1148 <== $self->{line_no} ->[ @{ $self - ->{line_no} } - + ->{line_no} } - @{ $self->{line} } - 1 ]; $self->{line_no} ->[ @{ $self - ->{line_no} } - + ->{line_no} } - @{ $self->{line} } - 1 ]; $self->{line_no} ->[ @{ $self - ->{line_no} } - + ->{line_no} } - @{ $self->{line} } - 1 ]; @@ -5348,26 +5349,22 @@ is( # S1 my $oldage = ( - sort { $a <=> $b } - map { -M } - @files )[-1]; + sort { $a <=> $b } + map { -M } @files )[-1]; my $depage = ( sort { $a <=> $b } - map { -M } @deps ) - [0]; + map { -M } @deps )[0]; # S2 my $oldage = ( - sort { $a <=> $b } - map { -M } - @files )[-1]; + sort { $a <=> $b } + map { -M } @files )[-1]; my $depage = ( sort { $a <=> $b } - map { -M } @deps ) - [0]; + map { -M } @deps )[0]; ==> b1236 <== # Added level test when applying kpit @@ -9734,9 +9731,9 @@ for ( for my $index( GZIP_MIN_HEADER_SIZE.. - GZIP_MIN_HEADER_SIZE - + length($Name) - -1) + GZIP_MIN_HEADER_SIZE + + length($Name) + -1) __END__ for my $index( @@ -9750,9 +9747,9 @@ for my $index( ==> b787 <== # State 1: the +GZIP is parsed as type p for my $index ( GZIP_MIN_HEADER_SIZE - +1 .. GZIP_MIN_HEADER_SIZE - -GZIP_FEXTRA_HEADER_SIZE - +1 ) + +1 .. GZIP_MIN_HEADER_SIZE + -GZIP_FEXTRA_HEADER_SIZE + +1 ) __END__ @@ -9829,8 +9826,7 @@ return $oDoW[ ( localtime( $time - ->as_int - ) + ->as_int ) )[6] ]; } @@ -9841,8 +9837,7 @@ return $oDoW[ ( localtime( $time - ->as_int - ) + ->as_int ) )[6] ]; } @@ -10205,7 +10200,7 @@ my %nodecount = ==> b924 <== foreach my $p( sort{lc($a)cmp lc($b)} - keys%v + keys%v ) __END__ @@ -10387,7 +10382,7 @@ my @parts # S1 foreach my $x ( sort{lc($a)cmp lc($b)} - keys %INC + keys %INC ) __END__ @@ -10902,7 +10897,7 @@ my ( ==> b975 <== foreach my $x ( sort { lc($a) cmp lc($b) } - keys %INC + keys %INC ) __END__ diff --git a/docs/ChangeLog.html b/docs/ChangeLog.html index 3137c3d4..23955dd6 100644 --- a/docs/ChangeLog.html +++ b/docs/ChangeLog.html @@ -1,8 +1,18 @@

Perltidy Change Log

-

2023 03 09.02

+

2023 03 09.03

-
- Issue git #116. A new flag --valign-if-unless, -viu, was added to
+
- Issue git #121. Added parameters -xbt, or --extended-block-tightness,
+  and -xbtl=s, or --extended-block-tightness-list=s, to allow
+  certain small code blocks to have internal spacing controlled by
+  -bbt=n instead of -bt=n. The man pages have details.
+
+- Issue git #118. A warning will be issued if a duplicate format-skipping
+  starting marker is seen within a format-skipping section. The same
+  applies to duplicate code-skipping starting markers within code-skipping
+  sections.
+
+- Issue git #116. A new flag --valign-if-unless, -viu, was added to
   allow postfix 'unless' terms to align with postfix 'if' terms.  The
   default remains not to do this.
 
@@ -15,6 +25,21 @@
 - Fixed git #110, add missing documentation for new options
   -cpb and -bfvt=n. These work in version 20230309 but the pod
   documentation was missing and has been added.
+
+- Fixed an undefined reference message when running with
+  --dump-block-summary on a file without any subs or other
+  selected block types.
+
+- Some rare, minor issues with continuation indentation have been fixed.
+  Most scripts will remain unchanged.  The main change is that block
+  comments which occur just before a closing brace, bracket or paren
+  now have an indentation which is independent of the existance of
+  an optional comma or semicolon.  Previously, adding or deleting
+  an optional trailing comma could cause their indentation to jump.
+  Also, indentation of comments within ternary statements has been
+  improved. For additonal information see
+
+  https://github.com/perltidy/perltidy/blob/master/docs/ci_update.md
 

 
 
2023 03 09

diff --git a/docs/Tidy.html b/docs/Tidy.html
index cf07c72f..ae99b6c7 100644
--- a/docs/Tidy.html
+++ b/docs/Tidy.html
@@ -399,7 +399,7 @@
 
 
VERSION

 
-
This man page documents Perl::Tidy version 20230309.02

+
This man page documents Perl::Tidy version 20230309.03

 
 
LICENSE

 
diff --git a/docs/perltidy.html b/docs/perltidy.html
index 56372995..15ec6246 100644
--- a/docs/perltidy.html
+++ b/docs/perltidy.html
@@ -935,6 +935,47 @@
 
 
To simplify input in the case that all of the tightness flags have the same value <n>, the parameter <-act=n> or --all-containers-tightness=n is an abbreviation for the combination <-pt=n -sbt=n -bt=n -bbt=n>.

 
+
+
-xbt, --extended-block-tightness

+

+
+
Curly braces which are considered by perltidy to contain code blocks for formatting purposes exclude some of the code blocks used by Perl mainly for isolating terms. These include curly braces following a keyword where an indirect object might occur, or curly braces following a type symbol. For example

+
+
  print {*STDERR} $message;
+  return @{$self};

+
+
Since perltidy does not format these small containers as code blocks, by default the spacing within for these braces follows the flag --brace-tightness=n.

+
+
But they can be made to instead follow the spacing defined by the --block-brace-tightness=n flag by seting --extended-block-tightness.

+
+
Note that if the two flags -bbt=n and -bt=n have the same value n then there would be no reason to set this flag.

+
+

+
-xbtl=s, --extended-block-tightness-list=s

+

+
+
The small blocks to which the parameter -xbt applies consist of those curly braces preceded by the keywords

+
+
    print printf sort exec system say

+
+
and special symbols

+
+
    $ @ % & * $#

+
+
To restrict -xbt to apply to just the above keywords use

+
+
   -xbtl=k

+
+
and to restrict it to apply to just the above special type symbols use

+
+
   -xbtl=t

+
+
To restrict it to certain specific keywords or type symbols, enter them in the parameter s. For example, the following restricts it apply to just the keywords print and say:

+
+
   -xbtl="print say"

+
+
Note that this parameter merely changes the way that the parameter --extended-block-tightness works. It has no effect unless --extended-block-tightness is set.

+
 

 
-tso, --tight-secret-operators

 

@@ -4335,19 +4376,19 @@
  boc    bok    bol    bom    bos    bot    cblx   ce     conv   cpb
  cs     csc    cscb   cscw   dac    dbc    dbs    dcbl   dcsc   ddf
  dln    dnl    dop    dp     dpro   drc    dsc    dsm    dsn    dtc
- dtt    dwic   dwls   dwrs   dws    eos    f      fll    fpva   frm
- fs     fso    gcs    hbc    hbcm   hbco   hbh    hbhh   hbi    hbj
- hbk    hbm    hbn    hbp    hbpd   hbpu   hbq    hbs    hbsc   hbv
- hbw    hent   hic    hicm   hico   hih    hihh   hii    hij    hik
- him    hin    hip    hipd   hipu   hiq    his    hisc   hiv    hiw
- hsc    html   ibc    icb    icp    iob    isbc   iscl   kgb    kgbd
- kgbi   kis    lal    log    lop    lp     lsl    mem    nib    ohbr
- okw    ola    olc    oll    olq    opr    opt    osbc   osbr   otr
- ple    pod    pvl    q      sac    sbc    sbl    scbb   schb   scp
- scsb   sct    se     sfp    sfs    skp    sob    sobb   sohb   sop
- sosb   sot    ssc    st     sts    t      tac    tbc    toc    tp
- tqw    trp    ts     tsc    tso    vbc    vc     vmll   vsc    w
- wfc    wn     x      xci    xlp    xs
+ dtt dwic dwls dwrs dws eos f fpva frm fs + fso gcs hbc hbcm hbco hbh hbhh hbi hbj hbk + hbm hbn hbp hbpd hbpu hbq hbs hbsc hbv hbw + hent hic hicm hico hih hihh hii hij hik him + hin hip hipd hipu hiq his hisc hiv hiw hsc + html ibc icb icp iob isbc iscl kgb kgbd kgbi + kis lal log lop lp lsl mem nib ohbr okw + ola olc oll olq opr opt osbc osbr otr ple + pod pvl q sac sbc sbl scbb schb scp scsb + sct se sfp sfs skp sob sobb sohb sop sosb + sot ssc st sts t tac tbc toc tp tqw + trp ts tsc tso vbc vc viu vmll vsc w + wfc wn x xbt xci xlp xs

Equivalently, the prefix 'no' or 'no-' on the corresponding long names may be used.

@@ -4425,7 +4466,7 @@

VERSION

-

This man page documents perltidy version 20230309.02

+

This man page documents perltidy version 20230309.03

BUG REPORTS

diff --git a/lib/Perl/Tidy.pm b/lib/Perl/Tidy.pm index 375eae54..4c1e132d 100644 --- a/lib/Perl/Tidy.pm +++ b/lib/Perl/Tidy.pm @@ -114,7 +114,7 @@ BEGIN { # then the Release version must be bumped, and it is probably past time for # a release anyway. - $VERSION = '20230309.02'; + $VERSION = '20230309.03'; } ## end BEGIN sub DESTROY { diff --git a/lib/Perl/Tidy.pod b/lib/Perl/Tidy.pod index 7d64d813..5748e5a9 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 20230309.02 +This man page documents Perl::Tidy version 20230309.03 =head1 LICENSE diff --git a/lib/Perl/Tidy/Debugger.pm b/lib/Perl/Tidy/Debugger.pm index 3c1f6bf9..f17b5277 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 = '20230309.02'; +our $VERSION = '20230309.03'; use constant EMPTY_STRING => q{}; use constant SPACE => q{ }; diff --git a/lib/Perl/Tidy/DevNull.pm b/lib/Perl/Tidy/DevNull.pm index fe254280..0b3b2437 100644 --- a/lib/Perl/Tidy/DevNull.pm +++ b/lib/Perl/Tidy/DevNull.pm @@ -7,7 +7,7 @@ package Perl::Tidy::DevNull; use strict; use warnings; -our $VERSION = '20230309.02'; +our $VERSION = '20230309.03'; sub new { my $self = shift; return bless {}, $self } sub print { return } sub close { return } diff --git a/lib/Perl/Tidy/Diagnostics.pm b/lib/Perl/Tidy/Diagnostics.pm index cfa870ed..200c3622 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 = '20230309.02'; +our $VERSION = '20230309.03'; use constant EMPTY_STRING => q{}; diff --git a/lib/Perl/Tidy/FileWriter.pm b/lib/Perl/Tidy/FileWriter.pm index b9c22744..6ff08d6a 100644 --- a/lib/Perl/Tidy/FileWriter.pm +++ b/lib/Perl/Tidy/FileWriter.pm @@ -7,7 +7,7 @@ package Perl::Tidy::FileWriter; use strict; use warnings; -our $VERSION = '20230309.02'; +our $VERSION = '20230309.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 9d813ad4..e9136238 100644 --- a/lib/Perl/Tidy/Formatter.pm +++ b/lib/Perl/Tidy/Formatter.pm @@ -53,7 +53,7 @@ use constant SPACE => q{ }; use Carp; use English qw( -no_match_vars ); use List::Util qw( min max ); # min, max are in Perl 5.8 -our $VERSION = '20230309.02'; +our $VERSION = '20230309.03'; # The Tokenizer will be loaded with the Formatter ##use Perl::Tidy::Tokenizer; # for is_keyword() diff --git a/lib/Perl/Tidy/HtmlWriter.pm b/lib/Perl/Tidy/HtmlWriter.pm index 7ad24722..c190cd5c 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 = '20230309.02'; +our $VERSION = '20230309.03'; use English qw( -no_match_vars ); use File::Basename; diff --git a/lib/Perl/Tidy/IOScalar.pm b/lib/Perl/Tidy/IOScalar.pm index c83d71b1..78fb9854 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 = '20230309.02'; +our $VERSION = '20230309.03'; use constant EMPTY_STRING => q{}; diff --git a/lib/Perl/Tidy/IOScalarArray.pm b/lib/Perl/Tidy/IOScalarArray.pm index eb5a39b3..7af66fe9 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 = '20230309.02'; +our $VERSION = '20230309.03'; sub AUTOLOAD { diff --git a/lib/Perl/Tidy/IndentationItem.pm b/lib/Perl/Tidy/IndentationItem.pm index 77b7190e..f8fe3197 100644 --- a/lib/Perl/Tidy/IndentationItem.pm +++ b/lib/Perl/Tidy/IndentationItem.pm @@ -8,7 +8,7 @@ package Perl::Tidy::IndentationItem; use strict; use warnings; -our $VERSION = '20230309.02'; +our $VERSION = '20230309.03'; BEGIN { diff --git a/lib/Perl/Tidy/LineBuffer.pm b/lib/Perl/Tidy/LineBuffer.pm index 9279ff45..af941243 100644 --- a/lib/Perl/Tidy/LineBuffer.pm +++ b/lib/Perl/Tidy/LineBuffer.pm @@ -12,7 +12,7 @@ package Perl::Tidy::LineBuffer; use strict; use warnings; -our $VERSION = '20230309.02'; +our $VERSION = '20230309.03'; sub AUTOLOAD { diff --git a/lib/Perl/Tidy/LineSink.pm b/lib/Perl/Tidy/LineSink.pm index 18f5c64a..fbfaa0ec 100644 --- a/lib/Perl/Tidy/LineSink.pm +++ b/lib/Perl/Tidy/LineSink.pm @@ -8,7 +8,7 @@ package Perl::Tidy::LineSink; use strict; use warnings; -our $VERSION = '20230309.02'; +our $VERSION = '20230309.03'; sub AUTOLOAD { diff --git a/lib/Perl/Tidy/LineSource.pm b/lib/Perl/Tidy/LineSource.pm index 2fff097c..813cfbd6 100644 --- a/lib/Perl/Tidy/LineSource.pm +++ b/lib/Perl/Tidy/LineSource.pm @@ -9,7 +9,7 @@ package Perl::Tidy::LineSource; use strict; use warnings; use English qw( -no_match_vars ); -our $VERSION = '20230309.02'; +our $VERSION = '20230309.03'; use constant DEVEL_MODE => 0; diff --git a/lib/Perl/Tidy/Logger.pm b/lib/Perl/Tidy/Logger.pm index 857128da..299fbb30 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 = '20230309.02'; +our $VERSION = '20230309.03'; use English qw( -no_match_vars ); use constant DEVEL_MODE => 0; diff --git a/lib/Perl/Tidy/Tokenizer.pm b/lib/Perl/Tidy/Tokenizer.pm index 4ea6138d..a462863d 100644 --- a/lib/Perl/Tidy/Tokenizer.pm +++ b/lib/Perl/Tidy/Tokenizer.pm @@ -23,7 +23,7 @@ use strict; use warnings; use English qw( -no_match_vars ); -our $VERSION = '20230309.02'; +our $VERSION = '20230309.03'; use Perl::Tidy::LineBuffer; use Carp; diff --git a/lib/Perl/Tidy/VerticalAligner.pm b/lib/Perl/Tidy/VerticalAligner.pm index e0e0b775..6dd263c7 100644 --- a/lib/Perl/Tidy/VerticalAligner.pm +++ b/lib/Perl/Tidy/VerticalAligner.pm @@ -3,7 +3,7 @@ use strict; use warnings; use Carp; use English qw( -no_match_vars ); -our $VERSION = '20230309.02'; +our $VERSION = '20230309.03'; use Perl::Tidy::VerticalAligner::Alignment; use Perl::Tidy::VerticalAligner::Line; diff --git a/lib/Perl/Tidy/VerticalAligner/Alignment.pm b/lib/Perl/Tidy/VerticalAligner/Alignment.pm index 70d6d334..b00a3cec 100644 --- a/lib/Perl/Tidy/VerticalAligner/Alignment.pm +++ b/lib/Perl/Tidy/VerticalAligner/Alignment.pm @@ -10,7 +10,7 @@ use warnings; { #<<< A non-indenting brace -our $VERSION = '20230309.02'; +our $VERSION = '20230309.03'; sub new { my ( $class, $rarg ) = @_; diff --git a/lib/Perl/Tidy/VerticalAligner/Line.pm b/lib/Perl/Tidy/VerticalAligner/Line.pm index c35dead7..f7d48fca 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; use English qw( -no_match_vars ); -our $VERSION = '20230309.02'; +our $VERSION = '20230309.03'; sub AUTOLOAD {