Change 30290 by [EMAIL PROTECTED] on 2007/02/14 16:13:48
Integrate:
[ 29660]
remove conflict in pending_ident function and field name
[ 29705]
Subject: patch: shorten perl.h by six lines
From: "David Nicol" <[EMAIL PROTECTED]>
Date: Sat, 6 Jan 2007 00:02:24 -0600
Message-ID: <[EMAIL PROTECTED]>
[ 29767]
fix typo in hv.c
[ 29790]
In S_hfreeentries, orig_array can be const.
[ 29922]
Fix a typo and some doubled spaces in comments.
[ 29930]
Subject: [perl #41318] Patch: win32.c typo in #define MULTIPLICITY
From: "Devin Heitmueller" (via RT) <[EMAIL PROTECTED]>
Date: Mon, 22 Jan 2007 14:46:15 -0800
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/cop.h#35 integrate
... //depot/maint-5.8/perl/embed.fnc#208 integrate
... //depot/maint-5.8/perl/embed.h#156 integrate
... //depot/maint-5.8/perl/hv.c#111 integrate
... //depot/maint-5.8/perl/perl.h#159 integrate
... //depot/maint-5.8/perl/pod/perlapi.pod#97 integrate
... //depot/maint-5.8/perl/proto.h#200 integrate
... //depot/maint-5.8/perl/sv.h#78 integrate
... //depot/maint-5.8/perl/toke.c#164 integrate
... //depot/maint-5.8/perl/win32/win32.c#32 integrate
Differences ...
==== //depot/maint-5.8/perl/cop.h#35 (text) ====
Index: perl/cop.h
--- perl/cop.h#34~30166~ 2007-02-07 14:59:15.000000000 -0800
+++ perl/cop.h 2007-02-14 08:13:48.000000000 -0800
@@ -716,7 +716,7 @@
#define G_KEEPERR 16 /* Append errors to $@, don't overwrite it */
#define G_NODEBUG 32 /* Disable debugging at toplevel. */
#define G_METHOD 64 /* Calling method. */
-#define G_FAKINGEVAL 256 /* Faking en eval context for call_sv or
+#define G_FAKINGEVAL 256 /* Faking an eval context for call_sv or
fold_constants. */
/* flag bits for PL_in_eval */
==== //depot/maint-5.8/perl/embed.fnc#208 (text) ====
Index: perl/embed.fnc
--- perl/embed.fnc#207~30230~ 2007-02-12 07:40:42.000000000 -0800
+++ perl/embed.fnc 2007-02-14 08:13:48.000000000 -0800
@@ -1359,7 +1359,6 @@
s |char* |force_word |NN char *start|int token|int check_keyword \
|int allow_pack|int allow_tick
s |SV* |tokeq |NN SV *sv
-s |int |pending_ident
sR |char* |scan_const |NN char *start
sR |char* |scan_formline |NN char *s
sR |char* |scan_heredoc |NN char *s
==== //depot/maint-5.8/perl/embed.h#156 (text+w) ====
Index: perl/embed.h
--- perl/embed.h#155~30263~ 2007-02-13 11:23:41.000000000 -0800
+++ perl/embed.h 2007-02-14 08:13:48.000000000 -0800
@@ -1383,7 +1383,6 @@
#define force_version S_force_version
#define force_word S_force_word
#define tokeq S_tokeq
-#define pending_ident S_pending_ident
#define scan_const S_scan_const
#define scan_formline S_scan_formline
#define scan_heredoc S_scan_heredoc
@@ -3483,7 +3482,6 @@
#define force_version(a,b) S_force_version(aTHX_ a,b)
#define force_word(a,b,c,d,e) S_force_word(aTHX_ a,b,c,d,e)
#define tokeq(a) S_tokeq(aTHX_ a)
-#define pending_ident() S_pending_ident(aTHX)
#define scan_const(a) S_scan_const(aTHX_ a)
#define scan_formline(a) S_scan_formline(aTHX_ a)
#define scan_heredoc(a) S_scan_heredoc(aTHX_ a)
==== //depot/maint-5.8/perl/hv.c#111 (text) ====
Index: perl/hv.c
--- perl/hv.c#110~30226~ 2007-02-12 06:48:32.000000000 -0800
+++ perl/hv.c 2007-02-14 08:13:48.000000000 -0800
@@ -1569,15 +1569,14 @@
STATIC void
S_hfreeentries(pTHX_ HV *hv)
{
- register HE **array;
+ /* This is the array that we're going to restore */
+ HE **const orig_array = HvARRAY(hv);
I32 i;
-
- if (!HvARRAY(hv))
+ if (!orig_array)
return;
i = HvMAX(hv);
- array = HvARRAY(hv);
/* make everyone else think the array is empty, so that the destructors
* called for freed entries can't recusively mess with us */
HvARRAY(hv) = Null(HE**);
@@ -1586,7 +1585,7 @@
do {
/* Loop down the linked list heads */
- HE *entry = array[i];
+ HE *entry = orig_array[i];
while (entry) {
register HE * const oentry = entry;
@@ -1595,7 +1594,7 @@
}
} while (--i >= 0);
- HvARRAY(hv) = array;
+ HvARRAY(hv) = orig_array;
(void)hv_iterinit(hv);
}
@@ -2136,7 +2135,7 @@
withflags++;
if (HeKWASUTF8(entry)) {
PerlIO_printf(Perl_debug_log,
- "hash key has both WASUFT8 and UTF8: '%.*s'\n",
+ "hash key has both WASUTF8 and UTF8: '%.*s'\n",
(int) HeKLEN(entry), HeKEY(entry));
bad = 1;
}
==== //depot/maint-5.8/perl/perl.h#159 (text) ====
Index: perl/perl.h
--- perl/perl.h#158~30286~ 2007-02-14 06:15:49.000000000 -0800
+++ perl/perl.h 2007-02-14 08:13:48.000000000 -0800
@@ -1644,12 +1644,6 @@
#define DBL_DIG 15 /* A guess that works lots of places */
#endif
#endif
-#ifdef I_FLOAT
-#include <float.h>
-#endif
-#ifndef HAS_DBL_DIG
-#define DBL_DIG 15 /* A guess that works lots of places */
-#endif
#ifdef OVR_LDBL_DIG
/* Use an overridden LDBL_DIG */
==== //depot/maint-5.8/perl/pod/perlapi.pod#97 (text+w) ====
Index: perl/pod/perlapi.pod
--- perl/pod/perlapi.pod#96~30261~ 2007-02-13 09:58:37.000000000 -0800
+++ perl/pod/perlapi.pod 2007-02-14 08:13:48.000000000 -0800
@@ -3660,7 +3660,7 @@
=item SvIV
X<SvIV>
-Coerces the given SV to an integer and returns it. See C<SvIVx> for a
+Coerces the given SV to an integer and returns it. See C<SvIVx> for a
version which guarantees to evaluate sv only once.
IV SvIV(SV* sv)
@@ -3830,7 +3830,7 @@
=item SvNV
X<SvNV>
-Coerce the given SV to a double and return it. See C<SvNVx> for a version
+Coerce the given SV to a double and return it. See C<SvNVx> for a version
which guarantees to evaluate sv only once.
NV SvNV(SV* sv)
==== //depot/maint-5.8/perl/proto.h#200 (text+w) ====
Index: perl/proto.h
--- perl/proto.h#199~30263~ 2007-02-13 11:23:41.000000000 -0800
+++ perl/proto.h 2007-02-14 08:13:48.000000000 -0800
@@ -1931,7 +1931,6 @@
STATIC char* S_force_version(pTHX_ char *start, int guessing);
STATIC char* S_force_word(pTHX_ char *start, int token, int check_keyword,
int allow_pack, int allow_tick);
STATIC SV* S_tokeq(pTHX_ SV *sv);
-STATIC int S_pending_ident(pTHX);
STATIC char* S_scan_const(pTHX_ char *start)
__attribute__warn_unused_result__;
==== //depot/maint-5.8/perl/sv.h#78 (text) ====
Index: perl/sv.h
--- perl/sv.h#77~30154~ 2007-02-07 02:45:15.000000000 -0800
+++ perl/sv.h 2007-02-14 08:13:48.000000000 -0800
@@ -299,7 +299,7 @@
to a lexical from "outside". */
#define SVf_OOK 0x00200000 /* has valid offset value */
#define SVf_BREAK 0x00400000 /* refcnt is artificially low - used by
- SV's in final arena cleanup */
+ SV's in final arena cleanup */
#define SVf_READONLY 0x00800000 /* may not be modified */
@@ -1117,7 +1117,7 @@
stringified form becoming C<SvPOK>. Handles 'get' magic.
=for apidoc Am|IV|SvIV|SV* sv
-Coerces the given SV to an integer and returns it. See C<SvIVx> for a
+Coerces the given SV to an integer and returns it. See C<SvIVx> for a
version which guarantees to evaluate sv only once.
=for apidoc Am|IV|SvIV_nomg|SV* sv
@@ -1128,7 +1128,7 @@
sv only once. Use the more efficient C<SvIV> otherwise.
=for apidoc Am|NV|SvNV|SV* sv
-Coerce the given SV to a double and return it. See C<SvNVx> for a version
+Coerce the given SV to a double and return it. See C<SvNVx> for a version
which guarantees to evaluate sv only once.
=for apidoc Am|NV|SvNVx|SV* sv
==== //depot/maint-5.8/perl/toke.c#164 (text) ====
Index: perl/toke.c
--- perl/toke.c#163~30099~ 2007-02-02 13:14:53.000000000 -0800
+++ perl/toke.c 2007-02-14 08:13:48.000000000 -0800
@@ -25,6 +25,8 @@
#define yychar PL_yychar
#define yylval PL_yylval
+static int
+S_pending_ident(pTHX);
static const char ident_too_long[] = "Identifier too long";
static const char commaless_variable_list[] = "comma-less variable list";
==== //depot/maint-5.8/perl/win32/win32.c#32 (text) ====
Index: perl/win32/win32.c
--- perl/win32/win32.c#31~30269~ 2007-02-13 13:18:26.000000000 -0800
+++ perl/win32/win32.c 2007-02-14 08:13:48.000000000 -0800
@@ -4933,7 +4933,7 @@
for (i=0; i < SIG_SIZE; i++) {
w32_sighandler[i] = SIG_DFL;
}
-# ifdef MULTIPLICTY
+# ifdef MULTIPLICITY
if (my_perl == PL_curinterp) {
# else
{
End of Patch.
