From f365105f342a4a81872df32b01938bc62f63539d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ville=20Skytt=C3=A4?= Date: Wed, 23 Oct 2024 00:03:21 +0300 Subject: [PATCH] Spelling fixes --- CHANGES.md | 24 ++++++++++++------------ bin/perltidy | 6 +++--- docs/ChangeLog.html | 24 ++++++++++++------------ docs/ci_update.md | 2 +- docs/eos_flag.md | 6 +++--- docs/index.html | 2 +- docs/index.md | 2 +- docs/perltidy.html | 4 ++-- lib/Perl/Tidy.pm | 2 +- lib/Perl/Tidy/Formatter.pm | 26 +++++++++++++------------- lib/Perl/Tidy/Tokenizer.pm | 6 +++--- lib/Perl/Tidy/VerticalAligner.pm | 8 ++++---- local-docs/Release-Checklist.md | 2 +- 13 files changed, 57 insertions(+), 57 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 792a1084..db488da5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -556,11 +556,11 @@ - Some 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 + now have an indentation which is independent of the existence 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 details see: + improved. For additional details see: https://github.com/perltidy/perltidy/blob/master/docs/ci_update.md @@ -1120,7 +1120,7 @@ - Added a new option '--code-skipping', requested in git #65, in which code between comment lines '#<>V' is passed verbatim to the output - stream without error checking. It is simmilar to --format-skipping + stream without error checking. It is similar to --format-skipping but there is no error checking of the skipped code. This can be useful for skipping past code which employs an extended syntax. @@ -1614,7 +1614,7 @@ will exit with a non-zero exit flag if the assertion fails. - fixed issue RT#130297; the perltidy script now exits with a nonzero exit - status if it wrote to the standard error output. Prevously only fatal + status if it wrote to the standard error output. Previously only fatal run errors produced a non-zero exit flag. Now, even non-fatal messages requested with the -w flag will cause a non-zero exit flag. The exit flag now has these values: @@ -1943,7 +1943,7 @@ - RT #123749, partial fix. "Continuation indentation" is removed from lines with leading closing parens which are part of a call chain. For example, the call to pack() is is now outdented to the starting - indentation in the following experession: + indentation in the following expression: # OLD $mw->Button( @@ -2668,7 +2668,7 @@ -it>1. - Fixed bug where a line occasionally ended with an extra space. This reduces - rhe number of instances where a second iteration gives a result different + the number of instances where a second iteration gives a result different from the first. - Updated documentation to note that the Tidy.pm module parameter may @@ -2742,7 +2742,7 @@ - Allow configuration file to be 'perltidy.ini' for Windows systems. i.e. C:\Documents and Settings\User\perltidy.ini - and added documentation for setting configuation file under Windows in man + and added documentation for setting configuration file under Windows in man page. Thanks to Stuart Clark. - Corrected problem of unwanted semicolons in hash ref within given/when code. @@ -3385,7 +3385,7 @@ Thanks to Mark Olesen for suggesting this. - -Improved alignement of '='s in certain cases. + -Improved alignment of '='s in certain cases. Thanks to Norbert Gruener for sending an example. -Outdent-long-comments (-olc) has been re-instated as a default, since @@ -3653,7 +3653,7 @@ ); -Lists which do not format well in uniform columns are now better - identified and formated. + identified and formatted. OLD: return $c->create( 'polygon', $x, $y, $x + $ruler_info{'size'}, @@ -3705,7 +3705,7 @@ to control what text is appended to 'else' and 'elsif' blocks. Default is to just add leading 'if' text to an 'else'. See manual. - -The -csc option now labels 'else' blocks with additinal information + -The -csc option now labels 'else' blocks with additional information from the opening if statement and elsif statements, if space. Thanks to Wolfgang Weisselberg for suggesting this. @@ -3814,7 +3814,7 @@ '92', '94', '96', '98', '100', '102', '104' ); - -Lists of complex items, such as matricies, are now detected + -Lists of complex items, such as matrices, are now detected and displayed with just one item per row: OLD: @@ -3923,7 +3923,7 @@ if ( ( $tmp >= 0x80_00_00 ) || ( $tmp < -0x80_00_00 ) ) { } -'**=' was incorrectly tokenized as '**' and '='. This only - caused a problem with the -extrude opton. + caused a problem with the -extrude option. -Corrected a divide by zero when -extrude option is used diff --git a/bin/perltidy b/bin/perltidy index e3258025..c08fc405 100755 --- a/bin/perltidy +++ b/bin/perltidy @@ -1491,7 +1491,7 @@ and look at the F<.DEBUG> file to see the tokenization. To illustrate, suppose we do not want a space after a colon which introduces a sub attribute. We need to know its type. It is not a colon because that is the -type of a ternary operator. The ouput of B<--dump-token-types> states that it +type of a ternary operator. The output of B<--dump-token-types> states that it is token type 'A'. To verify this, we can run C on a short piece of code containing such a colon, such as @@ -4107,7 +4107,7 @@ line breaks. Running with B<--converge> gives the desired result: because comma changes are based on the line breaks after the first iteration. The additional computer time needed by the B<--converge> option to do another -iteration or two will not be noticable except for files with many thousands of +iteration or two will not be noticeable except for files with many thousands of lines. A parameter B<--delay-trailing-comma-operations>, or B<-dtco>, is available to @@ -4147,7 +4147,7 @@ B<--delete-lone-trailing-commas, -dltc> - gives permission to delete the only c One issue with deleting a lone comma is that if it is deleted, then it might not be possible add it back automatically since perltidy uses the -existance of commas to help locate containers where commas are appropriate. For +existence of commas to help locate containers where commas are appropriate. For example, given my ( $self, ) = @_; diff --git a/docs/ChangeLog.html b/docs/ChangeLog.html index 9f030570..ce550c2a 100644 --- a/docs/ChangeLog.html +++ b/docs/ChangeLog.html @@ -559,11 +559,11 @@ my $html = $this->SUPER::genObject( $query, $bindNode, $field . ":$var", - Some 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 + now have an indentation which is independent of the existence 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 details see: + improved. For additional details see: https://github.com/perltidy/perltidy/blob/master/docs/ci_update.md @@ -1130,7 +1130,7 @@ my $html = $this->SUPER::genObject( $query, $bindNode, $field . ":$var", - Added a new option '--code-skipping', requested in git #65, in which code between comment lines '#<<V' and '#>>V' is passed verbatim to the output - stream without error checking. It is simmilar to --format-skipping + stream without error checking. It is similar to --format-skipping but there is no error checking of the skipped code. This can be useful for skipping past code which employs an extended syntax. @@ -1635,7 +1635,7 @@ signatures. Reformatting with the current version will fix the problem. will exit with a non-zero exit flag if the assertion fails. - fixed issue RT#130297; the perltidy script now exits with a nonzero exit - status if it wrote to the standard error output. Prevously only fatal + status if it wrote to the standard error output. Previously only fatal run errors produced a non-zero exit flag. Now, even non-fatal messages requested with the -w flag will cause a non-zero exit flag. The exit flag now has these values: @@ -1971,7 +1971,7 @@ NEW: 
- RT #123749, partial fix.  "Continuation indentation" is removed from lines 
   with leading closing parens which are part of a call chain. 
   For example, the call to pack() is is now outdented to the starting 
-  indentation in the following experession:  
+  indentation in the following expression:
 
       # OLD
       $mw->Button(
@@ -2710,7 +2710,7 @@ NEW:
   -it>1.
 
 - Fixed bug where a line occasionally ended with an extra space. This reduces
-  rhe number of instances where a second iteration gives a result different
+  the number of instances where a second iteration gives a result different
   from the first. 
 
 - Updated documentation to note that the Tidy.pm module <stderr> parameter may
@@ -2786,7 +2786,7 @@ NEW:
 
 
- Allow configuration file to be 'perltidy.ini' for Windows systems.
   i.e. C:\Documents and Settings\User\perltidy.ini
-  and added documentation for setting configuation file under Windows in man
+  and added documentation for setting configuration file under Windows in man
   page.  Thanks to Stuart Clark.
 
 - Corrected problem of unwanted semicolons in hash ref within given/when code.
@@ -3439,7 +3439,7 @@ formatting.  For example:
 
  Thanks to Mark Olesen for suggesting this.
 
--Improved alignement of '='s in certain cases.
+-Improved alignment of '='s in certain cases.
  Thanks to Norbert Gruener for sending an example.
 
 -Outdent-long-comments (-olc) has been re-instated as a default, since
@@ -3712,7 +3712,7 @@ a terminal =cut.  Thanks to Mike Birdsall for reporting this.
    );
 
 -Lists which do not format well in uniform columns are now better
- identified and formated.
+ identified and formatted.
 
    OLD:
    return $c->create( 'polygon', $x, $y, $x + $ruler_info{'size'},
@@ -3764,7 +3764,7 @@ a terminal =cut.  Thanks to Mike Birdsall for reporting this.
  to control what text is appended to 'else' and 'elsif' blocks.
  Default is to just add leading 'if' text to an 'else'.  See manual.
 
--The -csc option now labels 'else' blocks with additinal information
+-The -csc option now labels 'else' blocks with additional information
  from the opening if statement and elsif statements, if space.
  Thanks to Wolfgang Weisselberg for suggesting this.
 
@@ -3874,7 +3874,7 @@ a terminal =cut.  Thanks to Mike Birdsall for reporting this.
                  '92', '94', '96', '98', '100', '102', '104'
                  );
 
--Lists of complex items, such as matricies, are now detected
+-Lists of complex items, such as matrices, are now detected
  and displayed with just one item per row:
 
    OLD:
@@ -3984,7 +3984,7 @@ but the second one was not:
    if ( ( $tmp >= 0x80_00_00 ) || ( $tmp < -0x80_00_00 ) ) { }
 
 -'**=' was incorrectly tokenized as '**' and '='.  This only
-    caused a problem with the -extrude opton.
+    caused a problem with the -extrude option.
 
 -Corrected a divide by zero when -extrude option is used
 
diff --git a/docs/ci_update.md b/docs/ci_update.md
index 565fa88a..76ee7173 100644
--- a/docs/ci_update.md
+++ b/docs/ci_update.md
@@ -340,7 +340,7 @@ formatting would be
 ```
 
 The first line now has a different indentation from the rest, and this is
-undesirable because ideally indentation should be independent of the existance
+undesirable because ideally indentation should be independent of the existence
 of side comments.  The new version handles this correctly:
 
 ```
diff --git a/docs/eos_flag.md b/docs/eos_flag.md
index 1dca74e0..06a6a724 100644
--- a/docs/eos_flag.md
+++ b/docs/eos_flag.md
@@ -117,7 +117,7 @@ that this will occur the Change Log for perltidy will contain a warning to be
 alert for the double encoding problem, and how to reset the default if
 necessary.  This is also the reason for waiting some time before the second step was made.
 
-If double encoding does appear to be occuring with the change in the default for some program which calls Perl::Tidy, then a quick emergency fix can be made by the program user by setting **-neos** to revert to the old default.  A better fix can eventually be made by the program author by removing the second encoding using a technique such as illustrated above.
+If double encoding does appear to be occurring with the change in the default for some program which calls Perl::Tidy, then a quick emergency fix can be made by the program user by setting **-neos** to revert to the old default.  A better fix can eventually be made by the program author by removing the second encoding using a technique such as illustrated above.
 
 ## Summary
 
@@ -150,7 +150,7 @@ the realm of Perl the text must be stored in 'B' mode.
 The source can only be in 'C' mode if it arrives by a call from another Perl
 program, and the destination can only be in 'C' mode if the destination is a
 Perl program.  Otherwise, if the destination is a file, or object with a print
-method, then it will be assumed to be ending its existance as a Perl string and
+method, then it will be assumed to be ending its existence as a Perl string and
 will be placed in an end state which is 'B' mode.
 
 Transition from a starting 'B' mode to 'C' mode is done by a decoding operation
@@ -161,7 +161,7 @@ mode to an ending 'C' mode.
 
 Let us make a list of all possible sets of string storage modes to be sure that
 all cases are covered.  If each of the three stages list above (entry,
-intermedite, and exit) could be in 'B' or 'C' mode then we would have a total
+intermediate, and exit) could be in 'B' or 'C' mode then we would have a total
 of 2 x 2 x 2 = 8 combinations of states.  Each end point may either be a file
 or a string reference. Here is a list of them, with a note indicating which
 ones are possible, and when:
diff --git a/docs/index.html b/docs/index.html
index d604c9b6..f119f3f6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -54,7 +54,7 @@ make install
 

 
 
The INSTALL file has additional installation notes. They
-are mainly for older sytems but also tell how to use perltidy without doing an installation.

+are mainly for older systems but also tell how to use perltidy without doing an installation.

 
 
Links

 
diff --git a/docs/index.md b/docs/index.md
index f337f6d0..5497e7b5 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -58,7 +58,7 @@ test and install using the Makefile.PL:
     make install
 
 The [INSTALL file](./INSTALL.html) has additional installation notes. They
-are mainly for older sytems but also tell how to use perltidy without doing an installation.
+are mainly for older systems but also tell how to use perltidy without doing an installation.
 
 ## Links
 
diff --git a/docs/perltidy.html b/docs/perltidy.html
index dccd90f7..10292c86 100644
--- a/docs/perltidy.html
+++ b/docs/perltidy.html
@@ -1139,7 +1139,7 @@
 
 
It is necessary to have a list of all token types in order to create this type of input. Such a list can be obtained by the command --dump-token-types. Also try the -D flag on a short snippet of code and look at the .DEBUG file to see the tokenization.

 
-
To illustrate, suppose we do not want a space after a colon which introduces a sub attribute. We need to know its type. It is not a colon because that is the type of a ternary operator. The ouput of --dump-token-types states that it is token type 'A'. To verify this, we can run perltidy -D on a short piece of code containing such a colon, such as

+
To illustrate, suppose we do not want a space after a colon which introduces a sub attribute. We need to know its type. It is not a colon because that is the type of a ternary operator. The output of --dump-token-types states that it is token type 'A'. To verify this, we can run perltidy -D on a short piece of code containing such a colon, such as

 
 
    sub foo : lvalue;

 
@@ -3269,7 +3269,7 @@
 
 
 
-
One issue with deleting a lone comma is that if it is deleted, then it might not be possible add it back automatically since perltidy uses the existance of commas to help locate containers where commas are appropriate. For example, given

+
One issue with deleting a lone comma is that if it is deleted, then it might not be possible add it back automatically since perltidy uses the existence of commas to help locate containers where commas are appropriate. For example, given

 
 
    my ( $self, ) = @_;

 
diff --git a/lib/Perl/Tidy.pm b/lib/Perl/Tidy.pm
index 94251a56..73346545 100644
--- a/lib/Perl/Tidy.pm
+++ b/lib/Perl/Tidy.pm
@@ -1100,7 +1100,7 @@ EOM
         unshift( @Arg_files, '-' );
     }
 
-    # check file existance and expand any globs
+    # check file existence and expand any globs
     else {
         my @updated_files;
         foreach my $input_file (@Arg_files) {
diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index e1809640..560708ec 100644
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -5,7 +5,7 @@
 
 # Usage Outline:
 #
-#   STEP 1: initialize or re-initialze Formatter with user options
+#   STEP 1: initialize or re-initialize Formatter with user options
 #     Perl::Tidy::Formatter::check_options($rOpts);
 #
 #   STEP 2: crate a tokenizer for the source stream
@@ -7505,7 +7505,7 @@ EOM
 
                     # The opening depth should always be defined, and
                     # it should equal $nesting_depth-1.  To protect
-                    # against unforseen error conditions, however, we
+                    # against unforeseen error conditions, however, we
                     # will check this and fix things if necessary.  For
                     # a test case see issue c055.
                     my $opening_depth = $rdepth_of_opening_seqno->[$seqno];
@@ -7924,7 +7924,7 @@ sub find_loop_label {
         # skip a blank line
         next if ( !defined($Kfirst) );
 
-        # check for a lable
+        # check for a label
         if ( $rLL->[$Kfirst]->[_TYPE_] eq 'J' ) {
             $label = $rLL->[$Kfirst]->[_TOKEN_];
             last;
@@ -8135,7 +8135,7 @@ EOM
         }
 
         # Both 'sub' and 'asub' select an anonymous sub.
-        # This allows anonymous subs to be explicitely selected
+        # This allows anonymous subs to be explicitly selected
         elsif (
             $ris_asub_block->{$seqno}
             && (   $dump_all_types
@@ -11535,7 +11535,7 @@ sub wildcard_match {
     # For example, key='$pack' with code=3 is short for '$pack*'
     # which will match '$package', '$packer', etc
 
-    # Loop over all possible matchs
+    # Loop over all possible matches
     foreach ( @{$rwildcard_match_list} ) {
         my ( $key, $code ) = @{$_};
         my $len_key  = length($key);
@@ -11839,7 +11839,7 @@ sub initialize_call_paren_style {
 sub scan_call_parens {
     my ($self) = @_;
 
-    # Perform a scan requesed by --want-call-parens
+    # Perform a scan requested by --want-call-parens
     # We search for selected functions or keywords and for a following paren.
     # A warning is issued if the paren existence is not what is wanted
     # according to the setting --want-call-parens.
@@ -14470,7 +14470,7 @@ sub unstore_last_nonblank_token {
 
     my ( $rcomma, $rblank );
 
-    # Note: orignally just for ',' but now also for '->'
+    # Note: originally just for ',' but now also for '->'
 
     # case 1: pop comma from top of stack
     if ( $rLL_new->[-1]->[_TYPE_] eq $type ) {
@@ -14734,7 +14734,7 @@ sub match_trailing_comma_rule {
 
             # if outer container is paren, must be sub call or list assignment
             # Note that _ris_function_call_paren_ does not currently include
-            # calls of the form '->(', so that has to be checked separetely.
+            # calls of the form '->(', so that has to be checked separately.
             if (   $token eq '('
                 && !$self->[_ris_function_call_paren_]->{$type_sequence}
                 && !$is_arrow_call
@@ -17772,9 +17772,9 @@ sub cross_check_sub_calls {
             }
         }
 
-        #--------------------------------------------
-        # compare caller/sub return counts if posible
-        #--------------------------------------------
+        #---------------------------------------------
+        # compare caller/sub return counts if possible
+        #---------------------------------------------
 
         # rhs check: only check subs returning finite lists (i.e. not '@list');
         next if ($return_count_indefinite);
@@ -32401,7 +32401,7 @@ EOM
         # We have a list spanning multiple lines and are trying
         # to decide the best way to set comma breakpoints.
 
-        # Overriden variables
+        # Overridden variables
         my $item_count       = $rhash_A->{_item_count_A};
         my $identifier_count = $rhash_A->{_identifier_count_A};
 
@@ -32843,7 +32843,7 @@ EOM
 
         # Returns:
         #    - nothing if nothing more to do
-        #    - a ref to a hash containg some derived parameters
+        #    - a ref to a hash containing some derived parameters
 
         # Variables from caller
         my $i_opening_paren     = $rhash_IN->{i_opening_paren};
diff --git a/lib/Perl/Tidy/Tokenizer.pm b/lib/Perl/Tidy/Tokenizer.pm
index 76e40d3f..bb17ddae 100644
--- a/lib/Perl/Tidy/Tokenizer.pm
+++ b/lib/Perl/Tidy/Tokenizer.pm
@@ -4,7 +4,7 @@
 #
 # Usage Outline:
 #
-#   STEP 1: initialize or re-initialze Tokenizer with user options
+#   STEP 1: initialize or re-initialize Tokenizer with user options
 #     Perl::Tidy::Tokenizer::check_options($rOpts);
 #
 #   STEP 2: create a tokenizer for a specific input source object
@@ -2769,7 +2769,7 @@ EOM
 
         my $self = shift;
 
-        # TEST 1: class stmt can only go where a new statment can start
+        # TEST 1: class stmt can only go where a new statement can start
         if ( !new_statement_ok() ) { return }
 
         my $i_beg   = $i + 1;
@@ -10935,7 +10935,7 @@ The following additional token types are defined:
     G    user-defined function taking block parameter (like grep/map/eval)
     S    sub definition     (reported as type 'i' in older versions)
     P    package definition (reported as type 'i' in older versions)
-    t    type indicater such as %,$,@,*,&,sub
+    t    type indicator such as %,$,@,*,&,sub
     w    bare word (perhaps a subroutine call)
     i    identifier of some type (with leading %, $, @, *, &, sub, -> )
     n    a number
diff --git a/lib/Perl/Tidy/VerticalAligner.pm b/lib/Perl/Tidy/VerticalAligner.pm
index 71aa1aa7..d15380d0 100644
--- a/lib/Perl/Tidy/VerticalAligner.pm
+++ b/lib/Perl/Tidy/VerticalAligner.pm
@@ -2535,7 +2535,7 @@ sub sweep_left_to_right {
                 my $is_blocked = defined( $blocking_level[$ng] )
                   && $lev > $blocking_level[$ng];
 
-                # TAIL-WAG-DOG RULE: prevent a 'tail-wag-dog' syndrom, meaning:
+                # TAIL-WAG-DOG RULE: prevent a 'tail-wag-dog' syndrome, meaning:
                 # Do not let one or two lines with a **different number of
                 # alignments** open up a big gap in a large block.  For
                 # example, we will prevent something like this, where the first
@@ -3373,7 +3373,7 @@ sub match_line_pairs {
             $list_type      = $line->{'list_type'};
             $ci_level       = $line->{'ci_level'};
 
-            # Quick approxmiate check for signed numbers in this line.
+            # Quick approximate check for signed numbers in this line.
             # This speeds up large runs by about 0.5%
             if ( !$saw_signed_number ) {
 
@@ -4934,7 +4934,7 @@ sub end_signed_number_column {
 
     # Finish formatting a column of unsigned numbers
     # Given:
-    #   $rgroup_lines - the current vertical aligment group of lines
+    #   $rgroup_lines - the current vertical alignment group of lines
     #   $rcol_hash    - a hash of information about this vertical column
     #   $ix_last      - index of the last line of this vertical column
     # Task:
@@ -5773,7 +5773,7 @@ sub end_wide_equals_column {
 
     # Finish formatting a column of wide equals
     # Given:
-    #   $rgroup_lines - the current vertical aligment group of lines
+    #   $rgroup_lines - the current vertical alignment group of lines
     #   $rcol_hash    - a hash of information about this vertical column
     #   $ix_last      - index of the last line of this vertical column
 
diff --git a/local-docs/Release-Checklist.md b/local-docs/Release-Checklist.md
index d1efa738..af5477af 100644
--- a/local-docs/Release-Checklist.md
+++ b/local-docs/Release-Checklist.md
@@ -1,7 +1,7 @@
 # Checklist for preparing a new version and/or release
 
 - basic quality control:
-  - 'make test' successful for all commit canditates
+  - 'make test' successful for all commit candidates
   - run 'devbin/run__convergence_tests.pl' for all commit candidates
   - Run perlcritic
   - run NYTProf and check the activity and performance of all changed code
-- 
2.39.5