In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/d32207c9fde2dae3f943cff7b308d59eef63e106?hp=b953e60c2880b16b41fe537533d7b46247f12778>

- Log -----------------------------------------------------------------
commit d32207c9fde2dae3f943cff7b308d59eef63e106
Author: Father Chrysostomos <spr...@cpan.org>
Date:   Sun Feb 13 21:37:48 2011 -0800

    perldiag: reflow ‘Missing right brace on \N{}’
    
    for ‘use diagnostics’ output on eighty-column terminals

M       pod/perldiag.pod

commit 532cb70d32c55a408417bbd71826eaa5d30b09e7
Author: Father Chrysostomos <spr...@cpan.org>
Date:   Sun Feb 13 18:46:53 2011 -0800

    perldiag: reflow ‘Missing braces on \N{}’ for 80 cols.

M       pod/perldiag.pod

commit 4a5d3a93cf30815c219d070fc6d05abdf44c68f3
Author: Father Chrysostomos <spr...@cpan.org>
Date:   Sun Feb 13 18:41:59 2011 -0800

    perldiag: sort the ma* entries

M       pod/perldiag.pod

commit 2db62bbc77d2091d4f055a8778c159e46c3d0c44
Author: Father Chrysostomos <spr...@cpan.org>
Date:   Sun Feb 13 18:40:29 2011 -0800

    perldiag: whitespace; grammar

M       pod/perldiag.pod

commit e9200be317191a78ab296df196326e9d0f42e4a9
Author: Father Chrysostomos <spr...@cpan.org>
Date:   Sun Feb 13 18:34:02 2011 -0800

    perldiag: an number -> a number
    
    That’s my own typo.

M       pod/perldiag.pod

commit d35a2c713b849ca40ae4717642a3af54a43205f0
Author: Father Chrysostomos <spr...@cpan.org>
Date:   Sun Feb 13 18:31:50 2011 -0800

    perldiag: reflow ‘Lexing code attempted to stuff...’
    
    for the sake of diagnostics.pm, which displays the link simply as
    lex_stuff_pvn_flags.

M       pod/perldiag.pod
-----------------------------------------------------------------------

Summary of changes:
 pod/perldiag.pod |  110 ++++++++++++++++++++++++++---------------------------
 1 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/pod/perldiag.pod b/pod/perldiag.pod
index 2a464ec..23f6e60 100644
--- a/pod/perldiag.pod
+++ b/pod/perldiag.pod
@@ -1940,14 +1940,14 @@ earlier in the line, and you really meant a "less than".
 
 =item gmtime(%f) too large
 
-(W overflow) You called C<gmtime> with an number that was larger than
+(W overflow) You called C<gmtime> with a number that was larger than
 it can reliably handle and C<gmtime> probably returned the wrong
 date. This warning is also triggered with nan (the special
 not-a-number value).
 
 =item gmtime(%f) too small
 
-(W overflow) You called C<gmtime> with an number that was smaller than
+(W overflow) You called C<gmtime> with a number that was smaller than
 it can reliably handle and C<gmtime> probably returned the wrong
 date. This warning is also triggered with nan (the special
 not-a-number value).
@@ -2403,11 +2403,10 @@ an undefined value for the length. See L<perlfunc/pack>.
 =item Lexing code attempted to stuff non-Latin-1 character into Latin-1 input
 
 (F) An extension is attempting to insert text into the current parse
-(using L<lex_stuff_pvn_flags|perlapi/lex_stuff_pvn_flags> or similar), but
-tried to insert a character that couldn't be part of the current input.
-This is an inherent pitfall of the stuffing mechanism, and one of the
-reasons to avoid it.  Where it is necessary to stuff, stuffing only
-plain ASCII is recommended.
+(using L<lex_stuff_pvn_flags|perlapi/lex_stuff_pvn_flags> or similar), but 
tried to insert a character
+that couldn't be part of the current input. This is an inherent pitfall
+of the stuffing mechanism, and one of the reasons to avoid it.  Where it
+is necessary to stuff, stuffing only plain ASCII is recommended.
 
 =item Lexing code internal error (%s)
 
@@ -2422,14 +2421,14 @@ L<perlfunc/listen>.
 
 =item localtime(%f) too large
 
-(W overflow) You called C<localtime> with an number that was larger
+(W overflow) You called C<localtime> with a number that was larger
 than it can reliably handle and C<localtime> probably returned the
 wrong date. This warning is also triggered with nan (the special
 not-a-number value).
 
 =item localtime(%f) too small
 
-(W overflow) You called C<localtime> with an number that was smaller
+(W overflow) You called C<localtime> with a number that was smaller
 than it can reliably handle and C<localtime> probably returned the
 wrong date. This warning is also triggered with nan (the special
 not-a-number value).
@@ -2468,14 +2467,14 @@ the definition.
 values cannot be returned in subroutines used in lvalue context.  See
 L<perlsub/"Lvalue subroutines">.
 
-=item Malformed integer in [] in  pack
+=item Malformed integer in [] in pack
 
-(F) Between the  brackets enclosing a numeric repeat count only digits
+(F) Between the brackets enclosing a numeric repeat count only digits
 are permitted.  See L<perlfunc/pack>.
 
 =item Malformed integer in [] in unpack
 
-(F) Between the  brackets enclosing a numeric repeat count only digits
+(F) Between the brackets enclosing a numeric repeat count only digits
 are permitted.  See L<perlfunc/pack>.
 
 =item Malformed PERLLIB_PREFIX
@@ -2515,37 +2514,29 @@ message.
 
 See also L<Encode/"Handling Malformed Data">.
 
-=item Malformed UTF-16 surrogate
-
-(F) Perl thought it was reading UTF-16 encoded character data but while
-doing it Perl met a malformed Unicode surrogate.
-
 =item Malformed UTF-8 returned by \N
 
 (F) The charnames handler returned malformed UTF-8.
 
-=item Malformed UTF-8 string in pack
+=item Malformed UTF-8 string in '%c' format in unpack
 
-(F) You tried to pack something that didn't comply with UTF-8 encoding
+(F) You tried to unpack something that didn't comply with UTF-8 encoding
 rules and perl was unable to guess how to make more progress.
 
-=item Malformed UTF-8 string in unpack
+=item Malformed UTF-8 string in pack
 
-(F) You tried to unpack something that didn't comply with UTF-8 encoding
+(F) You tried to pack something that didn't comply with UTF-8 encoding
 rules and perl was unable to guess how to make more progress.
 
-=item Malformed UTF-8 string in '%c' format in unpack
+=item Malformed UTF-8 string in unpack
 
 (F) You tried to unpack something that didn't comply with UTF-8 encoding
 rules and perl was unable to guess how to make more progress.
 
-=item Maximal count of pending signals (%u) exceeded
+=item Malformed UTF-16 surrogate
 
-(F) Perl aborted due to a too high number of signals pending. This
-usually indicates that your operating system tried to deliver signals
-too fast (with a very high priority), starving the perl process from
-resources it would need to reach a point where it can process signals
-safely. (See L<perlipc/"Deferred Signals (Safe Signals)">.)
+(F) Perl thought it was reading UTF-16 encoded character data but while
+doing it Perl met a malformed Unicode surrogate.
 
 =item %s matches null string many times in regex; marked by <-- HERE in m/%s/
 
@@ -2554,6 +2545,14 @@ regular expression engine didn't specifically check for 
that.  The <-- HERE
 shows in the regular expression about where the problem was discovered.
 See L<perlre>.
 
+=item Maximal count of pending signals (%u) exceeded
+
+(F) Perl aborted due to too high a number of signals pending. This
+usually indicates that your operating system tried to deliver signals
+too fast (with a very high priority), starving the perl process from
+resources it would need to reach a point where it can process signals
+safely. (See L<perlipc/"Deferred Signals (Safe Signals)">.)
+
 =item "%s" may clash with future reserved word
 
 (W) This warning may be due to running a perl5 script through a perl4
@@ -2599,10 +2598,10 @@ immediately after the switch, without intervening 
spaces.
 =item Missing braces on \N{}
 
 (F) Wrong syntax of character name literal C<\N{charname}> within
-double-quotish context.  This can also happen when there is a space (or
-comment) between the C<\N> and the C<{> in a regex with the C</x> modifier.
-This modifier does not change the requirement that the brace immediately follow
-the C<\N>.
+double-quotish context.  This can also happen when there is a space
+(or comment) between the C<\N> and the C<{> in a regex with the C</x> modifier.
+This modifier does not change the requirement that the brace immediately
+follow the C<\N>.
 
 =item Missing braces on \o{}
 
@@ -2646,30 +2645,29 @@ can vary from one line to the next.
 
 =item Missing right brace on \N{} or unescaped left brace after \N
 
-(F)
-C<\N> has two meanings.
-
-The traditional one has it followed by a name enclosed
-in braces, meaning the character (or sequence of characters) given by that 
name.
-Thus C<\N{ASTERISK}> is another way of writing C<*>, valid in both
-double-quoted strings and regular expression patterns.  In patterns, it doesn't
-have the meaning an unescaped C<*> does.
-
-Starting in Perl 5.12.0, C<\N> also can have an additional meaning (only) in
-patterns, namely to match a non-newline character.  (This is short for
-C<[^\n]>, and like C<.> but is not affected by the C</s> regex modifier.)
-
-This can lead to some ambiguities.  When C<\N> is not followed immediately by a
-left brace, Perl assumes the C<[^\n]> meaning.  Also, if
-the braces form a valid quantifier such as C<\N{3}> or C<\N{5,}>, Perl assumes
-that this means to match the given quantity of non-newlines (in these examples,
-3; and 5 or more, respectively).  In all other case, where there is a C<\N{>
-and a matching C<}>, Perl assumes that a character name is desired.
-
-However, if there is no matching C<}>, Perl doesn't know if it was mistakenly
-omitted, or if C<[^\n]{> was desired, and
-raises this error.  If you meant the former, add the right brace; if you meant
-the latter, escape the brace with a backslash, like so: C<\N\{>
+(F) C<\N> has two meanings.
+
+The traditional one has it followed by a name enclosed in braces,
+meaning the character (or sequence of characters) given by that
+name. Thus C<\N{ASTERISK}> is another way of writing C<*>, valid in both
+double-quoted strings and regular expression patterns.  In patterns,
+it doesn't have the meaning an unescaped C<*> does.
+
+Starting in Perl 5.12.0, C<\N> also can have an additional meaning (only)
+in patterns, namely to match a non-newline character.  (This is short
+for C<[^\n]>, and like C<.> but is not affected by the C</s> regex modifier.)
+
+This can lead to some ambiguities.  When C<\N> is not followed immediately
+by a left brace, Perl assumes the C<[^\n]> meaning.  Also, if the braces
+form a valid quantifier such as C<\N{3}> or C<\N{5,}>, Perl assumes that this
+means to match the given quantity of non-newlines (in these examples,
+3; and 5 or more, respectively).  In all other case, where there is a
+C<\N{> and a matching C<}>, Perl assumes that a character name is desired.
+
+However, if there is no matching C<}>, Perl doesn't know if it was
+mistakenly omitted, or if C<[^\n]{> was desired, and raises this error.
+If you meant the former, add the right brace; if you meant the latter,
+escape the brace with a backslash, like so: C<\N\{>
 
 =item Missing right curly or square bracket
 

--
Perl5 Master Repository

Reply via email to