From: Rafael Garcia-Suarez Date: Wed, 26 Sep 2007 16:57:34 +0000 (+0000) Subject: API spelling patch, by Jerry D. Hedden X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=95b611b0bba585b54c6e7623440a11b1268968e2;p=p5sagit%2Fp5-mst-13.2.git API spelling patch, by Jerry D. Hedden p4raw-id: //depot/perl@31983 --- diff --git a/dump.c b/dump.c index a0e76b1..c9c9bb4 100644 --- a/dump.c +++ b/dump.c @@ -296,21 +296,21 @@ Perl_pv_escape( pTHX_ SV *dsv, char const * const str, |const U32 flags Converts a string into something presentable, handling escaping via -pv_escape() and supporting quoting and elipses. +pv_escape() and supporting quoting and ellipses. If the PERL_PV_PRETTY_QUOTE flag is set then the result will be double quoted with any double quotes in the string escaped. Otherwise if the PERL_PV_PRETTY_LTGT flag is set then the result be wrapped in angle brackets. -If the PERL_PV_PRETTY_ELIPSES flag is set and not all characters in -string were output then an elipses C<...> will be appended to the +If the PERL_PV_PRETTY_ELLIPSES flag is set and not all characters in +string were output then an ellipsis C<...> will be appended to the string. Note that this happens AFTER it has been quoted. If start_color is non-null then it will be inserted after the opening quote (if there is one) but before the escaped text. If end_color is non-null then it will be inserted after the escaped text but before -any quotes or elipses. +any quotes or ellipses. Returns a pointer to the prettified text as held by dsv. @@ -345,7 +345,7 @@ Perl_pv_pretty( pTHX_ SV *dsv, char const * const str, const STRLEN count, else if ( flags & PERL_PV_PRETTY_LTGT ) sv_catpvn( dsv, ">", 1); - if ( (flags & PERL_PV_PRETTY_ELIPSES) && ( escaped < count ) ) + if ( (flags & PERL_PV_PRETTY_ELLIPSES) && ( escaped < count ) ) sv_catpvn( dsv, "...", 3 ); return SvPVX(dsv); @@ -1276,7 +1276,7 @@ Perl_do_magic_dump(pTHX_ I32 level, PerlIO *file, const MAGIC *mg, I32 nest, I32 SV * const dsv = sv_newmortal(); const char * const s = pv_pretty(dsv, re->wrapped, re->wraplen, 60, NULL, NULL, - ( PERL_PV_PRETTY_QUOTE | PERL_PV_ESCAPE_RE | PERL_PV_PRETTY_ELIPSES | + ( PERL_PV_PRETTY_QUOTE | PERL_PV_ESCAPE_RE | PERL_PV_PRETTY_ELLIPSES | ((re->extflags & RXf_UTF8) ? PERL_PV_ESCAPE_UNI : 0)) ); Perl_dump_indent(aTHX_ level+1, file, " PAT = %s\n", s); diff --git a/lib/ExtUtils/ParseXS.pm b/lib/ExtUtils/ParseXS.pm index 7f3bbd0..fd762f8 100644 --- a/lib/ExtUtils/ParseXS.pm +++ b/lib/ExtUtils/ParseXS.pm @@ -360,7 +360,7 @@ EOF ." followed by a statement on column one?)") if $line[0] =~ /^\s/; - my ($class, $externC, $static, $elipsis, $wantRETVAL, $RETVAL_no_return); + my ($class, $externC, $static, $ellipsis, $wantRETVAL, $RETVAL_no_return); my (@fake_INPUT_pre); # For length(s) generated variables my (@fake_INPUT); @@ -513,7 +513,7 @@ EOF my $report_args = ''; foreach my $i (0 .. $#args) { if ($args[$i] =~ s/\.\.\.//) { - $elipsis = 1; + $ellipsis = 1; if ($args[$i] eq '' && $i == $#args) { $report_args .= ", ..."; pop(@args); @@ -577,7 +577,7 @@ EOF print Q(<<"EOF") if $INTERFACE ; # dXSFUNCTION($ret_type); EOF - if ($elipsis) { + if ($ellipsis) { $cond = ($min_args ? qq(items < $min_args) : 0); } elsif ($min_args == $num_args) { $cond = qq(items != $min_args); @@ -842,7 +842,7 @@ EOF $proto_arg[$min_args] .= ";" ; } push @proto_arg, "$s\@" - if $elipsis ; + if $ellipsis ; $proto = join ("", grep defined, @proto_arg); } diff --git a/perl.h b/perl.h index 5c6d656..3371a7f 100644 --- a/perl.h +++ b/perl.h @@ -5855,7 +5855,8 @@ extern void moncontrol(int); #define PERL_PV_PRETTY_QUOTE PERL_PV_ESCAPE_QUOTE -#define PERL_PV_PRETTY_ELIPSES 0x0002 +#define PERL_PV_PRETTY_ELIPSES 0x0002 /* DEFUNCT */ +#define PERL_PV_PRETTY_ELLIPSES 0x0002 #define PERL_PV_PRETTY_LTGT 0x0004 #define PERL_PV_ESCAPE_FIRSTCHAR 0x0008 @@ -5869,8 +5870,8 @@ extern void moncontrol(int); #define PERL_PV_ESCAPE_RE 0x8000 /* used by pv_display in dump.c*/ -#define PERL_PV_PRETTY_DUMP PERL_PV_PRETTY_ELIPSES|PERL_PV_PRETTY_QUOTE -#define PERL_PV_PRETTY_REGPROP PERL_PV_PRETTY_ELIPSES|PERL_PV_PRETTY_LTGT|PERL_PV_ESCAPE_RE +#define PERL_PV_PRETTY_DUMP PERL_PV_PRETTY_ELLIPSES|PERL_PV_PRETTY_QUOTE +#define PERL_PV_PRETTY_REGPROP PERL_PV_PRETTY_ELLIPSES|PERL_PV_PRETTY_LTGT|PERL_PV_ESCAPE_RE /* diff --git a/pod/perlapi.pod b/pod/perlapi.pod index 716c6b1..13f83df 100644 --- a/pod/perlapi.pod +++ b/pod/perlapi.pod @@ -887,21 +887,21 @@ X |const U32 flags Converts a string into something presentable, handling escaping via -pv_escape() and supporting quoting and elipses. +pv_escape() and supporting quoting and ellipses. If the PERL_PV_PRETTY_QUOTE flag is set then the result will be double quoted with any double quotes in the string escaped. Otherwise if the PERL_PV_PRETTY_LTGT flag is set then the result be wrapped in angle brackets. -If the PERL_PV_PRETTY_ELIPSES flag is set and not all characters in -string were output then an elipses C<...> will be appended to the +If the PERL_PV_PRETTY_ELLIPSES flag is set and not all characters in +string were output then an ellipsis C<...> will be appended to the string. Note that this happens AFTER it has been quoted. If start_color is non-null then it will be inserted after the opening quote (if there is one) but before the escaped text. If end_color is non-null then it will be inserted after the escaped text but before -any quotes or elipses. +any quotes or ellipses. Returns a pointer to the prettified text as held by dsv. diff --git a/regcomp.c b/regcomp.c index 23148d2..dd48f3c 100644 --- a/regcomp.c +++ b/regcomp.c @@ -8804,7 +8804,7 @@ Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o) pv_pretty(dsv, STRING(o), STR_LEN(o), 60, PL_colors[0], PL_colors[1], PERL_PV_ESCAPE_UNI_DETECT | - PERL_PV_PRETTY_ELIPSES | + PERL_PV_PRETTY_ELLIPSES | PERL_PV_PRETTY_LTGT ); Perl_sv_catpvf(aTHX_ sv, " %s", s ); @@ -9772,7 +9772,7 @@ S_dumpuntil(pTHX_ const regexp *r, const regnode *start, const regnode *node, elem_ptr ? pv_pretty(sv, SvPV_nolen_const(*elem_ptr), SvCUR(*elem_ptr), 60, PL_colors[0], PL_colors[1], (SvUTF8(*elem_ptr) ? PERL_PV_ESCAPE_UNI : 0) | - PERL_PV_PRETTY_ELIPSES | + PERL_PV_PRETTY_ELLIPSES | PERL_PV_PRETTY_LTGT ) : "???" diff --git a/regcomp.h b/regcomp.h index 8f14a20..b10c8d6 100644 --- a/regcomp.h +++ b/regcomp.h @@ -796,7 +796,7 @@ re.pm, especially to the documentation. const char * const rpv = \ pv_pretty((dsv), (pv), (l), (m), \ PL_colors[0], PL_colors[1], \ - ( PERL_PV_PRETTY_QUOTE | PERL_PV_ESCAPE_RE | PERL_PV_PRETTY_ELIPSES | \ + ( PERL_PV_PRETTY_QUOTE | PERL_PV_ESCAPE_RE | PERL_PV_PRETTY_ELLIPSES | \ ((isuni) ? PERL_PV_ESCAPE_UNI : 0)) \ )