[inseparable changes from patch from perl5.003_17 to perl5.003_18]

 CORE LANGUAGE CHANGES

Subject: Inherited overloading
Date: Sun, 29 Dec 1996 08:12:54 -0500 (EST)
From: Ilya Zakharevich <ilya@math.ohio-state.edu>
Files: gv.c lib/overload.pm perl.h sv.c sv.h t/op/overload.t

    Chip Salzenberg writes:
    > 
    > Patch now, tarchive later:
    
    Below is the fixed overloading patch.
    
    Note that in between AMG_names got const on it (a good thing!), but as
    a corollary I needed to cast away const-ness to actually use it
    (since, say, newSVpv does not have const args).
    
    Enjoy,
    
    p5p-msgid: <199612291312.IAA02134@monk.mps.ohio-state.edu>

Subject: Closures at file scope must be anonymous
From: Chip Salzenberg <chip@atlantic.net>
Files: op.c

Subject: Warn on '{if,while} ($x = X)' where X is glob, readdir, or <FH>
From: Chip Salzenberg <chip@atlantic.net>
Files: op.c pod/perldiag.pod

 DOCUMENTATION

Subject: Re: perldiag.pod entry for "Scalar value @%s{%s} ..."
Date: Tue, 31 Dec 1996 11:50:19 -0500
From: Roderick Schertler <roderick@gate.net>
Files: pod/perldiag.pod
Msg-ID: <2043.852051019@eeyore.ibcinc.com>

    (applied based on p5p patch as commit c885792efecf3f527b3b5099727cc16b03eee1dc)

 OTHER CORE CHANGES

Subject: Get rid of 'Leaked scalars'
From: Chip Salzenberg <chip@atlantic.net>
Files: cop.h gv.c op.c

 TESTS

Subject: Expanded locale.t and misc.t
From: Jarkko Hietaniemi <jhi@cc.hut.fi>
Files: t/lib/locale.t t/lib/misc.t

Subject: Expanded my.t
From: Chip Salzenberg <chip@atlantic.net>
Files: t/lib/my.t

1 files changed, 46 insertions, 34 deletions

diff --git a/perl.h b/perl.h
index 470a44d03c..f048d73f79 100644
--- a/perl.h
+++ b/perl.h
@@ -1950,55 +1950,67 @@ EXT MGVTBL vtbl_amagicelem;
 #ifdef OVERLOAD
 EXT long amagic_generation;
 
-#define NofAMmeth 29
+#define NofAMmeth 58
 #ifdef DOINIT
-EXTCONST char * AMG_names[NofAMmeth][2] = {
-  {"fallback","abs"},
-  {"bool", "nomethod"},
-  {"\"\"", "0+"},
-  {"+","+="},
-  {"-","-="},
-  {"*", "*="},
-  {"/", "/="},
-  {"%", "%="},
-  {"**", "**="},
-  {"<<", "<<="},
-  {">>", ">>="},
-  {"&", "&="},
-  {"|", "|="},
-  {"^", "^="},
-  {"<", "<="},
-  {">", ">="},
-  {"==", "!="},
-  {"<=>", "cmp"},
-  {"lt", "le"},
-  {"gt", "ge"},
-  {"eq", "ne"},
-  {"!", "~"},
-  {"++", "--"},
-  {"atan2", "cos"},
-  {"sin", "exp"},
-  {"log", "sqrt"},
-  {"x","x="},
-  {".",".="},
-  {"=","neg"}
+EXTCONST char * AMG_names[NofAMmeth] = {
+  "fallback",	"abs",			/* "fallback" should be the first. */
+  "bool",	"nomethod",
+  "\"\"",	"0+",
+  "+",		"+=",
+  "-",		"-=",
+  "*",		"*=",
+  "/",		"/=",
+  "%",		"%=",
+  "**",		"**=",
+  "<<",		"<<=",
+  ">>",		">>=",
+  "&",		"&=",
+  "|",		"|=",
+  "^",		"^=",
+  "<",		"<=",
+  ">",		">=",
+  "==",		"!=",
+  "<=>",	"cmp",
+  "lt",		"le",
+  "gt",		"ge",
+  "eq",		"ne",
+  "!",		"~",
+  "++",		"--",
+  "atan2",	"cos",
+  "sin",	"exp",
+  "log",	"sqrt",
+  "x",		"x=",
+  ".",		".=",
+  "=",		"neg"
 };
 #else
-EXTCONST char * AMG_names[NofAMmeth][2];
+EXTCONST char * AMG_names[NofAMmeth];
 #endif /* def INITAMAGIC */
 
-struct  am_table        {
+struct am_table {
   long was_ok_sub;
   long was_ok_am;
-  CV* table[NofAMmeth*2];
+  U32 flags;
+  CV* table[NofAMmeth];
   long fallback;
 };
+struct am_table_short {
+  long was_ok_sub;
+  long was_ok_am;
+  U32 flags;
+};
 typedef struct am_table AMT;
+typedef struct am_table_short AMTS;
 
 #define AMGfallNEVER	1
 #define AMGfallNO	2
 #define AMGfallYES	3
 
+#define AMTf_AMAGIC		1
+#define AMT_AMAGIC(amt)		((amt)->flags & AMTf_AMAGIC)
+#define AMT_AMAGIC_on(amt)	((amt)->flags |= AMTf_AMAGIC)
+#define AMT_AMAGIC_off(amt)	((amt)->flags &= ~AMTf_AMAGIC)
+
 enum {
   fallback_amg,	abs_amg,
   bool__amg,	nomethod_amg,