Dictionary.st
author Jan Vrany <jan.vrany@fit.cvut.cz>
Wed, 17 Jun 2015 06:22:00 +0100
branchjv
changeset 18487 8735bd9eee2f
parent 18345 fb699032075a
child 18800 02724cc719b6
permissions -rw-r--r--
Use inlined FNV1a hash for String ...and do not use __symbolHash(). Although currently the VM also uses FNV1a hash for Symbols, the __symbolHash() does not handle properly character with codepoint 0 (because '\0' is used as a string terminator). This causes problems with Unicode16/32Strigs whose version of FNV1a hash is using object size from header to determine string's end. Added Symbol>>hash that actually *uses* the __symbolHash() to make sure it's hash is the the same as used bu the VM. Symbols with zeroes are rare and there's no Unicode16/32Symbol. This commit fixes issue #65.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
17671
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
     1
"{ Encoding: utf8 }"
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
     2
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     3
"
5
67342904af11 *** empty log message ***
claus
parents: 3
diff changeset
     4
 COPYRIGHT (c) 1991 by Claus Gittinger
12669
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
     5
	      All Rights Reserved
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     6
a27a279701f8 Initial revision
claus
parents:
diff changeset
     7
 This software is furnished under a license and may be used
a27a279701f8 Initial revision
claus
parents:
diff changeset
     8
 only in accordance with the terms of that license and with the
a27a279701f8 Initial revision
claus
parents:
diff changeset
     9
 inclusion of the above copyright notice.   This software may not
a27a279701f8 Initial revision
claus
parents:
diff changeset
    10
 be provided or otherwise made available to, or used by, any
a27a279701f8 Initial revision
claus
parents:
diff changeset
    11
 other person.  No title to or ownership of the software is
a27a279701f8 Initial revision
claus
parents:
diff changeset
    12
 hereby transferred.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    13
"
5362
a6b34f66b25f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5336
diff changeset
    14
"{ Package: 'stx:libbasic' }"
a6b34f66b25f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5336
diff changeset
    15
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
    16
"{ NameSpace: Smalltalk }"
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
    17
12
8e03bd717355 *** empty log message ***
claus
parents: 10
diff changeset
    18
Set subclass:#Dictionary
12669
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
    19
	instanceVariableNames:'valueArray'
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
    20
	classVariableNames:''
12669
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
    21
	poolDictionaries:''
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
    22
	category:'Collections-Unordered'
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    23
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    24
2094
42cd02703bf4 handle recursive printString/displayString
Claus Gittinger <cg@exept.de>
parents: 1703
diff changeset
    25
!Dictionary class methodsFor:'documentation'!
68
59faa75185ba *** empty log message ***
claus
parents: 54
diff changeset
    26
88
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    27
copyright
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    28
"
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    29
 COPYRIGHT (c) 1991 by Claus Gittinger
12669
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
    30
	      All Rights Reserved
88
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    31
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    32
 This software is furnished under a license and may be used
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    33
 only in accordance with the terms of that license and with the
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    34
 inclusion of the above copyright notice.   This software may not
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    35
 be provided or otherwise made available to, or used by, any
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    36
 other person.  No title to or ownership of the software is
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    37
 hereby transferred.
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    38
"
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    39
!
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    40
68
59faa75185ba *** empty log message ***
claus
parents: 54
diff changeset
    41
documentation
59faa75185ba *** empty log message ***
claus
parents: 54
diff changeset
    42
"
59faa75185ba *** empty log message ***
claus
parents: 54
diff changeset
    43
    a Dictionary is (conceptionally) a set of Associations storing key-value pairs.
59faa75185ba *** empty log message ***
claus
parents: 54
diff changeset
    44
    (The implementation uses two arrays to store the keys and values separately.)
59faa75185ba *** empty log message ***
claus
parents: 54
diff changeset
    45
    Searching for an element is done using a hash into the key array.
362
claus
parents: 360
diff changeset
    46
    Another way of looking at a dictionary is as a array which uses
345
claus
parents: 302
diff changeset
    47
    arbitrary access keys (i.e. not just integers as arrays do).
claus
parents: 302
diff changeset
    48
claus
parents: 302
diff changeset
    49
    Since the keys are unordered, no internal element order is defined
362
claus
parents: 360
diff changeset
    50
    (i.e. enumerating them may return elements in any order - even changing
345
claus
parents: 302
diff changeset
    51
     over time).
claus
parents: 302
diff changeset
    52
68
59faa75185ba *** empty log message ***
claus
parents: 54
diff changeset
    53
    Many methods for searching and hashing are inherited from Set.
92
0c73b48551ac *** empty log message ***
claus
parents: 88
diff changeset
    54
1279
ad7a3786e73a commentary
Claus Gittinger <cg@exept.de>
parents: 1256
diff changeset
    55
    [Instance variables:]
345
claus
parents: 302
diff changeset
    56
15800
be0b36a7c1e2 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15786
diff changeset
    57
        keyArray        <Array>         (from Set) the keys
1279
ad7a3786e73a commentary
Claus Gittinger <cg@exept.de>
parents: 1256
diff changeset
    58
15800
be0b36a7c1e2 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15786
diff changeset
    59
        valueArray      <Array>         the values ('valueArray at:index' corresponds
be0b36a7c1e2 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15786
diff changeset
    60
                                        to the value stored under 'keyArray at:index')
92
0c73b48551ac *** empty log message ***
claus
parents: 88
diff changeset
    61
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
    62
    Performance hints:
362
claus
parents: 360
diff changeset
    63
      since the dictionary does not really store associations internally,
claus
parents: 360
diff changeset
    64
      it is less efficient, to store/retrieve associations. The reason is
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
    65
      that these assocs are created temporarily in some extract methods.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
    66
      I.e. 'at:key put:value' is faster than 'add:anAssoc'
345
claus
parents: 302
diff changeset
    67
      and 'keysAndValuesDo:' is faster than 'associationsDo:' etc.
92
0c73b48551ac *** empty log message ***
claus
parents: 88
diff changeset
    68
362
claus
parents: 360
diff changeset
    69
      If only symbols or smallIntegers are used as keys, use IdentityDictionaries
claus
parents: 360
diff changeset
    70
      for slightly better performance, since both hashing and comparison is faster.
345
claus
parents: 302
diff changeset
    71
claus
parents: 302
diff changeset
    72
      If you have a rough idea how big the dictionary is going to grow,
claus
parents: 302
diff changeset
    73
      create it using #new: instead of #new. Even if the size given is a
claus
parents: 302
diff changeset
    74
      poor guess (say half of the real size), there is some 20-30% performance
claus
parents: 302
diff changeset
    75
      win to expect, since many resizing operations are avoided when associations
claus
parents: 302
diff changeset
    76
      are added.
362
claus
parents: 360
diff changeset
    77
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
    78
    Special note:
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
    79
      in previous versions, nil was not allowed as valid key
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
    80
      This has been changed; internally, a special nil-key is used,
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
    81
      which is converted back to nil whenever keys are accessed.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
    82
1290
15ba3221b89b documentation
Claus Gittinger <cg@exept.de>
parents: 1279
diff changeset
    83
    [See also:]
15800
be0b36a7c1e2 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15786
diff changeset
    84
        Set, IdentityDictionary, IdentitySet, WeakIdentitySet and
be0b36a7c1e2 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15786
diff changeset
    85
        WeakIdentityDictionary
1290
15ba3221b89b documentation
Claus Gittinger <cg@exept.de>
parents: 1279
diff changeset
    86
15ba3221b89b documentation
Claus Gittinger <cg@exept.de>
parents: 1279
diff changeset
    87
    [author:]
15800
be0b36a7c1e2 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15786
diff changeset
    88
        Claus Gittinger
68
59faa75185ba *** empty log message ***
claus
parents: 54
diff changeset
    89
"
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
    90
!
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
    91
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
    92
examples
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
    93
"
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
    94
									[exBegin]
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
    95
    |d|
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
    96
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
    97
    d := Dictionary new.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
    98
    d at:'1' put:'one'.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
    99
    d at:2 put:'two'.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   100
    d at:2
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   101
									[exEnd]
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   102
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   103
									[exBegin]
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   104
    |d|
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   105
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   106
    d := Dictionary new.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   107
    d at:'1' put:'one'.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   108
    d at:2   put:nil.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   109
    d.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   110
    d at:2
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   111
									[exEnd]
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   112
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   113
									[exBegin]
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   114
    |d|
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   115
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   116
    d := Dictionary new.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   117
    d at:'1' put:'one'.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   118
    d at:2   put:nil.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   119
    d includes:nil.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   120
									[exEnd]
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   121
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   122
									[exBegin]
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   123
    |d|
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   124
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   125
    d := Dictionary new.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   126
    d at:'1' put:'one'.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   127
    d includes:nil.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   128
									[exEnd]
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   129
"
68
59faa75185ba *** empty log message ***
claus
parents: 54
diff changeset
   130
! !
59faa75185ba *** empty log message ***
claus
parents: 54
diff changeset
   131
2094
42cd02703bf4 handle recursive printString/displayString
Claus Gittinger <cg@exept.de>
parents: 1703
diff changeset
   132
!Dictionary class methodsFor:'instance creation'!
345
claus
parents: 302
diff changeset
   133
6100
a3af162517fe add method decodeFromLiteralArray:
ab
parents: 6053
diff changeset
   134
decodeFromLiteralArray:anArray
a3af162517fe add method decodeFromLiteralArray:
ab
parents: 6053
diff changeset
   135
    "create & return a new instance from information encoded in anArray."
a3af162517fe add method decodeFromLiteralArray:
ab
parents: 6053
diff changeset
   136
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   137
    |dictionary
8831
918f291920c2 Speed up #decodeFromLiteralArray:
Stefan Vogel <sv@exept.de>
parents: 8434
diff changeset
   138
     sz "{ Class: SmallInteger }"|
6100
a3af162517fe add method decodeFromLiteralArray:
ab
parents: 6053
diff changeset
   139
8831
918f291920c2 Speed up #decodeFromLiteralArray:
Stefan Vogel <sv@exept.de>
parents: 8434
diff changeset
   140
    sz := anArray size.
918f291920c2 Speed up #decodeFromLiteralArray:
Stefan Vogel <sv@exept.de>
parents: 8434
diff changeset
   141
    dictionary := self new:sz//2.
918f291920c2 Speed up #decodeFromLiteralArray:
Stefan Vogel <sv@exept.de>
parents: 8434
diff changeset
   142
    2 to:sz by:2 do:[:idx | |key val|
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   143
	key := (anArray at:idx) decodeAsLiteralArray.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   144
	val := (anArray at:idx+1) decodeAsLiteralArray.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   145
	dictionary at:key put:val
6100
a3af162517fe add method decodeFromLiteralArray:
ab
parents: 6053
diff changeset
   146
    ].
8831
918f291920c2 Speed up #decodeFromLiteralArray:
Stefan Vogel <sv@exept.de>
parents: 8434
diff changeset
   147
    ^ dictionary
6100
a3af162517fe add method decodeFromLiteralArray:
ab
parents: 6053
diff changeset
   148
a3af162517fe add method decodeFromLiteralArray:
ab
parents: 6053
diff changeset
   149
    "
a3af162517fe add method decodeFromLiteralArray:
ab
parents: 6053
diff changeset
   150
     (Dictionary new
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   151
	 at:1 put:'one';
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   152
	 at:2 put:'two';
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   153
	 yourself
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   154
     ) literalArrayEncoding decodeAsLiteralArray
6100
a3af162517fe add method decodeFromLiteralArray:
ab
parents: 6053
diff changeset
   155
    "
a3af162517fe add method decodeFromLiteralArray:
ab
parents: 6053
diff changeset
   156
!
a3af162517fe add method decodeFromLiteralArray:
ab
parents: 6053
diff changeset
   157
8434
98ae6daa9aac Fix #addAll: and #declareAllFrom:
Stefan Vogel <sv@exept.de>
parents: 8395
diff changeset
   158
withAssociations:aCollectionOfAsociations
5255
cc5c0c1458aa added #withAssociations
Claus Gittinger <cg@exept.de>
parents: 5184
diff changeset
   159
    "return a new instance where associations are taken from the argument"
cc5c0c1458aa added #withAssociations
Claus Gittinger <cg@exept.de>
parents: 5184
diff changeset
   160
cc5c0c1458aa added #withAssociations
Claus Gittinger <cg@exept.de>
parents: 5184
diff changeset
   161
    |newDict sz "{ Class: SmallInteger }"|
cc5c0c1458aa added #withAssociations
Claus Gittinger <cg@exept.de>
parents: 5184
diff changeset
   162
8434
98ae6daa9aac Fix #addAll: and #declareAllFrom:
Stefan Vogel <sv@exept.de>
parents: 8395
diff changeset
   163
    sz := aCollectionOfAsociations size.
5255
cc5c0c1458aa added #withAssociations
Claus Gittinger <cg@exept.de>
parents: 5184
diff changeset
   164
    newDict := self new:sz.
8434
98ae6daa9aac Fix #addAll: and #declareAllFrom:
Stefan Vogel <sv@exept.de>
parents: 8395
diff changeset
   165
    aCollectionOfAsociations do:[:assoc |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   166
	newDict at:assoc key put:assoc value
5255
cc5c0c1458aa added #withAssociations
Claus Gittinger <cg@exept.de>
parents: 5184
diff changeset
   167
    ].
cc5c0c1458aa added #withAssociations
Claus Gittinger <cg@exept.de>
parents: 5184
diff changeset
   168
    ^ newDict
cc5c0c1458aa added #withAssociations
Claus Gittinger <cg@exept.de>
parents: 5184
diff changeset
   169
cc5c0c1458aa added #withAssociations
Claus Gittinger <cg@exept.de>
parents: 5184
diff changeset
   170
    "
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   171
     Dictionary withAssociations:(Array
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   172
				    with:#'one'->1
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   173
				    with:#'two'->2
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   174
				    with:#'three'->3
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   175
				    with:#'four'->4)
5255
cc5c0c1458aa added #withAssociations
Claus Gittinger <cg@exept.de>
parents: 5184
diff changeset
   176
    "
cc5c0c1458aa added #withAssociations
Claus Gittinger <cg@exept.de>
parents: 5184
diff changeset
   177
cc5c0c1458aa added #withAssociations
Claus Gittinger <cg@exept.de>
parents: 5184
diff changeset
   178
    "Created: / 11.2.2000 / 10:05:54 / cg"
cc5c0c1458aa added #withAssociations
Claus Gittinger <cg@exept.de>
parents: 5184
diff changeset
   179
!
cc5c0c1458aa added #withAssociations
Claus Gittinger <cg@exept.de>
parents: 5184
diff changeset
   180
357
claus
parents: 345
diff changeset
   181
withKeys:keyArray andValues:valueArray
claus
parents: 345
diff changeset
   182
    "return a new instance where keys and values are taken from
claus
parents: 345
diff changeset
   183
     the argumentArrays."
claus
parents: 345
diff changeset
   184
claus
parents: 345
diff changeset
   185
    |newDict sz "{ Class: SmallInteger }"|
claus
parents: 345
diff changeset
   186
claus
parents: 345
diff changeset
   187
    sz := keyArray size.
claus
parents: 345
diff changeset
   188
    newDict := self new:sz.
claus
parents: 345
diff changeset
   189
    keyArray with:valueArray do:[:key :value |
12669
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
   190
	newDict at:key put:value
357
claus
parents: 345
diff changeset
   191
    ].
claus
parents: 345
diff changeset
   192
    ^ newDict
claus
parents: 345
diff changeset
   193
claus
parents: 345
diff changeset
   194
    "
claus
parents: 345
diff changeset
   195
     Dictionary withKeys:#('one' 'two' 'three' 'four')
12669
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
   196
	       andValues:#(1 2 3 4)
357
claus
parents: 345
diff changeset
   197
    "
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   198
!
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   199
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   200
withKeysAndValues:anArray
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   201
    "return a new instance where keys and values are taken from alternating
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   202
     elements of anArray"
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   203
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   204
    |newDict sz "{ Class: SmallInteger }"|
345
claus
parents: 302
diff changeset
   205
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   206
    sz := anArray size.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   207
    newDict := self new:(sz // 2).
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   208
    1 to:sz by:2 do:[:i |
12669
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
   209
	newDict at:(anArray at:i) put:(anArray at:i+1)
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   210
    ].
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   211
    ^ newDict
345
claus
parents: 302
diff changeset
   212
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   213
    "
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   214
     Dictionary withKeysAndValues:#('one' 1 'two' 2 'three' 3 'four' 4)
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   215
    "
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   216
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   217
7306
909d88d8476f category
Claus Gittinger <cg@exept.de>
parents: 6233
diff changeset
   218
!Dictionary class methodsFor:'Compatibility-Squeak'!
5362
a6b34f66b25f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5336
diff changeset
   219
a6b34f66b25f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5336
diff changeset
   220
newFrom:aCollectionOfAssociations
a6b34f66b25f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5336
diff changeset
   221
    "return a new instance where associations are taken from the argument"
a6b34f66b25f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5336
diff changeset
   222
a6b34f66b25f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5336
diff changeset
   223
    ^  self withAssociations:aCollectionOfAssociations
a6b34f66b25f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5336
diff changeset
   224
a6b34f66b25f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5336
diff changeset
   225
    "
a6b34f66b25f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5336
diff changeset
   226
     Dictionary newFrom:(Array with:#foo->#Foo
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   227
			       with:#bar->#Bar)
5362
a6b34f66b25f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5336
diff changeset
   228
    "
a6b34f66b25f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5336
diff changeset
   229
! !
a6b34f66b25f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 5336
diff changeset
   230
12732
93312b4b2d17 added: #equals:
Claus Gittinger <cg@exept.de>
parents: 12669
diff changeset
   231
!Dictionary methodsFor:'Compatibility-Dolphin'!
93312b4b2d17 added: #equals:
Claus Gittinger <cg@exept.de>
parents: 12669
diff changeset
   232
93312b4b2d17 added: #equals:
Claus Gittinger <cg@exept.de>
parents: 12669
diff changeset
   233
equals:aDictionary
93312b4b2d17 added: #equals:
Claus Gittinger <cg@exept.de>
parents: 12669
diff changeset
   234
    ^ self = aDictionary
93312b4b2d17 added: #equals:
Claus Gittinger <cg@exept.de>
parents: 12669
diff changeset
   235
! !
93312b4b2d17 added: #equals:
Claus Gittinger <cg@exept.de>
parents: 12669
diff changeset
   236
17671
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   237
!Dictionary methodsFor:'Compatibility-VW5.4'!
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   238
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   239
contentsEquals: aDictionary
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   240
    "Anwer true if  the receiver and aDictionary contain the same key/values.
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   241
     (ignoring the classes)"
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   242
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   243
    self size == aDictionary size ifFalse: [ ^false ].
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   244
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   245
    self keysAndValuesDo: [ :key :value |
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   246
        ( aDictionary at: key ifAbsent: [ ^false ] ) = value
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   247
        ifFalse: [ ^false ]
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   248
    ].
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   249
    ^ true
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   250
! !
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
   251
18332
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
   252
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   253
!Dictionary methodsFor:'accessing'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   254
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   255
associationAt:aKey
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   256
    "return an association consisting of aKey and the element indexed
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   257
     by aKey -
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   258
     report an error, if no element is stored under aKey"
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   259
15008
a474f18209d4 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 14997
diff changeset
   260
    ^ self associationAt:aKey ifAbsent:[self errorKeyNotFound:aKey]
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   261
!
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   262
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   263
associationAt:aKey ifAbsent:exceptionBlock
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   264
    "return an association consisting of aKey and the element indexed by aKey -
14971
04b3466c98b7 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 14897
diff changeset
   265
     return result of exceptionBlock if no element is stored under aKey.
04b3466c98b7 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 14897
diff changeset
   266
     Warning: this is a comatibility interface only, with a different semantic as
04b3466c98b7 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 14897
diff changeset
   267
              the original ST80 implementation. The returned assoc is created on the fly,
04b3466c98b7 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 14897
diff changeset
   268
              and not the one stored in the receiver (there are not assocs there)"
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   269
15008
a474f18209d4 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 14997
diff changeset
   270
    |index|
a474f18209d4 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 14997
diff changeset
   271
a474f18209d4 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 14997
diff changeset
   272
    "/ must return the real key in the assoc - not aKey, which might be equal but not identical
a474f18209d4 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 14997
diff changeset
   273
    index := self find:aKey ifAbsent:0.
a474f18209d4 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 14997
diff changeset
   274
    index ~~ 0 ifTrue:[
a474f18209d4 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 14997
diff changeset
   275
        ^ Association key:(keyArray basicAt:index) value:(valueArray basicAt:index)
a474f18209d4 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 14997
diff changeset
   276
    ].
a474f18209d4 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 14997
diff changeset
   277
    ^ exceptionBlock value
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   278
!
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   279
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   280
associations
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   281
    "return an ordered collection containing the receivers associations."
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   282
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   283
    |coll|
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   284
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   285
    coll := OrderedCollection new:(keyArray size).
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   286
    self associationsDo:[:assoc | coll add:assoc].
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   287
    ^ coll
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   288
!
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   289
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   290
at:aKey
a27a279701f8 Initial revision
claus
parents:
diff changeset
   291
    "return the element indexed by aKey - report an error if none found"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   292
6233
0a79cbd07543 *** empty log message ***
martin
parents: 6101
diff changeset
   293
    ^ self at:aKey ifAbsent:[self errorKeyNotFound:aKey]
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   294
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   295
a27a279701f8 Initial revision
claus
parents:
diff changeset
   296
at:aKey ifAbsent:exceptionBlock
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   297
    "return the element indexed by aKey -
68
59faa75185ba *** empty log message ***
claus
parents: 54
diff changeset
   298
     return result of exceptionBlock if no element is stored under aKey"
2
claus
parents: 1
diff changeset
   299
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   300
    |index k|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   301
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   302
    (k := aKey) isNil ifTrue:[
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   303
	"/ nil is not allowed as key
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   304
	"/
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   305
	"/ previous versions of ST/X raised an error
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   306
	"/ here. However, there seem to exist applications
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   307
	"/ which depend on getting the exceptionBlocks value
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   308
	"/ in this case ... well ...
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   309
	"/ ^ self errorInvalidKey:aKey
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   310
"/ no longer invalid.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   311
"/      ^ exceptionBlock value
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   312
	k := NilEntry
155
edd7fc34e104 *** empty log message ***
claus
parents: 92
diff changeset
   313
    ].
362
claus
parents: 360
diff changeset
   314
claus
parents: 360
diff changeset
   315
    "/ I could have written:
claus
parents: 360
diff changeset
   316
    "/ index := self find:aKey ifAbsent:[^ exceptionBlock value]
claus
parents: 360
diff changeset
   317
    "/ but the code below is slighlty more efficient, since it avoids
1146
edadea7273b6 commentary
Claus Gittinger <cg@exept.de>
parents: 1126
diff changeset
   318
    "/ a block creation - thus speeding up the good case.
362
claus
parents: 360
diff changeset
   319
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   320
    index := self find:k ifAbsent:0.
1126
497de696dff0 OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents: 1056
diff changeset
   321
    index ~~ 0 ifTrue:[
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   322
	^ valueArray basicAt:index
1126
497de696dff0 OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents: 1056
diff changeset
   323
    ].
497de696dff0 OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents: 1056
diff changeset
   324
    ^ exceptionBlock value.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   325
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   326
16902
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   327
at:aKey ifAbsent:default update:aBlock 
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   328
    "update the element stored under aKey with the result from 
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   329
     evaluating aBlock with the previous stored value as argument, or with default,
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   330
     if there was no such key initially.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   331
     I.e. this is the same as self at:aKey put:(aBlock value:(self at:aKey ifAbsent:default)).
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   332
     Return the new value stored.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   333
     This is an optimized accessor, which only computes the hash value once."
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   334
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   335
    |k index "{ Class: SmallInteger }"
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   336
     newValue|
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   337
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   338
    (k := aKey) isNil ifTrue:[
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   339
        k := NilEntry
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   340
    ].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   341
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   342
    index := self findKeyOrNil:k.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   343
    (keyArray basicAt:index) notNil ifTrue:[
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   344
        "/ key present
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   345
        valueArray basicAt:index put:(newValue := aBlock value:(valueArray basicAt:index)).
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   346
        ^ newValue
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   347
    ].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   348
    "/ a new key
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   349
    keyArray basicAt:index put:k.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   350
    valueArray basicAt:index put:(newValue := aBlock value:default).
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   351
    tally := tally + 1.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   352
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   353
    self possiblyGrow.
16902
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   354
    ^ newValue
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   355
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   356
    "
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   357
     |d|
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   358
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   359
     d := Dictionary new.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   360
     d at:'one'  ifAbsent:0 update:[:val | val + 1].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   361
     d at:'two'  ifAbsent:0 update:[:val | val + 1].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   362
     d at:'three' ifAbsent:0  update:[:val | val + 1].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   363
     d at:'one' ifAbsent:0  update:[:val | val + 1].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   364
     d at:'two' ifAbsent:0  update:[:val | val + 1].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   365
     d
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   366
    "
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   367
!
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   368
3304
19ee5d1685d8 Make #at:ifAbsentPut: ST80 (and STBroker compatible).
Stefan Vogel <sv@exept.de>
parents: 3252
diff changeset
   369
at:aKey ifAbsentPut:valueBlock
3215
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   370
    "return the element indexed by aKey if present,
3304
19ee5d1685d8 Make #at:ifAbsentPut: ST80 (and STBroker compatible).
Stefan Vogel <sv@exept.de>
parents: 3252
diff changeset
   371
     if not present, store the result of evaluating valueBlock
19ee5d1685d8 Make #at:ifAbsentPut: ST80 (and STBroker compatible).
Stefan Vogel <sv@exept.de>
parents: 3252
diff changeset
   372
     under aKey and return it.
3215
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   373
     WARNING: do not add elements while iterating over the receiver.
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   374
              Iterate over a copy to do this."
3215
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   375
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   376
    |index "{ Class: SmallInteger }"
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   377
     k newValue|
3215
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   378
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   379
    (k := aKey) isNil ifTrue:[
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   380
        k := NilEntry
3215
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   381
    ].
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   382
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   383
    index := self findKeyOrNil:k.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   384
    (keyArray basicAt:index) notNil ifTrue:[
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   385
        "/ already present
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   386
        ^ valueArray at:index.
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   387
    ].
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   388
    "/ a new one
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   389
    newValue := valueBlock value.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   390
    keyArray basicAt:index put:k.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   391
    valueArray basicAt:index put:newValue.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   392
    tally := tally + 1.
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   393
    self possiblyGrow.
3215
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   394
    ^ newValue
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   395
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   396
    "
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   397
     |d|
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   398
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   399
     d := Dictionary new.
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   400
     Transcript showCR:(d at:'foo' ifAbsentPut:'bar').
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   401
     Transcript showCR:(d at:'foo2' ifAbsentPut:'bar2').
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   402
     Transcript showCR:(d at:'foo' ifAbsentPut:'barX').
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   403
     Transcript showCR:(d at:'foo2' ifAbsentPut:'bar2X').
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   404
    "
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   405
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   406
    "Created: / 23.1.1998 / 18:28:26 / cg"
3304
19ee5d1685d8 Make #at:ifAbsentPut: ST80 (and STBroker compatible).
Stefan Vogel <sv@exept.de>
parents: 3252
diff changeset
   407
    "Modified: / 26.2.1998 / 19:10:09 / stefan"
3215
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   408
!
dbb2ee7a5cb9 added #at:ifAbsentPut:
Claus Gittinger <cg@exept.de>
parents: 3192
diff changeset
   409
4871
211a7f44946d added #at:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 3919
diff changeset
   410
at:aKey ifPresent:aBlock
211a7f44946d added #at:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 3919
diff changeset
   411
    "if the receiver contains an element stored under aKey,
211a7f44946d added #at:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 3919
diff changeset
   412
     retrieve it and evaluate aBlock passing the element as argument,
211a7f44946d added #at:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 3919
diff changeset
   413
     return the blocks value.
211a7f44946d added #at:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 3919
diff changeset
   414
     If not, do nothing and return nil."
211a7f44946d added #at:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 3919
diff changeset
   415
211a7f44946d added #at:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 3919
diff changeset
   416
    |v|
211a7f44946d added #at:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 3919
diff changeset
   417
211a7f44946d added #at:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 3919
diff changeset
   418
    v := self at:aKey ifAbsent:[^ nil].
211a7f44946d added #at:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 3919
diff changeset
   419
    ^ aBlock value:v.
211a7f44946d added #at:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 3919
diff changeset
   420
!
211a7f44946d added #at:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 3919
diff changeset
   421
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   422
at:aKey put:anObject
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   423
    "add the argument anObject under key, aKey to the receiver.
1221
46d72af387e9 commentary
Claus Gittinger <cg@exept.de>
parents: 1146
diff changeset
   424
     Return anObject (sigh).
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   425
     WARNING: do not add elements while iterating over the receiver.
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   426
              Iterate over a copy to do this."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   427
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   428
    |k index "{ Class: SmallInteger }"|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   429
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   430
    (k := aKey) isNil ifTrue:[
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   431
        k := NilEntry
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   432
    ].
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   433
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   434
    index := self findKeyOrNil:k.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   435
    (keyArray basicAt:index) notNil ifTrue:[
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   436
        "/ key already present
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   437
        valueArray basicAt:index put:anObject.
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   438
        ^ anObject
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   439
    ].
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   440
    "/ a new key
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   441
    keyArray basicAt:index put:k.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   442
    valueArray basicAt:index put:anObject.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   443
    tally := tally + 1.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   444
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   445
    self possiblyGrow.
362
claus
parents: 360
diff changeset
   446
    ^ anObject
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   447
2328
0fd1d715e5a9 oops - the last one was not good
Claus Gittinger <cg@exept.de>
parents: 2324
diff changeset
   448
    "Modified: 30.1.1997 / 14:59:10 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   449
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   450
11420
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   451
at:aKey put:aValue ifPresent:aBlock
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   452
    "if the receiver contains an element stored under aKey,
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   453
     retrieve it and evaluate aBlock passing the element as argument,
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   454
     return the blocks value.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   455
     If not, store aValue under the key.
11420
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   456
     Use this with an error-reporting block, to ensure that no keys are reused"
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   457
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   458
    (self includesKey:aKey) ifTrue: [ ^ aBlock value ].
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   459
    ^ self at:aKey put:aValue.
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   460
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   461
    "
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   462
     |d|
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   463
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   464
     d := Dictionary new.
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   465
     d at:'foo' put:1234 ifPresent:[ self error: 'duplicate' ].
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   466
     d at:'foo' put:2345 ifPresent:[ self error: 'duplicate' ].
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   467
    "
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   468
!
9d37ee5d25c0 added at:put:ifPresent:
Claus Gittinger <cg@exept.de>
parents: 10808
diff changeset
   469
16902
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   470
at:aKey update:aBlock 
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   471
    "update the element stored under aKey with the result from 
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   472
     evaluating aBlock with the previous stored value as argument.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   473
     Report an error if there was no such key initially.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   474
     I.e. this is the same as self at:aKey put:(aBlock value:(self at:aKey)).
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   475
     Return the new value stored.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   476
     This is an optimized accessor, which only computes the hash value once."
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   477
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   478
    |k index "{ Class: SmallInteger }"
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   479
     newValue|
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   480
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   481
    (k := aKey) isNil ifTrue:[
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   482
        k := NilEntry
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   483
    ].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   484
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   485
    index := self findKeyOrNil:k.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   486
    (keyArray basicAt:index) notNil ifTrue:[
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   487
        "/ key present
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   488
        valueArray basicAt:index put:(newValue := aBlock value:(valueArray basicAt:index)).
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   489
        ^ newValue
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   490
    ].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   491
    "/ a new key
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   492
    ^ self errorKeyNotFound:k.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   493
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   494
    "
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   495
     |d|
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   496
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   497
     d := Dictionary new.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   498
     d at:'one'  update:[:val | val + 1].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   499
    "
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   500
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   501
    "
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   502
     |d|
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   503
     d := Dictionary new.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   504
     d at:'one' put:0.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   505
     d at:'two' put:0.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   506
     d at:'three' put:0.
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   507
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   508
     d at:'one'    update:[:val | val + 1].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   509
     d at:'two'    update:[:val | val + 1].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   510
     d at:'three'  update:[:val | val + 1].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   511
     d at:'one'    update:[:val | val + 1].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   512
     d at:'two'    update:[:val | val + 1].
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   513
     d
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   514
    "
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   515
!
869a0975a957 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 16808
diff changeset
   516
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   517
keyAtEqualValue:aValue
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   518
    "return the key whose value is equal (i.e. using #= for compare)
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   519
     to the argument, nil if none found.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   520
     This is a slow access, since there is no fast reverse mapping.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   521
     NOTICE:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   522
	The value is searched using equality compare;
12669
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
   523
	use #keyAtValue: to compare for identity."
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
   524
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   525
    ^ self keyAtEqualValue:aValue ifAbsent:[nil]
10
claus
parents: 5
diff changeset
   526
!
claus
parents: 5
diff changeset
   527
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   528
keyAtEqualValue:aValue ifAbsent:exceptionBlock
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   529
    "return the key whose value is equal (i.e. using #= for compare)
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   530
     to the argument, if not found, return the value of exceptionBlock.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   531
     This is a slow access, since there is no fast reverse mapping.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   532
     NOTICE:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   533
	The value is searched using equality compare;
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   534
	use #keyAtValue:ifAbsent: to compare for identity."
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   535
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   536
    |idx k|
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   537
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   538
    idx := 0.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   539
    [true] whileTrue:[
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   540
	idx := valueArray indexOf:aValue startingAt:idx+1.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   541
	idx == 0 ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   542
	    ^ exceptionBlock value
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   543
	].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   544
	(k := keyArray at:idx) notNil ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   545
	    k ~~ DeletedEntry ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   546
		k == NilEntry ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   547
		    ^ nil
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   548
		].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   549
		^ k
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   550
	    ].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   551
	].
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   552
    ].
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   553
    "/ NOT REACHED
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   554
!
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   555
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   556
keyAtIdentityValue:aValue
345
claus
parents: 302
diff changeset
   557
    "return the key whose value is identical (i.e. using #== for compare)
claus
parents: 302
diff changeset
   558
     to the argument, nil if none found.
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
   559
     This is a slow access, since there is no fast reverse mapping.
357
claus
parents: 345
diff changeset
   560
     NOTICE:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   561
	The value is searched using identity compare;
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   562
	use #keyAtEqualValue: to compare for equality."
10
claus
parents: 5
diff changeset
   563
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   564
    ^ self keyAtIdentityValue:aValue ifAbsent:[nil]
10
claus
parents: 5
diff changeset
   565
!
claus
parents: 5
diff changeset
   566
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   567
keyAtIdentityValue:aValue ifAbsent:exceptionBlock
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   568
    "return the key whose value is identical (i.e. using #== for compare)
345
claus
parents: 302
diff changeset
   569
     to the argument, if not found, return the value of exceptionBlock.
357
claus
parents: 345
diff changeset
   570
     This is a slow access, since there is no fast reverse mapping.
claus
parents: 345
diff changeset
   571
     NOTICE:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   572
	The value is searched using identity compare;
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   573
	use #keyAtEqualValue:ifAbsent: to compare for equality."
10
claus
parents: 5
diff changeset
   574
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   575
    |idx k|
359
claus
parents: 357
diff changeset
   576
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   577
    idx := 0.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   578
    [true] whileTrue:[
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   579
	idx := valueArray identityIndexOf:aValue startingAt:idx+1.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   580
	idx == 0 ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   581
	    ^ exceptionBlock value
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   582
	].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   583
	(k := keyArray at:idx) notNil ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   584
	    k ~~ DeletedEntry ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   585
		k == NilEntry ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   586
		    ^ nil
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   587
		].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   588
		^ k
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   589
	    ].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   590
	].
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   591
    ].
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   592
    "/ NOT REACHED
357
claus
parents: 345
diff changeset
   593
!
claus
parents: 345
diff changeset
   594
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   595
keyAtValue:aValue
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   596
    "return the key whose value is identical (i.e. using #== for compare)
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   597
     to the argument, nil if none found.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   598
     This is a slow access, since there is no fast reverse mapping.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   599
     NOTICE:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   600
	The value is searched using identity compare;
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   601
	use #keyAtEqualValue: to compare for equality."
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   602
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   603
    ^ self keyAtIdentityValue:aValue ifAbsent:[nil]
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   604
!
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   605
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   606
keyAtValue:aValue ifAbsent:exceptionBlock
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   607
    "return the key whose value is identical (i.e. using #== for compare)
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   608
     to the argument, if not found, return the value of exceptionBlock.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   609
     This is a slow access, since there is no fast reverse mapping.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   610
     NOTICE:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   611
	The value is searched using identity compare;
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   612
	use #keyAtEqualValue:ifAbsent: to compare for equality."
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   613
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   614
    ^ self keyAtIdentityValue:aValue ifAbsent:exceptionBlock
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   615
!
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   616
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   617
keys
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   618
    "return a collection containing all keys of the receiver"
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   619
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   620
    |keySet|
357
claus
parents: 345
diff changeset
   621
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   622
    keySet := self emptyCollectionForKeys.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   623
    keyArray do:[:key |
14320
0050f5925f57 changed: #keys
Stefan Vogel <sv@exept.de>
parents: 14318
diff changeset
   624
        (key notNil and:[key ~~ DeletedEntry]) ifTrue:[
0050f5925f57 changed: #keys
Stefan Vogel <sv@exept.de>
parents: 14318
diff changeset
   625
            key == NilEntry ifTrue:[
0050f5925f57 changed: #keys
Stefan Vogel <sv@exept.de>
parents: 14318
diff changeset
   626
                keySet add:nil
0050f5925f57 changed: #keys
Stefan Vogel <sv@exept.de>
parents: 14318
diff changeset
   627
            ] ifFalse:[
0050f5925f57 changed: #keys
Stefan Vogel <sv@exept.de>
parents: 14318
diff changeset
   628
                keySet add:key
0050f5925f57 changed: #keys
Stefan Vogel <sv@exept.de>
parents: 14318
diff changeset
   629
            ]
0050f5925f57 changed: #keys
Stefan Vogel <sv@exept.de>
parents: 14318
diff changeset
   630
        ]
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   631
    ].
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   632
    ^ keySet
357
claus
parents: 345
diff changeset
   633
!
claus
parents: 345
diff changeset
   634
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   635
values
12668
8766411e8573 comment/format in: #values
Claus Gittinger <cg@exept.de>
parents: 12659
diff changeset
   636
    "return a collection containing all values of the receiver.
8766411e8573 comment/format in: #values
Claus Gittinger <cg@exept.de>
parents: 12659
diff changeset
   637
     This is to make value access to an OrderedDictionary compatible with any-Collection"
359
claus
parents: 357
diff changeset
   638
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   639
    |aCollection|
359
claus
parents: 357
diff changeset
   640
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   641
    aCollection := OrderedCollection new:valueArray size.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   642
    self do:[:value| aCollection add:value].
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
   643
    ^ aCollection
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   644
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   645
a27a279701f8 Initial revision
claus
parents:
diff changeset
   646
!Dictionary methodsFor:'adding & removing'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   647
a27a279701f8 Initial revision
claus
parents:
diff changeset
   648
add:anAssociation
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   649
    "add the argument, anAssociation to the receiver.
14897
41e26dc8902b comment/format in: #add:
Claus Gittinger <cg@exept.de>
parents: 14320
diff changeset
   650
     Returns the argument, anAssosciation.
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   651
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   652
     WARNING: do not add elements while iterating over the receiver.
14897
41e26dc8902b comment/format in: #add:
Claus Gittinger <cg@exept.de>
parents: 14320
diff changeset
   653
              Iterate over a copy to do this."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   654
a27a279701f8 Initial revision
claus
parents:
diff changeset
   655
    self at:(anAssociation key) put:(anAssociation value).
a27a279701f8 Initial revision
claus
parents:
diff changeset
   656
    ^ anAssociation
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   657
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   658
    "Modified: 1.3.1996 / 21:23:53 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   659
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   660
8434
98ae6daa9aac Fix #addAll: and #declareAllFrom:
Stefan Vogel <sv@exept.de>
parents: 8395
diff changeset
   661
addAll:aCollection
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   662
    "ANSI 5.7.2.1:
8434
98ae6daa9aac Fix #addAll: and #declareAllFrom:
Stefan Vogel <sv@exept.de>
parents: 8395
diff changeset
   663
     Message:  addAll: dictionary
98ae6daa9aac Fix #addAll: and #declareAllFrom:
Stefan Vogel <sv@exept.de>
parents: 8395
diff changeset
   664
      Synopsis
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   665
	Store the elements of dictionary in the receiver at the
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   666
	corresponding keys from dictionary.
8434
98ae6daa9aac Fix #addAll: and #declareAllFrom:
Stefan Vogel <sv@exept.de>
parents: 8395
diff changeset
   667
      Definition: <abstractDictionary>
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   668
	This message is equivalent to repeatedly sending the #at:put:
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   669
	message to the receiver with each of the keys and elements in
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   670
	dictionary in turn.  If a key in dictionary is key equivalent
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   671
	to a key in the receiver, the associated element in dictionary
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   672
	replaces the element in the receiver.
8434
98ae6daa9aac Fix #addAll: and #declareAllFrom:
Stefan Vogel <sv@exept.de>
parents: 8395
diff changeset
   673
7750
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   674
     Returns the argument, aCollection (sigh).
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   675
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   676
     WARNING: do not add elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   677
	      Iterate over a copy to do this."
7750
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   678
8434
98ae6daa9aac Fix #addAll: and #declareAllFrom:
Stefan Vogel <sv@exept.de>
parents: 8395
diff changeset
   679
98ae6daa9aac Fix #addAll: and #declareAllFrom:
Stefan Vogel <sv@exept.de>
parents: 8395
diff changeset
   680
    self ~~ aCollection ifTrue:[
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   681
	aCollection isSequenceable ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   682
	    aCollection do:[:eachPair |
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   683
		self at:eachPair key put:eachPair value.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   684
	    ].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   685
	] ifFalse:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   686
	    aCollection keysAndValuesDo:[:eachKey :eachValue |
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   687
		self at:eachKey put:eachValue.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   688
	    ]
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   689
	].
7750
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   690
    ].
8434
98ae6daa9aac Fix #addAll: and #declareAllFrom:
Stefan Vogel <sv@exept.de>
parents: 8395
diff changeset
   691
    ^ aCollection
7750
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   692
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   693
    "
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   694
     |d1 d2|
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   695
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   696
     d1 := Dictionary new.
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   697
     d1 at:1 put:'one'.
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   698
     d1 at:2 put:'two'.
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   699
     d2 := Dictionary new.
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   700
     d2 at:3 put:'three'.
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   701
     d2 at:4 put:'four'.
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   702
     d1 addAll:d2.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   703
     d1.
7750
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   704
    "
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   705
!
5722e5569d3d fixed (added) #addAll:
Claus Gittinger <cg@exept.de>
parents: 7653
diff changeset
   706
2711
307c43b7a3f9 addPairsFrom:
ca
parents: 2466
diff changeset
   707
addPairsFrom:aSequenceableCollection
11673
baa4568523f0 comment
Claus Gittinger <cg@exept.de>
parents: 11581
diff changeset
   708
    "merge consecutive key-value pairs from aSequenceableCollection into the receiver."
2711
307c43b7a3f9 addPairsFrom:
ca
parents: 2466
diff changeset
   709
307c43b7a3f9 addPairsFrom:
ca
parents: 2466
diff changeset
   710
    aSequenceableCollection pairWiseDo:[:key :value |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   711
	self at:key put:value.
2711
307c43b7a3f9 addPairsFrom:
ca
parents: 2466
diff changeset
   712
    ]
307c43b7a3f9 addPairsFrom:
ca
parents: 2466
diff changeset
   713
7751
e6bfe9fd8ef8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 7750
diff changeset
   714
    "
e6bfe9fd8ef8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 7750
diff changeset
   715
     |d1 arr|
e6bfe9fd8ef8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 7750
diff changeset
   716
e6bfe9fd8ef8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 7750
diff changeset
   717
     d1 := Dictionary new.
e6bfe9fd8ef8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 7750
diff changeset
   718
     d1 at:1 put:'one'.
e6bfe9fd8ef8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 7750
diff changeset
   719
     d1 at:2 put:'two'.
e6bfe9fd8ef8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 7750
diff changeset
   720
     arr := #(3 'three'  4 'four').
e6bfe9fd8ef8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 7750
diff changeset
   721
     d1 addPairsFrom:arr.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   722
     d1.
7751
e6bfe9fd8ef8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 7750
diff changeset
   723
    "
e6bfe9fd8ef8 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 7750
diff changeset
   724
2711
307c43b7a3f9 addPairsFrom:
ca
parents: 2466
diff changeset
   725
    "Modified: 1.3.1996 / 21:24:03 / cg"
307c43b7a3f9 addPairsFrom:
ca
parents: 2466
diff changeset
   726
!
307c43b7a3f9 addPairsFrom:
ca
parents: 2466
diff changeset
   727
345
claus
parents: 302
diff changeset
   728
declare:key from:aDictionary
claus
parents: 302
diff changeset
   729
    "if the receiver does not include an association for key,
claus
parents: 302
diff changeset
   730
     take the association from aDictionary and add it to the receiver.
claus
parents: 302
diff changeset
   731
     If aDictionary does not contain such an association, use nil
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   732
     as the value of the new dictionary.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   733
9066
fe9eed32da70 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8831
diff changeset
   734
     Stubidity Notice:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   735
	 Incompatibility with #declareAllFrom:, where the other values are
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   736
	 defined unconditionally.
9066
fe9eed32da70 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8831
diff changeset
   737
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   738
     WARNING: do not add elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   739
	      Iterate over a copy to do this."
345
claus
parents: 302
diff changeset
   740
claus
parents: 302
diff changeset
   741
    |value|
claus
parents: 302
diff changeset
   742
claus
parents: 302
diff changeset
   743
    (self includesKey:key) ifFalse:[
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   744
	value := aDictionary at:key ifAbsent:nil.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   745
	self at:key put:value.
345
claus
parents: 302
diff changeset
   746
    ]
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   747
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   748
    "Modified: 1.3.1996 / 21:24:03 / cg"
345
claus
parents: 302
diff changeset
   749
!
claus
parents: 302
diff changeset
   750
16451
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   751
declareAll:keys from:aCollectionOrDictionary
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   752
    "declare all keys in the first argument, keys
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   753
     from values taken from the second argument, aCollectionOrDictionary.
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   754
     If aCollectionOrDictionary is a dictionary, access via the key;
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   755
     if it is a sequencable collection, add corresponding values pairwise."
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   756
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   757
    aCollectionOrDictionary isDictionary ifTrue:[
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   758
        keys do:[:k | self at:k put:(aCollectionOrDictionary at:k) ]
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   759
    ] ifFalse:[
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   760
        keys with:aCollectionOrDictionary do:[:k :v | self at:k put:v ]
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   761
    ].
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   762
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   763
    "
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   764
     |d|
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   765
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   766
     d := Dictionary new.
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   767
     d declareAll:#(a b c) from:#(10 20 30).
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   768
     d.
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   769
    "
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   770
    "
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   771
     |d1 d2 d3|
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   772
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   773
     d1 := Dictionary new.
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   774
     d1 declareAll:#(a b c) from:#(10 20 30).
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   775
     d2 := Dictionary new.
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   776
     d2 declareAll:#( b c d) from:#(100 200 300).
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   777
     d3 := Dictionary new.
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   778
     d3 declareAll:#(a b c) from:d1.
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   779
     d3 declareAll:#(c d) from:d2.
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   780
     d3
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   781
    "
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   782
!
59f63673573d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15857
diff changeset
   783
9938
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   784
declareAllFrom:aDictionaryOrNil
8434
98ae6daa9aac Fix #addAll: and #declareAllFrom:
Stefan Vogel <sv@exept.de>
parents: 8395
diff changeset
   785
    "merge all key-value pairs from aDictionary into the receiver.
98ae6daa9aac Fix #addAll: and #declareAllFrom:
Stefan Vogel <sv@exept.de>
parents: 8395
diff changeset
   786
9938
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   787
     sigh:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   788
	For compatibility with #declare:from: the behavior should be changed as following:
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   789
	If the receiver already contains a key, the existing value is retained.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   790
	To keep the compatibility with other smalltalks, the semantics of this remains
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   791
	as is, and #declareAllNewFrom: was added for convenience.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   792
	See #declareAllNewFrom: which does exactly what this name implies."
2711
307c43b7a3f9 addPairsFrom:
ca
parents: 2466
diff changeset
   793
9938
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   794
    self ~~ aDictionaryOrNil ifTrue:[
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   795
	aDictionaryOrNil notNil ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   796
	    aDictionaryOrNil keysAndValuesDo:[:key :value |
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   797
		self at:key put:value.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   798
	    ].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   799
	]
2711
307c43b7a3f9 addPairsFrom:
ca
parents: 2466
diff changeset
   800
    ]
9938
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   801
9939
59877f64325d *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 9938
diff changeset
   802
    "Modified: / 18-09-2006 / 22:01:12 / cg"
9938
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   803
!
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   804
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   805
declareAllNewFrom:aDictionaryOrNil
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   806
    "merge all new key-value pairs from aDictionary into the receiver
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   807
     i.e. If the receiver already contains a key, the existing value is retained.
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   808
     See also #declareAllFrom:"
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   809
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   810
    self ~~ aDictionaryOrNil ifTrue:[
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   811
	aDictionaryOrNil notNil ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   812
	    aDictionaryOrNil keysAndValuesDo:[:key :value |
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   813
		(self includesKey:key) ifFalse:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   814
		    self at:key put:value.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   815
		].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   816
	    ]
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   817
	]
9938
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   818
    ]
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   819
bec2c2e2c500 declareAllFrom: comment
Claus Gittinger <cg@exept.de>
parents: 9570
diff changeset
   820
    "Created: / 18-09-2006 / 21:58:54 / cg"
2711
307c43b7a3f9 addPairsFrom:
ca
parents: 2466
diff changeset
   821
!
307c43b7a3f9 addPairsFrom:
ca
parents: 2466
diff changeset
   822
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   823
remove:oldObject ifAbsent:aBlock
a27a279701f8 Initial revision
claus
parents:
diff changeset
   824
    "remove oldObject from the collection and return it.
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   825
     If it was not in the collection return the value of aBlock.
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   826
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   827
     This is blocked here; you have to use one of
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   828
     #removeKey:, #saveRemoveKey:, #removeAssociation:,
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   829
     #removeValue: or #saveRemoveValue:"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   830
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   831
    ^ self shouldNotImplement
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   832
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   833
    "Modified: 1.3.1996 / 21:21:38 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   834
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   835
6053
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   836
removeAllKeys:aKeyCollection
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   837
    "remove all associations under each key in aKeyCollection from the collection.
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   838
     If it was not in the collection report an error.
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   839
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   840
     WARNING: do not remove elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   841
	      See #saveRemoveKey: to do this."
6053
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   842
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   843
    aKeyCollection do:[:eachKey |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   844
	self removeKey:eachKey ifAbsent:[self errorKeyNotFound:eachKey]
6053
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   845
    ].
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   846
!
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   847
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   848
removeAllKeys:aKeyCollection ifAbsent:aBlock
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   849
    "remove all associations under each key in aKeyCollection from the collection.
15527
79c139096f4f class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15363
diff changeset
   850
     If it was not in the collection return the result from evaluating aBlock
79c139096f4f class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15363
diff changeset
   851
     (invoked for each missing element).
6053
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   852
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   853
     WARNING: do not remove elements while iterating over the receiver.
15527
79c139096f4f class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15363
diff changeset
   854
              See #saveRemoveKey: to do this."
6053
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   855
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   856
    aKeyCollection do:[:eachKey |
15527
79c139096f4f class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15363
diff changeset
   857
        self removeKey:eachKey ifAbsent:aBlock
6053
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   858
    ].
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   859
!
a97f27828c08 added #removeKeys: and #removeKeys:ifAbsent: (ANSI)
Claus Gittinger <cg@exept.de>
parents: 5865
diff changeset
   860
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   861
removeAssociation:assoc
a27a279701f8 Initial revision
claus
parents:
diff changeset
   862
    "remove the association from the collection.
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   863
     If it was not in the collection report an error.
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   864
     Only the key is used in the passed argument, and a new
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   865
     association, for the key and the previously stored value is returned.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   866
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   867
     WARNING: do not remove elements while iterating over the receiver.
12669
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
   868
	      See #saveRemoveKey: to do this."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   869
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   870
    |key|
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   871
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   872
    key := assoc key.
2897
0b6b43d0a300 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2711
diff changeset
   873
    ^ Association key:key value:(self removeKey:key)
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   874
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   875
    "Modified: 1.3.1996 / 21:21:11 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   876
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   877
a27a279701f8 Initial revision
claus
parents:
diff changeset
   878
removeKey:aKey
a27a279701f8 Initial revision
claus
parents:
diff changeset
   879
    "remove the association under aKey from the collection.
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   880
     If it was not in the collection report an error.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   881
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   882
     WARNING: do not remove elements while iterating over the receiver.
12669
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
   883
	      See #saveRemoveKey: to do this."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   884
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   885
    ^ self removeKey:aKey ifAbsent:[self errorKeyNotFound:aKey]
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   886
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   887
    "Modified: 1.3.1996 / 21:21:52 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   888
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   889
a27a279701f8 Initial revision
claus
parents:
diff changeset
   890
removeKey:aKey ifAbsent:aBlock
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   891
    "remove the association under aKey from the collection,
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   892
     return the value previously stored there..
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   893
     If it was not in the collection return the result
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   894
     from evaluating aBlock.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   895
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   896
     WARNING: do not remove elements while iterating over the receiver.
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   897
             See #saveRemoveKey: to do this."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   898
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   899
    |index "{ Class:SmallInteger }"
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   900
     "/ next  "{ Class:SmallInteger }"
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   901
     oldValue k|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   902
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   903
    (k := aKey) isNil ifTrue:[
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   904
"/ no longer invalid
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   905
"/        ^ self errorInvalidKey:aKey
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   906
        k := NilEntry
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   907
    ].
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   908
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   909
    "/   below, I could have written:
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   910
    "/      index := self find:aKey ifAbsent:[^ aBlock value]
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   911
    "/   but the code below is slighlty more efficient, since it avoids
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   912
    "/   a garbage block creation - thus speeding up the good case.
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   913
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   914
    index := self find:k ifAbsent:0.
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   915
    index == 0 ifTrue:[^ aBlock value].
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   916
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   917
    oldValue := valueArray basicAt:index.
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   918
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   919
    valueArray basicAt:index put:nil.
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   920
    keyArray basicAt:index put:DeletedEntry.
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
   921
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   922
    tally := tally - 1.
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   923
    tally == 0 ifTrue:[
18332
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
   924
        self initializeForCapacity:0
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   925
    ] ifFalse:[
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   926
"/        index == keyArray basicSize ifTrue:[
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   927
"/            next := 1
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   928
"/        ] ifFalse:[
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   929
"/            next := index + 1.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   930
"/        ].
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   931
"/        (keyArray basicAt:next) notNil ifTrue:[
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   932
"/            keyArray basicAt:index put:DeletedEntry
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
   933
"/        ].
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   934
        self possiblyShrink
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   935
    ].
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   936
    ^ oldValue
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   937
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   938
    "Modified: 1.3.1996 / 21:21:01 / cg"
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
   939
!
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
   940
5184
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   941
removeValue:aValue
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   942
    "remove (first) the association to aValue from the collection,
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   943
     return the key under which it was stored previously.
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   944
     If it was not in the collection, report an error.
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   945
     The value is searched using equality compare here,
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   946
     but identity compare in the IdentityDictionary subclass.
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   947
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   948
     Notice, this does a linear search through the values and may
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   949
     therefore be slow for big dictionaries.
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   950
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   951
     WARNING: do not remove elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   952
	     See #saveRemoveValue: to do this."
5184
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   953
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   954
    ^ self removeValue:aValue ifAbsent:[self errorValueNotFound:aValue]
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   955
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   956
    "
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   957
     |d|
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   958
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   959
     d := Dictionary new.
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   960
     d at:1 put:'one'.
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   961
     d at:2 put:'two'.
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   962
     d at:3 put:'three'.
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   963
     d removeValue:'two'.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   964
     d
5184
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   965
    "
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   966
!
cbf20f052178 added #removeValue: - for protocol completeness
Claus Gittinger <cg@exept.de>
parents: 5050
diff changeset
   967
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
   968
removeValue:aValue ifAbsent:aBlock
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   969
    "remove (first) the association to aValue from the collection,
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   970
     return the key under which it was stored previously.
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
   971
     If it was not in the collection return result from evaluating aBlock.
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   972
     The value is searched using equality compare here,
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   973
     but identity compare in the IdentityDictionary subclass.
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
   974
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   975
     Notice, this does a linear search through the values and may
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   976
     therefore be slow for big dictionaries.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   977
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
   978
     WARNING: do not remove elements while iterating over the receiver.
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   979
             See #saveRemoveValue: to do this."
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   980
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
   981
    |next  "{ Class:SmallInteger }"
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
   982
     oldKey|
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
   983
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
   984
    keyArray keysAndValuesDo:[:index :aKey |
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   985
        |idx "{Class:SmallInteger}"|
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   986
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   987
        (aKey notNil and:[aKey ~~ DeletedEntry]) ifTrue:[
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   988
            idx := index.
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   989
            (self compareSame:(valueArray at:idx) with:aValue) ifTrue:[
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   990
                "found it"
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   991
                valueArray basicAt:idx put:nil.
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   992
                oldKey := keyArray basicAt:idx.
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   993
                oldKey == NilEntry ifTrue:[
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   994
                    oldKey := nil
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   995
                ].
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   996
                keyArray basicAt:idx put:nil.
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   997
                tally := tally - 1.
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
   998
                tally == 0 ifTrue:[
18332
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
   999
                    self initializeForCapacity:0.
17264
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1000
                    ^ oldKey
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1001
                ].
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1002
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1003
                idx == keyArray basicSize ifTrue:[
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1004
                    next := 1
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1005
                ] ifFalse:[
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1006
                    next := index + 1.
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1007
                ].
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1008
                (keyArray basicAt:next) notNil ifTrue:[
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1009
                    keyArray basicAt:idx put:DeletedEntry
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1010
                ].
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1011
                self possiblyShrink.
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1012
                ^ oldKey
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1013
            ]
548ea4dc5aa4 renamed the private emptyCheck of Set & Dictionary
Claus Gittinger <cg@exept.de>
parents: 16902
diff changeset
  1014
        ]
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1015
    ].
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1016
    ^ aBlock value
641
ef3bcf9de54b return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents: 633
diff changeset
  1017
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1018
    "Modified: 1.3.1996 / 21:22:11 / cg"
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1019
!
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1020
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1021
safeRemoveKey:aKey
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1022
    "remove the association under aKey from the collection.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1023
     Return the value previously stored there.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1024
     If it was not in the collection return nil.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1025
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1026
     In contrast to #removeKey:, this does not resize the underlying collection
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1027
     and therefore does NOT rehash & change the elements order.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1028
     Therefor this can be used while enumerating the receiver,
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1029
     which is not possible if #removeKey: is used.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1030
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1031
     WARNING: since no resizing is done, the physical amount of memory used
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1032
              by the container remains the same, although the logical size shrinks.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1033
              You may want to manually resize the receiver using #emptyCheck."
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1034
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1035
    |index "{ Class:SmallInteger }"
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1036
     next  "{ Class:SmallInteger }"
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
  1037
     oldValue k|
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1038
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
  1039
    (k := aKey) isNil ifTrue:[
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1040
        k := NilEntry
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
  1041
    ].
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
  1042
"/    aKey isNil ifTrue:[^ nil].
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1043
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
  1044
    index := self find:k ifAbsent:0.
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1045
    index == 0 ifTrue:[^ nil].
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1046
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1047
    oldValue := valueArray basicAt:index.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1048
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1049
    valueArray basicAt:index put:nil.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1050
    keyArray basicAt:index put:nil.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1051
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1052
    tally := tally - 1.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1053
    tally ~~ 0 ifTrue:[
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1054
        index == keyArray basicSize ifTrue:[
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1055
            next := 1
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1056
        ] ifFalse:[
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1057
            next := index + 1.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1058
        ].
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1059
        (keyArray basicAt:next) notNil ifTrue:[
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1060
            keyArray basicAt:index put:DeletedEntry
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1061
        ].
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1062
    ].
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1063
    ^ oldValue
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1064
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1065
    "does NOT work:
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1066
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1067
        |d|
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1068
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1069
        d := Dictionary new.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1070
        d at:'one' put:1.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1071
        d at:'two' put:2.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1072
        d at:'three' put:3.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1073
        d at:'four' put:4.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1074
        d at:'five' put:5.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1075
        d at:'six' put:6.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1076
        d at:'seven' put:7.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1077
        d at:'eight' put:8.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1078
        d at:'nine' put:9.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1079
        d keysAndValuesDo:[:k :v |
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1080
            v odd ifTrue:[
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1081
                d removeKey:k
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1082
            ]
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1083
        ].
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1084
        d inspect
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1085
    "
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1086
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1087
    "DOES work:
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1088
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1089
        |d|
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1090
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1091
        d := Dictionary new.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1092
        d at:'one' put:1.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1093
        d at:'two' put:2.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1094
        d at:'three' put:3.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1095
        d at:'four' put:4.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1096
        d at:'five' put:5.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1097
        d at:'six' put:6.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1098
        d at:'seven' put:7.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1099
        d at:'eight' put:8.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1100
        d at:'nine' put:9.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1101
        d keysAndValuesDo:[:k :v |
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1102
            v odd ifTrue:[
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1103
                d safeRemoveKey:k
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1104
            ]
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1105
        ].
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1106
        d inspect
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1107
    "
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1108
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1109
    "Created: 1.3.1996 / 21:14:42 / cg"
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1110
    "Modified: 1.3.1996 / 21:14:53 / cg"
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1111
!
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1112
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1113
safeRemoveValue:aValue
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1114
    "remove the (first) association to aValue from the collection,
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1115
     return the key under which it was stored previously.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1116
     If it was not in the collection return nil.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1117
     The value is searched using equality compare here,
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1118
     but identity compare in the IdentityDictionary subclass.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1119
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1120
     In contrast to #removeValue:, this does not resize the underlying collection
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1121
     and therefore does NOT rehash & change the elements order.
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  1122
     Therefore, this can be used while enumerating the receiver,
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1123
     which is not possible if #removeValue: is used.
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1124
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1125
     WARNING: since no resizing is done, the physical amount of memory used
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1126
              by the container remains the same, although the logical size shrinks.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1127
              You may want to manually resize the receiver using #emptyCheck."
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1128
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1129
    |next  "{ Class:SmallInteger }"
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1130
     oldKey|
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1131
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  1132
    keyArray keysAndValuesDo:[:index :aKey |
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1133
        |idx "{Class:SmallInteger}"|
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1134
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1135
        (aKey notNil and:[aKey ~~ DeletedEntry]) ifTrue:[
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1136
            idx := index.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1137
            (self compareSame:(valueArray at:idx) with:aValue) ifTrue:[
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1138
                "found it"
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1139
                valueArray basicAt:idx put:nil.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1140
                oldKey := keyArray basicAt:idx.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1141
                oldKey == NilEntry ifTrue:[
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1142
                    oldKey := nil
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1143
                ].
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1144
                keyArray basicAt:idx put:nil.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1145
                tally := tally - 1.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1146
                tally ~~ 0 ifTrue:[
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1147
                    idx == keyArray basicSize ifTrue:[
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1148
                        next := 1
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1149
                    ] ifFalse:[
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1150
                        next := index + 1.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1151
                    ].
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1152
                    (keyArray basicAt:next) notNil ifTrue:[
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1153
                        keyArray basicAt:idx put:DeletedEntry
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1154
                    ].
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1155
                ].
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1156
                ^ oldKey
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1157
            ]
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1158
        ]
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1159
    ].
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1160
    ^ aValue
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1161
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1162
    "does NOT work:
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1163
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1164
        |d|
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1165
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1166
        d := Dictionary new.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1167
        d at:'one' put:1.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1168
        d at:'two' put:2.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1169
        d at:'three' put:3.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1170
        d at:'four' put:4.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1171
        d at:'five' put:5.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1172
        d at:'six' put:6.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1173
        d at:'seven' put:7.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1174
        d at:'eight' put:8.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1175
        d at:'nine' put:9.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1176
        d keysAndValuesDo:[:k :v |
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1177
            v odd ifTrue:[
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1178
                d removeValue:v ifAbsent:nil
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1179
            ]
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1180
        ].
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1181
        d inspect
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1182
    "
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1183
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1184
    "DOES work:
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1185
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1186
        |d|
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1187
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1188
        d := Dictionary new.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1189
        d at:'one' put:1.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1190
        d at:'two' put:2.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1191
        d at:'three' put:3.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1192
        d at:'four' put:4.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1193
        d at:'five' put:5.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1194
        d at:'six' put:6.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1195
        d at:'seven' put:7.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1196
        d at:'eight' put:8.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1197
        d at:'nine' put:9.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1198
        d keysAndValuesDo:[:k :v |
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1199
            v odd ifTrue:[
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1200
                d safeRemoveValue:v
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1201
            ]
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1202
        ].
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1203
        d inspect
1053
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1204
    "
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1205
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1206
    "Created: 1.3.1996 / 21:17:10 / cg"
ac1ea83233e6 added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents: 641
diff changeset
  1207
    "Modified: 1.3.1996 / 21:23:04 / cg"
16512
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1208
!
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1209
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1210
saveRemoveKey:aKey
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1211
    <resource: #obsolete>
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1212
    "bad spelling - kept for backward compatibility (2014-06-04)"
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1213
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1214
    ^ self safeRemoveKey:aKey.
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1215
!
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1216
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1217
saveRemoveValue:aValue
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1218
    <resource: #obsolete>
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1219
    "bad spelling - kept for backward compatibility (2014-06-04)"
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1220
326a51f05fb6 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16451
diff changeset
  1221
    ^ self safeRemoveValue:aValue.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1222
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1223
5279
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1224
!Dictionary methodsFor:'comparing'!
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1225
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1226
= aCollection
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1227
    "return true, if the argument is a Dictionary containing the same
5279
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1228
     key-value pairs as I do"
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1229
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1230
    aCollection species == self species ifFalse:[^ false].
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1231
    aCollection size == self size ifFalse:[^ false].
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1232
    "/ all of of my key-value associations must be in the other collection ...
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1233
    self keysAndValuesDo:[:key :value |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1234
	((aCollection at:key ifAbsent:[^ false]) = value) ifFalse:[^ false]
5279
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1235
    ].
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1236
    ^ true
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1237
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1238
    "
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1239
     |d1 d2|
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1240
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1241
     d1 := Dictionary new.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1242
     d2 := Dictionary new.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1243
     d1 at:1 put:'one'.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1244
     d1 at:'one' put:1.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1245
     d1 at:2 put:#two.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1246
     d1 at:'two' put:2.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1247
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1248
     d2 at:1 put:'one'.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1249
     d2 at:'one' put:1.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1250
     d2 at:2 put:#two.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1251
     d2 at:'two' put:2.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1252
     d1 = d2
5279
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1253
    "
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1254
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1255
    "
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1256
     |d1 d2|
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1257
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1258
     d1 := Dictionary new.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1259
     d2 := Dictionary new.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1260
     d1 at:1 put:'uno'.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1261
     d1 at:'one' put:1.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1262
     d1 at:2 put:#two.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1263
     d1 at:'two' put:2.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1264
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1265
     d2 at:1 put:'one'.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1266
     d2 at:'one' put:1.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1267
     d2 at:2 put:#two.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1268
     d2 at:'two' put:2.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1269
     d1 = d2
5279
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1270
    "
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1271
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1272
    "
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1273
     |d1 d2|
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1274
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1275
     d1 := Dictionary new.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1276
     d2 := Dictionary new.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1277
     d1 at:10 put:'one'.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1278
     d1 at:'one' put:1.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1279
     d1 at:2 put:#two.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1280
     d1 at:'two' put:2.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1281
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1282
     d2 at:1 put:'one'.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1283
     d2 at:'one' put:1.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1284
     d2 at:2 put:#two.
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1285
     d2 at:'two' put:2.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1286
     d1 = d2
5279
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1287
    "
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1288
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1289
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1290
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1291
! !
7f611c000835 added #= EXPERIMENTAL
Claus Gittinger <cg@exept.de>
parents: 5255
diff changeset
  1292
3252
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1293
!Dictionary methodsFor:'converting'!
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1294
7906
9956d7c3a7be +asDictionary
Claus Gittinger <cg@exept.de>
parents: 7751
diff changeset
  1295
asDictionary
9956d7c3a7be +asDictionary
Claus Gittinger <cg@exept.de>
parents: 7751
diff changeset
  1296
    ^ self
9956d7c3a7be +asDictionary
Claus Gittinger <cg@exept.de>
parents: 7751
diff changeset
  1297
!
9956d7c3a7be +asDictionary
Claus Gittinger <cg@exept.de>
parents: 7751
diff changeset
  1298
14997
19ac0ce7ab74 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 14971
diff changeset
  1299
asNewDictionary
19ac0ce7ab74 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 14971
diff changeset
  1300
    "return myself as an unique new dictionary"
19ac0ce7ab74 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 14971
diff changeset
  1301
19ac0ce7ab74 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 14971
diff changeset
  1302
    ^ self copy
19ac0ce7ab74 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 14971
diff changeset
  1303
!
19ac0ce7ab74 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 14971
diff changeset
  1304
14271
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1305
associationsOrderedBy:aCollectionOfKeys
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1306
    "return an OrderedCollection of my key-value pairs, ordered by the given key list"
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1307
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1308
    self assert:(aCollectionOfKeys size == self size).
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1309
    ^ aCollectionOfKeys collect:[:eachKey | eachKey -> (self at:eachKey) ] as: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1310
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1311
    "
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1312
     |d|
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1313
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1314
     d := Dictionary new.
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1315
     d at:'zzz' put:3.
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1316
     d at:'aaa' put:1.
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1317
     d at:'eee' put:2.
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1318
     d.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1319
     d valuesOrderedBy:#('aaa' 'eee' 'zzz').
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1320
     d associationsOrderedBy:#('aaa' 'eee' 'zzz').
14271
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1321
    "
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1322
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1323
    "Created: / 31-07-2012 / 17:32:34 / cg"
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1324
!
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1325
3252
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1326
fromLiteralArrayEncoding:encoding
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1327
    "read my values from an encoding.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1328
     The encoding is supposed to be of the form:
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1329
	(Dictionary key1 val1 ... keyN valN)"
3252
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1330
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1331
    2 to:encoding size by:2 do:[:i |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1332
	|key val|
3252
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1333
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1334
	key := encoding at:i.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1335
	val := encoding at:i+1.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1336
	self at:key put:val
3252
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1337
    ].
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1338
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1339
    "
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1340
     Dictionary new fromLiteralArrayEncoding:#(Dictionary 'hello' 'world' 1 'foo')
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1341
    "
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1342
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1343
    "Created: / 30.1.1998 / 04:30:47 / cg"
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1344
!
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1345
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1346
literalArrayEncoding
9413
195f7caf6610 Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9183
diff changeset
  1347
    |literalArrray idx|
3252
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1348
9413
195f7caf6610 Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9183
diff changeset
  1349
    literalArrray := Array new:(self size * 2)+1.
195f7caf6610 Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9183
diff changeset
  1350
    literalArrray at:1 put:self class name.
195f7caf6610 Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9183
diff changeset
  1351
    idx := 2.
195f7caf6610 Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9183
diff changeset
  1352
    self keysAndValuesDo:[:eachKey :eachValue |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1353
	literalArrray
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1354
	    at:idx   put:eachKey literalArrayEncoding;
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1355
	    at:idx+1 put:eachValue literalArrayEncoding.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1356
	idx := idx + 2.
3252
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1357
    ].
9413
195f7caf6610 Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9183
diff changeset
  1358
    ^ literalArrray
195f7caf6610 Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9183
diff changeset
  1359
195f7caf6610 Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9183
diff changeset
  1360
    "
195f7caf6610 Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9183
diff changeset
  1361
      |dict|
3252
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1362
9413
195f7caf6610 Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9183
diff changeset
  1363
      dict := Dictionary new.
195f7caf6610 Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9183
diff changeset
  1364
      dict at:1 put:'bla'.
195f7caf6610 Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9183
diff changeset
  1365
      dict at:'fasel' put:#[1 2 3 4].
195f7caf6610 Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9183
diff changeset
  1366
      dict literalArrayEncoding
195f7caf6610 Fix comments.
Stefan Vogel <sv@exept.de>
parents: 9183
diff changeset
  1367
    "
14271
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1368
!
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1369
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1370
valuesOrderedBy:aCollectionOfKeys
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1371
    "return an OrderedCollection of my values, ordered by the given key list"
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1372
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1373
    self assert:(aCollectionOfKeys size == self size).
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1374
    ^ aCollectionOfKeys collect:[:eachKey | self at:eachKey ] as: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1375
Claus Gittinger <cg@exept.de>
parents: 14226
diff changeset
  1376
    "Created: / 31-07-2012 / 17:33:12 / cg"
3252
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1377
! !
da066eafc2c5 added literalArrayEncoding support
Claus Gittinger <cg@exept.de>
parents: 3215
diff changeset
  1378
155
edd7fc34e104 *** empty log message ***
claus
parents: 92
diff changeset
  1379
!Dictionary methodsFor:'copying'!
edd7fc34e104 *** empty log message ***
claus
parents: 92
diff changeset
  1380
11909
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1381
, anotherDictionaryOrAssociation
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1382
    "return a new dictionary containing a merged set of associations.
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1383
     If anotherDictionaryOrAssociation includes any of the receiver's keys,
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1384
     the value from anotherDictionaryOrAssociation will be placed into the
11909
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1385
     returned result."
9066
fe9eed32da70 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8831
diff changeset
  1386
fe9eed32da70 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8831
diff changeset
  1387
    |newDictionary|
fe9eed32da70 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8831
diff changeset
  1388
11909
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1389
    newDictionary := self copy.
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1390
    newDictionary declareAllFrom:anotherDictionaryOrAssociation.
9066
fe9eed32da70 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8831
diff changeset
  1391
    ^ newDictionary
11909
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1392
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1393
    "
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1394
     |d1 d2|
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1395
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1396
     d1 := Dictionary new.
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1397
     d1 at:#a put:'aaa'.
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1398
     d1 at:#b put:'bbb'.
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1399
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1400
     d2 := Dictionary new.
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1401
     d2 at:#b put:'bbbb'.
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1402
     d2 at:#c put:'ccc'.
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1403
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1404
     d1 , d2
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1405
    "
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1406
    "
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1407
     |d1 d2|
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1408
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1409
     d1 := Dictionary new.
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1410
     d1 at:#a put:'aaa'.
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1411
     d1 at:#b put:'bbb'.
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1412
     d2 := d1 , (#c -> 'ccc').
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1413
     d2
3bc1c7c5eb7b comment in ,
Claus Gittinger <cg@exept.de>
parents: 11673
diff changeset
  1414
    "
9066
fe9eed32da70 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8831
diff changeset
  1415
!
fe9eed32da70 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 8831
diff changeset
  1416
155
edd7fc34e104 *** empty log message ***
claus
parents: 92
diff changeset
  1417
postCopy
edd7fc34e104 *** empty log message ***
claus
parents: 92
diff changeset
  1418
    "have to copy the valueArray too"
edd7fc34e104 *** empty log message ***
claus
parents: 92
diff changeset
  1419
edd7fc34e104 *** empty log message ***
claus
parents: 92
diff changeset
  1420
    super postCopy.
edd7fc34e104 *** empty log message ***
claus
parents: 92
diff changeset
  1421
    valueArray := valueArray shallowCopy
edd7fc34e104 *** empty log message ***
claus
parents: 92
diff changeset
  1422
! !
edd7fc34e104 *** empty log message ***
claus
parents: 92
diff changeset
  1423
217
a0400fdbc933 *** empty log message ***
claus
parents: 155
diff changeset
  1424
!Dictionary methodsFor:'enumerating'!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1425
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1426
allKeysDo:aBlock
302
1f76060d58a4 *** empty log message ***
claus
parents: 293
diff changeset
  1427
    "perform the block for all keys in the collection.
1f76060d58a4 *** empty log message ***
claus
parents: 293
diff changeset
  1428
     Obsolete: use keysDo: for ST-80 compatibility."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1429
5865
06a28f9ee22c Use <resource:#obsolete>
Stefan Vogel <sv@exept.de>
parents: 5816
diff changeset
  1430
    <resource:#obsolete>
06a28f9ee22c Use <resource:#obsolete>
Stefan Vogel <sv@exept.de>
parents: 5816
diff changeset
  1431
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1432
    self obsoleteMethodWarning:'please use #keysDo:'.
155
edd7fc34e104 *** empty log message ***
claus
parents: 92
diff changeset
  1433
    ^ super do:aBlock
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1434
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1435
    "Modified: 20.4.1996 / 11:22:01 / cg"
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1436
!
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1437
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1438
associationsCollect:aBlock
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1439
    "for each key-value pair in the receiver, evaluate the argument, aBlock
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1440
     and return a collection with the results.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1441
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1442
     See also:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1443
	#keysAndValuesCollect: (which passes separate keys & values)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1444
	#collect:              (which only passes values)
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1445
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1446
     This is much like #keysAndValuesCollect:, but aBlock gets the
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1447
     key and value as a single association argument.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1448
     #keysAndValuesCollect: and is a bit faster therefore (no intermediate objects).
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1449
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1450
     WARNING: do not add/remove elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1451
	      Iterate over a copy to do this."
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1452
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1453
    |newCollection|
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1454
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1455
    newCollection := OrderedCollection new.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1456
    self keysAndValuesDo:[:key :value |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1457
	newCollection add:(aBlock value:(Association key:key value:value))
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1458
    ].
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1459
    ^ newCollection
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1460
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1461
    "
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1462
     |ages|
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1463
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1464
     ages := Dictionary new.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1465
     ages at:'cg' put:37.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1466
     ages at:'ca' put:33.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1467
     ages at:'sv' put:36.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1468
     ages at:'tk' put:28.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1469
     ages associationsCollect:[:assoc |
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1470
		assoc key , '''s age is ' , assoc value printString]
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1471
    "
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1472
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1473
    "Modified: 20.4.1996 / 11:31:27 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1474
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1475
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1476
associationsDo:aBlock
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1477
    "perform the block for all associations in the collection.
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1478
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1479
     See also:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1480
	#do:              (which passes values to its block)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1481
	#keysDo:          (which passes only keys to its block)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1482
	#keysAndValuesDo: (which passes keys&values)
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1483
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1484
     This is much like #keysAndValuesDo:, but aBlock gets the
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1485
     key and value as a single association argument.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1486
     #keysAndValuesDo: and is a bit faster therefore (no intermediate objects).
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1487
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1488
     WARNING: do not add/remove elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1489
	      Iterate over a copy to do this."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1490
38
454b1b94a48e *** empty log message ***
claus
parents: 12
diff changeset
  1491
    |key n "{ Class: SmallInteger }"|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1492
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1493
    tally == 0 ifTrue:[^ self].
38
454b1b94a48e *** empty log message ***
claus
parents: 12
diff changeset
  1494
    n := keyArray basicSize.
454b1b94a48e *** empty log message ***
claus
parents: 12
diff changeset
  1495
    1 to:n do:[:index |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1496
	key := keyArray basicAt:index.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1497
	(key notNil and:[key ~~ DeletedEntry]) ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1498
	    key == NilEntry ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1499
		key := nil
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1500
	    ].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1501
	    aBlock value:(Association key:key value:(valueArray basicAt:index))
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1502
	]
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1503
    ]
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1504
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1505
    "Modified: 20.4.1996 / 11:31:39 / cg"
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1506
!
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1507
13721
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1508
associationsDo:aBlock separatedBy:sepBlock
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1509
    "perform the block for all associations in the collection.
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1510
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1511
     See also:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1512
	#do:              (which passes values to its block)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1513
	#keysDo:          (which passes only keys to its block)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1514
	#keysAndValuesDo: (which passes keys&values)
13721
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1515
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1516
     This is much like #keysAndValuesDo:, but aBlock gets the
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1517
     key and value as a single association argument.
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1518
     #keysAndValuesDo: and is a bit faster therefore (no intermediate objects).
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1519
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1520
     WARNING: do not add/remove elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1521
	      Iterate over a copy to do this."
13721
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1522
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1523
    |key n "{ Class: SmallInteger }"
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1524
     first|
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1525
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1526
    tally == 0 ifTrue:[^ self].
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1527
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1528
    first := true.
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1529
    n := keyArray basicSize.
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1530
    1 to:n do:[:index |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1531
	key := keyArray basicAt:index.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1532
	(key notNil and:[key ~~ DeletedEntry]) ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1533
	    key == NilEntry ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1534
		key := nil
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1535
	    ].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1536
	    first ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1537
		first := false.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1538
	    ] ifFalse:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1539
		sepBlock value
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1540
	    ].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1541
	    aBlock value:(Association key:key value:(valueArray basicAt:index))
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1542
	]
13721
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1543
    ]
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1544
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1545
    "Modified: / 20-04-1996 / 11:31:39 / cg"
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1546
    "Created: / 23-09-2011 / 14:07:43 / cg"
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1547
!
733cce16b968 added: #associationsDo:separatedBy:
Claus Gittinger <cg@exept.de>
parents: 13328
diff changeset
  1548
2425
3c23ae3de6d6 added #associationsReverseDo: for OD compatibility
Claus Gittinger <cg@exept.de>
parents: 2328
diff changeset
  1549
associationsReverseDo:aBlock
3c23ae3de6d6 added #associationsReverseDo: for OD compatibility
Claus Gittinger <cg@exept.de>
parents: 2328
diff changeset
  1550
    "perform the block for all associations in the collection.
3c23ae3de6d6 added #associationsReverseDo: for OD compatibility
Claus Gittinger <cg@exept.de>
parents: 2328
diff changeset
  1551
     Since dictionary does not define any order of its elements,
3c23ae3de6d6 added #associationsReverseDo: for OD compatibility
Claus Gittinger <cg@exept.de>
parents: 2328
diff changeset
  1552
     this is the same as #associationsDo: here.
3c23ae3de6d6 added #associationsReverseDo: for OD compatibility
Claus Gittinger <cg@exept.de>
parents: 2328
diff changeset
  1553
     Provided for protocol compatibility with OrderedDictionary"
3c23ae3de6d6 added #associationsReverseDo: for OD compatibility
Claus Gittinger <cg@exept.de>
parents: 2328
diff changeset
  1554
3c23ae3de6d6 added #associationsReverseDo: for OD compatibility
Claus Gittinger <cg@exept.de>
parents: 2328
diff changeset
  1555
    ^ self associationsDo:aBlock
3c23ae3de6d6 added #associationsReverseDo: for OD compatibility
Claus Gittinger <cg@exept.de>
parents: 2328
diff changeset
  1556
3c23ae3de6d6 added #associationsReverseDo: for OD compatibility
Claus Gittinger <cg@exept.de>
parents: 2328
diff changeset
  1557
    "Created: 28.2.1997 / 16:08:52 / cg"
3c23ae3de6d6 added #associationsReverseDo: for OD compatibility
Claus Gittinger <cg@exept.de>
parents: 2328
diff changeset
  1558
!
3c23ae3de6d6 added #associationsReverseDo: for OD compatibility
Claus Gittinger <cg@exept.de>
parents: 2328
diff changeset
  1559
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1560
associationsSelect:aBlock
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1561
    "return a new collection with all elements from the receiver, for which
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1562
     the argument aBlock evaluates to true.
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1563
     The block gets keys and values as an association argument.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1564
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1565
     See also: #keysAndValuesSelect: (which is slightly faster),
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1566
	       #select: (which only passes the value)
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1567
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1568
     This is much like #keysAndValuesSelect:, but aBlock gets the
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1569
     key and value as a single association argument.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1570
     #keysAndValuesSelect: and is a bit faster therefore (no intermediate objects).
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1571
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1572
     WARNING: do not add/remove elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1573
	      Iterate over a copy to do this."
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1574
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1575
    |newCollection|
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1576
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1577
    newCollection := self species new.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1578
    self keysAndValuesDo:[:key :value |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1579
	(aBlock value:(Association key:key value:value)) ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1580
	    newCollection at:key put:value
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1581
	]
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1582
    ].
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1583
    ^ newCollection
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1584
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1585
    "
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1586
     |ages|
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1587
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1588
     ages := Dictionary new.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1589
     ages at:'cg' put:37.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1590
     ages at:'ca' put:33.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1591
     ages at:'sv' put:36.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1592
     ages at:'tk' put:28.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1593
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1594
     ages associationsSelect:[:assoc |
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1595
		(assoc key startsWith:'c') or:[assoc value < 30]].
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1596
    "
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1597
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1598
    "Modified: 20.4.1996 / 11:31:15 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1599
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1600
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1601
collect:aBlock
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1602
    "for each element in the receiver, evaluate the argument, aBlock
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1603
     and return a Bag with the results.
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1604
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1605
     See also:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1606
	#associationsCollect:   (which passes key-value associations)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1607
	#keysAndValuesCollect:  (which passes keys & values separately)
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1608
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1609
     WARNING: do not add/remove elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1610
	      Iterate over a copy to do this."
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1611
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1612
    |newCollection|
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1613
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1614
    newCollection := Bag new.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1615
    self do:[:each |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1616
	newCollection add:(aBlock value:each)
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1617
    ].
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1618
    ^ newCollection
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1619
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1620
    "Modified: 20.4.1996 / 11:29:58 / cg"
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1621
!
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1622
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1623
do:aBlock
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1624
    "perform the block for all values in the collection.
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1625
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1626
     See also:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1627
	#associationsDo:   (which passes key-value associations)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1628
	#keysAndValuesDo:  (which passes keys & values separately)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1629
	#keysDo:           (which passes keys only)
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1630
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1631
     WARNING: do not add/remove elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1632
	      Iterate over a copy to do this."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1633
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  1634
    |key n "{ Class: SmallInteger }"
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  1635
     deletedEntry|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1636
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1637
    tally == 0 ifTrue:[^ self].
38
454b1b94a48e *** empty log message ***
claus
parents: 12
diff changeset
  1638
    n := keyArray basicSize.
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  1639
    deletedEntry := DeletedEntry.
38
454b1b94a48e *** empty log message ***
claus
parents: 12
diff changeset
  1640
    1 to:n do:[:index |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1641
	key := keyArray basicAt:index.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1642
	(key notNil and:[key ~~ deletedEntry]) ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1643
	    aBlock value:(valueArray basicAt:index)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1644
	].
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1645
    ]
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1646
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1647
    "Modified: 20.4.1996 / 11:32:11 / cg"
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1648
!
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1649
15786
670dc104db6a class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15527
diff changeset
  1650
keysAndValuesDetect: aBlock ifNone:exceptionBlock
670dc104db6a class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15527
diff changeset
  1651
    "evaluate the argument, aBlock for each element in the receiver until
670dc104db6a class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15527
diff changeset
  1652
     the block returns true; in this case return the element which caused
670dc104db6a class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15527
diff changeset
  1653
     the true evaluation.
670dc104db6a class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15527
diff changeset
  1654
     If none of the evaluations returns true, return the result of the
670dc104db6a class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15527
diff changeset
  1655
     evaluation of the exceptionBlock"
670dc104db6a class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15527
diff changeset
  1656
670dc104db6a class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15527
diff changeset
  1657
    self keysAndValuesDo:[:eachKey :eachValue| 
670dc104db6a class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15527
diff changeset
  1658
        (aBlock value:eachKey value:eachValue) ifTrue:[^ eachValue]
670dc104db6a class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15527
diff changeset
  1659
    ].
670dc104db6a class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15527
diff changeset
  1660
    ^ exceptionBlock value
670dc104db6a class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15527
diff changeset
  1661
!
670dc104db6a class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15527
diff changeset
  1662
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
  1663
keysAndValuesDo:aTwoArgBlock
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
  1664
    "evaluate the argument, aBlock for every element in the collection,
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1665
     passing both key and element as arguments.
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1666
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1667
     See also:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1668
	#associationsDo:       (which passes keys->value pairs)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1669
	#do:                   (which only passes values)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1670
	#keysDo:               (which only passes keys)
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1671
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1672
     This is much like #associationsDo:, but aBlock gets the
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1673
     key and value as two separate arguments.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1674
     #associationsDo: is a bit slower.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1675
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1676
     WARNING: do not add/remove elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1677
	      Iterate over a copy to do this."
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
  1678
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  1679
    |key n "{ Class: SmallInteger }"
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  1680
     deletedEntry|
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
  1681
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
  1682
    tally == 0 ifTrue:[^ self].
38
454b1b94a48e *** empty log message ***
claus
parents: 12
diff changeset
  1683
    n := keyArray basicSize.
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  1684
    deletedEntry := DeletedEntry.
38
454b1b94a48e *** empty log message ***
claus
parents: 12
diff changeset
  1685
    1 to:n do:[:index |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1686
	key := keyArray basicAt:index.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1687
	(key notNil and:[key ~~ deletedEntry]) ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1688
	    key == NilEntry ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1689
		key := nil
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1690
	    ].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1691
	    aTwoArgBlock value:key value:(valueArray basicAt:index)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1692
	].
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
  1693
    ]
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1694
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1695
    "Modified: 20.4.1996 / 11:33:42 / cg"
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1696
!
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1697
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1698
keysAndValuesSelect:aBlock
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1699
    "return a new collection with all elements from the receiver, for which
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1700
     the argument aBlock evaluates to true.
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1701
     The block gets keys and values as separate arguments.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1702
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1703
     See also:
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1704
	#associationsSelect:    (which passes key-value pairs),
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1705
	#keysSelect:            (which passes key values),
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1706
	#select:                (which only passes the value)
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1707
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1708
     This is much like #associationsSelect:, but aBlock gets the
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1709
     key and value as two separate arguments.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1710
     #associationsSelect: is a bit slower.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1711
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1712
     WARNING: do not add/remove elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1713
	      Iterate over a copy to do this."
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1714
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1715
    |newCollection|
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1716
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1717
    newCollection := self species new.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1718
    self keysAndValuesDo:[:key :value |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1719
	(aBlock value:key value:value) ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1720
	    newCollection at:key put:value
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1721
	]
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1722
    ].
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1723
    ^ newCollection
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1724
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1725
    "
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1726
     |ages|
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1727
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1728
     ages := Dictionary new.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1729
     ages at:'cg' put:37.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1730
     ages at:'ca' put:33.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1731
     ages at:'sv' put:36.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1732
     ages at:'tk' put:28.
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1733
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1734
     ages keysAndValuesSelect:[:name :age |
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1735
		(name startsWith:'c') or:[age < 30]].
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1736
    "
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1737
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1738
    "Modified: 20.4.1996 / 11:34:29 / cg"
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
  1739
!
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
  1740
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1741
keysDo:aBlock
13044
a22c040ba417 commented: #keysDo:
Claus Gittinger <cg@exept.de>
parents: 12732
diff changeset
  1742
    "evaluate the argument, aBlock for every key in the collection.
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1743
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1744
     See also:
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1745
	#associationsDo:   (which passes key-value associations)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1746
	#keysAndValuesDo:  (which passes keys & values separately)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1747
	#do:               (which passes values only)
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1748
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1749
     WARNING: do not add/remove elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1750
	      Iterate over a copy to do this."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1751
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
  1752
    |sz "{ Class: SmallInteger }"
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
  1753
     key|
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1754
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
  1755
    sz := keyArray size.
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
  1756
    1 to:sz do:[:index |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1757
	key := keyArray at:index.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1758
	(key notNil and:[key ~~ DeletedEntry]) ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1759
	    key == NilEntry ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1760
		key := nil
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1761
	    ].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1762
	    aBlock value:key
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1763
	]
5336
a285bb62a443 allow nil as key.
Claus Gittinger <cg@exept.de>
parents: 5279
diff changeset
  1764
    ]
13044
a22c040ba417 commented: #keysDo:
Claus Gittinger <cg@exept.de>
parents: 12732
diff changeset
  1765
a22c040ba417 commented: #keysDo:
Claus Gittinger <cg@exept.de>
parents: 12732
diff changeset
  1766
    "Modified: / 24-08-2010 / 10:13:58 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1767
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1768
11430
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1769
keysSelect:aBlock
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1770
    "return a new collection with all elements from the receiver, for which
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1771
     the argument aBlock evaluates to true.
11430
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1772
     The block gets the individual keys as its single argument.
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1773
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1774
     See also:
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1775
	#associationsSelect:            (which passes key->value associations),
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1776
	#keysAndValuesSelect:           (which passes key & value args)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1777
	#select:                        (which passes values as arg),
11430
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1778
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1779
     WARNING: do not add/remove elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1780
	      Iterate over a copy to do this."
11430
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1781
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1782
    |newCollection|
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1783
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1784
    newCollection := self species new.
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1785
    self keysAndValuesDo:[:key :value |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1786
	(aBlock value:key) ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1787
	    newCollection at:key put:value
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1788
	]
11430
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1789
    ].
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1790
    ^ newCollection
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1791
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1792
    "
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1793
     |d|
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1794
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1795
     d := Dictionary new.
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1796
     d at:#foo put:#bar.
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1797
     d at:#bar put:#baz.
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1798
     d at:#baz put:#foo.
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1799
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1800
     d select:[:el | el startsWith:'b'].
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1801
    "
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1802
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1803
    "Modified: / 12-10-2006 / 11:24:06 / cg"
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1804
!
7306d849ead8 +keysSelect
Claus Gittinger <cg@exept.de>
parents: 11420
diff changeset
  1805
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1806
select:aBlock
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1807
    "return a new collection with all elements from the receiver, for which
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1808
     the argument aBlock evaluates to true.
10077
21e92bc1b64f comment
Claus Gittinger <cg@exept.de>
parents: 9939
diff changeset
  1809
     The block gets the individual values as its single argument.
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1810
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1811
     See also:
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1812
	#associationsSelect:            (which passes key->value associations),
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1813
	#keysAndValuesSelect:           (which passes key & value args)
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1814
	#keysSelect:                    (which passes key values),
1233
21452b1c61eb more enumaration variations & commentary
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
  1815
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1816
     WARNING: do not add/remove elements while iterating over the receiver.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1817
	      Iterate over a copy to do this."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1818
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1819
    |newCollection|
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1820
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1821
    newCollection := self species new.
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1822
    self keysAndValuesDo:[:key :value |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1823
	(aBlock value:value) ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1824
	    newCollection at:key put:value
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1825
	]
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1826
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1827
    ^ newCollection
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1828
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1829
    "
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1830
     |d|
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1831
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1832
     d := Dictionary new.
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1833
     d at:#foo put:#bar.
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1834
     d at:#bar put:#baz.
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1835
     d at:#baz put:#foo.
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1836
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1837
     d select:[:el | el startsWith:'b'].
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1838
    "
1056
991ed2a9318b commentary
Claus Gittinger <cg@exept.de>
parents: 1053
diff changeset
  1839
10077
21e92bc1b64f comment
Claus Gittinger <cg@exept.de>
parents: 9939
diff changeset
  1840
    "Modified: / 12-10-2006 / 11:24:06 / cg"
7653
0a81451a7a59 added #valuesDo: for compatibility
Claus Gittinger <cg@exept.de>
parents: 7306
diff changeset
  1841
!
0a81451a7a59 added #valuesDo: for compatibility
Claus Gittinger <cg@exept.de>
parents: 7306
diff changeset
  1842
0a81451a7a59 added #valuesDo: for compatibility
Claus Gittinger <cg@exept.de>
parents: 7306
diff changeset
  1843
valuesDo:aBlock
0a81451a7a59 added #valuesDo: for compatibility
Claus Gittinger <cg@exept.de>
parents: 7306
diff changeset
  1844
    "perform the block for all values in the collection.
0a81451a7a59 added #valuesDo: for compatibility
Claus Gittinger <cg@exept.de>
parents: 7306
diff changeset
  1845
     Same as #do: - for VisualWorks compatibility"
0a81451a7a59 added #valuesDo: for compatibility
Claus Gittinger <cg@exept.de>
parents: 7306
diff changeset
  1846
0a81451a7a59 added #valuesDo: for compatibility
Claus Gittinger <cg@exept.de>
parents: 7306
diff changeset
  1847
    ^ self do:aBlock
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1848
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1849
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1850
17671
8b8de728c259 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17264
diff changeset
  1851
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1852
!Dictionary methodsFor:'printing & storing'!
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1853
3192
47bf17818a88 Use #printOn: from Collection.
Stefan Vogel <sv@exept.de>
parents: 2897
diff changeset
  1854
printElementsDo:aBlock
47bf17818a88 Use #printOn: from Collection.
Stefan Vogel <sv@exept.de>
parents: 2897
diff changeset
  1855
    "redefined, so #printOn: prints associations"
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1856
3192
47bf17818a88 Use #printOn: from Collection.
Stefan Vogel <sv@exept.de>
parents: 2897
diff changeset
  1857
    ^ self associationsDo:aBlock
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1858
3192
47bf17818a88 Use #printOn: from Collection.
Stefan Vogel <sv@exept.de>
parents: 2897
diff changeset
  1859
    "Created: / 20.1.1998 / 14:11:02 / stefan"
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1860
!
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1861
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1862
storeOn:aStream
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1863
    "output a printed representation (which can be re-read)
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1864
     onto the argument aStream"
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1865
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1866
    |isEmpty|
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1867
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1868
    thisContext isRecursive ifTrue:[
15857
bf865a059191 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15800
diff changeset
  1869
        RecursiveStoreError raiseRequestWith:self.
bf865a059191 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15800
diff changeset
  1870
        ('Dictionary [error]: storeOn: of self referencing collection.') errorPrintCR.
bf865a059191 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15800
diff changeset
  1871
        aStream nextPutAll:'#recursive'.
bf865a059191 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15800
diff changeset
  1872
        ^ self
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1873
    ].
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1874
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1875
    aStream nextPutAll:'('.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1876
    aStream nextPutAll:(self class name).
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1877
    aStream nextPutAll:' new'.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1878
    isEmpty := true.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1879
    self keysAndValuesDo:[:key :value |
15857
bf865a059191 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15800
diff changeset
  1880
        aStream nextPutAll:' at:'.
bf865a059191 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15800
diff changeset
  1881
        key storeOn:aStream.
bf865a059191 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15800
diff changeset
  1882
        aStream nextPutAll:' put:'.
bf865a059191 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15800
diff changeset
  1883
        value storeOn:aStream.
bf865a059191 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15800
diff changeset
  1884
        aStream nextPutAll:'; '.
bf865a059191 class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 15800
diff changeset
  1885
        isEmpty := false
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1886
    ].
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1887
    isEmpty ifFalse:[aStream nextPutAll:' yourself'].
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1888
    aStream nextPut:$)
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1889
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1890
    "
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1891
     Dictionary new storeOn:Transcript
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1892
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1893
     (Dictionary new at:1 put:'hello'; yourself) storeOn:Transcript
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  1894
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  1895
     (Dictionary new at:1 put:'hello'; at:2 put:nil; yourself) storeOn:Transcript
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1896
    "
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1897
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1898
    "
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1899
     |d|
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1900
     d := Dictionary new.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1901
     d at:1 put:'hello'.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1902
     d at:'hello' put:#world.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1903
     d storeOn:Transcript
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1904
    "
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1905
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1906
    "
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1907
     |d|
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1908
     d := Dictionary new.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1909
     d at:1 put:'hello'.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1910
     d at:'hello' put:#world.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1911
     d at:2 put:d.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1912
     d storeOn:Transcript
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1913
    "
1417
59e7d3c1df6d showCr: -> showCR:
Claus Gittinger <cg@exept.de>
parents: 1290
diff changeset
  1914
2288
033f06bf1bab *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2094
diff changeset
  1915
    "Modified: 28.1.1997 / 00:37:46 / cg"
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1916
! !
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1917
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1918
!Dictionary methodsFor:'private'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1919
345
claus
parents: 302
diff changeset
  1920
compareSame:element1 with:element2
1256
249fd57abee5 commentary
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
  1921
    "compare two elements for being the same. Here, return true if the
249fd57abee5 commentary
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
  1922
     elements are equal (i.e. using #=).
249fd57abee5 commentary
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
  1923
     Redefinable in subclasses."
249fd57abee5 commentary
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
  1924
345
claus
parents: 302
diff changeset
  1925
    ^ element1 = element2
1256
249fd57abee5 commentary
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
  1926
249fd57abee5 commentary
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
  1927
    "Modified: 22.4.1996 / 17:34:27 / cg"
345
claus
parents: 302
diff changeset
  1928
!
claus
parents: 302
diff changeset
  1929
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1930
emptyCollectionForKeys
1256
249fd57abee5 commentary
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
  1931
    "return an empty collection to hold keys. Here, a Set is returned.
249fd57abee5 commentary
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
  1932
     Redefinable in subclasses."
249fd57abee5 commentary
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
  1933
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  1934
    ^ Set new:(self size)
1256
249fd57abee5 commentary
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
  1935
249fd57abee5 commentary
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
  1936
    "Modified: 22.4.1996 / 17:35:17 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1937
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1938
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1939
grow:newSize
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1940
    "grow the receiver to make space for at least newSize elements.
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1941
     To do this, we have to rehash into the new arrays.
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1942
     (which is done by re-adding all elements to a new, empty key/value array pair)."
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1943
92
0c73b48551ac *** empty log message ***
claus
parents: 88
diff changeset
  1944
    |key deletedEntry oldKeyArray oldValueArray n
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1945
     oldSize  "{ Class:SmallInteger }"
10
claus
parents: 5
diff changeset
  1946
     newIndex "{ Class:SmallInteger }" |
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1947
10
claus
parents: 5
diff changeset
  1948
    oldKeyArray := keyArray.
claus
parents: 5
diff changeset
  1949
    oldValueArray := valueArray.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1950
249
claus
parents: 217
diff changeset
  1951
    n := self class goodSizeFrom:newSize.
claus
parents: 217
diff changeset
  1952
    oldSize := oldKeyArray size.
claus
parents: 217
diff changeset
  1953
    n == oldSize ifTrue:[^ self].
claus
parents: 217
diff changeset
  1954
10
claus
parents: 5
diff changeset
  1955
    keyArray := self keyContainerOfSize:n.
92
0c73b48551ac *** empty log message ***
claus
parents: 88
diff changeset
  1956
    valueArray := self valueContainerOfSize:n.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1957
249
claus
parents: 217
diff changeset
  1958
92
0c73b48551ac *** empty log message ***
claus
parents: 88
diff changeset
  1959
    deletedEntry := DeletedEntry.
10
claus
parents: 5
diff changeset
  1960
    1 to:oldSize do:[:index |
12669
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  1961
	key := oldKeyArray basicAt:index.
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  1962
	(key notNil and:[key ~~ deletedEntry]) ifTrue:[
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  1963
	    newIndex := self findNil:key.
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  1964
	    keyArray basicAt:newIndex put:key.
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  1965
	    valueArray basicAt:newIndex put:(oldValueArray basicAt:index).
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  1966
	]
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1967
    ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1968
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1969
18332
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1970
initializeForCapacity:minSize
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1971
    "initialize the contents array (for at least minSize slots)
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1972
     and set tally to zero.
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1973
     The size is increased to the next prime for better hashing behavior."
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1974
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1975
    |n|
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1976
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1977
    n := self class goodSizeFrom:minSize.
18342
6d9664be691d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 18332
diff changeset
  1978
    (keyArray notNil and:[n == keyArray size]) ifTrue:[
18332
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1979
        keyArray atAllPut:nil.
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1980
        valueArray atAllPut:nil.
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1981
    ] ifFalse:[
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1982
        keyArray := self keyContainerOfSize:n.
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1983
        valueArray := self valueContainerOfSize:n.
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1984
    ].
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1985
    tally := 0
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1986
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1987
    "Modified: / 5.8.1998 / 10:48:51 / cg"
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1988
!
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  1989
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1990
rehash
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1991
    "rehash contents - is done by re-adding all elements to a new, empty key/value array pair)."
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1992
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  1993
    | oldKeyArray oldValueArray key
2
claus
parents: 1
diff changeset
  1994
      n        "{ Class:SmallInteger }"
claus
parents: 1
diff changeset
  1995
      newIndex "{ Class:SmallInteger }" |
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1996
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1997
    oldKeyArray := keyArray.
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1998
    oldValueArray := valueArray.
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1999
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2000
    n := keyArray size.
10
claus
parents: 5
diff changeset
  2001
    keyArray := self keyContainerOfSize:n.
92
0c73b48551ac *** empty log message ***
claus
parents: 88
diff changeset
  2002
    valueArray := self valueContainerOfSize:n.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2003
2
claus
parents: 1
diff changeset
  2004
    1 to:n do:[:index |
12669
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2005
	key := oldKeyArray basicAt:index.
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2006
	(key notNil and:[key ~~ DeletedEntry]) ifTrue:[
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2007
	    newIndex := self findNil:key.
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2008
	    keyArray basicAt:newIndex put:key.
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2009
	    valueArray basicAt:newIndex put:(oldValueArray basicAt:index).
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2010
	]
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2011
    ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2012
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2013
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2014
rehashFrom:startIndex
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  2015
    "rehash elements starting at index - after a remove.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2016
     NOTE: this method is no longer needed;
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2017
	   the trick using DeletedEntry avoids the need to do this time
12669
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2018
	   consuming operation, making remove pretty fast :-)
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  2019
    "
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2020
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2021
    |key i length
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2022
     index "{ Class:SmallInteger }" |
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2023
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2024
    length := keyArray basicSize.
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2025
    index := startIndex.
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2026
    key := keyArray basicAt:index.
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2027
    [key notNil] whileTrue:[
12669
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2028
	key ~~ DeletedEntry ifTrue:[
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2029
	    i := self findNil:key.
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2030
	    i == index ifTrue:[
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2031
		^ self
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2032
	    ].
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2033
	    keyArray basicAt:i put:key.
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2034
	    valueArray basicAt:i put:(valueArray basicAt:index).
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2035
	    keyArray basicAt:index put:nil.
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2036
	    valueArray basicAt:index put:nil.
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2037
	].
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2038
	index == length ifTrue:[
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2039
	    index := 1
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2040
	] ifFalse:[
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2041
	    index := index + 1.
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2042
	].
2acc2409c3f4 changed: #declareAllNewFrom:
Claus Gittinger <cg@exept.de>
parents: 12668
diff changeset
  2043
	key := keyArray basicAt:index.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2044
    ]
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  2045
!
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  2046
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2047
valueContainerOfSize:n
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2048
    "return a container for values of size n.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2049
     Extracted to make life of weak subclasses easier ..."
44
b262907c93ea *** empty log message ***
claus
parents: 38
diff changeset
  2050
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2051
    ^ Array basicNew:n
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2052
! !
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2053
1460
370226bb8fd7 Add method #findFirstKey:
Stefan Vogel <sv@exept.de>
parents: 1432
diff changeset
  2054
!Dictionary methodsFor:'searching'!
370226bb8fd7 Add method #findFirstKey:
Stefan Vogel <sv@exept.de>
parents: 1432
diff changeset
  2055
16808
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2056
findFirst:aBlock ifNone:exceptionValue
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2057
    "find the index of the first element, for which evaluation of the argument, aBlock returns true; 
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2058
     return its index or the value from exceptionValue if none detected.
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2059
     This is much like #detect:ifNone:, however, here an INDEX is returned,
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2060
     while #detect:ifNone: returns the element.
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2061
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2062
     Here we return the first key for which aBlock matches the value.
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2063
     Note that there is no order in a Dictionary, so any element is first."
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2064
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2065
    self keysAndValuesDo:[:eachKey :eachValue| (aBlock value:eachValue) ifTrue:[^ eachKey]].
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2066
    ^ exceptionValue value.
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2067
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2068
    "
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2069
        (Dictionary withKeys:#('a' 'b' 'c') andValues:#('bla' 'hello' 'hallo'))
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2070
            findFirst:[:v| v first = $h].
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2071
    "
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2072
!
793e0523328e class: Dictionary
Stefan Vogel <sv@exept.de>
parents: 16728
diff changeset
  2073
1460
370226bb8fd7 Add method #findFirstKey:
Stefan Vogel <sv@exept.de>
parents: 1432
diff changeset
  2074
findFirstKey:aBlock
370226bb8fd7 Add method #findFirstKey:
Stefan Vogel <sv@exept.de>
parents: 1432
diff changeset
  2075
    "find and return the first key, for which evaluation of the argument, aBlock
1703
9337c2c135d7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1460
diff changeset
  2076
     returns true; return nil if none is detected."
1460
370226bb8fd7 Add method #findFirstKey:
Stefan Vogel <sv@exept.de>
parents: 1432
diff changeset
  2077
370226bb8fd7 Add method #findFirstKey:
Stefan Vogel <sv@exept.de>
parents: 1432
diff changeset
  2078
    self keysDo:[:key |
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2079
	(aBlock value:key) ifTrue:[^ key].
1460
370226bb8fd7 Add method #findFirstKey:
Stefan Vogel <sv@exept.de>
parents: 1432
diff changeset
  2080
    ].
370226bb8fd7 Add method #findFirstKey:
Stefan Vogel <sv@exept.de>
parents: 1432
diff changeset
  2081
    ^ nil
370226bb8fd7 Add method #findFirstKey:
Stefan Vogel <sv@exept.de>
parents: 1432
diff changeset
  2082
370226bb8fd7 Add method #findFirstKey:
Stefan Vogel <sv@exept.de>
parents: 1432
diff changeset
  2083
    "Created: 5.6.1996 / 11:55:50 / stefan"
1703
9337c2c135d7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1460
diff changeset
  2084
    "Modified: 8.10.1996 / 22:01:59 / cg"
1460
370226bb8fd7 Add method #findFirstKey:
Stefan Vogel <sv@exept.de>
parents: 1432
diff changeset
  2085
! !
370226bb8fd7 Add method #findFirstKey:
Stefan Vogel <sv@exept.de>
parents: 1432
diff changeset
  2086
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2087
!Dictionary methodsFor:'testing'!
44
b262907c93ea *** empty log message ***
claus
parents: 38
diff changeset
  2088
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2089
includes:anObject
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2090
    "return true, if the argument, aValue is stored in the dictionary,
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2091
     i.e. if there is an associaten, with aValue as value.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2092
     This is a slow search, since there is no fast reverse mapping;
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2093
     the values have to be all scanned without any hashing.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2094
     You need a special collection (or two Dictionaries) to get this
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2095
     reverse mapping fast."
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2096
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2097
    ^ self includesEqualValue:anObject
1256
249fd57abee5 commentary
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
  2098
249fd57abee5 commentary
Claus Gittinger <cg@exept.de>
parents: 1233
diff changeset
  2099
    "Modified: 22.4.1996 / 17:20:11 / cg"
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2100
!
68
59faa75185ba *** empty log message ***
claus
parents: 54
diff changeset
  2101
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2102
includesAssociation:anAssociation
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2103
    "return true, if there is an association in the receiver with the
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2104
     same key and value as the argument, anAssociation.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2105
     NOTICE: in contrast to #includes:, this compares both key and value."
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2106
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2107
    |val|
44
b262907c93ea *** empty log message ***
claus
parents: 38
diff changeset
  2108
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2109
    val := self at:(anAssociation key) ifAbsent:[^ false].
3318
d8173a888c93 oops - compareSame was wrong (used with #includesAssociation:)
Claus Gittinger <cg@exept.de>
parents: 3304
diff changeset
  2110
    ^ self compareSame:val with:anAssociation value
d8173a888c93 oops - compareSame was wrong (used with #includesAssociation:)
Claus Gittinger <cg@exept.de>
parents: 3304
diff changeset
  2111
d8173a888c93 oops - compareSame was wrong (used with #includesAssociation:)
Claus Gittinger <cg@exept.de>
parents: 3304
diff changeset
  2112
    "Modified: / 5.3.1998 / 20:35:00 / cg"
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2113
!
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2114
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2115
includesEqualValue:aValue
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2116
    "return true, if the argument, aValue is stored in the dictionary,
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2117
     i.e. if there is an associaten, with aValue as value.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2118
     This is a slow search, since there is no fast reverse mapping;
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2119
     the values have to be all scanned without any hashing.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2120
     You need a special collection (or two Dictionaries) to get this
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2121
     reverse mapping fast."
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2122
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2123
    aValue isNil ifTrue:[
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2124
	"/ need a special case for that ...
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2125
	^ self includesIdenticalValue:aValue.
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2126
    ].
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2127
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2128
    ^ valueArray includes:aValue
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2129
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2130
    "
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2131
     |d|
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2132
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2133
     d := Dictionary new.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2134
     d at:'1' put:'one'.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2135
     d includes:nil.
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2136
    "
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2137
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2138
    "
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2139
     |d|
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2140
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2141
     d := Dictionary new.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2142
     d at:'1' put:'one'.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2143
     d at:2 put:nil.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2144
     d includes:nil.
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2145
    "
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2146
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2147
!
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2148
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2149
includesIdenticalValue:aValue
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2150
    "return true, if the argument, aValue is stored in the dictionary,
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2151
     i.e. if there is an associaten, with aValue as value.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2152
     This is a slow search, since there is no fast reverse mapping;
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2153
     the values have to be all scanned without any hashing.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2154
     You need a special collection (or two Dictionaries) to get this
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2155
     reverse mapping fast."
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2156
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2157
    |idx|
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2158
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2159
    aValue isNil ifTrue:[
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2160
	"/ need a special case for that ...
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2161
	idx := 0.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2162
	[true] whileTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2163
	    idx := valueArray identityIndexOf:nil startingAt:idx+1.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2164
	    idx == 0 ifTrue:[^ false].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2165
	    (keyArray at:idx) notNil ifTrue:[^ true].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2166
	]
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2167
    ].
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2168
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2169
    ^ valueArray includesIdentical:aValue
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2170
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2171
    "
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2172
     |d|
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2173
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2174
     d := Dictionary new.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2175
     d at:'1' put:'one'.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2176
     d includes:nil.
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2177
    "
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2178
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2179
    "
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2180
     |d|
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2181
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2182
     d := Dictionary new.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2183
     d at:'1' put:'one'.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2184
     d at:2 put:nil.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2185
     d includes:nil.
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2186
    "
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2187
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2188
!
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2189
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2190
includesKey:aKey
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2191
    "return true, if the argument, aKey is a key in the receiver"
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2192
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2193
    ^ (self find:(aKey ? NilEntry) ifAbsent:0) ~~ 0
9570
008049e411b5 includesKey: returned a wrong answer for a nil key.
Claus Gittinger <cg@exept.de>
parents: 9413
diff changeset
  2194
008049e411b5 includesKey: returned a wrong answer for a nil key.
Claus Gittinger <cg@exept.de>
parents: 9413
diff changeset
  2195
    "Modified: / 17-08-2006 / 21:06:41 / cg"
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2196
!
293
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  2197
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2198
includesValue:aValue
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2199
    "return true, if the argument, aValue is stored in the dictionary,
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2200
     i.e. if there is an associaten, with aValue as value.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2201
     This is a slow search, since there is no fast reverse mapping;
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2202
     the values have to be all scanned without any hashing.
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2203
     You need a special collection (or two Dictionaries) to get this
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2204
     reverse mapping fast."
293
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  2205
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2206
    ^ self includesEqualValue:aValue
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2207
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2208
!
293
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  2209
15363
d2a30831055a class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15008
diff changeset
  2210
isDictionary
d2a30831055a class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15008
diff changeset
  2211
    "return true, if the receiver is some kind of dictionary;
d2a30831055a class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15008
diff changeset
  2212
     true returned here - the method is redefined from Object."
d2a30831055a class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15008
diff changeset
  2213
d2a30831055a class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15008
diff changeset
  2214
    ^ true
d2a30831055a class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15008
diff changeset
  2215
!
d2a30831055a class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 15008
diff changeset
  2216
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2217
occurrencesOf:anObject
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2218
    "count & return how often anObject is stored in the dictionary.
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2219
     This counts values - not keys. Uses #= (i.e. equality) compare."
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2220
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2221
    |idx count|
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2222
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2223
    anObject isNil ifTrue:[
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2224
	"/ need a special case for that ...
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2225
	idx := 0.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2226
	count := 0.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2227
	[true] whileTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2228
	    idx := valueArray identityIndexOf:nil startingAt:idx+1.
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2229
	    idx == 0 ifTrue:[^ count].
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2230
	    (keyArray at:idx) notNil ifTrue:[
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2231
		count := count + 1
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2232
	    ]
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2233
	]
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2234
    ].
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2235
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2236
    ^ valueArray occurrencesOf:anObject
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2237
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2238
    "
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2239
     |d|
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2240
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2241
     d := Dictionary new.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2242
     d at:'1' put:'one'.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2243
     d occurrencesOf:nil.
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2244
    "
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2245
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2246
    "
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2247
     |d|
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2248
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2249
     d := Dictionary new.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2250
     d at:'1' put:'one'.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2251
     d at:2 put:nil.
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2252
     d at:5 put:nil.
14318
aa571cad5e4b NilKey moved to Set
Stefan Vogel <sv@exept.de>
parents: 14271
diff changeset
  2253
     d occurrencesOf:nil.
5050
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2254
    "
ea292b958108 allow for nil to be stored as a value.
Claus Gittinger <cg@exept.de>
parents: 4871
diff changeset
  2255
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2256
! !
609
12be97f6d5a7 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 528
diff changeset
  2257
8395
6bd97113cb4c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 7906
diff changeset
  2258
!Dictionary methodsFor:'visiting'!
6bd97113cb4c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 7906
diff changeset
  2259
6bd97113cb4c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 7906
diff changeset
  2260
acceptVisitor:aVisitor with:aParameter
16728
0182965b1985 comment/format only
Claus Gittinger <cg@exept.de>
parents: 16512
diff changeset
  2261
    "dispatch for visitor pattern; send #visitDictionary:with: to aVisitor"
8395
6bd97113cb4c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 7906
diff changeset
  2262
6bd97113cb4c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 7906
diff changeset
  2263
    ^ aVisitor visitDictionary:self with:aParameter
6bd97113cb4c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 7906
diff changeset
  2264
! !
6bd97113cb4c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 7906
diff changeset
  2265
18332
68976cee1b99 class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 17671
diff changeset
  2266
2094
42cd02703bf4 handle recursive printString/displayString
Claus Gittinger <cg@exept.de>
parents: 1703
diff changeset
  2267
!Dictionary class methodsFor:'documentation'!
633
46e996b3c18f version at the end
Claus Gittinger <cg@exept.de>
parents: 609
diff changeset
  2268
46e996b3c18f version at the end
Claus Gittinger <cg@exept.de>
parents: 609
diff changeset
  2269
version
18342
6d9664be691d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 18332
diff changeset
  2270
    ^ '$Header: /cvs/stx/stx/libbasic/Dictionary.st,v 1.126 2015-05-15 06:54:25 cg Exp $'
12659
6884221caecf changed: #declareAllFrom:
Michael Beyl <mb@exept.de>
parents: 11909
diff changeset
  2271
!
6884221caecf changed: #declareAllFrom:
Michael Beyl <mb@exept.de>
parents: 11909
diff changeset
  2272
6884221caecf changed: #declareAllFrom:
Michael Beyl <mb@exept.de>
parents: 11909
diff changeset
  2273
version_CVS
18342
6d9664be691d class: Dictionary
Claus Gittinger <cg@exept.de>
parents: 18332
diff changeset
  2274
    ^ '$Header: /cvs/stx/stx/libbasic/Dictionary.st,v 1.126 2015-05-15 06:54:25 cg Exp $'
633
46e996b3c18f version at the end
Claus Gittinger <cg@exept.de>
parents: 609
diff changeset
  2275
! !
14897
41e26dc8902b comment/format in: #add:
Claus Gittinger <cg@exept.de>
parents: 14320
diff changeset
  2276