Skip to content

Commit 7738bad

Browse files
jhischwern
jhi
authored and
schwern
committed
import Set-Scalar 1.06 from CPAN
git-cpan-module: Set-Scalar git-cpan-version: 1.06 git-cpan-authorid: JHI git-cpan-file: authors/id/J/JH/JHI/Set-Scalar-1.06.tar.gz
1 parent 5f575b2 commit 7738bad

File tree

7 files changed

+57
-50
lines changed

7 files changed

+57
-50
lines changed

‎ChangeLog‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
1+
Sat Feb 10 00:54:29 2001 Jarkko Hietaniemi <jhi@alpha.hut.fi>
2+
3+
* Make the code Perl 5.00404-proof, patch from Ed Grimm.
4+
5+
* Released as 1.06.
6+
17
Thu Jan 18 08:24:20 2001 Jarkko Hietaniemi <jhi@alpha.hut.fi>
28

39
* Add examples of the set differences.
410

511
* NOTE: unique now returns a set, not a list of elements,
612
as it was documented and intended.
7-
13+
814
* Released as 1.05.
915

1016
* unique() was rather broken, reported by Malcolm Purvis.
11-
17+
1218
* Released as 1.04.
1319

1420
Tue Oct 31 03:09:03 2000 Jarkko Hietaniemi <jhi@iki.fi>
@@ -17,7 +23,7 @@ Tue Oct 31 03:09:03 2000 Jarkko Hietaniemi <jhi@iki.fi>
1723
instead of overload::StrVal(). This solves the memory
1824
leak reported by Joshua Richardson <jric@yahoo-inc.com>
1925
_and_ speeds up the code by about 40%! (make test timings)
20-
26+
2127
* Released as 1.03.
2228

2329
Fri Sep 15 18:56:08 2000 Jarkko Hietaniemi <jhi@iki.fi>
@@ -30,7 +36,7 @@ Fri Sep 15 18:56:08 2000 Jarkko Hietaniemi <jhi@iki.fi>
3036
2000-04-15 Jarkko Hietaniemi <jhi@iki.fi>
3137

3238
* Make to work with perl 5.6.0.
33-
39+
3440
* Release as 1.01 as no bug reports have been seen for many moons.
3541

3642
1999-09-24 Jarkko Hietaniemi <jhi@iki.fi>
@@ -40,7 +46,7 @@ Fri Sep 15 18:56:08 2000 Jarkko Hietaniemi <jhi@iki.fi>
4046
not "(a (b (a ...)) (c ...))" as expected. Nondeterminism
4147
in stringification. Not yet resolved but the test hacked
4248
to allow either (for subtests #5 and #6).
43-
49+
4450
* Timothy Kimball <kimball@stsci.edu> reported that Set::Scalar 0.9
4551
had the super/subsetness the wrong way round. Fixed.
4652

‎lib/Set/Scalar.pm‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local $^W = 1;
55

66
use vars qw($VERSION @ISA);
77

8-
$VERSION = 1.05;
8+
$VERSION = 1.06;
99

1010
@ISA = qw(Set::Scalar::Real Set::Scalar::Null Set::Scalar::Base);
1111

@@ -119,7 +119,7 @@ two sets beware: C<symmetric_difference> returns true for elements
119119
that are in an odd number (1, 3, 5, ...) of sets, C<unique> returns
120120
true for elements that are in one set.
121121
122-
Here are examples of the various set differences:
122+
Some examples of the various set differences:
123123
124124
set or difference value
125125
@@ -153,7 +153,8 @@ Here are examples of the various set differences:
153153
154154
The C<compare> method returns a string from the following list:
155155
"equal", "disjoint", "proper subset", "proper superset", "proper
156-
intersect", and in future, "disjoint universes".
156+
intersect", and in future (once I get around implementing it),
157+
"disjoint universes".
157158
158159
These methods have operator overloads:
159160

‎lib/Set/Scalar/Base.pm‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -106,29 +106,29 @@ sub _insert_elements {
106106
my $self = shift;
107107
my $elements = shift;
108108

109-
@{ $self->{ elements } }{ keys %$elements } = values %$elements;
109+
@{ $self->{'elements'} }{ keys %$elements } = values %$elements;
110110

111111
$self->_invalidate_cached;
112112
}
113113

114114
sub universe {
115115
my $self = shift;
116116

117-
return $self->{ universe };
117+
return $self->{'universe'};
118118
}
119119

120120
sub size {
121121
my $self = shift;
122122

123-
return scalar keys %{ $self->{ elements } };
123+
return scalar keys %{ $self->{'elements'} };
124124
}
125125

126126
sub elements {
127127
my $self = shift;
128128

129129
return @_ ?
130-
@{ $self->{ elements } }{ map { _strval($_) } @_ } :
131-
values %{ $self->{ elements } };
130+
@{ $self->{'elements'} }{ map { _strval($_) } @_ } :
131+
values %{ $self->{'elements'} };
132132
}
133133

134134
*members = \&elements;
@@ -147,17 +147,17 @@ sub _clone {
147147
my $self = shift;
148148
my $original = shift;
149149

150-
$self->{ universe } = $original->{ universe };
150+
$self->{'universe'} = $original->{'universe'};
151151

152-
$self->{ null } = $original->{ null };
152+
$self->{'null' } = $original->{'null' };
153153

154-
$self->_insert( $original->{ elements } );
154+
$self->_insert( $original->{'elements'} );
155155
}
156156

157157
sub clone {
158158
my $self = shift;
159159
my $clone = (ref $self)->new;
160-
160+
161161
$clone->_clone( $self );
162162

163163
return $clone;
@@ -342,7 +342,7 @@ sub _complement {
342342

343343
$complement->delete( $self->elements );
344344

345-
return $complement;
345+
return $complement;
346346
}
347347

348348
sub _complement_overload {
@@ -365,7 +365,7 @@ sub _unique {
365365

366366
for my $set ( @_ ) {
367367
if ($set->universe == $universe) {
368-
foreach my $element ( keys %{ $set->{ elements } } ) {
368+
foreach my $element ( keys %{ $set->{'elements'} } ) {
369369
$frequency{ $element }++;
370370
}
371371
} else {
@@ -498,7 +498,7 @@ sub cmp {
498498
sub have_same_universe {
499499
my $self = shift;
500500
my $universe = $self->universe;
501-
501+
502502
foreach my $set ( @_ ) {
503503
return 0 unless $set->universe == $universe;
504504
}
@@ -566,8 +566,8 @@ sub as_string {
566566

567567
my $string;
568568

569-
if (exists $self->{ as_string }) {
570-
$string = $self->{ as_string };
569+
if (exists $self->{'as_string'}) {
570+
$string = $self->{'as_string'};
571571
# print "from cache: $string\n";
572572
} else {
573573
($string, my $have_reference, my $recursive) =
@@ -578,7 +578,7 @@ sub as_string {
578578

579579
$string = sprintf $self->_set_format, $string;
580580

581-
$self->{ as_string } = $string unless $have_reference;
581+
$self->{'as_string'} = $string unless $have_reference;
582582
}
583583

584584
return $string;
@@ -587,27 +587,27 @@ sub as_string {
587587
sub _element_separator {
588588
my $self = shift;
589589

590-
return $self->{ display }->{ element_separator }
591-
if exists $self->{ display }->{ element_separator };
590+
return $self->{'display'}->{'element_separator'}
591+
if exists $self->{'display'}->{'element_separator'};
592592

593593
my $universe = $self->universe;
594594

595-
return $universe->{ display }->{ element_separator }
596-
if exists $universe->{ display }->{ element_separator };
595+
return $universe->{'display'}->{'element_separator'}
596+
if exists $universe->{'display'}->{'element_separator'};
597597

598598
return (ref $self)->ELEMENT_SEPARATOR;
599599
}
600600

601601
sub _set_format {
602602
my $self = shift;
603603

604-
return $self->{ display }->{ set_format }
605-
if exists $self->{ display }->{ set_format };
604+
return $self->{'display'}->{'set_format'}
605+
if exists $self->{'display'}->{'set_format'};
606606

607607
my $universe = $self->universe;
608608

609-
return $universe->{ display }->{ set_format }
610-
if exists $universe->{ display }->{ set_format };
609+
return $universe->{'display'}->{'set_format'}
610+
if exists $universe->{'display'}->{'set_format'};
611611

612612
return (ref $self)->SET_FORMAT;
613613
}

‎lib/Set/Scalar/Null.pm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ sub _new_hook {
2525
sub universe {
2626
my $self = shift;
2727

28-
$self->{ universe } = shift if @_;
28+
$self->{'universe'} = shift if @_;
2929

30-
return $self->{ universe };
30+
return $self->{'universe'};
3131
}
3232

3333
sub elements {

‎lib/Set/Scalar/Real.pm‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ sub _delete {
3636
my $self = shift;
3737
my $elements = shift;
3838

39-
delete @{ $self->{ elements } }{ keys %$elements };
39+
delete @{ $self->{'elements'} }{ keys %$elements };
4040

4141
$self->_invalidate_cached;
4242

@@ -62,10 +62,10 @@ sub _invert {
6262
my $elements = shift;
6363

6464
foreach my $element ( keys %$elements ) {
65-
if ( exists $self->{ elements }->{ $element } ) {
66-
delete $self->{ elements }->{ $element };
65+
if ( exists $self->{'elements'}->{ $element } ) {
66+
delete $self->{'elements'}->{ $element };
6767
} else {
68-
$self->{ elements }->{ $element } = $elements->{ $element };
68+
$self->{'elements'}->{ $element } = $elements->{ $element };
6969
}
7070
}
7171

@@ -111,8 +111,8 @@ sub fill {
111111
sub DESTROY {
112112
my $self = shift;
113113

114-
delete $self->{ null };
115-
delete $self->{ universe };
114+
delete $self->{'null' };
115+
delete $self->{'universe'};
116116

117117
$self->clear;
118118
}

‎lib/Set/Scalar/Universe.pm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ sub universe {
2727
sub null {
2828
my $self = shift;
2929

30-
return $self->{ null };
30+
return $self->{'null'};
3131
}
3232

3333
sub enter {
@@ -40,8 +40,8 @@ sub _new_hook {
4040
my $self = shift;
4141
my $elements = shift;
4242

43-
$self->{ universe } = $UNIVERSE;
44-
$self->{ null } = Set::Scalar::Null->new( $self );
43+
$self->{'universe'} = $UNIVERSE;
44+
$self->{'null' } = Set::Scalar::Null->new( $self );
4545

4646
$self->_extend( { _make_elements( @$elements ) } );
4747
}

‎lib/Set/Scalar/Valued.pm‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ sub _new_hook {
4646
my $self = shift;
4747
my $elements = shift;
4848

49-
$self->{ universe } = Set::Scalar::ValuedUniverse->universe;
49+
$self->{'universe'} = Set::Scalar::ValuedUniverse->universe;
5050

5151
$self->_insert( { _make_valued_elements( $elements ) } );
5252
}
@@ -61,8 +61,8 @@ sub _valued_elements {
6161
my $self = shift;
6262

6363
return @_ ?
64-
@{ $self->{ elements } }{ map { _strval($_) } @_ } :
65-
values %{ $self->{ elements } };
64+
@{ $self->{'elements'} }{ map { _strval($_) } @_ } :
65+
values %{ $self->{'elements'} };
6666
}
6767

6868
sub valued_elements {
@@ -77,7 +77,7 @@ sub value {
7777
my $self = shift;
7878
my $member = shift;
7979

80-
return $self->{ elements }->{ $member };
80+
return $self->{'elements'}->{ $member };
8181
}
8282

8383
sub elements {
@@ -110,13 +110,13 @@ sub _elements_as_string {
110110
sub _value_separator {
111111
my $self = shift;
112112

113-
return $self->{ display }->{ value_separator }
114-
if exists $self->{ display }->{ value_separator };
113+
return $self->{'display'}->{'value_separator'}
114+
if exists $self->{'display'}->{'value_separator'};
115115

116116
my $universe = $self->universe;
117117

118-
return $universe->{ display }->{ value_separator }
119-
if exists $universe->{ display }->{ value_separator };
118+
return $universe->{'display'}->{'value_separator'}
119+
if exists $universe->{'display'}->{'value_separator'};
120120

121121
return (ref $self)->VALUE_SEPARATOR;
122122
}

0 commit comments

Comments
 (0)