Merge jv
authorMerge Script
Thu, 08 Sep 2016 06:45:58 +0200
branchjv
changeset 20362 fea6b00ed63a
parent 20361 f48f50e335a6 (current diff)
parent 20356 0126bd94776d (diff)
child 20397 59b59d09f64e
Merge
ArithmeticValue.st
Collection.st
Object.st
OrderedCollection.st
Set.st
UndefinedObject.st
--- a/ArithmeticValue.st	Wed Sep 07 13:50:10 2016 +0100
+++ b/ArithmeticValue.st	Thu Sep 08 06:45:58 2016 +0200
@@ -336,7 +336,7 @@
 !
 
 modulusOf:aNumber
-    "return aNumber modulo the reciever.
+    "return aNumber modulo the receiver.
      The remainder has the same sign as something.
      Defined for protocol compatibility with ModuloNumber."
 
--- a/Collection.st	Wed Sep 07 13:50:10 2016 +0100
+++ b/Collection.st	Thu Sep 08 06:45:58 2016 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1989 by Claus Gittinger
               All Rights Reserved
@@ -4335,7 +4333,7 @@
     aStream nextPut:$)
 
     "
-     #(1 2 3 'hello' $a $ü) printOn:Transcript
+     #(1 2 3 'hello' $a $ü) printOn:Transcript
      (Array new:100000) printOn:Transcript
      (Array new:100000) printOn:Stdout
      (Array new:100000) printString size
@@ -5634,10 +5632,10 @@
 !
 
 capacity
-    "return the number of elements, that the receiver is
-     prepared to take. For most collections, this is the actual
-     size. However, some have more space preallocated to allow
-     for faster adding of elements.
+    "return the number of elements, that the receiver is prepared to take. 
+     For most collections, this is the actual size. 
+     However, some have more space preallocated to allow
+     for faster adding of elements (i.e. there are logical vs. physical sizes).
      Not used by the system; added for ST-80 compatibility."
 
     ^ self size
@@ -5689,7 +5687,7 @@
 includesAll:aCollection
     "return true if the receiver includes all elements of
      the argument, aCollection; false if any is missing.
-     Notice: this method has O² runtime behavior and may be
+     Notice: this method has O² runtime behavior and may be
              slow for big receivers/args.
              Think about using a Set, or Dictionary."
 
@@ -5709,7 +5707,7 @@
      Return false if it includes none.
      Uses #= (value compare)
      Notice:
-        this method has O² runtime behavior for some subclasses and may be slow for big receivers/args.
+        this method has O² runtime behavior for some subclasses and may be slow for big receivers/args.
         Think about using a Set or Dictionary.
         Some speedup is also possible, by arranging highly
         probable elements towards the beginning of aCollection, to avoid useless searches.
@@ -5779,7 +5777,7 @@
      Return false if it includes none.
      Use identity compare for comparing.
      Notice:
-        this method has O² runtime behavior for some subclasses and may be slow for big receivers/args.
+        this method has O² runtime behavior for some subclasses and may be slow for big receivers/args.
         Think about using a Set or Dictionary.
         Some speedup is also possible, by arranging highly
         probable elements towards the beginning of aCollection, to avoid useless searches."
--- a/Object.st	Wed Sep 07 13:50:10 2016 +0100
+++ b/Object.st	Thu Sep 08 06:45:58 2016 +0200
@@ -4706,12 +4706,12 @@
 !
 
 shouldNeverBeSent
-    "report an error that this message may never be sent to the reciever"
+    "report an error that this message may never be sent to the receiver"
 
     <resource: #skipInDebuggersWalkBack>
 
     ^ MethodNotAppropriateError
-	raiseRequestErrorString:'This message never may be sent to me'.
+        raiseRequestErrorString:'This message never may be sent to me'.
 
     "Modified: / 20-04-2005 / 18:59:28 / janfrog"
     "Modified: / 02-11-2012 / 10:10:42 / cg"
@@ -9214,7 +9214,7 @@
 !
 
 ifNotNilDo:aBlock
-    "if the reciever is non-nil, return the value of aBlock, passing myself as argument.
+    "if the receiver is non-nil, return the value of aBlock, passing myself as argument.
      Otherwise do nothing and return nil."
 
     ^ aBlock value:self
--- a/OrderedCollection.st	Wed Sep 07 13:50:10 2016 +0100
+++ b/OrderedCollection.st	Thu Sep 08 06:45:58 2016 +0200
@@ -312,7 +312,6 @@
 ! !
 
 
-
 !OrderedCollection methodsFor:'accessing'!
 
 at:anInteger
@@ -2071,8 +2070,10 @@
 !OrderedCollection methodsFor:'queries'!
 
 capacity
-    "return the number of elements, that the receiver is
-     prepared to take.
+    "return the number of elements, that the receiver is prepared to take
+     without growing. 
+     Notice, that OCs do automatically resize as required, 
+     so knowing the capacity is of no real use.
      Not used by the system; added for ST-80 compatibility."
 
     ^ contentsArray size
--- a/Set.st	Wed Sep 07 13:50:10 2016 +0100
+++ b/Set.st	Thu Sep 08 06:45:58 2016 +0200
@@ -1311,8 +1311,9 @@
 !Set methodsFor:'testing'!
 
 capacity 
-    "return the number of elements, that the receiver is
-     prepared to take.
+    "return the number of elements, that the receiver is prepared to take w.o. resizing.
+     Notice, that Sets do automatically resize as required, 
+     so knowing the capacity is of no real use.
      Not used by the system; added for ST-80 compatibility."
 
     ^ keyArray size
--- a/UndefinedObject.st	Wed Sep 07 13:50:10 2016 +0100
+++ b/UndefinedObject.st	Thu Sep 08 06:45:58 2016 +0200
@@ -649,7 +649,7 @@
 !
 
 ifNotNilDo:aBlock
-    "if the reciever is non-nil, return the value of aBlock, passing myself as argument.
+    "if the receiver is non-nil, return the value of aBlock, passing myself as argument.
      Otherwise do nothing and return nil."
 
     ^ nil