added input checks for -kba and -kbb

diff --git a/dev-bin/run_convergence_tests.pl.data b/dev-bin/run_convergence_tests.pl.data
index ccd676fedad63a3e5c31c900d03a791bf71e0a44..332ad2555c126ba039e4ba80ec242e7b6bc84574 100644 (file)
--- a/dev-bin/run_convergence_tests.pl.data
+++ b/dev-bin/run_convergence_tests.pl.data
@@ -352,8 +352,6 @@ open( CVSLOG,
 --indent-spaced-block-comments
 --keep-interior-semicolons
 --keep-old-blank-lines=72
-#--keep-old-breakpoints-after='=+'
-#--keep-old-breakpoints-before='=+'
 --keyword-group-blanks-before=0
 --keyword-group-blanks-delete
 --keyword-group-blanks-repeat-count=17
@@ -4324,8 +4322,6 @@ __END__
 --indent-spaced-block-comments
 --nokeep-interior-semicolons
 --keep-old-blank-lines=87
-#--keep-old-breakpoints-after='=+'
-#--keep-old-breakpoints-before='!'
 --keyword-group-blanks-after=0
 --keyword-group-blanks-delete
 --keyword-group-blanks-repeat-count=48
@@ -4541,8 +4537,6 @@ sub receive_bgp_update_message {
 --indent-spaced-block-comments
 --keep-interior-semicolons
 --keep-old-blank-lines=9
---keep-old-breakpoints-after='train'
---keep-old-breakpoints-before='sub'
 --keyword-group-blanks-after=2
 --keyword-group-blanks-before=2
 --keyword-group-blanks-repeat-count=82
@@ -9604,8 +9598,6 @@ Readonly::Hash my%CAPTURE_REFERENCE_ENGLISH=>
 --indent-spaced-block-comments
 --nokeep-interior-semicolons
 --keep-old-blank-lines=46
---keep-old-breakpoints-after='=+'
---keep-old-breakpoints-before='sub'
 --keyword-group-blanks-before=2
 --keyword-group-blanks-inside
 --keyword-group-blanks-repeat-count=69
@@ -10052,8 +10044,6 @@ Readonly::Scalar
 --noindent-spaced-block-comments
 --keep-interior-semicolons
 --keep-old-blank-lines=20
---keep-old-breakpoints-after='subaru'
---keep-old-breakpoints-before='train'
 --keyword-group-blanks-before=2
 --keyword-group-blanks-inside
 --keyword-group-blanks-repeat-count=45
@@ -11854,8 +11844,6 @@ my%where=
 --noindent-spaced-block-comments
 --keep-interior-semicolons
 --keep-old-blank-lines=27
---keep-old-breakpoints-after='train'
---keep-old-breakpoints-before='sub'
 --keyword-group-blanks-after=2
 --keyword-group-blanks-repeat-count=59
 --keyword-group-blanks-size='2.8'
@@ -11953,8 +11941,6 @@ my%where=
 --indent-spaced-block-comments
 --keep-interior-semicolons
 --keep-old-blank-lines=24
-#--keep-old-breakpoints-after='!'
-#--keep-old-breakpoints-before='=+'
 --keyword-group-blanks-delete
 --keyword-group-blanks-repeat-count=92
 --keyword-group-blanks-size='2.8'
@@ -12871,8 +12857,6 @@ __END__
 ##--iterations=93
 --nokeep-interior-semicolons
 --keep-old-blank-lines=70
-#--keep-old-breakpoints-after='subaru'
-#--keep-old-breakpoints-before='train'
 --keyword-group-blanks-before=2
 --keyword-group-blanks-repeat-count=43
 --keyword-group-blanks-size='7'
@@ -13010,8 +12994,6 @@ foreach my $key
 ##--iterations=61
 --keep-interior-semicolons
 --keep-old-blank-lines=82
-#--keep-old-breakpoints-after='train'
-#--keep-old-breakpoints-before='subaru'
 --keyword-group-blanks-after=2
 --keyword-group-blanks-before=2
 --keyword-group-blanks-delete
@@ -13190,8 +13172,6 @@ foreach my $key
 --indent-spaced-block-comments
 --nokeep-interior-semicolons
 --keep-old-blank-lines=39
---keep-old-breakpoints-after='1x'
---keep-old-breakpoints-before='!'
 --keyword-group-blanks-inside
 --keyword-group-blanks-repeat-count=59
 --keyword-group-blanks-size='2.8'
@@ -13324,8 +13304,6 @@ explain
 --indent-spaced-block-comments
 --keep-interior-semicolons
 --keep-old-blank-lines=7
-#--keep-old-breakpoints-after='1x'
-#--keep-old-breakpoints-before='sub'
 --keyword-group-blanks-before=0
 --keyword-group-blanks-delete
 --keyword-group-blanks-inside
@@ -14258,11 +14236,8 @@ if ($printmask
 --ignore-side-comment-lengths
 --indent-closing-brace
 --indent-spaced-block-comments
-##--iterations=93
 --nokeep-interior-semicolons
 --keep-old-blank-lines=37
---keep-old-breakpoints-after='sub'
---keep-old-breakpoints-before='=+'
 --keyword-group-blanks-after=2
 --keyword-group-blanks-before=0
 --keyword-group-blanks-delete
@@ -14570,11 +14545,8 @@ my ( $template, $loggedinuser, $cookie )
 --noignore-side-comment-lengths
 --noindent-closing-brace
 --indent-spaced-block-comments
-#--iterations=92
 --keep-interior-semicolons
 --keep-old-blank-lines=16
-#--keep-old-breakpoints-after='train'
-#--keep-old-breakpoints-before='=+'
 --keyword-group-blanks-before=2
 --keyword-group-blanks-delete
 --keyword-group-blanks-repeat-count=63
@@ -14706,8 +14678,6 @@ while (<>)
 --indent-spaced-block-comments
 --keep-interior-semicolons
 --keep-old-blank-lines=5
---keep-old-breakpoints-after='subaru'
---keep-old-breakpoints-before='=+'
 --keyword-group-blanks-before=2
 --keyword-group-blanks-repeat-count=44
 --keyword-group-blanks-size='1.8'
@@ -14879,11 +14849,8 @@ $cron =
 --indent-closing-brace
 --indent-columns=5
 --indent-spaced-block-comments
-#--iterations=17
 --keep-interior-semicolons
 --keep-old-blank-lines=39
---keep-old-breakpoints-after='!'
---keep-old-breakpoints-before='train'
 --keyword-group-blanks-after=2
 --keyword-group-blanks-before=2
 --keyword-group-blanks-repeat-count=23
@@ -15050,11 +15017,8 @@ my @cellbits=(
 --noindent-closing-brace
 --indent-columns=6
 --noindent-spaced-block-comments
-##--iterations=8
 --keep-interior-semicolons
 --keep-old-blank-lines=87
---keep-old-breakpoints-after='sub'
---keep-old-breakpoints-before='1x'
 --keyword-group-blanks-repeat-count=94
 --keyword-group-blanks-size='10'
 --line-up-parentheses

diff --git a/lib/Perl/Tidy/Formatter.pm b/lib/Perl/Tidy/Formatter.pm
index 57071652ab86d722ee1ebec7d67ae6a584c1a354..017f61d51344034955a8add781cd76e9e790123d 100644 (file)
--- a/lib/Perl/Tidy/Formatter.pm
+++ b/lib/Perl/Tidy/Formatter.pm
@@ -2272,10 +2272,21 @@ EOM
         }
     }
 
-    #--------------------------------------------------------------------------
-    # FIXME: check @list for valid token types here. For example, a missing
-    # space like '=>,' would cause an error and be hard to find.
-    #--------------------------------------------------------------------------
+    my @unknown_types;
+    foreach my $type (@list) {
+        if ( !Perl::Tidy::Tokenizer::is_valid_token_type($type) ) {
+            push @unknown_types, $type;
+        }
+    }
+
+    if (@unknown_types) {
+        my $num = @unknown_types;
+        local $" = ' ';
+        Warn(<<EOM);
+$num unrecognized token types were input with --$short_name :
+@unknown_types
+EOM
+    }
 
     @{$rkeep_break_hash}{@list} = (1) x scalar(@list);
 

diff --git a/lib/Perl/Tidy/Tokenizer.pm b/lib/Perl/Tidy/Tokenizer.pm
index 90dce9d04a343436efbfc65e4c70c714636b3124..73dc7b1da160ce4743b7aac95ba6bfffabe088b4 100644 (file)
--- a/lib/Perl/Tidy/Tokenizer.pm
+++ b/lib/Perl/Tidy/Tokenizer.pm
@@ -747,6 +747,11 @@ sub report_v_string {
     return;
 }
 
+sub is_valid_token_type {
+    my ($type) = @_;
+    return $is_valid_token_type{$type};
+}
+
 sub get_input_line_number {
     return $tokenizer_self->[_last_line_number_];
 }