From 084f7fbfea0f75cc8f5a20d3b079c0be2875f568 Mon Sep 17 00:00:00 2001 From: Steve Hancock Date: Mon, 7 Nov 2022 07:39:37 -0800 Subject: [PATCH] update version to 20111111 --- CHANGES.md | 6 +- bin/perltidy | 2 +- docs/ChangeLog.html | 130 ++++++++- docs/Tidy.html | 2 +- docs/perltidy.html | 293 ++++++++++++++++++--- lib/Perl/Tidy.pm | 2 +- lib/Perl/Tidy.pod | 2 +- lib/Perl/Tidy/Debugger.pm | 2 +- lib/Perl/Tidy/DevNull.pm | 2 +- lib/Perl/Tidy/Diagnostics.pm | 2 +- lib/Perl/Tidy/FileWriter.pm | 2 +- lib/Perl/Tidy/Formatter.pm | 4 +- 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/LineBuffer.pm | 2 +- lib/Perl/Tidy/LineSink.pm | 2 +- lib/Perl/Tidy/LineSource.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 +- 24 files changed, 405 insertions(+), 68 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a26f46d5..d6c8bf06 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # Perltidy Change Log -## 2022 06 13.06 +## 2022 11 11 - No significant bugs have been found since the last release to CPAN. Several minor issues have been fixed, and some new parameters have been @@ -34,11 +34,11 @@ combination -xlp -pt=2, mainly for two-line lists with short function names. One indentation space is removed to improve alignment: - # OLD: perltidy -xlp -pt=2 + # OLD: perltidy -xlp -pt=2 is($module->VERSION, $expected, "$main_module->VERSION matches $module->VERSION ($expected)"); - # NEW: perltidy -xlp -pt=2 + # NEW: perltidy -xlp -pt=2 is($module->VERSION, $expected, "$main_module->VERSION matches $module->VERSION ($expected)"); diff --git a/bin/perltidy b/bin/perltidy index 0d6ac057..82060f0d 100755 --- a/bin/perltidy +++ b/bin/perltidy @@ -5426,7 +5426,7 @@ The perltidy binary uses the Perl::Tidy module and is installed when that module =head1 VERSION -This man page documents perltidy version 20220613.06 +This man page documents perltidy version 20221111 =head1 BUG REPORTS diff --git a/docs/ChangeLog.html b/docs/ChangeLog.html index 90acabb9..f6f918a4 100644 --- a/docs/ChangeLog.html +++ b/docs/ChangeLog.html @@ -1,5 +1,133 @@

Perltidy Change Log

+

2022 11 11

+ +
- No significant bugs have been found since the last release to CPAN.
+  Several minor issues have been fixed, and some new parameters have been
+  added, as follows:
+
+- Fixed rare problem with irregular indentation involving --cuddled-else,
+  usually also with the combination -xci and -lp.  Reported in rt #144979.
+
+- Add option --weld-fat-comma (-wfc) for issue git #108. When -wfc
+  is set, along with -wn, perltidy is allowed to weld an opening paren
+  to an inner opening container when they are separated by a hash key
+  and fat comma (=>).  For example:
+
+    # perltidy -wn
+    elf->call_method(
+        method_name_foo => {
+            some_arg1       => $foo,
+            some_other_arg3 => $bar->{'baz'},
+        }
+    );
+
+    # perltidy -wn -wfc
+    elf->call_method( method_name_foo => {
+        some_arg1       => $foo,
+        some_other_arg3 => $bar->{'baz'},
+    } );
+
+  This flag is off by default.
+
+- Fix issue git #106. This fixes some edge cases of formatting with the
+  combination -xlp -pt=2, mainly for two-line lists with short function
+  names. One indentation space is removed to improve alignment:
+
+    # OLD: perltidy -xlp -pt=2
+    is($module->VERSION, $expected,
+        "$main_module->VERSION matches $module->VERSION ($expected)");
+
+    # NEW: perltidy -xlp -pt=2
+    is($module->VERSION, $expected,
+       "$main_module->VERSION matches $module->VERSION ($expected)");
+
+- Fix for issue git #105, incorrect formatting with 5.36 experimental
+  for_list feature.
+
+- Fix for issue git #103. For parameter -b, or --backup-and-modify-in-place,
+  the default backup method has been changed to preserve the inode value
+  of the file being formatted.  If this causes a problem, the previous
+  method is available and can be used by setting -backup-mode='move', or
+  -bm='move'.  The new default corresponds to -bm='copy'.  The difference
+  between the two methods is as follows.  For the older method,
+  -bm='move', the input file was moved to the backup, and a new file was
+  created for the formatted output.  This caused the inode to change.  For
+  the new default method, -bm='copy', the input is copied to the backup
+  and then the input file is reopened and rewritten. This preserves the
+  file inode.  Tests have not produced any problems with this change, but
+  before using the --backup-and-modify-in-place parameter please verify
+  that it works correctly in your environment and operating system. The
+  initial update for this had an error which was caught and fixed
+  in git #109.
+
+- Fix undefined value message when perltidy -D is used (git #104)
+
+- Fixed an inconsistency in html colors near pointers when -html is used.
+  Previously, a '->' at the end of a line got the 'punctuation color', black
+  by default but a '->' before an identifier got the color of the following
+  identifier. Now all pointers get the same color, which is black by default.
+  Also, previously a word following a '->' was given the color of a bareword,
+  black by default, but now it is given the color of an identifier.
+
+- Fixed incorrect indentation of any function named 'err'.  This was
+  due to some old code from when "use feature 'err'" was valid.
+
+        # OLD:
+        my ($curr) = current();
+          err (@_);
+
+        # NEW:
+        my ($curr) = current();
+        err(@_);
+
+- Added parameter --delete-repeated-commas (-drc) to delete repeated
+  commas. This is off by default. For example, given:
+
+        ignoreSpec( $file, "file",, \%spec, \%Rspec );
+
+  # perltidy -drc:
+        ignoreSpec( $file, "file", \%spec, \%Rspec );
+
+- Add continuation indentation to long C-style 'for' terms; i.e.
+
+        # OLD
+        for (
+            $j = $i - $shell ;
+            $j >= 0
+            && ++$ncomp
+            && $array->[$j] gt $array->[ $j + $shell ] ;
+            $j -= $shell
+          )
+
+        # NEW
+        for (
+            $j = $i - $shell ;
+            $j >= 0
+              && ++$ncomp
+              && $array->[$j] gt $array->[ $j + $shell ] ;
+            $j -= $shell
+          )
+
+  This will change some existing formatting.
+
+- The following new parameters are available for manipulating
+  trailing commas of lists. They are described in the manual.
+
+       --want-trailing-commas=s, -wtc=s
+       --add-trailing-commas,    -atc
+       --delete-trailing-commas, -dtc
+       --delete-weld-interfering-commas, -dwic
+
+- Files with errors due to missing, extra or misplaced parens, braces,
+  or square brackets are now written back out verbatim, without any
+  attempt at formatting.
+
+- This version runs 10 to 15 percent faster than the previous
+  release on large files due to optimizations made with the help of
+  Devel::NYTProf.
+
+

2022 06 13

- No significant bugs have been found since the last release but users
@@ -22,7 +150,7 @@
 - Added vertical alignment for qw quotes and empty parens in 'use'
   statements (see issue #git 93).  This new alignment is 'on' by default
   and will change formatting as shown below. If this is not wanted it can
-  be turned off with the parameter -vxl='q' (--valign-exclude-list='q').
+  be turned off with the parameter -vxl='q' (--valign-exclusion-list='q').
 
     # old default, or -vxl='q'
     use Getopt::Long qw(GetOptions);
diff --git a/docs/Tidy.html b/docs/Tidy.html
index ae33f1d7..06eea570 100644
--- a/docs/Tidy.html
+++ b/docs/Tidy.html
@@ -401,7 +401,7 @@
 
 

VERSION

-

This man page documents Perl::Tidy version 20220613

+

This man page documents Perl::Tidy version 20221111

LICENSE

diff --git a/docs/perltidy.html b/docs/perltidy.html index 8087a23f..6bcea468 100644 --- a/docs/perltidy.html +++ b/docs/perltidy.html @@ -18,7 +18,7 @@
  • EXAMPLES
  • OPTIONS - OVERVIEW
  • FORMATTING OPTIONS @@ -29,7 +29,11 @@
  • Comment Controls
  • Skipping Selected Sections of Code
  • Line Break Control
  • +
  • Controlling Breaks at Braces, Parens, and Square Brackets
  • +
  • Welding
  • +
  • Breaking Before or After Operators
  • Controlling List Formatting
  • +
  • Adding and Deleting Commas
  • Retaining or Ignoring Existing Line Breaks
  • Blank Line Control
  • Styles
  • @@ -153,7 +157,7 @@

    Option names may be terminated early as long as they are uniquely identified. For example, instead of --dump-token-types, it would be sufficient to enter --dump-tok, or even --dump-t, to uniquely identify this command.

    -

    I/O control

    +

    I/O Control

    The following parameters concern the files which are read and written.

    @@ -216,6 +220,8 @@

    Modify the input file or files in-place and save the original with the extension .bak. Any existing .bak file will be deleted. See next item for changing the default backup extension, and for eliminating the backup file altogether.

    +

    Please Note: Writing back to the input file increases the risk of data loss or corruption in the event of a software or hardware malfunction. Before using the -b parameter please be sure to have backups and verify that it works correctly in your environment and operating system.

    +

    A -b flag will be ignored if input is from standard input or goes to standard output, or if the -html flag is set.

    In particular, if you want to use both the -b flag and the -pbp (--perl-best-practices) flag, then you must put a -nst flag after the -pbp flag because it contains a -st flag as one of its components, which means that output will go to the standard output stream.

    @@ -240,6 +246,12 @@ <-bext='/backup'> F<.backup> Delete if no errors <-bext='original/'> F<.original> Delete if no errors
    + +
    -bm=s, --backup-method=s
    +
    + +

    This parameter should not normally be used but is available in the event that problems arise as a transition is made from an older implementation of the backup logic to a newer implementation. The newer implementation is the default and is specified with -bm='copy'. The older implementation is specified with -bm='move'. The difference is that the older implementation made the backup by moving the input file to the backup file, and the newer implementation makes the backup by copying the input file. The newer implementation preserves the file system inode value. This may avoid problems with other software running simultaneously. This change was made as part of issue git #103 at github.

    +
    -w, --warning-output
    @@ -898,7 +910,7 @@ fixit($i); } -

    Use -nola to not outdent labels. To control line breaks after labels see "bal=n, --break-after-labels=n".

    +

    Use -nola to not outdent labels. To control line breaks after labels see "-bal=n, --break-after-labels=n".

    Outdenting Keywords
    @@ -1755,10 +1767,24 @@

    Line Break Control

    -

    The parameters in this section control breaks after non-blank lines of code. Blank lines are controlled separately by parameters in the section "Blank Line Control".

    +

    The parameters in this and the next sections control breaks after non-blank lines of code. Blank lines are controlled separately by parameters in the section "Blank Line Control".

    +
    -dnl, --delete-old-newlines
    +
    + +

    By default, perltidy first deletes all old line break locations, and then it looks for good break points to match the desired line length. Use -ndnl or --nodelete-old-newlines to force perltidy to retain all old line break points.

    + +
    +
    -anl, --add-newlines
    +
    + +

    By default, perltidy will add line breaks when necessary to create continuations of long lines and to improve the script appearance. Use -nanl or --noadd-newlines to prevent any new line breaks.

    + +

    This flag does not prevent perltidy from eliminating existing line breaks; see --freeze-newlines to completely prevent changes to line break points.

    + +
    -fnl, --freeze-newlines
    @@ -1767,6 +1793,12 @@

    Note: If you also want to keep your blank lines exactly as they are, you can use the -fbl flag which is described in the section "Blank Line Control".

    +
    + +

    Controlling Breaks at Braces, Parens, and Square Brackets

    + +
    +
    -ce, --cuddled-else
    @@ -1834,7 +1866,7 @@
    -cblx, --cuddled-block-list-exclusive
    -

    When cuddled else formatting is selected with -ce, setting this flag causes perltidy to ignore its built-in defaults and rely exclusively on the block types specified on the -cbl flag described in the previous section. For example, to avoid using cuddled catch and finally, which among in the defaults, the following set of parameters could be used:

    +

    When cuddled else formatting is selected with -ce, setting this flag causes perltidy to ignore its built-in defaults and rely exclusively on the block types specified on the -cbl flag described in the previous section. For example, to avoid using cuddled catch and finally, which are among the defaults, the following set of parameters could be used:

      perltidy -ce -cbl='else elsif continue' -cblx
    @@ -2148,6 +2180,12 @@ -bbpi=2 indent one full indentation level
    +
    + +

    Welding

    + +
    +
    -wn, --weld-nested-containers
    @@ -2167,7 +2205,7 @@ next if $x == $y; } } until $x++ > $z; -

    When this flag is set perltidy makes a preliminary pass through the file and identifies all nested pairs of containers. To qualify as a nested pair, the closing container symbols must be immediately adjacent and the opening symbols must either (1) be adjacent as in the above example, or (2) have an anonymous sub declaration following an outer opening container symbol which is not a code block brace, or (3) have an outer opening paren separated from the inner opening symbol by any single non-container symbol or something that looks like a function evaluation, as illustrated in the next examples.

    +

    When this flag is set perltidy makes a preliminary pass through the file and identifies all nested pairs of containers. To qualify as a nested pair, the closing container symbols must be immediately adjacent and the opening symbols must either (1) be adjacent as in the above example, or (2) have an anonymous sub declaration following an outer opening container symbol which is not a code block brace, or (3) have an outer opening paren separated from the inner opening symbol by any single non-container symbol or something that looks like a function evaluation, as illustrated in the next examples. An additonal option (4) which can be turned on with the flag --weld-fat-comma is when the opening container symbols are separated by a hash key and fat comma (=>).

    Any container symbol may serve as both the inner container of one pair and as the outer container of an adjacent pair. Consequently, any number of adjacent opening or closing symbols may join together in weld. For example, here are three levels of wrapped function calls:

    @@ -2229,6 +2267,20 @@

    Finally, the stacking of containers defined by this flag have priority over any other container stacking flags. This is because any welding is done first.

    +
    +
    -wfc, --weld-fat-comma
    +
    + +

    When the -wfc flag is set, along with -wn, perltidy is allowed to weld an opening paren to an inner opening container when they are separated by a hash key and fat comma (=>). for example

    + +
        # perltidy -wn -wfc
    +    elf->call_method( method_name_foo => {
    +        some_arg1       => $foo,
    +        some_other_arg3 => $bar->{'baz'},
    +    } );
    + +

    This option is off by default.

    +
    -wnxl=s, --weld-nested-exclusion-list
    @@ -2550,22 +2602,9 @@

    Please note that if both opening and closing tokens are to be stacked, then the newer flag -weld-nested-containers may be preferable because it insures that stacking is always done symmetrically. It also removes an extra level of unnecessary indentation within welded containers. It is able to do this because it works on formatting globally rather than locally, as the -sot and -sct flags do.

    -
    -dnl, --delete-old-newlines
    -
    - -

    By default, perltidy first deletes all old line break locations, and then it looks for good break points to match the desired line length. Use -ndnl or --nodelete-old-newlines to force perltidy to retain all old line break points.

    - -
    -
    -anl, --add-newlines
    -
    - -

    By default, perltidy will add line breaks when necessary to create continuations of long lines and to improve the script appearance. Use -nanl or --noadd-newlines to prevent any new line breaks.

    - -

    This flag does not prevent perltidy from eliminating existing line breaks; see --freeze-newlines to completely prevent changes to line break points.

    +
    - -
    Controlling whether perltidy breaks before or after operators
    -
    +

    Breaking Before or After Operators

    Four command line parameters provide some control over whether a line break should be before or after specific token types. Two parameters give detailed control:

    @@ -2605,8 +2644,9 @@

    and the -bbao flag sets the default to break before all of these operators. These can be used to define an initial break preference which can be fine-tuned with the -wba and -wbb flags. For example, to break before all operators except an = one could use --bbao -wba='=' rather than listing every single perl operator except = on a -wbb flag.

    -
    -
    bal=n, --break-after-labels=n
    +
    + +
    -bal=n, --break-after-labels=n

    This flag controls whether or not a line break occurs after a label. There are three possible values for n:

    @@ -2733,6 +2773,174 @@
    +

    Adding and Deleting Commas

    + +
    + +
    -drc, --delete-repeated-commas
    +
    + +

    Repeated commas in a list are undesirable and can be removed with this flag. For example, given this list with a repeated comma

    + +
          ignoreSpec( $file, "file",, \%spec, \%Rspec );
    + +

    we can remove it with -drc

    + +
          # perltidy -drc:
    +      ignoreSpec( $file, "file", \%spec, \%Rspec );
    + +

    Since the default is not to add or delete commas, this feature is off by default and must be requested.

    + +
    +
    --want-trailing-commas=s or -wtc=s, --add-trailing-commas or -atc, and --delete-trailing-commas or -dtc
    +
    + +

    A trailing comma is a comma following the last item of a list. Perl allows trailing commas but they are not required. By default, perltidy does not add or delete trailing commas, but it is possible to manipulate them with the following set of three related parameters:

    + +
      --want-trailing-commas=s, -wtc=s - defines where trailing commas are wanted
    +  --add-trailing-commas,    -atc   - gives permission to add trailing commas to match the style wanted
    +  --delete-trailing-commas, -dtc   - gives permission to delete trailing commas which do not match the style wanted
    + +

    The parameter --want-trailing-commas=s, or -wtc=s, defines a preferred style. The string s indicates which lists should get trailing commas, as follows:

    + +
      s=0 : no list should have a trailing comma
    +  s=1 or * : every list should have a trailing comma
    +  s=m a multi-line list should have a trailing commas
    +  s=b trailing commas should be 'bare' (comma followed by newline)
    +  s=h lists of key=>value pairs, with about one one '=>' and one ',' per line,
    +      with a bare trailing comma
    +  s=i lists with about one comma per line, with a bare trailing comma
    +  s=' ' or -wtc not defined : leave trailing commas unchanged [DEFAULT].
    + +

    This parameter by itself only indicates the where trailing commas are wanted. Perltidy only adds these trailing commas if the flag --add-trailing-commas, or -atc is set. And perltidy only removes unwanted trailing commas if the flag --delete-trailing-commas, or -dtc is set.

    + +

    Here are some example parameter combinations and their meanings

    + +
      -wtc=0 -dtc   : delete all trailing commas
    +  -wtc=1 -atc   : all lists get trailing commas
    +  -wtc=m -atc   : all multi-line lists get trailing commas, but
    +                  single line lists remain unchanged.
    +  -wtc=m -dtc   : multi-line lists remain unchanged, but
    +                  any trailing commas on single line lists are removed.
    +  -wtc=m -atc -dtc  : all multi-line lists get trailing commas, and
    +                      any trailing commas on single line lists are removed.
    + +

    For example, given the following input without a trailing comma

    + +
        bless {
    +        B    => $B,
    +        Root => $Root
    +    } => $package;
    + +

    we can add a trailing comma after the variable $Root using

    + +
        # perltidy -wtc=m -atc
    +    bless {
    +        B    => $B,
    +        Root => $Root,
    +    } => $package;
    + +

    This could also be achieved in this case with -wtc=b instead of -wtc=m because the trailing comma here is bare (separated from its closing brace by a newline). And it could also be achieved with -wtc=h because this particular list is a list of key=>value pairs.

    + +

    The above styles should cover the main of situations of interest, but it is possible to apply a different style to each type of container token by including an opening token ahead of the style character in the above table. For example

    + +
        -wtc='(m [b'
    + +

    means that lists within parens should have multi-line trailing commas, and that lists within square brackets have bare trailing commas. Since there is no specification for curly braces in this example, their trailing commas would remain unchanged.

    + +

    For parentheses, an additional item of information which can be given is an alphanumeric letter which is used to limit the selection further depending on the type of token immediately before the opening paren. The possible letters are currently 'k', 'K', 'f', 'F', 'w', and 'W', with these meanings for matching whatever precedes an opening paren:

    + +
     'k' matches if the previous nonblank token is a perl built-in keyword (such as 'if', 'while'),
    + 'K' matches if 'k' does not, meaning that the previous token is not a keyword.
    + 'f' matches if the previous token is a function other than a keyword.
    + 'F' matches if 'f' does not.
    + 'w' matches if either 'k' or 'f' match.
    + 'W' matches if 'w' does not.
    + +

    These are the same codes used for --line-up-parentheses-inclusion-list. For example,

    + +
      -wtc = 'w(m'
    + +

    means that trailing commas are wanted for multi-line parenthesized lists following a function call or keyword.

    + +

    Here are some points to note regarding adding and deleting trailing commas:

    + +
      + +
    • For the implementation of these parameters, a list is basically taken to be a container of items (parens, square brackets, or braces), which is not a code block, with one or more commas. These parameters only apply to something that fits this definition of a list.

      + +

      Note that a paren-less list of parameters is not a list by this definition, so these parameters have no effect on a peren-less list.

      + +

      Another consequence is that if the only comma in a list is deleted, then it cannot later be added back with these parameters because the container no longer fits this definition of a list. For example, given

      + +
          my ( $self, ) = @_;
      + +

      and if we remove the comma with

      + +
          # perltidy -wtc=m -dtc
      +    my ( $self ) = @_;
      + +

      then we cannot use these trailing comma controls to add this comma back.

      + +
    • +
    • By multiline list is meant a list for which the first comma and trailing comma are on different lines.

      + +
    • +
    • A bare trailing comma is a comma which is at the end of a line. That is, the closing container token follows on a different line. So a list with a bare trailing comma is a special case of a multi-line list.

      + +
    • +
    • The decision regarding whether or not a list is multi-line or bare is made based on the input stream. In some cases it may take an iteration or two to reach a final state.

      + +
    • +
    • When using these parameters for the first time it is a good idea to practice on some test scripts and verify that the results are as expected.

      + +
    • +
    • Since the default behavior is not to add or delete commas, these parameters can be useful on a temporary basis for reformatting a script.

      + +
    • +
    + +
    +
    -dwic, --delete-weld-interfering-commas
    +
    + +

    If the closing tokens of two nested containers are separated by a comma, then welding requested with --weld-nested-containers cannot occur. Any commas in this situation are optional trailing commas and can be removed with -dwic. For example, a comma in this scipt prevents welding:

    + +
        # perltidy -wn
    +    skip_symbols(
    +        [ qw(
    +            Perl_dump_fds
    +            Perl_ErrorNo
    +            Perl_GetVars
    +            PL_sys_intern
    +        ) ],
    +    );
    + +

    Using -dwic removes the comma and allows welding:

    + +
        # perltidy -wn -dwic
    +    skip_symbols( [ qw(
    +        Perl_dump_fds
    +        Perl_ErrorNo
    +        Perl_GetVars
    +        PL_sys_intern
    +    ) ] );
    + +

    Since the default is not to add or delete commas, this feature is off by default. Here are some points to note about the -dwic parameter

    + +
      + +
    • This operation is not reversible, so please check results of using this parameter carefully.

      + +
    • +
    • Removing this type of isolated trailing comma is necessary for welding to be possible, but not sufficient. So welding will not always occur where these commas are removed.

      + +
    • +
    + +
    +
    +

    Retaining or Ignoring Existing Line Breaks

    Several additional parameters are available for controlling the extent to which line breaks in the input script influence the output script. In most cases, the default parameter values are set so that, if a choice is possible, the output style follows the input style. For example, if a short logical container is broken in the input script, then the default behavior is for it to remain broken in the output script.

    @@ -2767,7 +2975,7 @@
    -bom, --break-at-old-method-breakpoints
    -

    By default, a method call arrow -> is considered a candidate for a breakpoint, but method chains will fill to the line width before a break is considered. With -bom, breaks before the arrow are preserved, so if you have preformatted a method chain:

    +

    By default, a method call arrow -> is considered a candidate for a breakpoint, but method chains will fill to the line width before a break is considered. With -bom, breaks before the arrow are preserved, so if you have pre-formatted a method chain:

      my $q = $rs
         ->related_resultset('CDs')
    @@ -3911,23 +4119,24 @@
     
     

    The following list shows all short parameter names which allow a prefix 'n' to produce the negated form:

    -
     D      anl    asbl   asc    ast    asu    atnl   aws    b      baa
    - baao   bar    bbao   bbb    bbc    bbs    bl     bli    boa    boc
    - bok    bol    bom    bos    bot    cblx   ce     conv   cs     csc
    - cscb   cscw   dac    dbc    dcbl   dcsc   ddf    dln    dnl    dop
    - dp     dpro   dsc    dsm    dsn    dtt    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      wn     x      xci    xlp    xs
    +
     D      anl    asbl   asc    ast    asu    atc    atnl   aws    b
    + baa    baao   bar    bbao   bbb    bbc    bbs    bl     bli    boa
    + boc    bok    bol    bom    bos    bot    cblx   ce     conv   cs
    + csc    cscb   cscw   dac    dbc    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

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

    @@ -4005,7 +4214,7 @@

    VERSION

    -

    This man page documents perltidy version 20220613

    +

    This man page documents perltidy version 20221111

    BUG REPORTS

    diff --git a/lib/Perl/Tidy.pm b/lib/Perl/Tidy.pm index e21e2147..1bc97785 100644 --- a/lib/Perl/Tidy.pm +++ b/lib/Perl/Tidy.pm @@ -113,7 +113,7 @@ BEGIN { # then the Release version must be bumped, and it is probably past time for # a release anyway. - $VERSION = '20220613.06'; + $VERSION = '20221111'; } sub DESTROY { diff --git a/lib/Perl/Tidy.pod b/lib/Perl/Tidy.pod index c418fa0b..a09d1d80 100644 --- a/lib/Perl/Tidy.pod +++ b/lib/Perl/Tidy.pod @@ -475,7 +475,7 @@ The module 'Perl::Tidy' comes with a binary 'perltidy' which is installed when t =head1 VERSION -This man page documents Perl::Tidy version 20220613.06 +This man page documents Perl::Tidy version 20221111 =head1 LICENSE diff --git a/lib/Perl/Tidy/Debugger.pm b/lib/Perl/Tidy/Debugger.pm index f821bae7..8e29a992 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 = '20220613.06'; +our $VERSION = '20221111'; use constant EMPTY_STRING => q{}; use constant SPACE => q{ }; diff --git a/lib/Perl/Tidy/DevNull.pm b/lib/Perl/Tidy/DevNull.pm index 79cb3de9..660f4230 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 = '20220613.06'; +our $VERSION = '20221111'; 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 4a4eaa13..b1bbd7ae 100644 --- a/lib/Perl/Tidy/Diagnostics.pm +++ b/lib/Perl/Tidy/Diagnostics.pm @@ -21,7 +21,7 @@ package Perl::Tidy::Diagnostics; use strict; use warnings; use English qw( -no_match_vars ); -our $VERSION = '20220613.06'; +our $VERSION = '20221111'; use constant EMPTY_STRING => q{}; diff --git a/lib/Perl/Tidy/FileWriter.pm b/lib/Perl/Tidy/FileWriter.pm index bc9def4e..c7645581 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 = '20220613.06'; +our $VERSION = '20221111'; 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 9643e698..e485156e 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 = '20220613.06'; +our $VERSION = '20221111'; # The Tokenizer will be loaded with the Formatter ##use Perl::Tidy::Tokenizer; # for is_keyword() @@ -9835,7 +9835,7 @@ sub weld_nested_containers { # FIXME: this block is deactivated. It will be retained for a while for # use in testing, but can eventually be removed. It is no longer necessary # because the test c161 below handles this issue. - if (0 && $rOpts_line_up_parentheses) { + if ( 0 && $rOpts_line_up_parentheses ) { # NOTE: this has only been found to be necessary for parens, but this # could be applied to all types if necessary. diff --git a/lib/Perl/Tidy/HtmlWriter.pm b/lib/Perl/Tidy/HtmlWriter.pm index de0ad978..ae287e1d 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 = '20220613.06'; +our $VERSION = '20221111'; use English qw( -no_match_vars ); use File::Basename; diff --git a/lib/Perl/Tidy/IOScalar.pm b/lib/Perl/Tidy/IOScalar.pm index 7cd551a2..e8d5f8bb 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 = '20220613.06'; +our $VERSION = '20221111'; use constant EMPTY_STRING => q{}; diff --git a/lib/Perl/Tidy/IOScalarArray.pm b/lib/Perl/Tidy/IOScalarArray.pm index 212a8150..01c2555d 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 = '20220613.06'; +our $VERSION = '20221111'; sub AUTOLOAD { diff --git a/lib/Perl/Tidy/IndentationItem.pm b/lib/Perl/Tidy/IndentationItem.pm index 9728f8b6..d5fb34be 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 = '20220613.06'; +our $VERSION = '20221111'; BEGIN { diff --git a/lib/Perl/Tidy/LineBuffer.pm b/lib/Perl/Tidy/LineBuffer.pm index 1fc45edb..00d1357b 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 = '20220613.06'; +our $VERSION = '20221111'; sub AUTOLOAD { diff --git a/lib/Perl/Tidy/LineSink.pm b/lib/Perl/Tidy/LineSink.pm index 683761bb..4d8f8702 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 = '20220613.06'; +our $VERSION = '20221111'; sub AUTOLOAD { diff --git a/lib/Perl/Tidy/LineSource.pm b/lib/Perl/Tidy/LineSource.pm index 41cf5b2e..9ef8c51d 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 = '20220613.06'; +our $VERSION = '20221111'; use constant DEVEL_MODE => 0; diff --git a/lib/Perl/Tidy/Logger.pm b/lib/Perl/Tidy/Logger.pm index aa7ae9a5..7ca91b7e 100644 --- a/lib/Perl/Tidy/Logger.pm +++ b/lib/Perl/Tidy/Logger.pm @@ -7,7 +7,7 @@ package Perl::Tidy::Logger; use strict; use warnings; -our $VERSION = '20220613.06'; +our $VERSION = '20221111'; 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 fe6d0230..4857b6e4 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 = '20220613.06'; +our $VERSION = '20221111'; use Perl::Tidy::LineBuffer; use Carp; diff --git a/lib/Perl/Tidy/VerticalAligner.pm b/lib/Perl/Tidy/VerticalAligner.pm index e6181528..62c96bda 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 = '20220613.06'; +our $VERSION = '20221111'; 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 05d632ee..23097df0 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 = '20220613.06'; +our $VERSION = '20221111'; sub new { my ( $class, $rarg ) = @_; diff --git a/lib/Perl/Tidy/VerticalAligner/Line.pm b/lib/Perl/Tidy/VerticalAligner/Line.pm index ec705fee..1dc696b7 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 = '20220613.06'; +our $VERSION = '20221111'; sub AUTOLOAD { -- 2.39.5