OrderedCollection.st
author Stefan Vogel <sv@exept.de>
Mon, 09 Oct 2017 17:47:23 +0200
changeset 22295 d47bb2912953
parent 21658 692b6497a669
child 22319 abb4316c6bff
permissions -rw-r--r--
#DOCUMENTATION by stefan class: OrderedCollection class changed: #new:withAll:
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     1
"
5
67342904af11 *** empty log message ***
claus
parents: 3
diff changeset
     2
 COPYRIGHT (c) 1989 by Claus Gittinger
159
514c749165c3 *** empty log message ***
claus
parents: 114
diff changeset
     3
	      All Rights Reserved
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     4
a27a279701f8 Initial revision
claus
parents:
diff changeset
     5
 This software is furnished under a license and may be used
a27a279701f8 Initial revision
claus
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
a27a279701f8 Initial revision
claus
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
a27a279701f8 Initial revision
claus
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
a27a279701f8 Initial revision
claus
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
a27a279701f8 Initial revision
claus
parents:
diff changeset
    10
 hereby transferred.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    11
"
5401
81ea19e6843c test for class
ps
parents: 4862
diff changeset
    12
"{ Package: 'stx:libbasic' }"
81ea19e6843c test for class
ps
parents: 4862
diff changeset
    13
17705
76b6ce4a59cd class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 17167
diff changeset
    14
"{ NameSpace: Smalltalk }"
76b6ce4a59cd class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 17167
diff changeset
    15
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    16
SequenceableCollection subclass:#OrderedCollection
1071
5875a6eedd28 added #includesIdentical:
Claus Gittinger <cg@exept.de>
parents: 679
diff changeset
    17
	instanceVariableNames:'contentsArray firstIndex lastIndex'
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
    18
	classVariableNames:'MinContentsArraySize'
1071
5875a6eedd28 added #includesIdentical:
Claus Gittinger <cg@exept.de>
parents: 679
diff changeset
    19
	poolDictionaries:''
5875a6eedd28 added #includesIdentical:
Claus Gittinger <cg@exept.de>
parents: 679
diff changeset
    20
	category:'Collections-Sequenceable'
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    21
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    22
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
    23
!OrderedCollection class methodsFor:'documentation'!
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
    24
88
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    25
copyright
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    26
"
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    27
 COPYRIGHT (c) 1989 by Claus Gittinger
159
514c749165c3 *** empty log message ***
claus
parents: 114
diff changeset
    28
	      All Rights Reserved
88
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    29
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    30
 This software is furnished under a license and may be used
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    31
 only in accordance with the terms of that license and with the
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    32
 inclusion of the above copyright notice.   This software may not
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    33
 be provided or otherwise made available to, or used by, any
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    34
 other person.  No title to or ownership of the software is
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    35
 hereby transferred.
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    36
"
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    37
!
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    38
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
    39
documentation
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
    40
"
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    41
    OrderedCollections (OCs) have their elements ordered as they were added.
18182
8504bb241a13 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18177
diff changeset
    42
    In addition, they provide all indexing access protocol
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
    43
    and bulk copying (much like Arrays).
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
    44
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    45
    Insertion and removal at both ends is possible and also usually fast
18182
8504bb241a13 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18177
diff changeset
    46
    - therefore they can be used for queues and stacks.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    47
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
    48
    [Instance variables:]
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    49
	contentsArray   <Array>         the actual contents
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
    50
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    51
	firstIndex      <SmallInteger>  index of first valid element
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
    52
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    53
	lastIndex       <SmallInteger>  index of last valid element
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
    54
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
    55
    [performance hint:]
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    56
	They overallocate a few slots to make insertion at either end often O(1),
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    57
	but sometimes O(n), where n is the current size of the collection
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    58
	(i.e. they have reallocate the underlying element buffer and therefore copy the
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    59
	 elements into a new one. However, this reallocation is not done on every insert,
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    60
	 and if elements are deleted and others reinserted, the buffer is usually already able
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    61
	 to hold the new element)
19096
dc826aced958 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18879
diff changeset
    62
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    63
	Insertion in the middle is O(n), and therefore slower, because elements have to be
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    64
	shuffled towards either end, in order to make space for the new element.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    65
	Therefore, it is often cheaper, to instantiate a new object, and copy over the
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    66
	elements.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    67
	see SegmentedOrderedCollection for a collection, which is specialized for this
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    68
	kind of usage with many elements.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    69
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
    70
    [beginners bug hint:]
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    71
	notice that:
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    72
	    Array new:n
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    73
	is quite different from:
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    74
	    OrderedCollection new:n
1290
15ba3221b89b documentation
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
    75
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    76
	The later creates an OC which is prepared to hold <n> elements,
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    77
	but has a logical size of 0 (zero). To get an OC containing <n> nils,
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    78
	use:
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    79
	     (OrderedCollection new) grow:n
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    80
	or the syntactic sugar for that:
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    81
	     OrderedCollection newWithSize:n
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
    82
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    83
	I know, this is confusing for beginners and was a bad semantic decision.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    84
	However, that's the way the standard was defined and how all Smalltalk's behave,
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    85
	so we can't change that here.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    86
4064
fd3d2922fb8b documentation
Claus Gittinger <cg@exept.de>
parents: 3968
diff changeset
    87
    [memory requirements:]
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    88
	OBJ-HEADER + (3 * ptr-size)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    89
		   + (size-roundedUpToNextPowerOf2 * ptr-size)
4064
fd3d2922fb8b documentation
Claus Gittinger <cg@exept.de>
parents: 3968
diff changeset
    90
19096
dc826aced958 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18879
diff changeset
    91
    [complexity:]
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    92
	access by index: O(1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    93
	insertion at either end: mostly O(1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    94
	removal at either end: O(1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    95
	insertion in the middle: O(n)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    96
	searching: O(n)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    97
	min/max: O(n)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
    98
1290
15ba3221b89b documentation
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
    99
    [see also:]
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   100
	Array
1290
15ba3221b89b documentation
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
   101
15ba3221b89b documentation
Claus Gittinger <cg@exept.de>
parents: 1221
diff changeset
   102
    [author:]
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   103
	Claus Gittinger
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
   104
"
1321
52e043fb7eaf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1290
diff changeset
   105
!
52e043fb7eaf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1290
diff changeset
   106
52e043fb7eaf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1290
diff changeset
   107
examples
52e043fb7eaf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1290
diff changeset
   108
"
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   109
  using OC as a stack:
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   110
									[exBegin]
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   111
    |stack top|
1321
52e043fb7eaf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1290
diff changeset
   112
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   113
    stack := OrderedCollection new.
1321
52e043fb7eaf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1290
diff changeset
   114
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   115
    1 to:10 do:[:i |
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   116
	stack add:i
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   117
    ].
1321
52e043fb7eaf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1290
diff changeset
   118
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   119
    10 timesRepeat:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   120
	top := stack removeLast.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   121
	Transcript showCR:top
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   122
    ]
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   123
									[exEnd]
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   124
  using OC as a queue (you should use Queue right away ..):
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   125
									[exBegin]
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   126
    |queue dequeued|
1321
52e043fb7eaf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1290
diff changeset
   127
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   128
    queue := OrderedCollection new.
1321
52e043fb7eaf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1290
diff changeset
   129
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   130
    1 to:10 do:[:i |
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   131
	queue addLast:i
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   132
    ].
1321
52e043fb7eaf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1290
diff changeset
   133
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   134
    10 timesRepeat:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   135
	dequeued := queue removeFirst.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   136
	Transcript showCR:dequeued
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   137
    ]
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   138
									[exEnd]
1324
Claus Gittinger <cg@exept.de>
parents: 1321
diff changeset
   139
Claus Gittinger <cg@exept.de>
parents: 1321
diff changeset
   140
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   141
  examples to support the performance hint (see documentation)
1324
Claus Gittinger <cg@exept.de>
parents: 1321
diff changeset
   142
Claus Gittinger <cg@exept.de>
parents: 1321
diff changeset
   143
    timing removal of all odd elements in a collection of 10000:
Claus Gittinger <cg@exept.de>
parents: 1321
diff changeset
   144
    (940 ms on P5/133)
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   145
									[exBegin]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   146
	|coll time|
1324
Claus Gittinger <cg@exept.de>
parents: 1321
diff changeset
   147
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   148
	coll := (1 to:10000) asOrderedCollection.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   149
	time := Time millisecondsToRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   150
	    coll removeAllSuchThat:[:el | el even]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   151
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   152
	Transcript show:'time is '; show:time; showCR:' ms'.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   153
									[exEnd]
1324
Claus Gittinger <cg@exept.de>
parents: 1321
diff changeset
   154
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   155
    tuning the removal by doing it reverse
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   156
    (less copying in #removeAtIndex:) speeds it up by a factor of 2:
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   157
									[exBegin]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   158
	|coll time|
1324
Claus Gittinger <cg@exept.de>
parents: 1321
diff changeset
   159
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   160
	coll := (1 to:10000) asOrderedCollection.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   161
	time := Time millisecondsToRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   162
	    coll size to:1 by:-1 do:[:index |
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   163
		(coll at:index) even ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   164
		    coll removeAtIndex:index
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   165
		]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   166
	    ]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   167
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   168
	Transcript show:'time is '; show:time; showCR:' ms'.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   169
									[exEnd]
1324
Claus Gittinger <cg@exept.de>
parents: 1321
diff changeset
   170
1387
Claus Gittinger <cg@exept.de>
parents: 1367
diff changeset
   171
    rebuilding a new collection:
1324
Claus Gittinger <cg@exept.de>
parents: 1321
diff changeset
   172
    (64 ms on P5/133)
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   173
									[exBegin]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   174
	|coll time|
1324
Claus Gittinger <cg@exept.de>
parents: 1321
diff changeset
   175
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   176
	coll := (1 to:10000) asOrderedCollection.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   177
	time := Time millisecondsToRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   178
	    coll := coll select:[:el | el odd]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   179
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   180
	Transcript show:'time is '; show:time; showCR:' ms'.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   181
									[exEnd]
11271
5b75b4a7fb35 tuned makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 11269
diff changeset
   182
5b75b4a7fb35 tuned makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 11269
diff changeset
   183
    adding at the end (fast):
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   184
									[exBegin]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   185
	|coll time|
11271
5b75b4a7fb35 tuned makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 11269
diff changeset
   186
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   187
	coll := OrderedCollection new.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   188
	time := TimeDuration toRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   189
	    (1 to:100000) do:[:el | coll add:el].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   190
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   191
	Transcript show:'time is '; showCR:time.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   192
	self assert:(coll = (1 to:100000)).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   193
	self assert:(coll asBag = (1 to:100000) asBag).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   194
									[exEnd]
11271
5b75b4a7fb35 tuned makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 11269
diff changeset
   195
    adding at front (fast):
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   196
									[exBegin]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   197
	|coll time|
11271
5b75b4a7fb35 tuned makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 11269
diff changeset
   198
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   199
	coll := OrderedCollection new.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   200
	time := TimeDuration toRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   201
	    (1 to:100000) reverseDo:[:el | coll addFirst:el].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   202
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   203
	Transcript show:'time is '; showCR:time.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   204
	self assert:(coll = (1 to:100000)).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   205
	self assert:(coll asBag = (1 to:100000) asBag).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   206
									[exEnd]
11271
5b75b4a7fb35 tuned makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 11269
diff changeset
   207
    inserting in the middle (slow):
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   208
									[exBegin]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   209
	|coll time|
11271
5b75b4a7fb35 tuned makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 11269
diff changeset
   210
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   211
	coll := OrderedCollection new.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   212
	time := TimeDuration toRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   213
	    (1 to:100000) do:[:el | coll add:el beforeIndex:(coll size // 2)+1 ].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   214
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   215
	Transcript show:'time is '; showCR:time.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   216
	self assert:(coll asBag = (1 to:100000) asBag).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   217
									[exEnd]
1321
52e043fb7eaf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1290
diff changeset
   218
"
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
   219
! !
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   220
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
   221
!OrderedCollection class methodsFor:'initialization'!
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
   222
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
   223
initialize
19990
c819e0a71d64 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19865
diff changeset
   224
    MinContentsArraySize := 4. "the minimum size of a non-empty contentsArray"
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
   225
! !
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
   226
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   227
!OrderedCollection class methodsFor:'instance creation'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   228
a27a279701f8 Initial revision
claus
parents:
diff changeset
   229
new
1106
a101113cc0a8 commentary
Claus Gittinger <cg@exept.de>
parents: 1090
diff changeset
   230
    "create a new, empty OrderedCollection"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   231
19991
7675defcd5c2 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19990
diff changeset
   232
    ^ self basicNew initContents:0
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
   233
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
   234
    "
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   235
	self new
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
   236
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   237
	|nEmpty|
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   238
	nEmpty := 0.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   239
	self allInstancesDo:[:e| e size == 0 ifTrue:[nEmpty := nEmpty + 1]].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   240
	nEmpty
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
   241
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   242
	|nEmpty|
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   243
	nEmpty := OrderedCollection new.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   244
	self allInstancesDo:[:e| (e size == 0 and:[e contentsArray size ~~ 0]) ifTrue:[nEmpty add:e]].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   245
	nEmpty
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
   246
    "
1106
a101113cc0a8 commentary
Claus Gittinger <cg@exept.de>
parents: 1090
diff changeset
   247
a101113cc0a8 commentary
Claus Gittinger <cg@exept.de>
parents: 1090
diff changeset
   248
    "Modified: 19.3.1996 / 17:53:12 / cg"
293
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
   249
!
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
   250
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   251
new:size
1106
a101113cc0a8 commentary
Claus Gittinger <cg@exept.de>
parents: 1090
diff changeset
   252
    "create a new, empty OrderedCollection with a preallocated physical
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   253
     size.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   254
     NOTICE:
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   255
	the logical size of the returned collection is 0 (i.e. it is empty).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   256
	This may be confusing, in that it is different from what Array>>new:
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   257
	returns. However, that's the way OrderedCollections work in every other
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   258
	Smalltalk, so here it should as well.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   259
     See also newWithSize:, which might do what you really want.
1106
a101113cc0a8 commentary
Claus Gittinger <cg@exept.de>
parents: 1090
diff changeset
   260
     "
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   261
19991
7675defcd5c2 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19990
diff changeset
   262
    ^ self basicNew initContents:size
1106
a101113cc0a8 commentary
Claus Gittinger <cg@exept.de>
parents: 1090
diff changeset
   263
a101113cc0a8 commentary
Claus Gittinger <cg@exept.de>
parents: 1090
diff changeset
   264
    "Modified: 19.3.1996 / 17:53:47 / cg"
4427
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   265
!
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   266
6700
e4254778c239 new:withAll: redefined to work around the wierd new: behavior.
Claus Gittinger <cg@exept.de>
parents: 6088
diff changeset
   267
new:size withAll:element
e4254778c239 new:withAll: redefined to work around the wierd new: behavior.
Claus Gittinger <cg@exept.de>
parents: 6088
diff changeset
   268
    "return a new collection of size, where all elements are
e4254778c239 new:withAll: redefined to work around the wierd new: behavior.
Claus Gittinger <cg@exept.de>
parents: 6088
diff changeset
   269
     initialized to element."
e4254778c239 new:withAll: redefined to work around the wierd new: behavior.
Claus Gittinger <cg@exept.de>
parents: 6088
diff changeset
   270
22295
d47bb2912953 #DOCUMENTATION by stefan
Stefan Vogel <sv@exept.de>
parents: 21658
diff changeset
   271
    ^ (self newWithSize:size)
d47bb2912953 #DOCUMENTATION by stefan
Stefan Vogel <sv@exept.de>
parents: 21658
diff changeset
   272
        atAllPut:element;
d47bb2912953 #DOCUMENTATION by stefan
Stefan Vogel <sv@exept.de>
parents: 21658
diff changeset
   273
        yourself.
6700
e4254778c239 new:withAll: redefined to work around the wierd new: behavior.
Claus Gittinger <cg@exept.de>
parents: 6088
diff changeset
   274
e4254778c239 new:withAll: redefined to work around the wierd new: behavior.
Claus Gittinger <cg@exept.de>
parents: 6088
diff changeset
   275
    "
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   276
     OrderedCollection new:10 withAll:1234
6700
e4254778c239 new:withAll: redefined to work around the wierd new: behavior.
Claus Gittinger <cg@exept.de>
parents: 6088
diff changeset
   277
    "
22295
d47bb2912953 #DOCUMENTATION by stefan
Stefan Vogel <sv@exept.de>
parents: 21658
diff changeset
   278
d47bb2912953 #DOCUMENTATION by stefan
Stefan Vogel <sv@exept.de>
parents: 21658
diff changeset
   279
    "Modified: / 09-10-2017 / 17:04:11 / stefan"
6700
e4254778c239 new:withAll: redefined to work around the wierd new: behavior.
Claus Gittinger <cg@exept.de>
parents: 6088
diff changeset
   280
!
e4254778c239 new:withAll: redefined to work around the wierd new: behavior.
Claus Gittinger <cg@exept.de>
parents: 6088
diff changeset
   281
4427
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   282
newFrom:aCollection
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   283
    "return a new OrderedCollection filled with all elements from the argument,
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   284
     aCollection"
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   285
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   286
    |newColl|
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   287
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   288
    newColl := self new:(aCollection size).
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   289
    newColl addAll:aCollection.
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   290
    ^ newColl
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   291
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   292
    "
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   293
     OrderedCollection newFrom:#(1 2 3 4)
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   294
     OrderedCollection newFrom:(Set with:1 with:2 with:3)
8833e118ff25 added #newFrom:
Claus Gittinger <cg@exept.de>
parents: 4153
diff changeset
   295
    "
17167
6b129633ca35 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16713
diff changeset
   296
!
6b129633ca35 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16713
diff changeset
   297
6b129633ca35 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16713
diff changeset
   298
newLikelyToRemainEmpty
6b129633ca35 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16713
diff changeset
   299
    "create a new, empty OrderedCollection, for which we already know
6b129633ca35 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16713
diff changeset
   300
     that it is very likely to remain empty.
6b129633ca35 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16713
diff changeset
   301
     Use this for collections which may sometimes get elements added, but usually not.
19991
7675defcd5c2 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19990
diff changeset
   302
     This is now obsolete and the same as new:
7675defcd5c2 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19990
diff changeset
   303
     as the algorithm is now clever enough to deal efficiently with this situation"
17167
6b129633ca35 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16713
diff changeset
   304
19991
7675defcd5c2 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19990
diff changeset
   305
    ^ self new:0
17167
6b129633ca35 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16713
diff changeset
   306
6b129633ca35 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16713
diff changeset
   307
    "
6b129633ca35 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16713
diff changeset
   308
     self newLikelyToRemainEmpty size
6b129633ca35 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16713
diff changeset
   309
     self newLikelyToRemainEmpty add:1; size
6b129633ca35 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16713
diff changeset
   310
     self newLikelyToRemainEmpty addAll:#(1 2); size
6b129633ca35 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16713
diff changeset
   311
    "
293
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
   312
! !
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
   313
20026
c4063e226888 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19991
diff changeset
   314
21524
d4c86d7c0bfc #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 20354
diff changeset
   315
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   316
!OrderedCollection methodsFor:'accessing'!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   317
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   318
at:anInteger
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   319
    "return the element at index, anInteger"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   320
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   321
    |idx "{ Class: SmallInteger }"|
387
claus
parents: 384
diff changeset
   322
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   323
    idx := anInteger + firstIndex - 1.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   324
    ((anInteger < 1) or:[idx > lastIndex]) ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   325
	^ self subscriptBoundsError:anInteger
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   326
    ].
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   327
    ^ contentsArray basicAt:idx
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   328
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   329
    "Modified: / 12.11.1997 / 17:56:05 / cg"
360
claus
parents: 349
diff changeset
   330
!
claus
parents: 349
diff changeset
   331
18811
54e839ea9d44 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18379
diff changeset
   332
at:anInteger ifAbsent:exceptionValue
54e839ea9d44 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18379
diff changeset
   333
    "return the element at index, anInteger.
54e839ea9d44 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18379
diff changeset
   334
     If the index is invalid, return the value from exceptionValue"
54e839ea9d44 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18379
diff changeset
   335
54e839ea9d44 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18379
diff changeset
   336
    |idx "{ Class: SmallInteger }"|
54e839ea9d44 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18379
diff changeset
   337
54e839ea9d44 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18379
diff changeset
   338
    idx := anInteger + firstIndex - 1.
54e839ea9d44 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18379
diff changeset
   339
    ((anInteger < 1) or:[idx > lastIndex]) ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   340
	^ exceptionValue value
18811
54e839ea9d44 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18379
diff changeset
   341
    ].
54e839ea9d44 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18379
diff changeset
   342
    ^ contentsArray basicAt:idx
54e839ea9d44 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18379
diff changeset
   343
!
54e839ea9d44 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18379
diff changeset
   344
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   345
at:anInteger put:anObject
1221
46d72af387e9 commentary
Claus Gittinger <cg@exept.de>
parents: 1170
diff changeset
   346
    "set the element at index, to be anInteger.
46d72af387e9 commentary
Claus Gittinger <cg@exept.de>
parents: 1170
diff changeset
   347
     Return anObject (sigh)."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   348
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   349
    |idx "{ Class: SmallInteger }"|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   350
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   351
    idx := anInteger + firstIndex - 1.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   352
    ((anInteger < 1) or:[idx > lastIndex]) ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   353
	^ self subscriptBoundsError:anInteger
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   354
    ].
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   355
    ^ contentsArray basicAt:idx put:anObject
1221
46d72af387e9 commentary
Claus Gittinger <cg@exept.de>
parents: 1170
diff changeset
   356
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   357
    "Modified: / 12.11.1997 / 17:56:32 / cg"
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 159
diff changeset
   358
!
40ca7cc6fb9c *** empty log message ***
claus
parents: 159
diff changeset
   359
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   360
first
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   361
    "return the first element"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   362
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   363
    firstIndex <= lastIndex ifTrue:[
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   364
	^ contentsArray at:firstIndex
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   365
    ].
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   366
    "error if collection is empty"
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   367
    ^ self emptyCollectionError
2
claus
parents: 1
diff changeset
   368
93
e31220cb391f *** empty log message ***
claus
parents: 88
diff changeset
   369
    "
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   370
     (OrderedCollection withAll:#(1 2 3 4 5)) first
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   371
     (SortedCollection withAll:#(5 4 3 2 1)) first
93
e31220cb391f *** empty log message ***
claus
parents: 88
diff changeset
   372
    "
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   373
!
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   374
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   375
last
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   376
    "return the last element"
68
59faa75185ba *** empty log message ***
claus
parents: 56
diff changeset
   377
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   378
    firstIndex <= lastIndex ifTrue:[
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   379
	^ contentsArray at:lastIndex
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   380
    ].
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   381
    "error if collection is empty"
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   382
    ^ self emptyCollectionError
68
59faa75185ba *** empty log message ***
claus
parents: 56
diff changeset
   383
93
e31220cb391f *** empty log message ***
claus
parents: 88
diff changeset
   384
    "
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   385
     (OrderedCollection withAll:#(1 2 3 4 5)) last
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   386
     (SortedCollection withAll:#(5 4 3 2 1)) last
93
e31220cb391f *** empty log message ***
claus
parents: 88
diff changeset
   387
    "
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   388
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   389
a27a279701f8 Initial revision
claus
parents:
diff changeset
   390
!OrderedCollection methodsFor:'adding & removing'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   391
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   392
add:anObject
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   393
    "add the argument, anObject to the end of the collection
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   394
     Return the argument, anObject."
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   395
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   396
    |idx "{ Class:SmallInteger }"|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   397
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   398
    idx := lastIndex.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   399
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   400
    (idx == contentsArray size) ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   401
	self makeRoomAtLast.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   402
	idx := lastIndex.
42
e33491f6f260 *** empty log message ***
claus
parents: 40
diff changeset
   403
    ].
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   404
    lastIndex := idx := idx + 1.
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   405
    contentsArray basicAt:idx put:anObject.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   406
    ^ anObject
42
e33491f6f260 *** empty log message ***
claus
parents: 40
diff changeset
   407
348
claus
parents: 345
diff changeset
   408
    "
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   409
     |c|
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   410
     c := #(4 3 2 1) asOrderedCollection.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   411
     c add:'here'
348
claus
parents: 345
diff changeset
   412
    "
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   413
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   414
    "Modified: / 12.11.1997 / 17:49:47 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   415
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   416
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   417
add:newObject after:oldObject
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   418
    "insert the argument, newObject after oldObject.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   419
     If oldObject is not in the receiver, report an error,
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   420
     otherwise return the argument, anObject."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   421
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   422
    |idx|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   423
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   424
    idx := self indexOf:oldObject.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   425
    idx ~~ 0 ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   426
	self add:newObject beforeIndex:(idx + 1).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   427
	^ newObject
42
e33491f6f260 *** empty log message ***
claus
parents: 40
diff changeset
   428
    ].
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   429
    ^ self errorValueNotFound:oldObject
42
e33491f6f260 *** empty log message ***
claus
parents: 40
diff changeset
   430
348
claus
parents: 345
diff changeset
   431
    "
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   432
     |c|
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   433
     c := #(4 3 2 1) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   434
     c add:'here' after:3; yourself.
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   435
    "
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   436
    "
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   437
     |c|
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   438
     c := #(4 3 2 1) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   439
     c add:'here' after:1; yourself.
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   440
    "
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   441
    "
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   442
     |c|
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   443
     c := #(4 3 2 1) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   444
     c add:'here' after:5; yourself
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   445
    "
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   446
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   447
    "Modified: 12.4.1996 / 13:51:56 / cg"
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   448
!
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   449
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   450
add:anObject afterIndex:index
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   451
    "insert the argument, anObject to become located at index.
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   452
     Return the receiver (sigh - ST-80 compatibility)."
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   453
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   454
    ^ self add:anObject beforeIndex:(index + 1)
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   455
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   456
    "
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   457
     |c|
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   458
     c := #(4 3 2 1) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   459
     c add:'here' afterIndex:2
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   460
    "
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   461
    "
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   462
     |c|
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   463
     c := #(4 3 2 1) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   464
     c add:'here' afterIndex:4
348
claus
parents: 345
diff changeset
   465
    "
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   466
    "
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   467
     |c|
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   468
     c := #(4 3 2 1) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   469
     c add:'here' afterIndex:0
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   470
    "
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   471
    "
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   472
     |c|
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   473
     c := #(4 3 2 1) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   474
     c add:'here' afterIndex:5
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   475
    "
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   476
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   477
    "Modified: 12.4.1996 / 13:52:41 / cg"
348
claus
parents: 345
diff changeset
   478
!
claus
parents: 345
diff changeset
   479
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   480
add:newObject before:oldObject
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   481
    "insert the argument, newObject before oldObject.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   482
     If oldObject is not in the receiver, report an error,
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   483
     otherwise return the argument, anObject."
348
claus
parents: 345
diff changeset
   484
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   485
    |idx|
348
claus
parents: 345
diff changeset
   486
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   487
    idx := self indexOf:oldObject.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   488
    idx ~~ 0 ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   489
	self add:newObject beforeIndex:idx.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   490
	^ newObject
348
claus
parents: 345
diff changeset
   491
    ].
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   492
    ^ self errorValueNotFound:oldObject
348
claus
parents: 345
diff changeset
   493
claus
parents: 345
diff changeset
   494
    "
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   495
     |c|
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   496
     c := #(4 3 2 1) asOrderedCollection.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   497
     c add:'here' before:3.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   498
     c add:'here' before:5
348
claus
parents: 345
diff changeset
   499
    "
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   500
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   501
    "Modified: 12.4.1996 / 13:25:47 / cg"
348
claus
parents: 345
diff changeset
   502
!
claus
parents: 345
diff changeset
   503
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   504
add:anObject beforeIndex:index
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   505
    "insert the argument, anObject to become located at index.
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   506
     Return the receiver (sigh - ST-80 compatibility)."
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   507
3236
b5f80b416cff check for valid subscript in #add:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 3109
diff changeset
   508
    |idx physicalIndex|
348
claus
parents: 345
diff changeset
   509
3236
b5f80b416cff check for valid subscript in #add:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 3109
diff changeset
   510
    physicalIndex := index + firstIndex - 1.
b5f80b416cff check for valid subscript in #add:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 3109
diff changeset
   511
    physicalIndex > lastIndex ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   512
	"can only add to the end of the collection"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   513
	physicalIndex == (lastIndex+1) ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   514
	    idx := lastIndex.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   515
	    (idx == contentsArray size) ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   516
		self makeRoomAtLast.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   517
		idx := lastIndex.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   518
	    ].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   519
	    lastIndex := idx := idx + 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   520
	] ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   521
	    ^ self subscriptBoundsError:index.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   522
	]
10839
285fa5534f61 #add:beforeIndex: take care for redefinitions of #add: in subclasses sending #add:beforeIndex:
Stefan Vogel <sv@exept.de>
parents: 10799
diff changeset
   523
    ] ifFalse:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   524
	"notice: this may change firstIndex"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   525
	idx := self makeRoomAtIndex:physicalIndex.
3236
b5f80b416cff check for valid subscript in #add:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 3109
diff changeset
   526
    ].
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   527
    contentsArray basicAt:idx put:anObject.
348
claus
parents: 345
diff changeset
   528
claus
parents: 345
diff changeset
   529
    "
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   530
     |c|
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   531
     c := #(4 3 2 1) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   532
     c add:'here' beforeIndex:3
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   533
    "
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   534
    "
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   535
     |c|
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   536
     c := #(4 3 2 1) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   537
     c add:'here' beforeIndex:1
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   538
    "
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   539
    "
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   540
     |c|
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   541
     c := #(4 3 2 1) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   542
     c add:'here' beforeIndex:5
348
claus
parents: 345
diff changeset
   543
    "
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   544
3236
b5f80b416cff check for valid subscript in #add:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 3109
diff changeset
   545
    "Modified: / 28.1.1998 / 17:17:48 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   546
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   547
3109
2ac640e610aa reimplement #addAll:aCollection
ca
parents: 3107
diff changeset
   548
addAll:aCollection
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   549
    "add all elements of the argument, aCollection to the receiver.
7752
134213bdebd8 comment
Claus Gittinger <cg@exept.de>
parents: 7260
diff changeset
   550
     Returns the argument, aCollection (sigh)."
3109
2ac640e610aa reimplement #addAll:aCollection
ca
parents: 3107
diff changeset
   551
2ac640e610aa reimplement #addAll:aCollection
ca
parents: 3107
diff changeset
   552
    self addAll:aCollection beforeIndex:(1 + self size).
2ac640e610aa reimplement #addAll:aCollection
ca
parents: 3107
diff changeset
   553
    ^ aCollection
2ac640e610aa reimplement #addAll:aCollection
ca
parents: 3107
diff changeset
   554
!
2ac640e610aa reimplement #addAll:aCollection
ca
parents: 3107
diff changeset
   555
15442
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   556
addAll:aCollection afterIndex:index
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   557
    "insert the argument, anObject to become located after index.
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   558
     Return the receiver (sigh - ST-80 compatibility)."
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   559
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   560
    ^ self addAll:aCollection beforeIndex:(index + 1)
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   561
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   562
    "
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   563
     |c|
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   564
     c := #(4 3 2 1) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   565
     c addAll:#(10 20 30) afterIndex:2
15442
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   566
    "
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   567
    "
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   568
     |c|
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   569
     c := #(4 3 2 1) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   570
     c addAll:#(10 20 30) afterIndex:4
15442
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   571
    "
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   572
    "
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   573
     |c|
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   574
     c := #(4 3 2 1) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   575
     c addAll:#(10 20 30) afterIndex:0
15442
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   576
    "
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   577
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   578
    "Modified: 12.4.1996 / 13:52:41 / cg"
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   579
!
5ae3f8265977 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15401
diff changeset
   580
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   581
addAll:aCollection beforeIndex:index
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   582
    "insert all elements of the argument, anObject to become located at index.
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   583
     The collection may be unordered, but then order of the sliced-in elements
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   584
     is undefined.
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   585
     Return the receiver."
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   586
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   587
    |idx count|
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   588
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   589
    aCollection isSequenceable ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   590
	"/ we are lucky - that thing can count & do bulk copies
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   591
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   592
	count := aCollection size.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   593
	idx := self makeRoomAtIndex:(index + firstIndex - 1) for:count.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   594
	"/ notice: the above may change firstIndex
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   595
	contentsArray replaceFrom:idx to:(idx + count - 1) with:aCollection startingAt:1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   596
	^ self
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   597
    ].
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   598
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   599
    idx := index.
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   600
    aCollection do:[:element |
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   601
	self add:element beforeIndex:idx.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   602
	idx := idx + 1.
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   603
    ].
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   604
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   605
    "
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   606
     |c|
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   607
     c := #(1 2 3 4) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   608
     c addAll:'here' beforeIndex:3
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   609
    "
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   610
    "
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   611
     |c|
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   612
     c := #(1 2 3 4) asOrderedCollection.
2549
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   613
     c removeFirst.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   614
     c addAll:'here' beforeIndex:3
2549
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   615
    "
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   616
    "
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   617
     |c|
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   618
     c := #(1 2 3 4) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   619
     c addAll:'here' beforeIndex:1
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   620
    "
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   621
    "
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   622
     |c|
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   623
     c := #(1 2 3 4) asOrderedCollection.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   624
     c addAll:'here' beforeIndex:5
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   625
    "
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   626
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   627
    "
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   628
     |c|
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   629
     c := #(1 2 3 4) asOrderedCollection.
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   630
     c addAll:('hello' asSet) beforeIndex:3
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   631
    "
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   632
2549
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   633
    "Modified: 15.4.1997 / 12:43:59 / cg"
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   634
!
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
   635
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   636
addFirst:anObject
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   637
    "add the argument, anObject to the beginning of the collection.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   638
     Return the argument, anObject."
56
be0ed17e6f85 *** empty log message ***
claus
parents: 42
diff changeset
   639
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   640
    |idx "{ Class:SmallInteger }"|
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   641
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   642
    (idx := firstIndex) == 1 ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   643
	self makeRoomAtFront.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   644
	idx := firstIndex.
348
claus
parents: 345
diff changeset
   645
    ].
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   646
    firstIndex := idx := idx - 1.
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   647
    contentsArray basicAt:idx put:anObject.
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   648
    ^ anObject
56
be0ed17e6f85 *** empty log message ***
claus
parents: 42
diff changeset
   649
be0ed17e6f85 *** empty log message ***
claus
parents: 42
diff changeset
   650
    "
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   651
     |c|
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   652
     c := #(1 2 3 4) asOrderedCollection.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   653
     c addFirst:'here'.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   654
     c
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   655
    "
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   656
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   657
    "
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   658
     |c|
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   659
     c := #() asOrderedCollection.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   660
     c addFirst:'here'.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   661
     c
56
be0ed17e6f85 *** empty log message ***
claus
parents: 42
diff changeset
   662
    "
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   663
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   664
    "Modified: / 12.11.1997 / 17:58:05 / cg"
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   665
!
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   666
3368
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   667
clearContents
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   668
    "remove all elements from the collection but keep the contentsArray.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   669
     Useful for huge lists, if the contents will be rebuild soon (using #add:)
3368
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   670
     to a size which is similar to the lists current size.
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   671
     Destructive: modifies the receiver.
3368
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   672
     Returns the receiver."
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   673
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   674
    "/ clear those references, to give the garbage collector
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   675
    "/ a chance ...
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   676
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   677
    firstIndex >= lastIndex ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   678
	contentsArray from:firstIndex to:lastIndex put:nil.
3368
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   679
    ].
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   680
    firstIndex := 1.
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   681
    lastIndex := 0.
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   682
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   683
    "/ this is the same as:
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   684
    "/ self initContents:(self size)
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   685
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   686
    "Modified: 12.4.1996 / 13:34:19 / cg"
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   687
!
5b84482d26c9 added #clearContents:
ca
parents: 3236
diff changeset
   688
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   689
remove:anObject ifAbsent:exceptionBlock
2348
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
   690
    "remove the first element which is equal to anObject;
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   691
     if found, remove and return it;
2348
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
   692
     if not, return the value from evaluating exceptionBlock.
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   693
     Destructive: modifies the receiver.
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   694
     Uses equality compare (=) to search for the element."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   695
2354
652d17daeeb5 faster remove: if its the first or last element
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
   696
    |index retVal|
652d17daeeb5 faster remove: if its the first or last element
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
   697
12035
b927a2b293f8 changed:
Claus Gittinger <cg@exept.de>
parents: 11330
diff changeset
   698
    index := self indexOf:anObject.
2354
652d17daeeb5 faster remove: if its the first or last element
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
   699
    index ~~ 0 ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   700
	retVal := contentsArray at:index+firstIndex-1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   701
	self removeFromIndex:index toIndex:index.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   702
	^ retVal
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   703
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   704
    ^ exceptionBlock value
348
claus
parents: 345
diff changeset
   705
claus
parents: 345
diff changeset
   706
    "
12035
b927a2b293f8 changed:
Claus Gittinger <cg@exept.de>
parents: 11330
diff changeset
   707
     #(1 2 3 4 5) asOrderedCollection remove:9 ifAbsent:[self halt]; yourself
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   708
     #(1 2 3 4 5) asOrderedCollection remove:3 ifAbsent:[self halt]; yourself
1496
bea70dc24829 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
   709
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   710
     #(1 2 3 4 5 6 7 8 9) asOrderedCollection remove:3 ifAbsent:'oops'
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   711
     #(1 2 3 4 5) asOrderedCollection remove:9 ifAbsent:'oops'
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   712
     #(1.0 2.0 3.0 4.0 5.0) asOrderedCollection remove:4 ifAbsent:'oops'
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   713
     #(1.0 2.0 3.0 4.0 5.0) asOrderedCollection removeIdentical:4 ifAbsent:'oops'
348
claus
parents: 345
diff changeset
   714
    "
2348
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
   715
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   716
    "Modified: 8.2.1997 / 19:17:19 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   717
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   718
114
0353ec6749c8 added faster removeAll
claus
parents: 93
diff changeset
   719
removeAll
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   720
    "remove all elements from the collection.
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   721
     Returns the receiver.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   722
     Destructive: modifies the receiver."
114
0353ec6749c8 added faster removeAll
claus
parents: 93
diff changeset
   723
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
   724
    self initContents:0
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   725
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   726
    "Modified: 12.4.1996 / 13:34:19 / cg"
114
0353ec6749c8 added faster removeAll
claus
parents: 93
diff changeset
   727
!
0353ec6749c8 added faster removeAll
claus
parents: 93
diff changeset
   728
348
claus
parents: 345
diff changeset
   729
removeAllSuchThat:aBlock
claus
parents: 345
diff changeset
   730
    "remove all elements that meet a test criteria as specified in aBlock.
claus
parents: 345
diff changeset
   731
     The argument, aBlock is evaluated for successive elements and all those,
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   732
     for which it returns true, are removed.
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   733
     Destructive: modifies the receiver.
1496
bea70dc24829 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
   734
     Return a collection containing the removed elements.
bea70dc24829 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
   735
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   736
     Performance:
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   737
	this is an O(N) algorithm (the receiver's elements are scanned once)."
348
claus
parents: 345
diff changeset
   738
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   739
    "/ this is a q&d implementation (possibly slow).
348
claus
parents: 345
diff changeset
   740
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   741
    |removed element
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   742
     srcIndex "{ Class: SmallInteger }"
19865
6b114e3b40b9 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 19836
diff changeset
   743
     dstIndex "{ Class: SmallInteger }"
6b114e3b40b9 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 19836
diff changeset
   744
     lastIdx "{ Class: SmallInteger }"|
348
claus
parents: 345
diff changeset
   745
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   746
    "/ first search forward to the first element which has
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   747
    "/ to be removed (meets the criteria)
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   748
    srcIndex := firstIndex.
19865
6b114e3b40b9 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 19836
diff changeset
   749
    lastIdx := lastIndex.
6b114e3b40b9 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 19836
diff changeset
   750
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   751
    [
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   752
	srcIndex > lastIdx
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   753
	or:[ aBlock value:(contentsArray at:srcIndex) ]
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   754
    ] whileFalse:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   755
	srcIndex := srcIndex + 1.
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   756
    ].
19865
6b114e3b40b9 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 19836
diff changeset
   757
    srcIndex > lastIdx ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   758
	"/ nothing removed
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   759
	^ #()
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   760
    ].
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   761
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   762
    "/ now srcIndex is the index of element, which is the first to be removed
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   763
    removed := OrderedCollection new.
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   764
    removed add:(contentsArray at:srcIndex).
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   765
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   766
    dstIndex := srcIndex.
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   767
    srcIndex := srcIndex + 1.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   768
19865
6b114e3b40b9 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 19836
diff changeset
   769
    srcIndex to:lastIdx do:[:idx|
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   770
	element := contentsArray at:idx.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   771
	(aBlock value:element) ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   772
	    removed add:element
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   773
	] ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   774
	    contentsArray at:dstIndex put:element.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   775
	    dstIndex := dstIndex + 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   776
	].
348
claus
parents: 345
diff changeset
   777
    ].
19865
6b114e3b40b9 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 19836
diff changeset
   778
    contentsArray from:dstIndex to:lastIdx put:nil.
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   779
    lastIndex := dstIndex - 1.
348
claus
parents: 345
diff changeset
   780
    ^ removed
claus
parents: 345
diff changeset
   781
claus
parents: 345
diff changeset
   782
    "
claus
parents: 345
diff changeset
   783
     |coll|
claus
parents: 345
diff changeset
   784
claus
parents: 345
diff changeset
   785
     coll := OrderedCollection withAll:(1 to:10).
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   786
     Transcript show:'removed: '; showCR:(coll removeAllSuchThat:[:el | el even]).
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   787
     Transcript show:'coll: '; showCR:coll
348
claus
parents: 345
diff changeset
   788
    "
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   789
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   790
    "
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   791
     |coll1 coll2|
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   792
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   793
     Transcript showCR:'no element removed:'.
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   794
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   795
     coll1 := OrderedCollection withAll:(1 to:1000).
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   796
     Transcript show:'  (1000) - '; showCR:(
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   797
	Time millisecondsToRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   798
	    100 timesRepeat:[ coll1 copy removeAllSuchThat:[:el | el == 500] ]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   799
	]).
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   800
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   801
     coll2 := OrderedCollection withAll:(1 to:10000).
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   802
     Transcript show:'  (10000) - '; showCR:(
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   803
	Time millisecondsToRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   804
	    100 timesRepeat:[ coll2 copy removeAllSuchThat:[:el | el == 5000] ]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   805
	]).
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   806
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   807
     coll2 := OrderedCollection withAll:(1 to:50000).
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   808
     Transcript show:'  (50000) - '; showCR:(
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   809
	Time millisecondsToRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   810
	    100 timesRepeat:[ coll2 copy removeAllSuchThat:[:el | el == 25000] ]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   811
	]).
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   812
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   813
     Transcript showCR:'small number of elements removed:'.
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   814
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   815
     coll1 := OrderedCollection withAll:(1 to:1000).
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   816
     Transcript show:'  (1000) - '; showCR:(
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   817
	Time millisecondsToRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   818
	    100 timesRepeat:[ coll1 copy removeAllSuchThat:[:el | el between:500 and:550] ]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   819
	]).
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   820
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   821
     coll2 := OrderedCollection withAll:(1 to:10000).
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   822
     Transcript show:'  (10000) - '; showCR:(
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   823
	Time millisecondsToRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   824
	    100 timesRepeat:[ coll2 copy removeAllSuchThat:[:el | el between:5000 and:5050] ]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   825
	]).
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   826
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   827
     coll2 := OrderedCollection withAll:(1 to:50000).
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   828
     Transcript show:'  (50000) - '; showCR:(
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   829
	Time millisecondsToRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   830
	    100 timesRepeat:[ coll2 copy removeAllSuchThat:[:el | el between:25000 and:25050] ]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   831
	]).
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   832
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   833
     Transcript showCR:'many elements removed:'.
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   834
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   835
     coll1 := OrderedCollection withAll:(1 to:1000).
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   836
     Transcript show:'  (1000) - '; showCR:(
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   837
	Time millisecondsToRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   838
	    100 timesRepeat:[ coll1 copy removeAllSuchThat:[:el | el even] ]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   839
	]).
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   840
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   841
     coll2 := OrderedCollection withAll:(1 to:10000).
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   842
     Transcript show:'  (10000) - '; showCR:(
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   843
	Time millisecondsToRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   844
	    100 timesRepeat:[ coll2 copy removeAllSuchThat:[:el | el even] ]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   845
	]).
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   846
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   847
     coll2 := OrderedCollection withAll:(1 to:50000).
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   848
     Transcript show:'  (50000) - '; showCR:(
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   849
	Time millisecondsToRun:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   850
	    100 timesRepeat:[ coll2 copy removeAllSuchThat:[:el | el even] ]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   851
	]).
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   852
    "
19831
5e0f261a1daa #TUNING by cg
Claus Gittinger <cg@exept.de>
parents: 19792
diff changeset
   853
    "
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   854
		    compiled bytecode bytecode/new (no jitter)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   855
	no element removed:
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   856
	  (1000)  -  10          20         20
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   857
	  (10000) -  70         240        200
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   858
	  (50000) - 390        1190        940
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   859
	small number of elements removed:
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   860
	  (1000)  -  10          30         20
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   861
	  (10000) - 160         300        260
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   862
	  (50000) - 700        1540       1180
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   863
	many elements removed:
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   864
	  (1000)  -  10          20         30
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   865
	  (10000) - 130         290        260
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   866
	  (50000) - 720        1470       1300
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   867
    "
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   868
    "Modified: 8.2.1997 / 19:19:00 / cg"
348
claus
parents: 345
diff changeset
   869
!
claus
parents: 345
diff changeset
   870
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   871
removeFirst
3695
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   872
    "remove the first element from the collection; return the element.
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   873
     If there is no element in the receiver collection, raise an error.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   874
     Destructive: modifies the receiver"
202
40ca7cc6fb9c *** empty log message ***
claus
parents: 159
diff changeset
   875
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   876
    |anObject
3968
a526029723ac checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3695
diff changeset
   877
     fI "{ Class: SmallInteger }" |
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   878
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   879
    fI := firstIndex.
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   880
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   881
    fI > lastIndex ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   882
	"error if collection is empty"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   883
	^ self emptyCollectionError.
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   884
    ].
2354
652d17daeeb5 faster remove: if its the first or last element
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
   885
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   886
    anObject := contentsArray basicAt:fI.
1496
bea70dc24829 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
   887
bea70dc24829 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
   888
    "/ nil it out, to allow GC to reclaim it.
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
   889
    contentsArray basicAt:fI put:nil.
1496
bea70dc24829 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
   890
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   891
    fI := fI + 1.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   892
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   893
    fI > lastIndex ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   894
	"reset to avoid ever growing"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   895
	fI := 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   896
	lastIndex := 0
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   897
    ].
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   898
    firstIndex := fI.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   899
    ^ anObject
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   900
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   901
    "
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   902
     (OrderedCollection withAll:#(1 2 3 4 5)) removeFirst; yourself
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   903
     OrderedCollection new removeFirst
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   904
     (SortedCollection withAll:#(5 4 3 2 1)) removeFirst; yourself
93
e31220cb391f *** empty log message ***
claus
parents: 88
diff changeset
   905
    "
2354
652d17daeeb5 faster remove: if its the first or last element
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
   906
3968
a526029723ac checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3695
diff changeset
   907
    "Modified: / 5.2.1999 / 23:22:58 / cg"
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   908
!
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   909
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   910
removeFirst:n
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   911
    "remove the first n elements from the collection;
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   912
     Return a collection containing the removed elements.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   913
     Destructive: modifies the receiver"
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   914
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   915
    |mySize ret newFirstIndex|
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   916
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   917
    mySize := self size.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   918
    mySize < n ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   919
	"error if collection has not enough elements"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   920
	^ self notEnoughElementsError.
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   921
    ].
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   922
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   923
    ret := Array new:n.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   924
    ret replaceFrom:1 to:n with:contentsArray startingAt:firstIndex.
1496
bea70dc24829 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
   925
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   926
    "/
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   927
    "/ nil-out contents array, to not keep elements from being GC'd
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   928
    "/
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   929
    newFirstIndex := firstIndex + n.
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   930
    contentsArray from:firstIndex to:newFirstIndex - 1 put:nil.
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   931
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   932
    newFirstIndex > lastIndex ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   933
	"reset to avoid ever growing"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   934
	newFirstIndex := 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   935
	lastIndex := 0
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   936
    ].
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   937
    firstIndex := newFirstIndex.
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   938
    ^ ret
93
e31220cb391f *** empty log message ***
claus
parents: 88
diff changeset
   939
e31220cb391f *** empty log message ***
claus
parents: 88
diff changeset
   940
    "
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   941
     (OrderedCollection withAll:#(1 2 3 4 5)) removeFirst:2; yourself
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   942
     (OrderedCollection withAll:#(1 2 3 4 5)) removeFirst:0; yourself
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   943
     OrderedCollection new removeFirst:2
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   944
     (OrderedCollection withAll:#(1 2 3 4 5)) removeFirst:6
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   945
     (SortedCollection withAll:#(5 4 3 2 1)) removeFirst:2; yourself
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
   946
    "
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
   947
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
   948
    "Modified: 8.2.1997 / 19:20:18 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   949
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   950
3695
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   951
removeFirstIfAbsent:exceptionBlock
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   952
    "remove the first element from the collection; return the element.
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   953
     If there is no element in the receiver collection, return the value from
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   954
     exceptionBlock.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
   955
     Destructive: modifies the receiver"
3695
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   956
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   957
    |anObject fI "{ Class: SmallInteger }" |
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   958
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   959
    fI := firstIndex.
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   960
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   961
    fI > lastIndex ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   962
	"error if collection is empty"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   963
	^ exceptionBlock value.
3695
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   964
    ].
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   965
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   966
    anObject := contentsArray basicAt:fI.
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   967
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   968
    "/ nil it out, to allow GC to reclaim it.
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   969
    contentsArray basicAt:fI put:nil.
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   970
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   971
    fI := fI + 1.
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   972
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   973
    fI > lastIndex ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   974
	"reset to avoid ever growing"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   975
	fI := 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
   976
	lastIndex := 0
3695
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   977
    ].
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   978
    firstIndex := fI.
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   979
    ^ anObject
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   980
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   981
    "
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   982
     (OrderedCollection withAll:#(1 2 3 4 5)) removeFirst; yourself
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   983
     OrderedCollection new removeFirst
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   984
     (SortedCollection withAll:#(5 4 3 2 1)) removeFirst; yourself
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   985
    "
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   986
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   987
    "Modified: / 12.11.1997 / 17:58:43 / cg"
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   988
    "Created: / 30.7.1998 / 13:19:42 / cg"
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   989
!
9ebf6de8a764 added #removeAllIfAbsent:
Claus Gittinger <cg@exept.de>
parents: 3368
diff changeset
   990
2549
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   991
removeFrom:startIndex to:stopIndex
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   992
    "added for ST-80 compatibility.
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   993
     Same as removeFromIndex:toIndex:."
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   994
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   995
    ^ self removeFromIndex:startIndex toIndex:stopIndex
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   996
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   997
    "Created: 15.4.1997 / 12:39:00 / cg"
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   998
!
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
   999
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1000
removeFromIndex:startIndex toIndex:stopIndex
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1001
    "remove the elements stored under startIndex up to and including
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1002
     the elements under stopIndex.
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1003
     Destructive: modifies the receiver
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1004
     Return the receiver.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1005
     Returning the receiver here is a historic leftover - it may change.
14917
e61f35bf3521 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 14616
diff changeset
  1006
     Please use yourself in a cascade, if you need the receiver's value
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1007
     when using this method."
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1008
3968
a526029723ac checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3695
diff changeset
  1009
    |nDeleted "{ Class: SmallInteger }"
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1010
     fI "{ Class: SmallInteger }"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1011
     lI "{ Class: SmallInteger }"
2364
788423a8d67f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2362
diff changeset
  1012
     newLastIndex sz|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1013
2364
788423a8d67f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2362
diff changeset
  1014
    sz := self size.
788423a8d67f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2362
diff changeset
  1015
788423a8d67f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2362
diff changeset
  1016
    (startIndex < 1 or:[stopIndex > sz]) ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1017
	^ self notEnoughElementsError
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1018
    ].
2355
9476ba4d810d faster #removeFromIndex:toIndex.
Claus Gittinger <cg@exept.de>
parents: 2354
diff changeset
  1019
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
  1020
    nDeleted := stopIndex - startIndex + 1.
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
  1021
    nDeleted < 0 ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1022
	"/ mhmh - what should be done here ?
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1023
	^ self error:'bad index range'
2355
9476ba4d810d faster #removeFromIndex:toIndex.
Claus Gittinger <cg@exept.de>
parents: 2354
diff changeset
  1024
    ].
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
  1025
    nDeleted == 0 ifTrue:[^ self].
2355
9476ba4d810d faster #removeFromIndex:toIndex.
Claus Gittinger <cg@exept.de>
parents: 2354
diff changeset
  1026
3968
a526029723ac checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3695
diff changeset
  1027
    fI := firstIndex.
a526029723ac checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3695
diff changeset
  1028
    lI := lastIndex.
a526029723ac checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3695
diff changeset
  1029
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
  1030
    "/
2355
9476ba4d810d faster #removeFromIndex:toIndex.
Claus Gittinger <cg@exept.de>
parents: 2354
diff changeset
  1031
    "/ can be done faster, when removing the first elements
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
  1032
    "/
2364
788423a8d67f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2362
diff changeset
  1033
    startIndex == 1 ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1034
	"/ nil out (helps GC)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1035
	contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1036
	    from:fI
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1037
	    to:fI + nDeleted - 1
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1038
	    put:nil.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1039
	firstIndex := fI := fI + nDeleted
2355
9476ba4d810d faster #removeFromIndex:toIndex.
Claus Gittinger <cg@exept.de>
parents: 2354
diff changeset
  1040
    ] ifFalse:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1041
	"/
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1042
	"/ can be done faster, when removing the last elements
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1043
	"/
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1044
	stopIndex == sz ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1045
	    "/ nil out (helps GC)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1046
	    contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1047
		from:lI - nDeleted + 1
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1048
		to:lI
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1049
		put:nil.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1050
	    lastIndex := lI := lI - nDeleted
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1051
	] ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1052
	    "/
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1053
	    "/ must shuffle
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1054
	    "/ TODO:
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1055
	    "/    for big collections, try to copy the smallest
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1056
	    "/    possible number of elements
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1057
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1058
	    newLastIndex := lI - nDeleted.
2362
23574f29c8af checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2361
diff changeset
  1059
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1060
	    contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1061
		replaceFrom:(fI + startIndex - 1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1062
		to:newLastIndex
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1063
		with:contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1064
		startingAt:(fI + stopIndex).
2355
9476ba4d810d faster #removeFromIndex:toIndex.
Claus Gittinger <cg@exept.de>
parents: 2354
diff changeset
  1065
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1066
	    "/ nil out rest (helps GC)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1067
	    contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1068
		from:(newLastIndex + 1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1069
		to:lI
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1070
		put:nil.
2355
9476ba4d810d faster #removeFromIndex:toIndex.
Claus Gittinger <cg@exept.de>
parents: 2354
diff changeset
  1071
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1072
	    lastIndex := lI := newLastIndex.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1073
	]
2355
9476ba4d810d faster #removeFromIndex:toIndex.
Claus Gittinger <cg@exept.de>
parents: 2354
diff changeset
  1074
    ].
9476ba4d810d faster #removeFromIndex:toIndex.
Claus Gittinger <cg@exept.de>
parents: 2354
diff changeset
  1075
3968
a526029723ac checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3695
diff changeset
  1076
    fI > lI ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1077
	"reset to avoid ever growing"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1078
	firstIndex := 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1079
	lastIndex := 0
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1080
    ]
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1081
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1082
    "
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1083
     #(1 2 3 4 5 6 7 8 9) asOrderedCollection removeFromIndex:3 toIndex:6
2355
9476ba4d810d faster #removeFromIndex:toIndex.
Claus Gittinger <cg@exept.de>
parents: 2354
diff changeset
  1084
     #(1 2 3 4 5 6 7 8 9) asOrderedCollection removeFromIndex:6 toIndex:8
9476ba4d810d faster #removeFromIndex:toIndex.
Claus Gittinger <cg@exept.de>
parents: 2354
diff changeset
  1085
     #(1 2 3 4 5 6 7 8 9) asOrderedCollection removeFromIndex:1 toIndex:3
9476ba4d810d faster #removeFromIndex:toIndex.
Claus Gittinger <cg@exept.de>
parents: 2354
diff changeset
  1086
     #(1 2 3 4 5 6 7 8 9) asOrderedCollection removeFromIndex:6 toIndex:9
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1087
     #(1 2 3 4 5) asOrderedCollection removeFromIndex:3 toIndex:6
217
a0400fdbc933 *** empty log message ***
claus
parents: 202
diff changeset
  1088
    "
2355
9476ba4d810d faster #removeFromIndex:toIndex.
Claus Gittinger <cg@exept.de>
parents: 2354
diff changeset
  1089
3968
a526029723ac checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3695
diff changeset
  1090
    "Modified: / 5.2.1999 / 23:22:07 / cg"
217
a0400fdbc933 *** empty log message ***
claus
parents: 202
diff changeset
  1091
!
a0400fdbc933 *** empty log message ***
claus
parents: 202
diff changeset
  1092
2348
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
  1093
removeIdentical:anObject ifAbsent:exceptionBlock
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
  1094
    "remove the first element which is identical to anObject;
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1095
     if found, remove and return it;
2348
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
  1096
     if not, return the value from evaluating exceptionBlock.
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1097
     Destructive: modifies the receiver.
2361
dd95b53674e9 oops - removeIdentical was wrong
Claus Gittinger <cg@exept.de>
parents: 2355
diff changeset
  1098
     Uses identity compare (==) to search for the element."
2354
652d17daeeb5 faster remove: if its the first or last element
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1099
652d17daeeb5 faster remove: if its the first or last element
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1100
    |index|
2348
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
  1101
2354
652d17daeeb5 faster remove: if its the first or last element
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1102
    index := contentsArray identityIndexOf:anObject startingAt:firstIndex endingAt:lastIndex.
652d17daeeb5 faster remove: if its the first or last element
Claus Gittinger <cg@exept.de>
parents: 2348
diff changeset
  1103
    index ~~ 0 ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1104
	index == firstIndex ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1105
	    contentsArray basicAt:firstIndex put:nil.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1106
	    firstIndex := firstIndex + 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1107
	    firstIndex > lastIndex ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1108
		"reset to avoid ever growing"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1109
		firstIndex := 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1110
		lastIndex := 0
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1111
	    ].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1112
	] ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1113
	    index == lastIndex ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1114
		contentsArray basicAt:lastIndex put:nil.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1115
		lastIndex := lastIndex - 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1116
		firstIndex > lastIndex ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1117
		    "reset to avoid ever growing"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1118
		    firstIndex := 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1119
		    lastIndex := 0
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1120
		].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1121
	    ] ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1122
		index := index - firstIndex + 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1123
		self removeFromIndex:index toIndex:index.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1124
	    ]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1125
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1126
	^ anObject
2348
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
  1127
    ].
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
  1128
    ^ exceptionBlock value
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
  1129
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
  1130
    "
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1131
     #(1.0 2.0 3.0 4.0 5.0) asOrderedCollection remove:4 ifAbsent:'oops'
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1132
     #(1.0 2.0 3.0 4.0 5.0) asOrderedCollection remove:4 ifAbsent:'oops'; yourself
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1133
     #(1.0 2.0 3.0 4.0 5.0) asOrderedCollection removeIdentical:4 ifAbsent:'oops'
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1134
     #(fee foo bar baz) asOrderedCollection removeIdentical:#fee; yourself
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1135
     #(fee foo bar baz) asOrderedCollection removeIdentical:#foo; yourself
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1136
     #(fee foo bar baz) asOrderedCollection removeIdentical:#baz; yourself
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1137
     #(fee) asOrderedCollection removeIdentical:#fee; yourself
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1138
     #(fee) asOrderedCollection removeIdentical:#foo; yourself
2348
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
  1139
    "
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
  1140
2361
dd95b53674e9 oops - removeIdentical was wrong
Claus Gittinger <cg@exept.de>
parents: 2355
diff changeset
  1141
    "Modified: 8.2.1997 / 18:57:43 / cg"
2348
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
  1142
!
523e9d6e0049 added #removeIdentical:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 2222
diff changeset
  1143
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1144
removeIndices:aSortedCollectionOfIndices
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1145
    "remove all elements stored in any of aSortedCollectionOfIndices,
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1146
     which must be sorted and sequenceable.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1147
     Destructive: modifies the receiver.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1148
     Returns a collection of removed elements.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1149
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1150
     Performance:
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1151
	this is an O(N) algorithm (N being the size of the receiver).
18184
b72a856332b8 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18183
diff changeset
  1152
b72a856332b8 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18183
diff changeset
  1153
     This could be done much better, especially if the removed indices are
b72a856332b8 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18183
diff changeset
  1154
     at either end of the receiver. However, as it is currently not heavily used,
b72a856332b8 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18183
diff changeset
  1155
     I leave that as an exercise to the brave reader..."
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1156
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1157
    |removed element dstIndex indexIndex nextIndex numIndices|
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1158
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1159
    removed := OrderedCollection new.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1160
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1161
    dstIndex := firstIndex.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1162
    numIndices := aSortedCollectionOfIndices size.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1163
    indexIndex := 1.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1164
    nextIndex := aSortedCollectionOfIndices at:1.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1165
    firstIndex to: lastIndex do:[:srcIndex |
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1166
	element := contentsArray at:srcIndex.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1167
	srcIndex == nextIndex ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1168
	    removed add:element.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1169
	    indexIndex := indexIndex + 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1170
	    indexIndex > numIndices ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1171
		nextIndex := nil.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1172
	    ] ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1173
		nextIndex := aSortedCollectionOfIndices at:indexIndex.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1174
	    ].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1175
	] ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1176
	    contentsArray at:dstIndex put:element.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1177
	    dstIndex := dstIndex + 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1178
	].
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1179
    ].
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1180
    contentsArray from:dstIndex to:lastIndex put:nil.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1181
    lastIndex := dstIndex - 1.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1182
    ^ removed
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1183
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1184
    "
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1185
     |coll|
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1186
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1187
     coll := OrderedCollection withAll:(1 to:10).
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1188
     Transcript showCR:(coll removeIndices:#(1 5 7)).
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1189
     Transcript showCR:coll
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1190
    "
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1191
!
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1192
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1193
removeLast
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1194
    "remove the last element from the collection.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1195
     Return the removed element.
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1196
     Destructive: modifies the receiver"
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1197
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
  1198
    |anObject
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
  1199
     idx "{ Class: SmallInteger }" |
217
a0400fdbc933 *** empty log message ***
claus
parents: 202
diff changeset
  1200
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
  1201
    idx := lastIndex.
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
  1202
    firstIndex > idx ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1203
	"error if collection is empty"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1204
	^ self emptyCollectionError.
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1205
    ].
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
  1206
    anObject := contentsArray basicAt:idx.
1496
bea70dc24829 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  1207
bea70dc24829 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  1208
    "/ nil it (helps GC)
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
  1209
    contentsArray basicAt:idx put:nil.
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
  1210
    lastIndex := idx := idx - 1.
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1211
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
  1212
    firstIndex > idx ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1213
	"reset to avoid ever growing"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1214
	firstIndex := 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1215
	lastIndex := 0
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1216
    ].
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1217
    ^ anObject
217
a0400fdbc933 *** empty log message ***
claus
parents: 202
diff changeset
  1218
a0400fdbc933 *** empty log message ***
claus
parents: 202
diff changeset
  1219
    "
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1220
     (OrderedCollection withAll:#(1 2 3 4 5)) removeLast; yourself
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1221
     OrderedCollection new removeLast
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1222
     (SortedCollection withAll:#(5 4 3 2 1)) removeLast; yourself
217
a0400fdbc933 *** empty log message ***
claus
parents: 202
diff changeset
  1223
    "
3107
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
  1224
ce4b0a4b3b3a checkin from browser
Claus Gittinger <cg@exept.de>
parents: 3095
diff changeset
  1225
    "Modified: / 12.11.1997 / 17:58:57 / cg"
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1226
!
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1227
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1228
removeLast:n
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1229
    "remove the last n elements from the receiver collection.
16304
2d8de035fd7a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15757
diff changeset
  1230
     Destructive: modifies the receiver.
11330
4a1580833cb5 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11275
diff changeset
  1231
     Return a collection of removed elements."
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1232
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1233
    |mySize ret|
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1234
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1235
    mySize := self size.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1236
    mySize < n ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1237
	"error if collection has not enough elements"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1238
	^ self notEnoughElementsError.
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1239
    ].
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1240
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1241
    ret := Array new:n.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1242
    ret replaceFrom:1 to:n with:contentsArray startingAt:lastIndex - n + 1.
1496
bea70dc24829 commentary
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  1243
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1244
    "/
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1245
    "/ nil-out contents array, to not keep elements from being GC'd
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1246
    "/
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1247
    contentsArray from:lastIndex - n + 1 to:lastIndex put:nil.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1248
    lastIndex := lastIndex - n.
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1249
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1250
    firstIndex > lastIndex ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1251
	"reset to avoid ever growing"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1252
	firstIndex := 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1253
	lastIndex := 0
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1254
    ].
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1255
    ^ ret
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1256
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1257
    "
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1258
     (OrderedCollection withAll:#(1 2 3 4 5)) removeLast:2; yourself
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1259
     (OrderedCollection withAll:#(1 2 3 4 5)) removeLast:0; yourself
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1260
     (OrderedCollection withAll:#(1 2 3 4 5)) removeLast:6; yourself
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1261
     (SortedCollection withAll:#(5 4 3 2 1)) removeLast:2; yourself
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1262
     (SortedCollection withAll:#(5 4 3 2 1)) removeLast:0; yourself
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1263
     (SortedCollection withAll:#(5 4 3 2 1)) removeLast:0
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1264
    "
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1265
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1266
    "Modified: 12.4.1996 / 13:39:12 / cg"
4862
5df99a53c364 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4427
diff changeset
  1267
!
5df99a53c364 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4427
diff changeset
  1268
5df99a53c364 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4427
diff changeset
  1269
reset
5df99a53c364 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4427
diff changeset
  1270
    "logically remove all elements from the collection.
16305
964f7ffb315d class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16304
diff changeset
  1271
     That's almost the same as #removeAll, but keeps the contentsArray.
4862
5df99a53c364 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4427
diff changeset
  1272
     Returns the receiver."
5df99a53c364 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4427
diff changeset
  1273
5df99a53c364 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4427
diff changeset
  1274
    firstIndex := contentsArray size // 3 max: 1.
5df99a53c364 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4427
diff changeset
  1275
    lastIndex := firstIndex - 1
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1276
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1277
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1278
!OrderedCollection methodsFor:'converting'!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1279
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1280
asArray
1170
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1281
    "return the receiver as an array."
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1282
4153
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  1283
    ^ contentsArray copyFrom:firstIndex to:lastIndex
1170
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1284
4153
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  1285
"/    |newArray sz|
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  1286
"/
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  1287
"/    sz := self size.
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  1288
"/    newArray := Array new:sz.
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  1289
"/    newArray replaceFrom:1 to:sz with:contentsArray startingAt:firstIndex.
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  1290
"/    ^ newArray
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  1291
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  1292
    "
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  1293
     OrderedCollection new asArray
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1294
     OrderedCollection new add:1;add:2;asArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1295
     OrderedCollection new add:1;removeFirst;asArray
4153
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  1296
    "
1170
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1297
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1298
    "
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1299
     |o rnd|
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1300
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1301
     o := OrderedCollection new.
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1302
     rnd := Random new.
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1303
     10000 timesRepeat:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1304
	 o add:rnd next.
1170
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1305
     ].
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1306
     Time millisecondsToRun:[o asArray]
1170
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1307
    "
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1308
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1309
    "Modified: 13.4.1996 / 12:10:56 / cg"
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1310
!
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1311
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1312
asNewOrderedCollection
14999
e6ad9751587b class: OrderedCollection
Stefan Vogel <sv@exept.de>
parents: 14919
diff changeset
  1313
    "return the receiver as an ordered collection.
e6ad9751587b class: OrderedCollection
Stefan Vogel <sv@exept.de>
parents: 14919
diff changeset
  1314
     Make sure to return a unique new OrderedCollection"
e6ad9751587b class: OrderedCollection
Stefan Vogel <sv@exept.de>
parents: 14919
diff changeset
  1315
e6ad9751587b class: OrderedCollection
Stefan Vogel <sv@exept.de>
parents: 14919
diff changeset
  1316
    "could be an instance of a subclass..."
e6ad9751587b class: OrderedCollection
Stefan Vogel <sv@exept.de>
parents: 14919
diff changeset
  1317
    self class == OrderedCollection ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1318
	^ self copy
14999
e6ad9751587b class: OrderedCollection
Stefan Vogel <sv@exept.de>
parents: 14919
diff changeset
  1319
    ].
e6ad9751587b class: OrderedCollection
Stefan Vogel <sv@exept.de>
parents: 14919
diff changeset
  1320
    ^ super asOrderedCollection
e6ad9751587b class: OrderedCollection
Stefan Vogel <sv@exept.de>
parents: 14919
diff changeset
  1321
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1322
    "
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1323
	|s|
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1324
	s := #(1 2 3 4) asOrderedCollection.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1325
	self assert:(s ~~ s asNewOrderedCollection).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1326
	self assert:(s = s asNewOrderedCollection).
14999
e6ad9751587b class: OrderedCollection
Stefan Vogel <sv@exept.de>
parents: 14919
diff changeset
  1327
     "
e6ad9751587b class: OrderedCollection
Stefan Vogel <sv@exept.de>
parents: 14919
diff changeset
  1328
!
e6ad9751587b class: OrderedCollection
Stefan Vogel <sv@exept.de>
parents: 14919
diff changeset
  1329
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1330
asOrderedCollection
15062
755e0e15b7fa class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 14999
diff changeset
  1331
    "return the receiver as an ordered collection.
755e0e15b7fa class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 14999
diff changeset
  1332
     Notice: this returns the receiver. Use asNewOrderedCollection, if you intent to
755e0e15b7fa class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 14999
diff changeset
  1333
     modify the returned collection."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1334
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1335
    "could be an instance of a subclass..."
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1336
    self class == OrderedCollection ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1337
	^ self
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1338
    ].
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1339
    ^ super asOrderedCollection
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1340
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1341
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1342
!OrderedCollection methodsFor:'copying'!
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1343
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1344
, aCollection
14071
8e39d6128e1e comment/format in: #,
Claus Gittinger <cg@exept.de>
parents: 12036
diff changeset
  1345
    "return a new collection formed from concatenating the receiver with the argument"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1346
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1347
    |newCollection|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1348
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1349
    newCollection := self copyEmpty:(self size + aCollection size).
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1350
    ^ newCollection
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1351
	addAll:self;
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1352
	addAll:aCollection;
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1353
	yourself.
42
e33491f6f260 *** empty log message ***
claus
parents: 40
diff changeset
  1354
253
30daee717a53 *** empty log message ***
claus
parents: 229
diff changeset
  1355
    "
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1356
     #(1 2 3) asOrderedCollection , #(4 5 6) asOrderedCollection
20026
c4063e226888 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19991
diff changeset
  1357
     #(1 3 5) asSortedCollection , #(6 4 2) asSortedCollection
c4063e226888 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19991
diff changeset
  1358
     #(1 3 5) asSortedCollection , #(6 4 2) asOrderedCollection
c4063e226888 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19991
diff changeset
  1359
     #(1 3 5) asSortedCollection , (#(6 4 2) asSortedCollection:[:a :b| a > b])
253
30daee717a53 *** empty log message ***
claus
parents: 229
diff changeset
  1360
    "
14071
8e39d6128e1e comment/format in: #,
Claus Gittinger <cg@exept.de>
parents: 12036
diff changeset
  1361
8e39d6128e1e comment/format in: #,
Claus Gittinger <cg@exept.de>
parents: 12036
diff changeset
  1362
    "Modified (comment): / 01-04-2012 / 13:17:30 / cg"
42
e33491f6f260 *** empty log message ***
claus
parents: 40
diff changeset
  1363
!
e33491f6f260 *** empty log message ***
claus
parents: 40
diff changeset
  1364
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1365
copy
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1366
    "return a new OrderedCollection containing the elements of the receiver."
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1367
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1368
    "redefinition is a consequence of the implementation with a
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1369
     separate array - otherwise we get a shallow copy of the
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1370
     contents array, which is not what we want here"
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1371
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1372
    ^ self copyFrom:1 to:self size
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1373
!
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1374
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1375
postCopy
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1376
    "have to copy the contentsArray too"
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1377
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1378
    contentsArray := contentsArray shallowCopy
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1379
! !
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1380
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1381
!OrderedCollection methodsFor:'enumerating'!
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1382
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1383
collect:aBlock
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1384
    "evaluate the argument, aBlock for every element in the collection
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1385
     and return a collection of the results"
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1386
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1387
    |newCollection
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1388
     start  "{ Class:SmallInteger }"
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1389
     stop   "{ Class:SmallInteger }" |
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1390
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1391
    newCollection := self copyEmpty:(self size).
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1392
    stop := lastIndex.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1393
    start := firstIndex.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1394
    start to:stop do:[:index |
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1395
	newCollection add:(aBlock value:(contentsArray at:index)).
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1396
    ].
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1397
    ^ newCollection
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1398
253
30daee717a53 *** empty log message ***
claus
parents: 229
diff changeset
  1399
    "
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1400
     #(1 2 3 4) asOrderedCollection collect:[:i | i * i]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1401
     #(1 2 3 4) asOrderedCollection collect:[:i | i even]
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1402
    "
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1403
!
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1404
5508
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1405
collect:collectBlock thenSelect:selectBlock
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1406
    "combination of collect followed by select;
7164
5cdefa506c0e comment
Claus Gittinger <cg@exept.de>
parents: 6756
diff changeset
  1407
     redefined to avoid the creation of an intermediate (garbage) collection."
5508
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1408
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1409
    |newCollection newElement
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1410
     start  "{ Class:SmallInteger }"
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1411
     stop   "{ Class:SmallInteger }" |
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1412
7166
Claus Gittinger <cg@exept.de>
parents: 7165
diff changeset
  1413
    newCollection := self copyEmpty.
5508
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1414
    stop := lastIndex.
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1415
    start := firstIndex.
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1416
    start to:stop do:[:index |
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1417
	newElement := collectBlock value:(contentsArray at:index).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1418
	(selectBlock value:newElement) ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1419
	    newCollection add:newElement.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1420
	]
5508
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1421
    ].
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1422
    ^ newCollection
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1423
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1424
    "
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1425
     #(1 2 3 4) asOrderedCollection collect:[:i | i * i] thenSelect:[:each | each > 5]
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1426
     ( #(1 2 3 4) asOrderedCollection collect:[:i | i * i]) select:[:each | each > 5]
5508
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1427
7165
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1428
     |coll|
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1429
     coll := #(1 2 3 4) asOrderedCollection.
5508
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1430
     Time millisecondsToRun:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1431
	100000 timesRepeat:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1432
	    coll collect:[:i | i * i] thenSelect:[:each | each > 5]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1433
	]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1434
     ]
5508
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1435
7165
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1436
     |coll|
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1437
     coll := #(1 2 3 4) asOrderedCollection.
5508
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1438
     Time millisecondsToRun:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1439
	100000 timesRepeat:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1440
	    ( coll collect:[:i | i * i]) select:[:each | each > 5]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1441
	]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1442
     ]
5508
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1443
    "
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1444
!
caabcccaf926 added #collect:thenSelect:
Claus Gittinger <cg@exept.de>
parents: 5502
diff changeset
  1445
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1446
do:aBlock
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1447
    "evaluate the argument, aBlock for every element in the collection."
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1448
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1449
    contentsArray from:firstIndex to:lastIndex do:aBlock
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1450
!
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1451
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1452
keysAndValuesDo:aTwoArgBlock
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1453
    "evaluate the argument, aBlock for every element in the collection,
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1454
     passing both index and element as arguments."
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1455
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1456
    |start  "{ Class:SmallInteger }"
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1457
     stop   "{ Class:SmallInteger }"
1090
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1458
     idx    "{ Class:SmallInteger }" |
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1459
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1460
    stop := lastIndex.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1461
    start := firstIndex.
1090
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1462
    idx := 1.
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1463
    start to:stop do:[:index |
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1464
	aTwoArgBlock value:idx value:(contentsArray at:index).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1465
	idx := idx + 1.
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1466
    ]
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1467
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1468
    "
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1469
     #(10 20 30 40) asOrderedCollection keysAndValuesDo:[:index :value |
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1470
	Transcript show:index; show:' '; showCR:value
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1471
     ]
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1472
    "
1090
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1473
    "
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1474
     |oc|
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1475
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1476
     oc := #(10 20 30 40 50 60 70 80) asOrderedCollection.
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1477
     oc removeFirst; removeFirst.
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1478
     oc keysAndValuesDo:[:index :value |
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1479
	Transcript show:index; show:' '; showCR:value
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1480
     ]
1090
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1481
    "
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1482
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1483
!
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1484
679
d3165edbb098 *** empty log message ***
chrisy
parents: 629
diff changeset
  1485
keysAndValuesReverseDo:aTwoArgBlock
d3165edbb098 *** empty log message ***
chrisy
parents: 629
diff changeset
  1486
    "evaluate the argument, aBlock for every element in the collection,
d3165edbb098 *** empty log message ***
chrisy
parents: 629
diff changeset
  1487
     passing both index and element as arguments."
d3165edbb098 *** empty log message ***
chrisy
parents: 629
diff changeset
  1488
d3165edbb098 *** empty log message ***
chrisy
parents: 629
diff changeset
  1489
    |start  "{ Class:SmallInteger }"
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1490
     stop   "{ Class:SmallInteger }"
1090
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1491
     idx    "{ Class:SmallInteger }"|
679
d3165edbb098 *** empty log message ***
chrisy
parents: 629
diff changeset
  1492
d3165edbb098 *** empty log message ***
chrisy
parents: 629
diff changeset
  1493
    stop := lastIndex.
d3165edbb098 *** empty log message ***
chrisy
parents: 629
diff changeset
  1494
    start := firstIndex.
1090
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1495
    idx := (stop - start + 1).
679
d3165edbb098 *** empty log message ***
chrisy
parents: 629
diff changeset
  1496
    stop to:start by: -1 do:[:index |
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1497
	aTwoArgBlock value:idx value:(contentsArray at:index).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1498
	idx := idx - 1.
679
d3165edbb098 *** empty log message ***
chrisy
parents: 629
diff changeset
  1499
    ]
d3165edbb098 *** empty log message ***
chrisy
parents: 629
diff changeset
  1500
d3165edbb098 *** empty log message ***
chrisy
parents: 629
diff changeset
  1501
    "
d3165edbb098 *** empty log message ***
chrisy
parents: 629
diff changeset
  1502
     #(10 20 30 40) asOrderedCollection keysAndValuesReverseDo:[:index :value |
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1503
	Transcript show:index; show:' '; showCR:value
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1504
     ]
1090
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1505
    "
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1506
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1507
    "
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1508
     |oc|
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1509
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1510
     oc := #(10 20 30 40 50 60 70 80) asOrderedCollection.
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1511
     oc removeFirst; removeFirst.
def6e50a2d13 oops - keysAndValuesDo was wrong, iff elements have been removed upFront recently
ca
parents: 1071
diff changeset
  1512
     oc keysAndValuesReverseDo:[:index :value |
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1513
	Transcript show:index; show:' '; showCR:value
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1514
     ]
679
d3165edbb098 *** empty log message ***
chrisy
parents: 629
diff changeset
  1515
    "
1071
5875a6eedd28 added #includesIdentical:
Claus Gittinger <cg@exept.de>
parents: 679
diff changeset
  1516
!
5875a6eedd28 added #includesIdentical:
Claus Gittinger <cg@exept.de>
parents: 679
diff changeset
  1517
5875a6eedd28 added #includesIdentical:
Claus Gittinger <cg@exept.de>
parents: 679
diff changeset
  1518
reverseDo:aBlock
5875a6eedd28 added #includesIdentical:
Claus Gittinger <cg@exept.de>
parents: 679
diff changeset
  1519
    "evaluate the argument, aBlock for every element in the collection
5875a6eedd28 added #includesIdentical:
Claus Gittinger <cg@exept.de>
parents: 679
diff changeset
  1520
     procesing elements in reverse direction (i.e. starting with the last)"
5875a6eedd28 added #includesIdentical:
Claus Gittinger <cg@exept.de>
parents: 679
diff changeset
  1521
5875a6eedd28 added #includesIdentical:
Claus Gittinger <cg@exept.de>
parents: 679
diff changeset
  1522
    contentsArray from:firstIndex to:lastIndex reverseDo:aBlock
7165
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1523
!
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1524
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1525
select:selectBlock thenCollect:collectBlock
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1526
    "combination of select followed by collect;
7165
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1527
     redefined to avoid the creation of an intermediate (garbage) collection."
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1528
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1529
    |newCollection element
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1530
     start  "{ Class:SmallInteger }"
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1531
     stop   "{ Class:SmallInteger }" |
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1532
7166
Claus Gittinger <cg@exept.de>
parents: 7165
diff changeset
  1533
    newCollection := self copyEmpty.
7165
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1534
    stop := lastIndex.
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1535
    start := firstIndex.
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1536
    start to:stop do:[:index |
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1537
	element := contentsArray at:index.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1538
	(selectBlock value:element) ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1539
	    newCollection add:(collectBlock value:element).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1540
	]
7165
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1541
    ].
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1542
    ^ newCollection
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1543
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1544
    "
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1545
     #(1 2 3 4 5 6 7 8) asOrderedCollection
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1546
	select:[:each | each > 5] thenCollect:[:i | i * i]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1547
     ( #(1 2 3 4 5 6 7 8) asOrderedCollection
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1548
	select:[:each | each > 5]) collect:[:i | i * i]
7165
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1549
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1550
     |coll|
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1551
     coll := #(1 2 3 4 5 6 7 8) asOrderedCollection.
7165
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1552
     Time millisecondsToRun:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1553
	100000 timesRepeat:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1554
	    coll select:[:each | each > 5] thenCollect:[:i | i * i]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1555
	]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1556
     ]
7165
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1557
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1558
     |coll|
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1559
     coll := #(1 2 3 4 5 6 7 8) asOrderedCollection.
7165
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1560
     Time millisecondsToRun:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1561
	100000 timesRepeat:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1562
	    ( coll select:[:each | each > 5]) collect:[:i | i * i]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1563
	]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1564
     ]
7165
Claus Gittinger <cg@exept.de>
parents: 7164
diff changeset
  1565
    "
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1566
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1567
56
be0ed17e6f85 *** empty log message ***
claus
parents: 42
diff changeset
  1568
!OrderedCollection methodsFor:'filling & replacing'!
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1569
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1570
replaceFrom:start to:stop with:aCollection startingAt:repStart
1170
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1571
    "replace elements in the receiver between index start and stop,
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1572
     with elements  taken from replacementCollection starting at repStart.
3236
b5f80b416cff check for valid subscript in #add:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 3109
diff changeset
  1573
     Return the receiver.
b5f80b416cff check for valid subscript in #add:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 3109
diff changeset
  1574
     Redefined here; can be done faster as the inherited operation."
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1575
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1576
    |end|
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1577
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1578
    end := stop + firstIndex - 1.
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1579
    ((start >= 1) and:[end <= lastIndex]) ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1580
	aCollection class == self class ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1581
	    contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1582
		replaceFrom:(start + firstIndex - 1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1583
		to:end
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1584
		with:aCollection contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1585
		startingAt:(repStart + aCollection firstIndex - 1).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1586
	] ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1587
	    contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1588
		replaceFrom:(start + firstIndex - 1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1589
		to:end
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1590
		with:aCollection
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1591
		startingAt:repStart.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1592
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1593
	^ self
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1594
    ].
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1595
    ^ super replaceFrom:start to:stop with:aCollection startingAt:repStart
293
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  1596
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  1597
    "
15757
f7e84eeeaaa9 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15749
diff changeset
  1598
     |c1 c2|
f7e84eeeaaa9 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15749
diff changeset
  1599
f7e84eeeaaa9 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15749
diff changeset
  1600
     c1 := #(1 2 3 4 5 6) asOrderedCollection.
f7e84eeeaaa9 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15749
diff changeset
  1601
     c2 := #(a b c d e f) asOrderedCollection.
f7e84eeeaaa9 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15749
diff changeset
  1602
     c2 replaceFrom:3 to:6 with:c1.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1603
     c2
15757
f7e84eeeaaa9 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15749
diff changeset
  1604
    "
f7e84eeeaaa9 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15749
diff changeset
  1605
    "
f7e84eeeaaa9 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15749
diff changeset
  1606
     |c1 c2|
f7e84eeeaaa9 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15749
diff changeset
  1607
f7e84eeeaaa9 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15749
diff changeset
  1608
     c1 := #(1 2 3 4 5 6) asOrderedCollection.
f7e84eeeaaa9 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15749
diff changeset
  1609
     c2 := #(a b c d e f) asOrderedCollection.
f7e84eeeaaa9 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15749
diff changeset
  1610
     c2 replaceFrom:3 to:6 with:c1 startingAt:2.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1611
     c2
15757
f7e84eeeaaa9 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15749
diff changeset
  1612
    "
f7e84eeeaaa9 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15749
diff changeset
  1613
    "
293
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  1614
     |c|
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  1615
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  1616
     c := #(1 2 3 4 5 6) asOrderedCollection.
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  1617
     c replaceFrom:3 to:6 with:c startingAt:2.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1618
     c
293
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  1619
    "
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  1620
    "
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  1621
     |c|
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  1622
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  1623
     c := #(1 2 3 4 5 6) asOrderedCollection.
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  1624
     c replaceFrom:3 to:5 with:c startingAt:4.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1625
     c
293
31df3850e98c *** empty log message ***
claus
parents: 282
diff changeset
  1626
    "
1170
4250fe63479b added #asArray; commentary
Claus Gittinger <cg@exept.de>
parents: 1161
diff changeset
  1627
3236
b5f80b416cff check for valid subscript in #add:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 3109
diff changeset
  1628
    "Modified: / 28.1.1998 / 16:49:31 / cg"
13
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1629
! !
62303f84ff5f *** empty log message ***
claus
parents: 10
diff changeset
  1630
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1631
!OrderedCollection methodsFor:'grow & shrink'!
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1632
18379
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1633
ensureSizeAtLeast:minSize
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1634
    "ensure that the size is at least minSize.
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1635
     If the receiver's size is smaller, grow the receiver to minSize,
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1636
     filling new slots with nil.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1637
     Otherwise, if the size is already >= minSize, leave the receiver unchanged."
18379
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1638
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1639
    (self size < minSize) ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1640
	self grow:minSize
18379
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1641
    ].
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1642
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1643
    "
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1644
     |oc|
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1645
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1646
     oc := OrderedCollection new.
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1647
     oc ensureSizeAtLeast:10.
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1648
     oc at:10 put:10.
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1649
     oc add:11.
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1650
     oc at:11.
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1651
     oc ensureSizeAtLeast:20.
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1652
     oc at:20 put:20.
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1653
     oc.
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1654
    "
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1655
!
e36a3b641b80 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18184
diff changeset
  1656
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1657
grow:newSize
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1658
    "grow the receiver to newSize.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1659
     This only logically changes the receiver's size;
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1660
     the underlying contentsArray is kept
19836
f6f451ada167 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19831
diff changeset
  1661
     (except if growing to a zero size, or too small for newSize)"
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1662
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1663
    |oldSize newContents oldLast newLast|
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1664
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1665
    oldSize := lastIndex - firstIndex + 1.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1666
    newSize ~~ oldSize ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1667
	newLast := firstIndex + newSize - 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1668
	newSize < oldSize ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1669
	    newSize == 0 ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1670
		self initContents:0.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1671
		^ self.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1672
	    ].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1673
	    oldLast := lastIndex.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1674
	    lastIndex := newLast.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1675
	    "
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1676
	     nil out rest, to give GC a chance to reclaim things
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1677
	    "
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1678
	    contentsArray from:lastIndex + 1 to:oldLast put:nil.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1679
	] ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1680
	    newLast <= contentsArray size ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1681
		lastIndex := newLast.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1682
		^ self
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1683
	    ].
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1684
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1685
	    newContents := Array basicNew:newSize.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1686
	    newContents replaceFrom:1 to:oldSize with:contentsArray startingAt:firstIndex.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1687
	    contentsArray := newContents.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1688
	    firstIndex := 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1689
	    lastIndex := newSize
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1690
	]
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1691
    ]
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1692
! !
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1693
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1694
20026
c4063e226888 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19991
diff changeset
  1695
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1696
!OrderedCollection methodsFor:'private'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1697
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1698
initContents:size
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1699
    "setup the receiver-collection to hold size entries"
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  1700
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
  1701
    size == 0 ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1702
	contentsArray := #().   "save memory by using a shared instance"
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
  1703
    ] ifFalse:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1704
	contentsArray := Array basicNew:size.
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
  1705
    ].
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1706
    firstIndex := 1.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1707
    lastIndex := 0
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1708
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1709
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1710
makeRoomAtFront
282
94f5c3a6230d *** empty log message ***
claus
parents: 253
diff changeset
  1711
    "grow/shift the contents for more room at the beginning.
94f5c3a6230d *** empty log message ***
claus
parents: 253
diff changeset
  1712
     Does not change the logical size.
18183
3178ced76cfa class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18182
diff changeset
  1713
     i.e. the contents array is changed from:
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1714
	#(1 2 3 4 5 6) -> #(nil 1 2 3 4 5 6)
18183
3178ced76cfa class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 18182
diff changeset
  1715
     and the start/stopIndices are adjusted as required"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1716
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1717
    |newContents
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  1718
     oldSize    "{ Class:SmallInteger }"
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1719
     newSize    "{ Class:SmallInteger }"
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  1720
     startIndex "{ Class:SmallInteger }"
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  1721
     sz         "{ Class:SmallInteger }"|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1722
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1723
    oldSize := contentsArray size.
506
984b32fe635a fixed makeRoomAtFront if underlying arrays size is <= 3
Claus Gittinger <cg@exept.de>
parents: 407
diff changeset
  1724
    sz := lastIndex - firstIndex + 1.
984b32fe635a fixed makeRoomAtFront if underlying arrays size is <= 3
Claus Gittinger <cg@exept.de>
parents: 407
diff changeset
  1725
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1726
    ((oldSize == 0) or:[sz == 0]) ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1727
	contentsArray := Array basicNew:MinContentsArraySize.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1728
	firstIndex := 2. lastIndex := 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1729
	^ self
93
e31220cb391f *** empty log message ***
claus
parents: 88
diff changeset
  1730
    ].
e31220cb391f *** empty log message ***
claus
parents: 88
diff changeset
  1731
329
claus
parents: 293
diff changeset
  1732
    "
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1733
     if there is lots of room at the end (> 50%),
329
claus
parents: 293
diff changeset
  1734
     shift instead of growing. This helps collections
claus
parents: 293
diff changeset
  1735
     which get elements removed at the end and added at front.
claus
parents: 293
diff changeset
  1736
    "
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  1737
    oldSize > (sz * 2) ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1738
	startIndex := oldSize // 4.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1739
	startIndex > 1 ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1740
	    contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1741
		replaceFrom:startIndex to:(startIndex + sz - 1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1742
		with:contentsArray startingAt:1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1743
	    contentsArray from:1 to:(startIndex - 1) put:nil.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1744
	    firstIndex := startIndex.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1745
	    lastIndex := startIndex + sz - 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1746
	    ^ self
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1747
	]
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  1748
    ].
2
claus
parents: 1
diff changeset
  1749
    newSize := oldSize * 2.
253
30daee717a53 *** empty log message ***
claus
parents: 229
diff changeset
  1750
    newContents := Array basicNew:newSize.
77
6c38ca59927f *** empty log message ***
claus
parents: 68
diff changeset
  1751
    newContents
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1752
	replaceFrom:(oldSize + 1) to:newSize
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1753
	with:contentsArray startingAt:1.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1754
    contentsArray := newContents.
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1755
    firstIndex := firstIndex + oldSize.
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1756
    lastIndex := lastIndex + oldSize
506
984b32fe635a fixed makeRoomAtFront if underlying arrays size is <= 3
Claus Gittinger <cg@exept.de>
parents: 407
diff changeset
  1757
11275
2883195d540e makeRoomAtIndex: there is no need to do an early reallocation
Claus Gittinger <cg@exept.de>
parents: 11271
diff changeset
  1758
    "Created: / 08-11-1995 / 12:47:49 / cg"
2883195d540e makeRoomAtIndex: there is no need to do an early reallocation
Claus Gittinger <cg@exept.de>
parents: 11271
diff changeset
  1759
    "Modified: / 22-10-2008 / 17:10:13 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1760
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1761
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1762
makeRoomAtIndex:whereToMakeEmptySlot
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1763
    "grow the contents for inserting at whereToMakeEmptySlot.
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1764
     The whereToMakeEmptySlot argument must be a physical index within the contentsArray.
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1765
     If there is (plenty of) room at either end, elements are shifted inplace to create
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1766
     an empty slot; otherwise, a new contentsArray is allocated.
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1767
     Since this changes the logical size, the modified index is returned.
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1768
     i.e.
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1769
     #(1 2 3 4 5 6) asOrderedCollection makeRoomAtIndex:3 -> #(1 2 nil 3 4 5 6)
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1770
     #(1 2 3 4 5 6) asOrderedCollection makeRoomAtIndex:1 -> #(nil 1 2 3 4 5 6)
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1771
     #(1 2 3 4 5 6) asOrderedCollection makeRoomAtIndex:7 -> #(1 2 3 4 5 6 nil)"
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1772
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1773
    |newContents
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1774
     newSize         "{ Class:SmallInteger }"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1775
     oldSize         "{ Class:SmallInteger }"
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1776
     first           "{ Class:SmallInteger }"
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1777
     last            "{ Class:SmallInteger }"
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1778
     index           "{ Class:SmallInteger }"
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1779
     shiftLeft shiftRight|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1780
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1781
    oldSize := contentsArray size.
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1782
    index := whereToMakeEmptySlot.
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1783
    first := firstIndex.
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1784
    last := lastIndex.
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1785
19791
610d2bf9af00 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 19098
diff changeset
  1786
    (first > 1) ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1787
	"there is room at the beginning"
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1788
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1789
	shiftLeft := true.
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  1790
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1791
	index == first ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1792
	    "/ so, we'd have to copy all elements before that index
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1793
	    "/ one slot towards the containers beginning ...
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1794
	    "/ if there is also space at the end, AND the number of
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1795
	    "/ elements after the index is smaller than the number before,
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1796
	    "/ copy the remaining elements. To copy the least possible number.
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1797
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1798
	    (last - index) < (index - first) ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1799
		last < oldSize ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1800
		    shiftLeft := false.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1801
		    shiftRight := true.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1802
		]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1803
	    ]
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1804
	]
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1805
    ] ifFalse:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1806
	last < oldSize ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1807
	    shiftRight := true
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1808
	]
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  1809
    ].
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1810
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1811
    shiftLeft == true ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1812
	"there is room at the beginning"
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  1813
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1814
	index == first ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1815
	    contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1816
		replaceFrom:(first - 1) to:(index - 2)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1817
		with:contentsArray startingAt:first.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1818
	    contentsArray at:index-1 put:nil.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1819
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1820
	firstIndex := first - 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1821
	^ index - 1
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1822
    ].
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1823
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1824
    shiftRight == true ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1825
	"there is room at the end"
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1826
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1827
	last := last + 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1828
	index == last ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1829
	    contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1830
		replaceFrom:(index + 1) to:last
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1831
		with:contentsArray startingAt:index.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1832
	    contentsArray at:index put:nil
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1833
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1834
	lastIndex := last.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1835
	^ index
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  1836
    ].
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  1837
19791
610d2bf9af00 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 19098
diff changeset
  1838
    "/ no space at either end
610d2bf9af00 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 19098
diff changeset
  1839
    oldSize < MinContentsArraySize ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1840
	newSize := MinContentsArraySize
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
  1841
    ] ifFalse:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1842
	newSize := oldSize * 2.
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
  1843
    ].
253
30daee717a53 *** empty log message ***
claus
parents: 229
diff changeset
  1844
    newContents := Array basicNew:newSize.
11271
5b75b4a7fb35 tuned makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 11269
diff changeset
  1845
    index == first ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1846
	"/ if there is a lot at the end (> 50), make all new space at the beginning.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1847
	"/ otherwise make 3/4 of the new space to the beginning, 1/4 to the end
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1848
	oldSize ~~ 0 ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1849
	    (last < (oldSize - 50)) ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1850
		lastIndex := newSize - (oldSize-last).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1851
		firstIndex := lastIndex - (last - first).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1852
	    ] ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1853
		firstIndex := oldSize * 3 // 4.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1854
		firstIndex < 2 ifTrue:[firstIndex := 2]. "/ pathological case (was explicitly allocated with size<MinSize
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1855
		lastIndex := firstIndex + (last - first).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1856
	    ].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1857
	    newContents
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1858
		replaceFrom:firstIndex to:lastIndex
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1859
		with:contentsArray startingAt:first.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1860
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1861
	contentsArray := newContents.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1862
	firstIndex := firstIndex - 1.
11271
5b75b4a7fb35 tuned makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 11269
diff changeset
  1863
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1864
	^ firstIndex.
11271
5b75b4a7fb35 tuned makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 11269
diff changeset
  1865
    ] ifFalse:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1866
	oldSize ~~ 0 ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1867
	    newContents
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1868
		replaceFrom:1 to:(index - first)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1869
		with:contentsArray startingAt:first.
11271
5b75b4a7fb35 tuned makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 11269
diff changeset
  1870
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1871
	    index <= last ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1872
		newContents
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1873
		    replaceFrom:(index - first + 2) to:(last - first + 2)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1874
		    with:contentsArray startingAt:index.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1875
	    ].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1876
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1877
	contentsArray := newContents.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1878
	firstIndex := 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1879
	lastIndex := last - first + 2.
11271
5b75b4a7fb35 tuned makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 11269
diff changeset
  1880
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1881
	"/ return the modified index
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1882
	^ index - (first - firstIndex).
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1883
    ].
1161
aad722dea51a return values compatible to ST-80; added comments; fixed & tuned #makeRoomAtIndex:
Claus Gittinger <cg@exept.de>
parents: 1157
diff changeset
  1884
11275
2883195d540e makeRoomAtIndex: there is no need to do an early reallocation
Claus Gittinger <cg@exept.de>
parents: 11271
diff changeset
  1885
    "Modified: / 22-10-2008 / 17:11:06 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1886
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1887
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1888
makeRoomAtIndex:whereToMakeEmptySlots for:howMany
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1889
    "grow the contents for inserting at whereToMakeEmptySlot.
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1890
     The whereToMakeEmptySlot argument must be a physical index within the contentsArray.
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1891
     If there is (plenty of) room at either end, elements are shifted inplace to create
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1892
     an empty slot; otherwise, a new contentsArray is allocated.
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1893
     Since this changes the logical size, the modified index is returned.
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1894
     i.e.
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1895
     #(1 2 3 4 5 6) asOrderedCollection makeRoomAtIndex:3 for:2 -> #(1 2 nil nil 3 4 5 6)
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1896
     #(1 2 3 4 5 6) asOrderedCollection makeRoomAtIndex:1 for:2 -> #(nil nil 1 2 3 4 5 6)
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1897
     #(1 2 3 4 5 6) asOrderedCollection makeRoomAtIndex:7 for:2 -> #(1 2 3 4 5 6 nil nil)"
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1898
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1899
    |newContents
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1900
     newSize         "{ Class:SmallInteger }"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1901
     oldSize         "{ Class:SmallInteger }"
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1902
     oneFourthOfSize "{ Class:SmallInteger }"
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1903
     first           "{ Class:SmallInteger }"
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1904
     last            "{ Class:SmallInteger }"
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1905
     index           "{ Class:SmallInteger }"
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1906
     shiftLeft shiftRight|
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1907
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1908
    oldSize := contentsArray size.
19792
4625cef49989 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 19791
diff changeset
  1909
    oneFourthOfSize := (oldSize // 4).
4625cef49989 #OTHER by cg
Claus Gittinger <cg@exept.de>
parents: 19791
diff changeset
  1910
    oneFourthOfSize == 0 ifTrue:[oneFourthOfSize := 1].
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1911
    index := whereToMakeEmptySlots.
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1912
    first := firstIndex.
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1913
    last := lastIndex.
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1914
2549
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
  1915
    shiftLeft := shiftRight := false.
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1916
    ((first > howMany) and:[first > oneFourthOfSize]) ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1917
	"there is room (>25%) at the beginning"
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1918
	shiftLeft := true.
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1919
    ] ifFalse:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1920
	((last + howMany) <= oldSize
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1921
	and:[last < (oneFourthOfSize * 3)]) ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1922
	    shiftRight := true
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1923
	]
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1924
    ].
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1925
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1926
    shiftLeft == true ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1927
	"there is room at the beginning"
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1928
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1929
	index == first ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1930
	    contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1931
		replaceFrom:(first - howMany)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1932
		to:(index - howMany - 1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1933
		with:contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1934
		startingAt:first.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1935
	    contentsArray from:index-howMany to:index-1 put:nil.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1936
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1937
	firstIndex := first - howMany.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1938
	^ index - howMany
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1939
    ].
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1940
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1941
    shiftRight == true ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1942
	"there is room at the end"
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1943
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1944
	last := last + howMany.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1945
	index == last ifFalse:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1946
	    contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1947
		replaceFrom:(index + howMany)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1948
		to:last
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1949
		with:contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1950
		startingAt:index.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1951
	    contentsArray from:index to:index+howMany-1 put:nil
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1952
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1953
	lastIndex := last.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1954
	^ index
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1955
    ].
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1956
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1957
    newSize := (oldSize+howMany) nextPowerOf2.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1958
    "/ newSize := (oldSize * 2).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1959
    "/ [newSize < (oldSize+howMany)] whileTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1960
    "/    newSize := (newSize * 2) max:howMany
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1961
    "/ ].
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1962
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1963
    newContents := Array basicNew:newSize.
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
  1964
    oldSize ~~ 0 ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1965
	index > first ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1966
	    newContents
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1967
		replaceFrom:1
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1968
		to:(index - first)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1969
		with:contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1970
		startingAt:first.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1971
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1972
	index <= last ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1973
	    newContents
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1974
		replaceFrom:(index - first + howMany + 1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1975
		to:(last - first + howMany + 1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1976
		with:contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1977
		startingAt:(index).
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1978
	].
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1979
    ].
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1980
    contentsArray := newContents.
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1981
    firstIndex := 1.
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1982
    lastIndex := last - first + howMany + 1.
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1983
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1984
    "/ return the modified index
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1985
    ^ index - (first - firstIndex).
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1986
2549
9ca8a3fcdaa7 fixed #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2364
diff changeset
  1987
    "Modified: 15.4.1997 / 12:34:16 / cg"
2222
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1988
!
e6fa084818ec added #addAll:beforeIndex:
Claus Gittinger <cg@exept.de>
parents: 2166
diff changeset
  1989
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1990
makeRoomAtLast
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1991
    "grow/shift the contents for more room at the end.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1992
     Does not change the logical size.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1993
     i.e.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1994
     #(1 2 3 4 5 6) -> #(1 2 3 4 5 6 nil)"
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1995
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1996
    |newContents
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1997
     oldSize    "{ Class:SmallInteger }"
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  1998
     newSize    "{ Class:SmallInteger }"
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1999
     startIndex "{ Class:SmallInteger }"
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2000
     sz         "{ Class:SmallInteger }"|
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2001
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2002
    oldSize := contentsArray size.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2003
    sz := lastIndex - firstIndex + 1.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2004
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2005
    "
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2006
     if there is lots of room at the beginning (> 50%),
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2007
     shift instead of growing. This helps collections which get
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2008
     elements removed at front and added at the end.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2009
    "
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2010
    oldSize > (sz * 2) ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2011
	startIndex := firstIndex // 4.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2012
	startIndex == 0 ifTrue:[
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2013
	    startIndex := 1
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2014
	].
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2015
	contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2016
	    replaceFrom:startIndex to:startIndex + sz - 1
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2017
	    with:contentsArray startingAt:firstIndex.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2018
	contentsArray from:startIndex + sz to:lastIndex put:nil.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2019
	firstIndex := startIndex.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2020
	lastIndex := startIndex + sz - 1.
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2021
	^ self
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2022
    ].
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
  2023
    oldSize == 0 ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2024
	newSize := MinContentsArraySize
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
  2025
    ] ifFalse:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2026
	newSize := oldSize * 2.
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
  2027
    ].
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2028
    newContents := Array basicNew:newSize.
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
  2029
    oldSize ~~ 0 ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2030
	newContents
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2031
	    replaceFrom:1 to:oldSize
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2032
	    with:contentsArray startingAt:1.
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
  2033
    ].
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2034
    contentsArray := newContents
11269
f45a4a2cd7ab *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 10839
diff changeset
  2035
f45a4a2cd7ab *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 10839
diff changeset
  2036
    "Modified: / 22-10-2008 / 11:50:28 / cg"
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2037
!
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2038
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2039
setFirstIndex:newFirstIndex lastIndex:newLastIndex
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2040
    "set first and last index"
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2041
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2042
    firstIndex := newFirstIndex.
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2043
    lastIndex := newLastIndex.
6088
db3fc1ec9c1a added #setIndices for VW compatibility
Claus Gittinger <cg@exept.de>
parents: 5874
diff changeset
  2044
!
db3fc1ec9c1a added #setIndices for VW compatibility
Claus Gittinger <cg@exept.de>
parents: 5874
diff changeset
  2045
db3fc1ec9c1a added #setIndices for VW compatibility
Claus Gittinger <cg@exept.de>
parents: 5874
diff changeset
  2046
setIndices
db3fc1ec9c1a added #setIndices for VW compatibility
Claus Gittinger <cg@exept.de>
parents: 5874
diff changeset
  2047
    "added for VW compatibility: set the indices for an empty collection"
db3fc1ec9c1a added #setIndices for VW compatibility
Claus Gittinger <cg@exept.de>
parents: 5874
diff changeset
  2048
db3fc1ec9c1a added #setIndices for VW compatibility
Claus Gittinger <cg@exept.de>
parents: 5874
diff changeset
  2049
    firstIndex := 1.
db3fc1ec9c1a added #setIndices for VW compatibility
Claus Gittinger <cg@exept.de>
parents: 5874
diff changeset
  2050
    lastIndex := 0.
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2051
! !
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2052
7260
edfa8d6a6046 method category rename
Claus Gittinger <cg@exept.de>
parents: 7166
diff changeset
  2053
!OrderedCollection methodsFor:'private-accessing'!
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2054
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2055
contentsArray
4153
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  2056
    "return the orderedCollections underlying contentsArray.
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  2057
     The actual elements are found here starting at firstIndex,
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  2058
     and ending at lastIndex."
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  2059
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2060
    ^ contentsArray
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2061
!
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2062
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2063
firstIndex
4153
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  2064
    "return the index of my first element in my underlying contentsArray.
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  2065
     The actual elements are found starting this index,
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  2066
     and ending at lastIndex."
3481f2a3429c much better #asArray
Claus Gittinger <cg@exept.de>
parents: 4064
diff changeset
  2067
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2068
    ^ firstIndex
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2069
! !
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2070
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2071
!OrderedCollection methodsFor:'queries'!
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2072
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2073
capacity
20354
a671aac9c70d #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20341
diff changeset
  2074
    "return the number of elements, that the receiver is prepared to take
a671aac9c70d #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20341
diff changeset
  2075
     without growing. 
a671aac9c70d #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20341
diff changeset
  2076
     Notice, that OCs do automatically resize as required, 
21658
692b6497a669 #DOCUMENTATION by stefan
Stefan Vogel <sv@exept.de>
parents: 21524
diff changeset
  2077
     so knowing the capacity is of no real use."
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2078
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2079
    ^ contentsArray size
21658
692b6497a669 #DOCUMENTATION by stefan
Stefan Vogel <sv@exept.de>
parents: 21524
diff changeset
  2080
692b6497a669 #DOCUMENTATION by stefan
Stefan Vogel <sv@exept.de>
parents: 21524
diff changeset
  2081
    "Modified (comment): / 17-03-2017 / 11:49:58 / stefan"
606
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2082
!
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2083
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2084
size
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2085
    "return the number of elements in the collection"
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2086
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2087
    ^ lastIndex - firstIndex + 1
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2088
! !
7a9ab63a6757 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  2089
3095
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2090
!OrderedCollection methodsFor:'searching'!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2091
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2092
identityIndexOf:anObject
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  2093
    "return the index of anObject or 0 if not found. Compare using =="
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2094
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2095
    |index|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2096
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2097
    index := contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2098
		identityIndexOf:anObject
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2099
		startingAt:firstIndex
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2100
		endingAt:lastIndex.
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2101
    index == 0 ifTrue:[^ 0].
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2102
    ^ index - firstIndex + 1
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2103
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2104
    "Modified: 12.4.1996 / 17:58:25 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2105
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2106
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2107
identityIndexOf:anObject startingAt:startIndex
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  2108
    "return the index of anObject, starting search at startIndex.
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  2109
     Compare using ==; return 0 if not found in the collection"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2110
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2111
    |index|
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2112
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2113
    index := contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2114
		identityIndexOf:anObject
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2115
		startingAt:(startIndex + firstIndex - 1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2116
		endingAt:lastIndex.
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2117
    index == 0 ifTrue:[^ 0].
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2118
    ^ index - firstIndex + 1
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2119
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2120
    "Modified: 12.4.1996 / 17:58:19 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2121
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2122
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2123
indexOf:anObject
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  2124
    "return the index of anObject or 0 if not found in the collection.
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  2125
     Compare using ="
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2126
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2127
    |index|
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2128
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2129
    index := contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2130
		indexOf:anObject
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2131
		startingAt:firstIndex
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2132
		endingAt:lastIndex.
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2133
    index == 0 ifTrue:[^ 0].
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2134
    ^ index - firstIndex + 1
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2135
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2136
    "
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2137
     |c|
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2138
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2139
     c := OrderedCollection new:10000.
12035
b927a2b293f8 changed:
Claus Gittinger <cg@exept.de>
parents: 11330
diff changeset
  2140
     c add:10; add:20; add:30.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2141
     c indexOf:99
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2142
    "
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2143
12035
b927a2b293f8 changed:
Claus Gittinger <cg@exept.de>
parents: 11330
diff changeset
  2144
    "
b927a2b293f8 changed:
Claus Gittinger <cg@exept.de>
parents: 11330
diff changeset
  2145
     |c|
b927a2b293f8 changed:
Claus Gittinger <cg@exept.de>
parents: 11330
diff changeset
  2146
b927a2b293f8 changed:
Claus Gittinger <cg@exept.de>
parents: 11330
diff changeset
  2147
     c := OrderedCollection new:10000.
b927a2b293f8 changed:
Claus Gittinger <cg@exept.de>
parents: 11330
diff changeset
  2148
     c add:10; add:20; add:30.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2149
     c indexOf:30
12035
b927a2b293f8 changed:
Claus Gittinger <cg@exept.de>
parents: 11330
diff changeset
  2150
    "
b927a2b293f8 changed:
Claus Gittinger <cg@exept.de>
parents: 11330
diff changeset
  2151
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2152
    "Modified: 12.4.1996 / 17:57:54 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2153
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2154
12036
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2155
indexOf:anObject ifAbsent:exceptionValue
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2156
    "return the index of anObject or 0 if not found in the collection.
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2157
     Compare using =
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2158
     If the receiver does not contain anElement,
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2159
     return the result of evaluating the argument, exceptionBlock."
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2160
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2161
    |index|
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2162
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2163
    index := contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2164
		indexOf:anObject
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2165
		startingAt:firstIndex
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2166
		endingAt:lastIndex.
12036
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2167
    index == 0 ifTrue:[^ exceptionValue value].
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2168
    ^ index - firstIndex + 1
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2169
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2170
    "
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2171
     |c|
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2172
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2173
     c := OrderedCollection new:10000.
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2174
     c add:10; add:20; add:30.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2175
     c indexOf:99 ifAbsent:'nope'
12036
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2176
    "
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2177
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2178
    "
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2179
     |c|
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2180
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2181
     c := OrderedCollection new:10000.
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2182
     c add:10; add:20; add:30.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2183
     c indexOf:30 ifAbsent:'nope'
12036
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2184
    "
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2185
!
4ce4157ce6a9 added: #indexOf:ifAbsent:
Claus Gittinger <cg@exept.de>
parents: 12035
diff changeset
  2186
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2187
indexOf:anObject startingAt:startIndex
33
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  2188
    "return the index of anObject, starting search at startIndex.
50cf0f6bc0ad *** empty log message ***
claus
parents: 13
diff changeset
  2189
     Compare using =; return 0 if not found in the collection"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2190
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2191
    |index|
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2192
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2193
    index := contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2194
		indexOf:anObject
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2195
		startingAt:(startIndex + firstIndex - 1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2196
		endingAt:lastIndex.
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2197
    index == 0 ifTrue:[^ 0].
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2198
    ^ index - firstIndex + 1
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2199
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2200
    "
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2201
     |c|
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2202
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2203
     c := OrderedCollection new:10000.
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2204
     c add:1; add:2; add:3.
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2205
     c indexOf:4 startingAt:5
1157
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2206
    "
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2207
c52d548036e2 faster search (limit to active range)
Claus Gittinger <cg@exept.de>
parents: 1106
diff changeset
  2208
    "Modified: 12.4.1996 / 17:58:53 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2209
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
  2210
3095
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2211
!OrderedCollection methodsFor:'testing'!
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2212
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2213
includes:anObject
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2214
    "return true if anObject is in the collection. Compare using ="
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2215
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2216
    ^ (contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2217
		indexOf:anObject
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2218
		startingAt:firstIndex
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2219
		endingAt:lastIndex) ~~ 0
3095
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2220
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2221
    "Modified: 12.4.1996 / 17:57:27 / cg"
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2222
!
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2223
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2224
includesIdentical:anObject
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2225
    "return true if anObject is in the collection. Compare using =="
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2226
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2227
    ^ (contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2228
		identityIndexOf:anObject
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2229
		startingAt:firstIndex
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2230
		endingAt:lastIndex) ~~ 0
3095
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2231
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2232
    "Modified: 12.4.1996 / 17:57:09 / cg"
5401
81ea19e6843c test for class
ps
parents: 4862
diff changeset
  2233
!
81ea19e6843c test for class
ps
parents: 4862
diff changeset
  2234
5556
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2235
isEmpty
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2236
    "return true, if the receiver has no elements"
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2237
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2238
    ^ lastIndex < firstIndex
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2239
!
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2240
17705
76b6ce4a59cd class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 17167
diff changeset
  2241
isEmptyOrNil
76b6ce4a59cd class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 17167
diff changeset
  2242
    "return true, if the receiver has no elements"
76b6ce4a59cd class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 17167
diff changeset
  2243
76b6ce4a59cd class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 17167
diff changeset
  2244
    ^ lastIndex < firstIndex
76b6ce4a59cd class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 17167
diff changeset
  2245
!
76b6ce4a59cd class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 17167
diff changeset
  2246
5556
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2247
isFixedSize
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2248
    "return true if the receiver cannot grow - this will vanish once
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2249
     Arrays and Strings learn how to grow ..."
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2250
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2251
    ^ false
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2252
!
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2253
5401
81ea19e6843c test for class
ps
parents: 4862
diff changeset
  2254
isOrderedCollection
81ea19e6843c test for class
ps
parents: 4862
diff changeset
  2255
    "return true, if the receiver is some kind of ordered collection (or list etc);
81ea19e6843c test for class
ps
parents: 4862
diff changeset
  2256
     true is returned here - the method is only redefined in Object."
81ea19e6843c test for class
ps
parents: 4862
diff changeset
  2257
81ea19e6843c test for class
ps
parents: 4862
diff changeset
  2258
    ^ true
81ea19e6843c test for class
ps
parents: 4862
diff changeset
  2259
81ea19e6843c test for class
ps
parents: 4862
diff changeset
  2260
5556
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2261
!
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2262
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2263
notEmpty
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2264
    "return true, if the receiver has any elements"
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2265
1056cc5d6ce0 category change
Claus Gittinger <cg@exept.de>
parents: 5508
diff changeset
  2266
    ^ lastIndex >= firstIndex
21524
d4c86d7c0bfc #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 20354
diff changeset
  2267
!
d4c86d7c0bfc #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 20354
diff changeset
  2268
d4c86d7c0bfc #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 20354
diff changeset
  2269
notEmptyOrNil
d4c86d7c0bfc #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 20354
diff changeset
  2270
    "return true, if the receiver has any elements"
d4c86d7c0bfc #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 20354
diff changeset
  2271
d4c86d7c0bfc #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 20354
diff changeset
  2272
    ^ lastIndex >= firstIndex
d4c86d7c0bfc #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 20354
diff changeset
  2273
d4c86d7c0bfc #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 20354
diff changeset
  2274
    "Created: / 22-02-2017 / 14:08:43 / stefan"
3095
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2275
! !
cdb753308f6e checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2549
diff changeset
  2276
15660
3143ca7c443a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15442
diff changeset
  2277
!OrderedCollection methodsFor:'tuning'!
3143ca7c443a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15442
diff changeset
  2278
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2279
quickSortFrom:inBegin to:inEnd
15660
3143ca7c443a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15442
diff changeset
  2280
    self class == OrderedCollection ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2281
	"/ because array-at/at:put: is much faster, this speeds up sorting by
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2282
	"/ up to 30%
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2283
	contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2284
	    quickSortFrom:(firstIndex + inBegin - 1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2285
	    to:(firstIndex + inEnd - 1)
15660
3143ca7c443a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15442
diff changeset
  2286
    ] ifFalse:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2287
	super quickSortFrom:inBegin to:inEnd
15660
3143ca7c443a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15442
diff changeset
  2288
    ].
3143ca7c443a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15442
diff changeset
  2289
!
3143ca7c443a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15442
diff changeset
  2290
3143ca7c443a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15442
diff changeset
  2291
quickSortFrom:inBegin to:inEnd sortBlock:sortBlock
3143ca7c443a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15442
diff changeset
  2292
    self class == OrderedCollection ifTrue:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2293
	"/ because array-at/at:put: is much faster, this speeds up sorting by
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2294
	"/ up to 30%
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2295
	contentsArray
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2296
	    quickSortFrom:(firstIndex + inBegin - 1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2297
	    to:(firstIndex + inEnd - 1)
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2298
	    sortBlock:sortBlock
15660
3143ca7c443a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15442
diff changeset
  2299
    ] ifFalse:[
20341
72ed68b0d0ec little code cleanup
Claus Gittinger <cg@exept.de>
parents: 20026
diff changeset
  2300
	super quickSortFrom:inBegin to:inEnd sortBlock:sortBlock
15660
3143ca7c443a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15442
diff changeset
  2301
    ]
3143ca7c443a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15442
diff changeset
  2302
! !
3143ca7c443a class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 15442
diff changeset
  2303
629
2ceefe9b5a19 version at the end
Claus Gittinger <cg@exept.de>
parents: 606
diff changeset
  2304
!OrderedCollection class methodsFor:'documentation'!
2ceefe9b5a19 version at the end
Claus Gittinger <cg@exept.de>
parents: 606
diff changeset
  2305
2ceefe9b5a19 version at the end
Claus Gittinger <cg@exept.de>
parents: 606
diff changeset
  2306
version
18811
54e839ea9d44 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18379
diff changeset
  2307
    ^ '$Header$'
16305
964f7ffb315d class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16304
diff changeset
  2308
!
964f7ffb315d class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16304
diff changeset
  2309
964f7ffb315d class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 16304
diff changeset
  2310
version_CVS
18811
54e839ea9d44 #BUGFIX
Claus Gittinger <cg@exept.de>
parents: 18379
diff changeset
  2311
    ^ '$Header$'
629
2ceefe9b5a19 version at the end
Claus Gittinger <cg@exept.de>
parents: 606
diff changeset
  2312
! !
14616
e763997b09d1 class: OrderedCollection
Claus Gittinger <cg@exept.de>
parents: 14071
diff changeset
  2313
18879
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
  2314
5d1bbfc1761d #FEATURE
Stefan Vogel <sv@exept.de>
parents: 18811
diff changeset
  2315
OrderedCollection initialize!