r29679 - in /branches/upstream/libset-object-perl/current: Changes.pod META.yml Object.xs README SIGNATURE lib/Set/Object.pm

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Thu Jan 15 22:11:37 UTC 2009


Author: ansgar-guest
Date: Thu Jan 15 22:11:34 2009
New Revision: 29679

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=29679
Log:
[svn-upgrade] Integrating new upstream version, libset-object-perl (1.27)

Modified:
    branches/upstream/libset-object-perl/current/Changes.pod
    branches/upstream/libset-object-perl/current/META.yml
    branches/upstream/libset-object-perl/current/Object.xs
    branches/upstream/libset-object-perl/current/README
    branches/upstream/libset-object-perl/current/SIGNATURE
    branches/upstream/libset-object-perl/current/lib/Set/Object.pm

Modified: branches/upstream/libset-object-perl/current/Changes.pod
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libset-object-perl/current/Changes.pod?rev=29679&op=diff
==============================================================================
--- branches/upstream/libset-object-perl/current/Changes.pod (original)
+++ branches/upstream/libset-object-perl/current/Changes.pod Thu Jan 15 22:11:34 2009
@@ -2,6 +2,29 @@
 =encoding utf8
 
 =head1 REVISION HISTORY FOR Set::Object
+
+=head1 1.27, 15 Jan 2009
+
+=over
+
+=item *
+
+Fix a typo that affected building against Perls with debugging enabled.
+
+=item *
+
+A minor #define refactor (Yuval).
+
+=item *
+
+Squash some long-standing warnings I had been ignoring for ages and
+Havard Eidnes prompted me to fix by logging an RT ticket for it.
+
+=item *
+
+Squash some global clean-up warnings.
+
+=back
 
 =head1 1.26, 13 Oct 2008
 
@@ -21,7 +44,14 @@
 
 Define behaviour when dealing with return values from operations on
 weak sets.  No longer hard-coded "Set::Object" - may affect
-Set::Object sub-classes (Sam)
+Set::Object sub-classes (Sam).
+
+=item *
+
+(post-release changelog entry) related to the previous change,
+Set::Object::Weak::set did not use to shift the invocant off the
+stack, which caused result sets to have the inserted sets as members.
+It now does, fixing this bug.
 
 =back
 

Modified: branches/upstream/libset-object-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libset-object-perl/current/META.yml?rev=29679&op=diff
==============================================================================
--- branches/upstream/libset-object-perl/current/META.yml (original)
+++ branches/upstream/libset-object-perl/current/META.yml Thu Jan 15 22:11:34 2009
@@ -1,14 +1,11 @@
---- #YAML:1.0
-name:                Set-Object
-version:             1.26
-abstract:            Unordered collections (sets) of Perl Objects
-license:             Artistic
-author:              
-    - Jean-Louis Leroy and Sam Vilain
-generated_by:        ExtUtils::MakeMaker version 6.42
-distribution_type:   module
-requires:     
+# http://module-build.sourceforge.net/META-spec.html
+#XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
+name:         Set-Object
+version:      1.27
+version_from: lib/Set/Object.pm
+installdirs:  site
+requires:
     Scalar::Util:                  0
-meta-spec:
-    url:     http://module-build.sourceforge.net/META-spec-v1.3.html
-    version: 1.3
+
+distribution_type: module
+generated_by: ExtUtils::MakeMaker version 6.30_01

Modified: branches/upstream/libset-object-perl/current/Object.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libset-object-perl/current/Object.xs?rev=29679&op=diff
==============================================================================
--- branches/upstream/libset-object-perl/current/Object.xs (original)
+++ branches/upstream/libset-object-perl/current/Object.xs Thu Jan 15 22:11:34 2009
@@ -30,7 +30,7 @@
 #if (PERL_VERSION > 7) || ( (PERL_VERSION == 7)&&( PERL_SUBVERSION > 2))
 #define SET_OBJECT_MAGIC_backref (char)0x9f
 #else
-#define SET_OBJECT_MAGIC_backref (char)0x7e
+#define SET_OBJECT_MAGIC_backref '~'
 #endif
 
 typedef struct _BUCKET
@@ -47,7 +47,7 @@
         HV* flat;
 } ISET;
 
-#define ISET_HASH(el) ((I32) (el) >> 4)
+#define ISET_HASH(el) ((PTR2UV(el)) >> 4)
 
 #define ISET_INSERT(s, item) \
 	     ( SvROK(item) \
@@ -337,15 +337,15 @@
     IF_SPELL_DEBUG(_warn("dispelling magic from 0x%.8x (self = 0x%.8x, mg = 0x%.8x)",
 			 sv, self_svrv, mg));
     if (mg) {
-       AV* wand = (AV *)mg->mg_obj;
+       AV* wand = (void *)(mg->mg_obj);
        SV ** const svp = AvARRAY(wand);
        I32 i = AvFILLp(wand);
        int c = 0;
 
-       assert( SvTYPE(want) == SVt_PVAV );
+       assert( SvTYPE(wand) == SVt_PVAV );
 
        while (i >= 0) {
-	 if (svp[i] && SvIV(svp[i])) {
+	 if (svp[i] && SvIOK(svp[i]) && SvIV(svp[i])) {
 	   ISET* o = INT2PTR(ISET*, SvIV(svp[i]));
 	   if (s == o) {
 	     /*
@@ -429,7 +429,7 @@
 
     while (i >= 0) {
         IF_SPELL_DEBUG(_warn("_spell_effect %d", i));
-	if (svp[i] && SvIV(svp[i])) {
+	if (svp[i] && SvIOK(svp[i]) && SvIV(svp[i])) {
 	  ISET* s = INT2PTR(ISET*, SvIV(svp[i]));
 	  IF_SPELL_DEBUG(_warn("_spell_effect i = %d, SV = 0x%.8x", i, svp[i]));
 	  if (!s->is_weak)
@@ -455,13 +455,8 @@
     MGVTBL *vtable = &SET_OBJECT_vtbl_backref;
     MAGIC* mg;
     SV ** svp;
-    int how = 0;
+    int how = SET_OBJECT_MAGIC_backref;
     I32 i,l,free;
-#if (PERL_VERSION > 7) || ( (PERL_VERSION == 7)&&( PERL_SUBVERSION > 2) )
-    how = 0x9f; // (int)SET_OBJECT_MAGIC_backref;
-#else
-    how = 0x7e; // '~'
-#endif
 
     mg = _detect_magic(sv);
     if (mg) {

Modified: branches/upstream/libset-object-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libset-object-perl/current/README?rev=29679&op=diff
==============================================================================
--- branches/upstream/libset-object-perl/current/README (original)
+++ branches/upstream/libset-object-perl/current/README Thu Jan 15 22:11:34 2009
@@ -1,5 +1,5 @@
-README for Set::Object 1.21
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
+README for Set::Object
+~~~~~~~~~~~~~~~~~~~~~~
 Set::Object provides for sets of Perl objects - scalars and references.
 
 INSTALLATION

Modified: branches/upstream/libset-object-perl/current/SIGNATURE
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libset-object-perl/current/SIGNATURE?rev=29679&op=diff
==============================================================================
--- branches/upstream/libset-object-perl/current/SIGNATURE (original)
+++ branches/upstream/libset-object-perl/current/SIGNATURE Thu Jan 15 22:11:34 2009
@@ -14,12 +14,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-SHA1 6f6095fe820326aaad9446165514fc76906e5d03 Changes.pod
+SHA1 1b613ef2c114e22986c2521c6237c9ad60148dfd Changes.pod
 SHA1 816639c05c69373b63a93333c3e7e60a87866e56 MANIFEST
 SHA1 c826cfdec5efc768c4a6eaec8d690b4f309c03d0 Makefile.PL
-SHA1 c7e94daaee60472be79ff69104d2b18d1b7fe2a3 Object.xs
-SHA1 c2c4506b0563e59dd930ccb513e5a5fc5b2a1f70 README
-SHA1 e04c3d0688bca4ddbc3d445328170de3bf7c97b3 lib/Set/Object.pm
+SHA1 e58e8f50f7f0b4e2e1fdc5ef6f47c3a969eff01b Object.xs
+SHA1 5df26a8f141049c2a8c277417af071782808300b README
+SHA1 d76039ec26a187ccfbad98b3a6505d8135fc7eb5 lib/Set/Object.pm
 SHA1 3ee3d2b72d4130ed27f8d24a2625fa22895e52ca lib/Set/Object/Weak.pm
 SHA1 f04d25338c1e35bda69ac5eda0bc672e10ca5b6f ppport.h
 SHA1 213b597a69c1f909d585a14a6a094a25c3e684af t/ingy/arrayref.t
@@ -68,7 +68,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iEYEARECAAYFAkjyaoUACgkQ/AZAiGayWEMzZACgzA0Y4+tZWxjK9xaO4q+Uur3C
-hBEAnRloSudJLKVGlfrWvEu5McFpRYMX
-=Ro6e
+iEYEARECAAYFAklunroACgkQ/AZAiGayWEP7OgCfbTkbqL8sI7LYWXfcbR0rFenV
+NWQAoLYZeengAT58Pr471emLtFZhRFO1
+=6Jis
 -----END PGP SIGNATURE-----

Modified: branches/upstream/libset-object-perl/current/lib/Set/Object.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libset-object-perl/current/lib/Set/Object.pm?rev=29679&op=diff
==============================================================================
--- branches/upstream/libset-object-perl/current/lib/Set/Object.pm (original)
+++ branches/upstream/libset-object-perl/current/lib/Set/Object.pm Thu Jan 15 22:11:34 2009
@@ -509,7 +509,7 @@
 
 @EXPORT_OK = qw( ish_int is_int is_string is_double blessed reftype
 		 refaddr is_overloaded is_object is_key set weak_set );
-$VERSION = '1.26';
+$VERSION = '1.27';
 
 bootstrap Set::Object $VERSION;
 




More information about the Pkg-perl-cvs-commits mailing list