import Set-Scalar 1.24 from CPAN

jhi · schwern · commit 788d78846590 · 2009-12-12T17:36:52.000-08:00
git-cpan-module:   Set-Scalar
git-cpan-version:  1.24
git-cpan-authorid: JHI
git-cpan-file:     authors/id/J/JH/JHI/Set-Scalar-1.24.tar.gz
diff --git a/ChangeLog b/ChangeLog
@@ -1,8 +1,24 @@
+2009-06-02  Jarkko Hietaniemi  <jhi@iki.fi>
+
+	* Fixed "The intersection method does not like references in the 
+	  set." [rt.cpan.org #46589], bug reported and fix provided by
+	  Father Chrysostomos.
+
+	* Cosmetics: removed trailing whitespace.
+	
+	* Renamed README as README.old.  It has been close to ten years.
+
+	* Added new README.
+	
+	* Updated copyright years. 
+	
+	* Released as 1.24.
+	
 2009-01-16  Jarkko Hietaniemi  <jhi@iki.fi>
 
 	* Add overload for '@{}' as suggested by John Loverso,
 	  meaning that you can now do @$set and get the members
-	  of the set (unordered, mind) [rt.cpan.org #42452]
+	  of the set (unordered, mind)
 
 	* Add overload for '=' (how did we manage so long without?)
 	  [rt.cpan.org #42449]
@@ -39,7 +55,7 @@ Sat Aug	 6 12:39:43 2005  Jarkko Hietaniemi  <jhi@iki.fi>
 
 	* [cpan #13816] Set::Scalar blesses unblessed refs
 
-	  A genuine bug, the suggsted fix used, but then again Set::Scalar
+	  A genuine bug, the suggested fix used, but then again Set::Scalar
 	  was never designed or tested be used with references as the set
 	  members.  I would not recommend doing that unless much more
 	  testing has been conducted.  A test added to misc.t for that,
diff --git a/MANIFEST b/MANIFEST
@@ -10,6 +10,7 @@ lib/Set/Scalar/Valued.pm
 lib/Set/Scalar/ValuedUniverse.pm
 lib/Set/Scalar/Virtual.pm
 README
+README.old
 t/basic.t
 t/basic_overload.t
 t/boolean.t
diff --git a/META.yml b/META.yml
@@ -1,19 +1,21 @@
 --- #YAML:1.0
 name:               Set-Scalar
-version:            1.23
+version:            1.24
 abstract:           ~
 author:
     - Jarkko Hietaniemi <jhi@iki.fi>
 license:            perl
 distribution_type:  module
 configure_requires:
     ExtUtils::MakeMaker:  0
+build_requires:
+    ExtUtils::MakeMaker:  0
 requires:  {}
 no_index:
     directory:
         - t
         - inc
-generated_by:       ExtUtils::MakeMaker version 6.48
+generated_by:       ExtUtils::MakeMaker version 6.52
 meta-spec:
     url:      http://module-build.sourceforge.net/META-spec-v1.4.html
     version:  1.4
diff --git a/README b/README
@@ -1,44 +1,10 @@
-This is a long-waited-for (I hope) rewrite of the venerable Set::Scalar
-module.  The original 0.00x series culminated in 0.003 back in May 1996,
-the 0.004 in October 1998 was just a minor update.
+The first priority of Set::Scalar is to be a convenient interface
+to sets (as in: unordered colletions of Perl scalars.)  While not
+designed to be slow or big, neither has it been designed to be
+fast or compact.
 
-The most egregious problem with the old implementation was that having
-complex things such as objects as set members (for example if sets of sets
-were wanted) didn't really work.
-
-While this new implementation is more correct, it may be also slower.
-Some operations are certainly slower, but some are faster.  It all
-depends on your mix of operations.
-
-Displaying sets is not as versatile as with the old implementation,
-but then on the other hand I doubt (hope) that anybody ever used the
-overly baroque interface anyway.  If, however, I am wrong in this,
-please let me know, I'll think of something.  The old interface should
-not be revived as such, I think, it was far too clunky.
-
-The "valued sets" concept is now moved to its own subclass,
-Set::Scalar::Valued.
-
-(There are two meta-classes, Set::Scalar::Universe and
- Set::Scalar::ValuedUniverse, but do not use them overmuch, as there
- are still some rough edges that may change in future releases.
- Do not use them directly (by instantiating them yourself, for example),
- $set->universe is about the only method that works and will continue
- to work.  Even more internal-use-only are the Set::Scalar::Real and
- Set::Scalar::Virtual.  Do not try to use them directly.
- Their interfaces are left undocumented on purpose.)
-
-The "inverted sets" concept is history, removed, gone, not to return.
-You can just use -$set.
-
-Let me know what you think, did I miss anything obvious?  Any old
-functionality that I didn't purposefully/accidentally migrate to
-the new one?  Could the documentation be better? (a rhetorical question)
-Any new functionality you would like to see?  (Please don't say that
-you want the Cartesian product: it's a concept from wholly different
-world, the ordered sets.  My sets are unordered.)
+Please see lib/Set/Scalar.pm for more information, once you have
+installed this module, "perldoc Set::Scalar" should work.
 
 -- 
-Jarkko Hietaniemi <jhi@iki.fi>
-
-
+jhi@iki.fi
diff --git a/README.old b/README.old
@@ -0,0 +1,44 @@
+This is a long-waited-for (I hope) rewrite of the venerable Set::Scalar
+module.  The original 0.00x series culminated in 0.003 back in May 1996,
+the 0.004 in October 1998 was just a minor update.
+
+The most egregious problem with the old implementation was that having
+complex things such as objects as set members (for example if sets of sets
+were wanted) didn't really work.
+
+While this new implementation is more correct, it may be also slower.
+Some operations are certainly slower, but some are faster.  It all
+depends on your mix of operations.
+
+Displaying sets is not as versatile as with the old implementation,
+but then on the other hand I doubt (hope) that anybody ever used the
+overly baroque interface anyway.  If, however, I am wrong in this,
+please let me know, I'll think of something.  The old interface should
+not be revived as such, I think, it was far too clunky.
+
+The "valued sets" concept is now moved to its own subclass,
+Set::Scalar::Valued.
+
+(There are two meta-classes, Set::Scalar::Universe and
+ Set::Scalar::ValuedUniverse, but do not use them overmuch, as there
+ are still some rough edges that may change in future releases.
+ Do not use them directly (by instantiating them yourself, for example),
+ $set->universe is about the only method that works and will continue
+ to work.  Even more internal-use-only are the Set::Scalar::Real and
+ Set::Scalar::Virtual.  Do not try to use them directly.
+ Their interfaces are left undocumented on purpose.)
+
+The "inverted sets" concept is history, removed, gone, not to return.
+You can just use -$set.
+
+Let me know what you think, did I miss anything obvious?  Any old
+functionality that I didn't purposefully/accidentally migrate to
+the new one?  Could the documentation be better? (a rhetorical question)
+Any new functionality you would like to see?  (Please don't say that
+you want the Cartesian product: it's a concept from wholly different
+world, the ordered sets.  My sets are unordered.)
+
+-- 
+Jarkko Hietaniemi <jhi@iki.fi>
+
+
diff --git a/lib/Set/Scalar.pm b/lib/Set/Scalar.pm
@@ -5,7 +5,7 @@ use strict;
 
 use vars qw($VERSION @ISA);
 
-$VERSION = '1.23';
+$VERSION = '1.24';
 
 @ISA = qw(Set::Scalar::Real Set::Scalar::Null Set::Scalar::Base);
 
@@ -57,7 +57,7 @@ Set::Scalar - basic set operations
 =head2 Creating
 
     $s = Set::Scalar->new;
-    $s = Set::Scalar->new(@members); 
+    $s = Set::Scalar->new(@members);
 
     $t = $s->clone;
     $t = $s->copy;         # Clone of clone.
@@ -106,6 +106,7 @@ Assuming a set C<$s>:
 
     $s->is_null        # Returns true if the set is empty.
     $s->is_empty       # Alias for is_null.
+
     $s->is_universal   # Returns true if the set is universal.
 
     $s->null           # The null set.
@@ -121,7 +122,7 @@ Assuming a set C<$s>:
     $v = $s->unique($t);
     $c = $s->complement;
 
-These methods have operator overloads:    
+These methods have operator overloads:
 
     $u = $s + $t;  # union
     $i = $s * $t;  # intersection
@@ -173,7 +174,7 @@ The C<compare> method returns a string from the following list:
 intersect", and in future (once I get around implementing it),
 "disjoint universes".
 
-These methods have operator overloads:    
+These methods have operator overloads:
 
     $eq = $s == $t;  # is_equal
     $dj = $s != $t;  # is_disjoint
@@ -277,7 +278,7 @@ For example:
 
   my $a = Set::Scalar->new(1..2);
   my $b = Set::Scalar->new(3..5);
-  my $c = $a->cartesian_product($b);  # As an object method. 
+  my $c = $a->cartesian_product($b);  # As an object method.
   my $d = Set::Scalar->cartesian_product($a, $b);  # As a class method.
 
 The $c and $d will be of the same class as $a.  The members of $c and
@@ -383,10 +384,10 @@ Jarkko Hietaniemi <jhi@iki.fi>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2001,2002,2003,2004 by Jarkko Hietaniemi
+Copyright 2001,2002,2003,2004,2005,2007,2009 by Jarkko Hietaniemi
 
 This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself. 
+it under the same terms as Perl itself.
 
 =cut
 
diff --git a/lib/Set/Scalar/Base.pm b/lib/Set/Scalar/Base.pm
@@ -306,7 +306,7 @@ sub _intersection ($$) {
 
     my %intersection = _make_elements $intersection->elements;
 
-    delete @intersection{ $that->elements };
+    delete @intersection{ keys %{{ _make_elements $that->elements }} };
 
     $intersection->delete( values %intersection );
 
diff --git a/t/intersection.t b/t/intersection.t
@@ -1,6 +1,6 @@
 use Set::Scalar;
 
-print "1..23\n";
+print "1..24\n";
 
 my $a = Set::Scalar->new("a".."e");
 my $b = Set::Scalar->new("c".."g");
@@ -95,6 +95,12 @@ print "ok 20\n";
 	print "ok 23\n";
 }
 
+print "not " unless join("", sort @{
+	new Set::Scalar \$1,\$2,\$3,->intersection(
+		new Set::Scalar \$2,\$3,\$4
+	)
+}) eq join "", sort \$2,\$3;
+print "ok 24\n";
 
 
 
