In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/4f2e2aa236a3300a5f46fd5b3f02db9cf158f62f?hp=6a86c6ad94ba9f2a00d21db1a38c46b8c011f213>

- Log -----------------------------------------------------------------
commit 4f2e2aa236a3300a5f46fd5b3f02db9cf158f62f
Author: Father Chrysostomos <[email protected]>
Date:   Wed Jun 5 23:56:52 2013 -0700

    perldiag: Correct severity/category for ‘False [] range’
    
    This can now be a fatal error or a warning.  diag.t is still not
    smart enough to verify this, so it is still in its exception list.

M       pod/perldiag.pod

commit beb1a06ece75d264a775516a43aaf6ae9209e5c6
Author: Father Chrysostomos <[email protected]>
Date:   Wed Jun 5 23:44:05 2013 -0700

    diag.t: Don’t confuse the two exception listse
    
    The second exception list is for things listed in perldiag whose cate-
    gories are in need of correction or are too baffling for diag.t to
    check correctly (it’s not very smart).
    
    Due to my careless implementation in commit 62f5f54d, the second list
    was also treated effectively as an addendum to the first.  Things not
    listed in perldiag could be listed in the second exception list and
    make tests pass.

M       t/porting/diag.t

commit 91dcf1581c191610bc0bae72c942b7f6e95054f2
Author: Father Chrysostomos <[email protected]>
Date:   Wed Jun 5 23:33:35 2013 -0700

    diag.t: Remove commented obsoleted by 62f5f54dc2d

M       t/porting/diag.t

commit f6289783b6f4ac2a829a6f53eadf6ac16c6dde1a
Author: Father Chrysostomos <[email protected]>
Date:   Wed Jun 5 22:05:20 2013 -0700

    Alphabetize perltrap
    
    Before 9b12f83b0b6, the programming languages other than Perl were in
    alphabetical order.

M       pod/perltrap.pod
-----------------------------------------------------------------------

Summary of changes:
 pod/perldiag.pod |    2 +-
 pod/perltrap.pod |  142 +++++++++++++++++++++++++++---------------------------
 t/porting/diag.t |   18 ++++---
 3 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index ecb4191..6016648 100644
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -1943,7 +1943,7 @@ queue of such routines has been prematurely ended.
 
 =item False [] range "%s" in regex; marked by <-- HERE in m/%s/
 
-(W regexp) A character class range must start and end at a literal
+(W regexp)(F) A character class range must start and end at a literal
 character, not another character class like C<\d> or C<[:alpha:]>.  The "-"
 in your false range is interpreted as a literal "-".  Consider quoting the
 "-", "\-".  The <-- HERE shows whereabouts in the regular expression the
diff --git a/pod/perltrap.pod b/pod/perltrap.pod
index d55e77a..1edb7f6 100644
--- a/pod/perltrap.pod
+++ b/pod/perltrap.pod
@@ -205,77 +205,6 @@ to find their names on your system.
 
 =back
 
-=head2 Sed Traps
-
-Seasoned B<sed> programmers should take note of the following:
-
-=over 4
-
-=item *
-
-A Perl program executes only once, not once for each input line.  You can
-do an implicit loop with C<-n> or C<-p>.
-
-=item *
-
-Backreferences in substitutions use "$" rather than "\".
-
-=item *
-
-The pattern matching metacharacters "(", ")", and "|" do not have backslashes
-in front.
-
-=item *
-
-The range operator is C<...>, rather than comma.
-
-=back
-
-=head2 Shell Traps
-
-Sharp shell programmers should take note of the following:
-
-=over 4
-
-=item *
-
-The backtick operator does variable interpolation without regard to
-the presence of single quotes in the command.
-
-=item *
-
-The backtick operator does no translation of the return value, unlike B<csh>.
-
-=item *
-
-Shells (especially B<csh>) do several levels of substitution on each
-command line.  Perl does substitution in only certain constructs
-such as double quotes, backticks, angle brackets, and search patterns.
-
-=item *
-
-Shells interpret scripts a little bit at a time.  Perl compiles the
-entire program before executing it (except for C<BEGIN> blocks, which
-execute at compile time).
-
-=item *
-
-The arguments are available via @ARGV, not $1, $2, etc.
-
-=item *
-
-The environment is not automatically made available as separate scalar
-variables.
-
-=item *
-
-The shell's C<test> uses "=", "!=", "<" etc for string comparisons and "-eq",
-"-ne", "-lt" etc for numeric comparisons. This is the reverse of Perl, which
-uses C<eq>, C<ne>, C<lt> for string comparisons, and C<==>, C<!=> C<< < >> etc
-for numeric comparisons.
-
-=back
-
 =head2 JavaScript Traps
 
 Judicious JavaScript programmers should take note of the following:
@@ -371,6 +300,77 @@ method's arguments, not as a separate C<this> value.
 
 =back
 
+=head2 Sed Traps
+
+Seasoned B<sed> programmers should take note of the following:
+
+=over 4
+
+=item *
+
+A Perl program executes only once, not once for each input line.  You can
+do an implicit loop with C<-n> or C<-p>.
+
+=item *
+
+Backreferences in substitutions use "$" rather than "\".
+
+=item *
+
+The pattern matching metacharacters "(", ")", and "|" do not have backslashes
+in front.
+
+=item *
+
+The range operator is C<...>, rather than comma.
+
+=back
+
+=head2 Shell Traps
+
+Sharp shell programmers should take note of the following:
+
+=over 4
+
+=item *
+
+The backtick operator does variable interpolation without regard to
+the presence of single quotes in the command.
+
+=item *
+
+The backtick operator does no translation of the return value, unlike B<csh>.
+
+=item *
+
+Shells (especially B<csh>) do several levels of substitution on each
+command line.  Perl does substitution in only certain constructs
+such as double quotes, backticks, angle brackets, and search patterns.
+
+=item *
+
+Shells interpret scripts a little bit at a time.  Perl compiles the
+entire program before executing it (except for C<BEGIN> blocks, which
+execute at compile time).
+
+=item *
+
+The arguments are available via @ARGV, not $1, $2, etc.
+
+=item *
+
+The environment is not automatically made available as separate scalar
+variables.
+
+=item *
+
+The shell's C<test> uses "=", "!=", "<" etc for string comparisons and "-eq",
+"-ne", "-lt" etc for numeric comparisons. This is the reverse of Perl, which
+uses C<eq>, C<ne>, C<lt> for string comparisons, and C<==>, C<!=> C<< < >> etc
+for numeric comparisons.
+
+=back
+
 =head2 Perl Traps
 
 Practicing Perl Programmers should take note of the following:
diff --git a/t/porting/diag.t b/t/porting/diag.t
index 3b0521a..25301a5 100644
--- a/t/porting/diag.t
+++ b/t/porting/diag.t
@@ -53,7 +53,8 @@ my %entries;
 my $reading_categorical_exceptions;
 while (<DATA>) {
   chomp;
-  $entries{$_}{$reading_categorical_exceptions ? 'cattodo' : 'todo'}=1;
+  $entries{$_}{todo} = 1;
+  $reading_categorical_exceptions and $entries{$_}{cattodo}=1;
   /__CATEGORIES__/ and ++$reading_categorical_exceptions;
 }
 
@@ -82,7 +83,8 @@ while (<$diagfh>) {
     $cur_entry =~ s/\n/ /gs; # Fix multi-line headers if they have \n's
     $cur_entry =~ s/\s+\z//;
 
-    if (exists $entries{$cur_entry} && $entries{$cur_entry}{todo}) {
+    if (exists $entries{$cur_entry} &&  $entries{$cur_entry}{todo}
+                                    && !$entries{$cur_entry}{cattodo}) {
         TODO: {
             local $::TODO = "Remove the TODO entry \"$cur_entry\" from DATA as 
it is already in $pod near line $.";
             ok($cur_entry);
@@ -365,7 +367,10 @@ sub check_message {
     # Kill precision
     $key =~ s/\%\.(\d+|\*)/%/g;
 
-    if (exists $entries{$key}) {
+    if (exists $entries{$key} and
+          # todo + cattodo means it is not found and it is not in the
+          # regular todo list, either
+          !$entries{$key}{todo} || !$entries{$key}{cattodo}) {
       $ret = 1;
       if ( $entries{$key}{seen}++ ) {
         # no need to repeat entries we've tested
@@ -403,7 +408,6 @@ sub check_message {
            ($categories ? "categories are [$categories]" : "no category")
              . " for $key");
       }
-      # Later, should start checking that the severity is correct, too.
     } elsif ($partial) {
       # noop
     } else {
@@ -486,6 +490,7 @@ Don't know how to handle magic of type \%o
 -Dp not implemented on this platform
 Error reading "%s": %s
 execl not implemented!
+Expecting '(?flags:(?[...' in regex; marked by <-- HERE in m/%s/
 EVAL without pos change exceeded limit in regex
 Filehandle opened only for %sput
 Filehandle %s opened only for %sput
@@ -531,6 +536,7 @@ More than one argument to open
 More than one argument to open(,':%s')
 mprotect for %p %u failed with %d
 mprotect RW for %p %u failed with %d
+\N{} in character class restricted to one character in regex; marked by <-- 
HERE in m/%s/
 No %s allowed while running setgid
 No %s allowed with (suid) fdscript
 No such class field "%s"
@@ -614,6 +620,7 @@ Within []-length '%c' not allowed in %s
 Wrong syntax (suid) fd script name "%s"
 'X' outside of string in %s
 'X' outside of string in unpack
+Zero length \N{} in regex; marked by <-- HERE in m/%s/
 
 __CATEGORIES__
 Code point 0x%X is not Unicode, all \p{} matches fail; all \P{} matches succeed
@@ -626,6 +633,3 @@ Operation "%s" returns its argument for UTF-16 surrogate 
U+%X
 Unicode surrogate U+%X is illegal in UTF-8
 UTF-16 surrogate U+%X
 False [] range "%s" in regex; marked by <-- HERE in m/%s/
-\N{} in character class restricted to one character in regex; marked by <-- 
HERE in m/%s/
-Zero length \N{} in regex; marked by <-- HERE in m/%s/
-Expecting '(?flags:(?[...' in regex; marked by <-- HERE in m/%s/

--
Perl5 Master Repository

Reply via email to