Packages January 2010

packages@lists.squeakfoundation.org

2 participants
722 discussions

The Trunk: Network-espin.54.mcz
by commits＠source.squeak.org 28 Jan '10

28 Jan '10

Andreas Raab uploaded a new version of Network to project The Trunk: http://source.squeak.org/trunk/Network-espin.54.mcz ==================== Summary ==================== Name: Network-espin.54 Author: espin Time: 25 January 2010, 2:26:17.098 pm UUID: 6acf58a1-4a00-0240-be97-3a3c9913b2c0 Ancestors: Network-nice.52 Added HTTPProxyCredentials to the HTTP GET message. This makes HTTPSocket work from behind a proxy. See also http://bugs.squeak.org/view.php?id=7193 http://bugs.squeak.org/view.php?id=912 =============== Diff against Network-nice.52 =============== Item was changed: ----- Method: HTTPSocket class>>httpGetDocument:args:accept:request: (in category 'get the page') ----- httpGetDocument: url args: args accept: mimeType request: requestString "Return the exact contents of a web object. Asks for the given MIME type. If mimeType is nil, use 'text/html'. An extra requestString may be submitted and must end with crlf. The parsed header is saved. Use a proxy server if one has been registered. tk 7/23/97 17:12" "Note: To fetch raw data, you can use the MIME type 'application/octet-stream'." | serverName serverAddr port bare page index connectToHost connectToPort aStream portSuffix | Socket initializeNetwork. bare := (url asLowercase beginsWith: 'http://') ifTrue: [url copyFrom: 8 to: url size] ifFalse: [url]. bare := bare copyUpTo: $#. "remove fragment, if specified" serverName := bare copyUpTo: $/. page := bare copyFrom: serverName size + 1 to: bare size. (serverName includes: $:) ifTrue: [ index := serverName indexOf: $:. port := (serverName copyFrom: index+1 to: serverName size) asNumber. portSuffix := ':', port printString. serverName := serverName copyFrom: 1 to: index-1. ] ifFalse: [ port := self defaultPort. portSuffix := ''. ]. page size = 0 ifTrue: [page := '/']. "add arguments" args ifNotNil: [page := page, (self argString: args) ]. (self shouldUseProxy: serverName) ifFalse: [ connectToHost := serverName. connectToPort := port ] ifTrue: [ page := 'http://', serverName, portSuffix, page. "put back together" connectToHost := self httpProxyServer. connectToPort := self httpProxyPort]. HTTPProgress signal: 'Looking up ', connectToHost. serverAddr := NetNameResolver addressForName: connectToHost timeout: 20. serverAddr ifNil: [^ 'Could not resolve the server named: ', connectToHost]. 3 timesRepeat: [ | sock length firstData list type header newUrl | sock := HTTPSocket new. sock connectTo: serverAddr port: connectToPort. (sock waitForConnectionUntil: (self deadlineSecs: 30)) ifFalse: [ Socket deadServer: connectToHost. sock destroy. ^ 'Server ',connectToHost,' is not responding']. "Transcript cr;show: url; cr. Transcript show: page; cr." sock sendCommand: 'GET ', page, ' HTTP/1.0', CrLf, (mimeType ifNotNil: ['ACCEPT: ', mimeType, CrLf] ifNil: ['']), 'ACCEPT: text/html', CrLf, "Always accept plain text" + HTTPProxyCredentials, HTTPBlabEmail, "may be empty" requestString, "extra user request. Authorization" self userAgentString, CrLf, 'Host: ', serverName, portSuffix, CrLf. "blank line automatically added" list := sock getResponseUpTo: CrLf, CrLf ignoring: (String with: CR). "list = header, CrLf, CrLf, beginningOfData" header := list at: 1. "Transcript show: page; cr; show: header; cr." firstData := list at: 3. header isEmpty ifTrue: [aStream := 'server aborted early'] ifFalse: [ "dig out some headers" sock header: header. length := sock getHeader: 'content-length'. length ifNotNil: [ length := length asNumber ]. type := sock getHeader: 'content-type'. sock responseCode first = $3 ifTrue: [ newUrl := sock getHeader: 'location'. newUrl ifNotNil: [ Transcript show: 'redirecting to ', newUrl; cr. sock destroy. newUrl := self expandUrl: newUrl ip: serverAddr port: connectToPort. ^self httpGetDocument: newUrl args: args accept: mimeType request: requestString] ]. aStream := sock getRestOfBuffer: firstData totalLength: length. "a 400-series error" sock responseCode first = $4 ifTrue: [^ header, aStream contents]. ]. sock destroy. "Always OK to destroy!!" aStream class ~~ String ifTrue: [ ^ MIMEDocument contentType: type content: aStream contents url: url]. aStream = 'server aborted early' ifTrue: [ ^aStream ]. ]. {'HTTPSocket class>>httpGetDocument:args:accept:request:'. aStream. url} inspect. ^'some other bad thing happened!!'!

1 0

The Trunk: Network-espin.54.mcz
by commits＠source.squeak.org 28 Jan '10

28 Jan '10

1 0

The Trunk: Kernel-tfel.383.mcz
by commits＠source.squeak.org 28 Jan '10

28 Jan '10

Andreas Raab uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-tfel.383.mcz ==================== Summary ==================== Name: Kernel-tfel.383 Author: tfel Time: 28 January 2010, 2:37:15.04 am UUID: 7b9f7929-2ba0-4997-bac3-23868341cb31 Ancestors: Kernel-ul.382 Seems that (according to ISO8601) reading a Time from a stream without explicit UTC offset should not assume the local timezone, but rather UTC. This fixes DateAndTimeTest>>#testReadFrom =============== Diff against Kernel-ul.382 =============== Item was changed: ----- Method: DateAndTime class>>readFrom: (in category 'squeak protocol') ----- readFrom: aStream | offset date time ch | date := Date readFrom: aStream. [aStream peek isDigit] whileFalse: [aStream next]. time := Time readFrom: aStream. aStream atEnd + ifTrue: [ offset := Duration zero ] - ifTrue: [ offset := self localOffset ] ifFalse: [ ch := aStream next. ch = $+ ifTrue: [ch := Character space]. offset := Duration fromString: ch asString, '0:', aStream upToEnd, ':0']. ^ self year: date year month: date monthIndex day: date dayOfMonth hour: time hour minute: time minute second: time second nanoSecond: time nanoSecond offset: offset " '-1199-01-05T20:33:14.321-05:00' asDateAndTime ' 2002-05-16T17:20:45.1+01:01' asDateAndTime ' 2002-05-16T17:20:45.02+01:01' asDateAndTime ' 2002-05-16T17:20:45.003+01:01' asDateAndTime ' 2002-05-16T17:20:45.0004+01:01' asDateAndTime ' 2002-05-16T17:20:45.00005' asDateAndTime ' 2002-05-16T17:20:45.000006+01:01' asDateAndTime ' 2002-05-16T17:20:45.0000007+01:01' asDateAndTime ' 2002-05-16T17:20:45.00000008-01:01' asDateAndTime ' 2002-05-16T17:20:45.000000009+01:01' asDateAndTime ' 2002-05-16T17:20:45.0000000001+01:01' asDateAndTime ' 2002-05-16T17:20' asDateAndTime ' 2002-05-16T17:20:45' asDateAndTime ' 2002-05-16T17:20:45+01:57' asDateAndTime ' 2002-05-16T17:20:45-02:34' asDateAndTime ' 2002-05-16T17:20:45+00:00' asDateAndTime ' 1997-04-26T01:02:03+01:02:3' asDateAndTime "!

1 0

The Trunk: Kernel-tfel.383.mcz
by commits＠source.squeak.org 28 Jan '10

28 Jan '10

1 0

The Trunk: Kernel-tfel.383.mcz
by commits＠source.squeak.org 28 Jan '10

28 Jan '10

1 0

The Trunk: Collections-ul.282.mcz
by commits＠source.squeak.org 25 Jan '10

25 Jan '10

Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.282.mcz ==================== Summary ==================== Name: Collections-ul.282 Author: ul Time: 25 January 2010, 10:56:13.924 pm UUID: 44962376-0c2e-ea4c-9fce-9fb056cd768b Ancestors: Collections-nice.281 In the HashedCollection hierarchy: - cosmetic changes: use #ifNotNil: if possible - use unary symbols instead of blocks with a single unary send - removed unnecessary line from #atRandom - restored correct compatibility method for #fullCheck In Dictionary: - make sure that #associationsSelect: works with PluggableDictionary by using #copyEmpty instead of #species + #new - deprecated #keyForIdentity:, because it's similar to #keyAtIdentityValue:ifAbsent: In WeakKeyDictionary: - #rehash throws away nil keys, so we don't have to iterate twice over array - don't let the key go away in #noCheckNoGrowFillFrom: In WeakKeyToCollectionDictionary: - don't let the key go away in #noCheckNoGrowFillFrom: - removed #finalizeValues because it became same as super In WeakSet: - #do:after: doesn't skip the first element if anElement is nil - speed up #slowSize - don't rehash twice in #grow, just count the occupied slots first with #slowSize Other: - simplified a few KeyedSet's methods - added #collect: to PluggableDictionary (super doesn't copy the blocks) =============== Diff against Collections-nice.281 =============== Item was changed: + ----- Method: IdentityDictionary>>keyAtValue:ifAbsent: (in category 'accessing') ----- - ----- Method: IdentityDictionary>>keyAtValue:ifAbsent: (in category 'private') ----- keyAtValue: value ifAbsent: exceptionBlock "Answer the key that is the external name for the argument, value. If there is none, answer the result of evaluating exceptionBlock." + ^super keyAtIdentityValue: value ifAbsent: exceptionBlock! - self associationsDo: - [:association | value == association value ifTrue: [^ association key]]. - ^ exceptionBlock value! Item was changed: ----- Method: Set>>noCheckNoGrowFillFrom: (in category 'private') ----- noCheckNoGrowFillFrom: anArray "Add the elements of anArray except nils to me assuming that I don't contain any of them, they are unique and I have more free space than they require." 1 to: anArray size do: [ :index | + (anArray at: index) ifNotNil: [ :object | - | object | - (object := anArray at: index) ifNotNil: [ array at: (self scanForEmptySlotFor: object) put: object ] ]! Item was changed: ----- Method: WeakSet>>noCheckNoGrowFillFrom: (in category 'private') ----- noCheckNoGrowFillFrom: anArray "Add the elements of anArray except nils and flag to me assuming that I don't contain any of them, they are unique and I have more free space than they require." tally := 0. 1 to: anArray size do: [ :index | + (anArray at: index) ifNotNil: [ :object | + object == flag ifFalse: [ - | object | - ((object := anArray at: index) == flag or: [ - object == nil ]) ifFalse: [ array at: (self scanForEmptySlotFor: object) put: object. + tally := tally + 1 ] ] ]! - tally := tally + 1 ] ]! Item was changed: ----- Method: WeakKeyDictionary>>finalizeValues: (in category 'finalization') ----- finalizeValues: finiObjects "Remove all associations with key == nil and value is in finiObjects. This method is folded with #rehash for efficiency." | oldArray | oldArray := array. array := Array new: oldArray size. tally := 0. + 1 to: array size do: [ :index | + (oldArray at: index) ifNotNil: [ :association | + association key ifNotNil: [ :key | "Don't let the key go away" + (finiObjects includes: association value) ifFalse: [ + array + at: (self scanForEmptySlotFor: key) + put: association. + tally := tally + 1 ] ] ] ]! - 1 to: array size do:[ :i | - | association | - (association := oldArray at: i) ifNotNil: [ - | key | - ((key := association key) == nil and: [ "Don't let the key go away" - finiObjects includes: association value ]) - ifFalse: [ - array - at: (self scanForEmptySlotFor: key) - put: association. - tally := tally + 1 ] ] ]! Item was changed: ----- Method: WeakSet>>grow (in category 'private') ----- grow "Grow the elements array if needed. Since WeakSets just nil their slots, a lot of the occupied (in the eyes of the set) slots are usually empty. Doubling size if unneeded can lead to BAD performance, therefore we see if reassigning the <live> elements to a Set of similiar size leads to a sufficiently (50% used here) empty set first" + tally // 2 < self slowSize + ifTrue: [ super grow ] + ifFalse: [ self rehash ] + ! - | oldTally | - oldTally := tally. - self rehash. - oldTally // 2 < tally ifTrue: [ super grow ]! Item was changed: ----- Method: WeakSet>>growTo: (in category 'private') ----- growTo: anInteger "Grow the elements array and reinsert the old elements" | oldElements | oldElements := array. + array := WeakArray new: anInteger withAll: flag. - array := WeakArray new: anInteger. - array atAllPut: flag. self noCheckNoGrowFillFrom: oldElements! Item was changed: ----- Method: HashedCollection>>atRandom: (in category 'accessing') ----- atRandom: aGenerator "Answer a random element of the receiver. Uses aGenerator which + should be kept by the user in a variable and used every time. Use + this instead of #atRandom for better uniformity of random numbers because - should be kept by the user in a variable and used every time. Use - this instead of #atRandom for better uniformity of random numbers because only you use the generator. Causes an error if self has no elements." + | rand | - self emptyCheck. rand := aGenerator nextInt: self size. + self doWithIndex: [ :each :index | + index = rand ifTrue: [ ^each ] ]! - self doWithIndex:[:each :ind | - ind = rand ifTrue:[^each]]. - ^ self errorEmptyCollection - ! Item was changed: ----- Method: KeyedSet>>member: (in category 'adding') ----- member: newObject "Include newObject as one of the receiver's elements, if already exists just return it" | index | newObject ifNil: [self error: 'Sets cannot meaningfully contain nil as an element']. index := self scanFor: (keyBlock value: newObject). + (array at: index) ifNotNil: [ :element | ^element ]. - (array at: index) ifNotNil: [^ array at: index]. self atNewIndex: index put: newObject. ^ newObject! Item was changed: + ----- Method: WeakSet>>add: (in category 'adding') ----- - ----- Method: WeakSet>>add: (in category 'public') ----- add: newObject "Include newObject as one of the receiver's elements, but only if not already present. Answer newObject" | index element | newObject ifNil: [self error: 'Sets cannot meaningfully contain nil as an element']. index := self scanFor: newObject. ((element := array at: index) == flag or: [ element == nil ]) ifTrue: [self atNewIndex: index put: newObject]. ^newObject! Item was changed: ----- Method: KeyedSet>>at:ifAbsent: (in category 'accessing') ----- at: key ifAbsent: aBlock "Answer the value associated with the key or, if key isn't found, answer the result of evaluating aBlock." + ^(array at: (self scanFor: key)) ifNil: [ aBlock value ]! - | obj | - obj := array at: (self scanFor: key). - obj ifNil: [^ aBlock value]. - ^ obj! Item was changed: + ----- Method: WeakSet>>includes: (in category 'testing') ----- - ----- Method: WeakSet>>includes: (in category 'public') ----- includes: anObject + ^(array at: (self scanFor: anObject)) + ifNil: [ false ] + ifNotNil: [ :object | object ~~ flag ]! - | element | - ^((element := array at: (self scanFor: anObject)) == flag or: [ element == nil ]) not! Item was changed: ----- Method: Dictionary>>noCheckNoGrowFillFrom: (in category 'private') ----- noCheckNoGrowFillFrom: anArray "Add the elements of anArray except nils to me assuming that I don't contain any of them, they are unique and I have more free space than they require." 1 to: anArray size do: [ :index | + (anArray at: index) ifNotNil: [ :association | - | object | - (object := anArray at: index) ifNotNil: [ array + at: (self scanForEmptySlotFor: association key) + put: association ] ]! - at: (self scanForEmptySlotFor: object key) - put: object ] ]! Item was changed: ----- Method: KeyedSet>>initialize: (in category 'private') ----- initialize: n + super initialize: n. + keyBlock := #key - keyBlock := [:element | element key]. ! Item was changed: ----- Method: WeakKeyDictionary>>keysDo: (in category 'accessing') ----- keysDo: aBlock "Evaluate aBlock for each of the receiver's keys." self associationsDo: [ :association | + (association key) ifNotNil: [ :key | "Don't let the key go away" - | key | - (key := association key) ifNotNil: [ "Don't let the key go away" aBlock value: key ] ].! Item was changed: ----- Method: Dictionary>>add: (in category 'adding') ----- add: anAssociation + | index | - | index element | index := self scanFor: anAssociation key. + (array at: index) - (element := array at: index) ifNil: [ self atNewIndex: index put: anAssociation ] + ifNotNil: [ :element | element value: anAssociation value ]. - ifNotNil: [ element value: anAssociation value ]. ^anAssociation! Item was changed: ----- Method: WeakSet>>do:after: (in category 'public') ----- do: aBlock after: anElement - | each startIndex | + | startIndex | + tally = 0 ifTrue: [ ^self ]. + startIndex := anElement + ifNil: [ 0 ] + ifNotNil: [ self scanFor: anElement ]. + startIndex + 1 to: array size do: [ :index | + (array at: index) ifNotNil: [ :object | + object == flag ifFalse: [ + aBlock value: object ] ] ]! - tally = 0 ifTrue: [^self]. - startIndex := anElement ifNil: [1] ifNotNil: - [self scanFor: anElement]. - startIndex + 1 to: array size do: - [:index | - ((each := array at: index) == nil or: [each == flag]) - ifFalse: [aBlock value: each] - ]! Item was changed: + ----- Method: WeakSet>>remove:ifAbsent: (in category 'removing') ----- - ----- Method: WeakSet>>remove:ifAbsent: (in category 'public') ----- remove: oldObject ifAbsent: aBlock | index | index := self scanFor: oldObject. (array at: index) == flag ifTrue: [ ^ aBlock value ]. array at: index put: flag. tally := tally - 1. self fixCollisionsFrom: index. ^oldObject! Item was changed: ----- Method: WeakKeyDictionary>>finalizeValues (in category 'finalization') ----- finalizeValues "remove all nil keys and rehash the receiver afterwards" - | assoc | - 1 to: array size do: [ :index | - (assoc := array at: index) ifNotNil: [ - assoc key ifNil: [ array at: index put: nil ] ] ]. self rehash! Item was changed: ----- Method: HashedCollection class>>goodPrimeAtLeast: (in category 'sizing') ----- goodPrimeAtLeast: lowerLimit "Answer the next good prime >= lowerlimit. If lowerLimit is larger than the largest known good prime, just make it odd." | primes low mid high prime | primes := self goodPrimes. low := 1. high := primes size. lowerLimit > (primes at: high) ifTrue: [ + ^lowerLimit bitOr: 1 ]. - ^lowerLimit even - ifTrue: [ lowerLimit + 1 ] - ifFalse: [ lowerLimit ] ]. [ high - low <= 1 ] whileFalse: [ mid := high + low // 2. prime := primes at: mid. prime = lowerLimit ifTrue: [ ^prime ]. prime < lowerLimit ifTrue: [ low := mid ] ifFalse: [ high := mid ] ]. (primes at: low) >= lowerLimit ifTrue: [ ^primes at: low ]. ^primes at: high! Item was changed: ----- Method: Dictionary>>at:put: (in category 'accessing') ----- at: key put: anObject "Set the value at key to be anObject. If key is not found, create a new entry for key and set is value to anObject. Answer anObject." + | index | - | index assoc | index := self scanFor: key. + (array at: index) + ifNil: [ self atNewIndex: index put: (Association key: key value: anObject) ] + ifNotNil: [ :association | association value: anObject ]. + ^anObject! - assoc := array at: index. - assoc - ifNil: [self atNewIndex: index put: (Association key: key value: anObject)] - ifNotNil: [assoc value: anObject]. - ^ anObject! Item was changed: ----- Method: KeyedSet>>keysSorted (in category 'accessing') ----- keysSorted + ^self keys sort! - | keys | - keys := SortedCollection new. - self do: [:item | keys add: (keyBlock value: item)]. - ^ keys! Item was changed: ----- Method: WeakSet>>slowSize (in category 'public') ----- slowSize "Careful!! Answer the maximum amount of elements in the receiver, not the exact amount" + | count | + count := 0. + 1 to: array size do: [ :index | + (array at: index) ifNotNil: [ :object | + object == flag ifFalse: [ + count := count + 1 ] ] ]. + ^tally := count! - tally := array inject: 0 into: - [:total :each | (each == nil or: [each == flag]) - ifTrue: [total] ifFalse: [total + 1]]. - ^tally! Item was changed: ----- Method: WeakKeyDictionary>>noCheckNoGrowFillFrom: (in category 'private') ----- noCheckNoGrowFillFrom: anArray "Add the elements of anArray except nils and flag to me assuming that I don't contain any of them, they are unique and I have more free space than they require." tally := 0. + 1 to: anArray size do:[ :index | + (anArray at: index) ifNotNil: [ :association | + association key ifNotNil: [ :key | "Don't let the key go away" + array + at: (self scanForEmptySlotFor: key) + put: association. + tally := tally + 1 ] ] ]! - 1 to: anArray size do:[ :i | - | association | - (association := anArray at: i) ifNotNil: [ - array - at: (self scanForEmptySlotFor: association key) - put: association. - tally := tally + 1 ] ]! Item was changed: ----- Method: WeakKeyToCollectionDictionary>>noCheckNoGrowFillFrom: (in category 'as yet unclassified') ----- noCheckNoGrowFillFrom: anArray "Add the elements of anArray except nils and associations with empty collections (or with only nils) to me assuming that I don't contain any of them, they are unique and I have more free space than they require." tally := 0. + 1 to: anArray size do: [ :index | + (anArray at: index) ifNotNil: [ :association | + association key ifNotNil: [ :key | "Don't let the key go away" + | cleanedValue | + (cleanedValue := association value copyWithout: nil) isEmpty + ifFalse: [ + association value: cleanedValue. + array + at: (self scanForEmptySlotFor: key) + put: association. + tally := tally + 1 ] ] ] ]! - 1 to: anArray size do:[ :i | - | association cleanedValue | - ((association := anArray at: i) == nil or: [ - (cleanedValue := association value copyWithout: nil) isEmpty ]) - ifFalse: [ - association value: cleanedValue. - array - at: (self scanForEmptySlotFor: association key) - put: association. - tally := tally + 1 ] ]! Item was changed: ----- Method: HashedCollection class>>rehashAll (in category 'initialization') ----- rehashAll "HashedCollection rehashAll" + self allSubclassesDo: #rehashAllInstances! - self allSubclassesDo: [ :each | each rehashAllInstances ]! Item was changed: ----- Method: HashedCollection>>fullCheck (in category 'compatibility') ----- fullCheck "This is a private method, formerly implemented in Set, that is no longer required. It is here for compatibility with external packages only." + "Keep array at least 1/4 free for decent hash behavior" + + array size * 3 < (tally * 4) ifTrue: [ self grow ]! - ^ self - ! Item was changed: ----- Method: KeyedSet>>noCheckNoGrowFillFrom: (in category 'private') ----- noCheckNoGrowFillFrom: anArray "Add the elements of anArray except nils to me assuming that I don't contain any of them, they are unique and I have more free space than they require." 1 to: anArray size do: [ :index | + (anArray at: index) ifNotNil: [ :object | - | object | - (object := anArray at: index) ifNotNil: [ array at: (self scanForEmptySlotFor: (keyBlock value: object)) put: object ] ]! Item was changed: ----- Method: Dictionary>>associationsSelect: (in category 'enumerating') ----- associationsSelect: aBlock "Evaluate aBlock with each of my associations as the argument. Collect into a new dictionary, only those associations for which aBlock evaluates to true." | newCollection | + newCollection := self copyEmpty. + self associationsDo: [ :each | + (aBlock value: each) ifTrue: [ newCollection add: each ] ]. - newCollection := self species new. - self associationsDo: - [:each | - (aBlock value: each) ifTrue: [newCollection add: each]]. ^newCollection! Item was changed: ----- Method: Dictionary>>associationsDo: (in category 'enumerating') ----- associationsDo: aBlock "Evaluate aBlock for each of the receiver's elements (key/value associations)." tally = 0 ifTrue: [ ^self]. 1 to: array size do: [ :index | + (array at: index) ifNotNil: [ :element | + aBlock value: element ] ]! - | each | - (each := array at: index) - ifNotNil: [ aBlock value: each ] ]! Item was changed: ----- Method: Set>>do: (in category 'enumerating') ----- do: aBlock tally = 0 ifTrue: [ ^self ]. 1 to: array size do: [ :index | + (array at: index) ifNotNil: [ :element | + aBlock value: element ] ]! - | each | - (each := array at: index) - ifNotNil: [ aBlock value: each ] ]! Item was changed: + ----- Method: Dictionary>>keyForIdentity: (in category 'accessing') ----- - ----- Method: Dictionary>>keyForIdentity: (in category 'testing') ----- keyForIdentity: anObject "If anObject is one of the values of the receive, return its key, else return nil. Contrast #keyAtValue: in which there is only an equality check, here there is an identity check" + self deprecated: 'Use #keyAtIdentityValue:ifAbsent:'. + ^self keyAtIdentityValue: anObject ifAbsent: nil! - self associationsDo: [:assoc | assoc value == anObject ifTrue: [^ assoc key]]. - ^ nil! Item was changed: + ----- Method: WeakSet>>do: (in category 'enumerating') ----- - ----- Method: WeakSet>>do: (in category 'public') ----- do: aBlock tally = 0 ifTrue: [ ^self ]. 1 to: array size do: [ :index | + (array at: index) ifNotNil: [ :object | + object == flag ifFalse: [ + aBlock value: object ] ] ]! - | each | - ((each := array at: index) == nil or: [ each == flag ]) - ifFalse: [ aBlock value: each ] ]! Item was changed: + ----- Method: WeakSet>>like: (in category 'accessing') ----- - ----- Method: WeakSet>>like: (in category 'public') ----- like: anObject "Answer an object in the receiver that is equal to anObject, nil if no such object is found. Relies heavily on hash properties" | element | ^(element := array at: (self scanFor: anObject)) == flag ifFalse: [ element ]! Item was changed: ----- Method: WeakKeyDictionary>>at:put: (in category 'accessing') ----- at: key put: anObject "Set the value at key to be anObject. If key is not found, create a new entry for key and set is value to anObject. Answer anObject." + | index | - | index element | key ifNil: [ ^anObject ]. index := self scanFor: key. + (array at: index) - (element := array at: index) ifNil: [ self atNewIndex: index put: (WeakKeyAssociation key: key value: anObject) ] + ifNotNil: [ :association | association value: anObject ]. - ifNotNil: [ element value: anObject ]. ^anObject! Item was changed: + ----- Method: WeakSet>>collect: (in category 'enumerating') ----- - ----- Method: WeakSet>>collect: (in category 'public') ----- collect: aBlock + + | newSet | - | each newSet | newSet := self species new: self size. + tally = 0 ifTrue: [ ^newSet ]. + 1 to: array size do: [ :index | + (array at: index) ifNotNil: [ :object | + object == flag ifFalse: [ + newSet add: (aBlock value: object) ] ] ]. - tally = 0 ifTrue: [^newSet ]. - 1 to: array size do: - [:index | - ((each := array at: index) == nil or: [each == flag]) - ifFalse: [newSet add: (aBlock value: each)] - ]. ^newSet! Item was changed: ----- Method: HashedCollection class>>rehashAllInstances (in category 'initialization') ----- rehashAllInstances "Do not use #allInstancesDo: because rehash may create new instances." + self allInstances do: #rehash! - self allInstances do: [ :each | each rehash ] ! Item was changed: + ----- Method: WeakSet>>size (in category 'accessing') ----- - ----- Method: WeakSet>>size (in category 'public') ----- size "Careful!! Answer the maximum amount of elements in the receiver, not the exact amount" ^tally! Item was added: + ----- Method: PluggableDictionary>>collect: (in category 'enumerating') ----- + collect: aBlock + "Evaluate aBlock with each of my values as the argument. Collect the resulting values into a collection that is like me. Answer with the new collection." + + | newCollection | + newCollection := (self species new: self size) + hashBlock: hashBlock; + equalBlock: equalBlock; + yourself. + self associationsDo: [ :each | + newCollection at: each key put: (aBlock value: each value) ]. + ^newCollection + + ! Item was removed: - ----- Method: WeakKeyToCollectionDictionary>>finalizeValues (in category 'as yet unclassified') ----- - finalizeValues - self rehash!

1 0

The Trunk: Collections-ul.282.mcz
by commits＠source.squeak.org 25 Jan '10

25 Jan '10

1 0

The Trunk: Collections-ul.282.mcz
by commits＠source.squeak.org 25 Jan '10

25 Jan '10

1 0

The Trunk: Kernel-ul.382.mcz
by commits＠source.squeak.org 25 Jan '10

25 Jan '10

Levente Uzonyi uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-ul.382.mcz ==================== Summary ==================== Name: Kernel-ul.382 Author: ul Time: 25 January 2010, 10:40:19.44 pm UUID: 0741847a-6bd5-c145-aa63-3c5e598d1742 Ancestors: Kernel-dtl.381 In MethodDictionary - cosmetic changes: use #ifNotNil: if possible - ensure that #rehashWithoutBecome doesn't send #become:, making #rehashAllInstances a lot faster - ensure that #removeAll preserves the capacity - deprecated #methodArray, it's the same as #array - new comment for #new =============== Diff against Kernel-dtl.381 =============== Item was changed: ----- Method: MethodDictionary>>postCopy (in category 'copying') ----- postCopy + array := array copy! - array := array shallowCopy! Item was changed: ----- Method: MethodDictionary>>rehashWithoutBecome (in category 'private') ----- rehashWithoutBecome + | newInstance | + newInstance := self species new: self basicSize - 1. "Make sure it has the same capacity" + 1 to: self basicSize do: [ :index | + (self basicAt: index) ifNotNil: [ :key | + newInstance at: key put: (array at: index) ] ]. + ^newInstance! - | newSelf | - newSelf := self species new: self size. - 1 to: self basicSize do: [ :i | - | key | - (key := self basicAt: i) ifNotNil: [ - newSelf at: key put: (array at: i) ] ]. - ^newSelf! Item was changed: ----- Method: MethodDictionary class>>new (in category 'instance creation') ----- new + "Create a new instance with 32 slots." - "change the default size to be a bit bigger to help reduce the number of #grows while filing in" ^self new: 16! Item was changed: ----- Method: MethodDictionary>>associationsDo: (in category 'enumeration') ----- associationsDo: aBlock tally = 0 ifTrue: [ ^self ]. 1 to: self basicSize do: [ :i | + (self basicAt: i) ifNotNil: [ :key | - | key | - (key := self basicAt: i) ifNotNil: [ aBlock value: (Association key: key value: (array at: i)) ] ]! Item was changed: ----- Method: MethodDictionary>>removeAll (in category 'removing') ----- removeAll "This provides a faster way than repeated become. a single become is still in use to prevent system crash." | newSelf | tally = 0 ifTrue: [^self]. + newSelf := self species new: self basicSize - 1. "This will preserve the capacity" - newSelf := self species new: self size. "This will preserve the capacity" self become: newSelf! Item was changed: ----- Method: MethodDictionary>>keysDo: (in category 'enumeration') ----- keysDo: aBlock tally = 0 ifTrue: [ ^self ]. 1 to: self basicSize do: [ :i | + (self basicAt: i) ifNotNil: [ :key | - | key | - (key := self basicAt: i) ifNotNil: [ aBlock value: key ] ]! Item was changed: ----- Method: MethodDictionary>>keysAndValuesDo: (in category 'enumeration') ----- keysAndValuesDo: aBlock "Enumerate the receiver with all the keys and values passed to the block" tally = 0 ifTrue: [^ self]. 1 to: self basicSize do: [ :i | + (self basicAt: i) ifNotNil: [ :key | - | key | - (key := self basicAt: i) ifNotNil: [ aBlock value: key value: (array at: i) ] ]! Item was changed: ----- Method: MethodDictionary>>grow (in category 'private') ----- grow | newSelf | newSelf := self species new: self basicSize. "This will double the size" 1 to: self basicSize do: [ :i | + (self basicAt: i) ifNotNil: [ :key | - | key | - (key := self basicAt: i) ifNotNil: [ newSelf at: key put: (array at: i) ] ]. self become: newSelf! Item was changed: ----- Method: MethodDictionary>>methodArray (in category 'private') ----- methodArray + + self deprecated: 'Use #array'. - ^array! Item was changed: ----- Method: MethodDictionary>>valuesDo: (in category 'enumeration') ----- valuesDo: aBlock tally = 0 ifTrue: [ ^self ]. 1 to: self basicSize do: [ :i | + (array at: i) ifNotNil: [ :value | - | value | - (value := array at: i) ifNotNil: [ aBlock value: value ] ]!

1 0

The Trunk: Kernel-ul.382.mcz
by commits＠source.squeak.org 25 Jan '10

25 Jan '10

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages January 2010