Squeak-dev November 2010

squeak-dev@lists.squeakfoundation.org

77 participants
254 discussions

The Inbox: Collections-ul.411.mcz
by commits＠source.squeak.org 23 Nov '10

23 Nov '10

A new version of Collections was added to project The Inbox: http://source.squeak.org/inbox/Collections-ul.411.mcz ==================== Summary ==================== Name: Collections-ul.411 Author: ul Time: 23 November 2010, 1:56:22.424 pm UUID: 42a0b87a-f525-6345-bd2c-e55186e17c9d Ancestors: Collections-ul.410 - use #shouldBePrintedAsLiteral instead of #isLiteral when printing or storing characters and arrays =============== Diff against Collections-ul.410 =============== Item was changed: ----- Method: Array>>printOn: (in category 'printing') ----- printOn: aStream + self shouldBePrintedAsLiteral ifTrue: [^self printAsLiteralFormOn: aStream]. - self isLiteral ifTrue: [^self printAsLiteralFormOn: aStream]. self class = Array ifTrue: [^self printAsBraceFormOn: aStream]. ^super printOn: aStream! Item was added: + ----- Method: Array>>shouldBePrintedAsLiteral (in category 'testing') ----- + shouldBePrintedAsLiteral + + ^self class == Array and: [ self allSatisfy: [ :each | each shouldBePrintedAsLiteral ] ]! Item was changed: ----- Method: Array>>storeOn: (in category 'printing') ----- storeOn: aStream "Use the literal form if possible." + self shouldBePrintedAsLiteral - self isLiteral ifTrue: [aStream nextPut: $#; nextPut: $(. self do: [:element | element storeOn: aStream. aStream space]. aStream nextPut: $)] ifFalse: [super storeOn: aStream]! Item was changed: ----- Method: Array>>storeOnStream: (in category 'filter streaming') ----- storeOnStream:aStream + + self shouldBePrintedAsLiteral + ifTrue: [ super storeOnStream:aStream ] + ifFalse:[ aStream writeCollection:self ] - self isLiteral ifTrue: [super storeOnStream:aStream] ifFalse:[aStream writeCollection:self]. ! Item was changed: + ----- Method: Character>>isLiteral (in category 'testing') ----- - ----- Method: Character>>isLiteral (in category 'printing') ----- isLiteral ^true! Item was added: + ----- Method: Character>>shouldBePrintedAsLiteral (in category 'testing') ----- + shouldBePrintedAsLiteral + + ^value between: 33 and: 255! Item was changed: ----- Method: Character>>storeOn: (in category 'printing') ----- storeOn: aStream "Common character literals are preceded by '$', however special need to be encoded differently: for some this might be done by using one of the shortcut constructor methods for the rest we have to create them by ascii-value." | name | + self shouldBePrintedAsLiteral - (value between: 33 and: 255) ifTrue: [ aStream nextPut: $$; nextPut: self ] ifFalse: [ name := self class constantNameFor: self. name notNil ifTrue: [ aStream nextPutAll: self class name; space; nextPutAll: name ] ifFalse: [ aStream nextPut: $(; nextPutAll: self class name; nextPutAll: ' value: '; print: value; nextPut: $) ] ].!

1 0

The Trunk: Tools-ul.281.mcz
by commits＠source.squeak.org 23 Nov '10

23 Nov '10

Levente Uzonyi uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-ul.281.mcz ==================== Summary ==================== Name: Tools-ul.281 Author: ul Time: 23 November 2010, 1:37:02.237 pm UUID: 30464fa6-e09b-764a-a157-57bc3f46560d Ancestors: Tools-ul.280 - replaced the PointerFinder >> #isLiteral hack by a direct class check, also reordered the checks in #follow:from:, so cheaper and common ones are performed first. =============== Diff against Tools-ul.280 =============== Item was changed: ----- Method: PointerFinder>>follow:from: (in category 'application') ----- follow: anObject from: parentObject + + anObject == goal ifTrue: [ + parents at: anObject put: parentObject. + ^ true]. - anObject == goal - ifTrue: - [parents at: anObject put: parentObject. - ^ true]. - anObject isLiteral ifTrue: [^ false]. "Remove this after switching to new CompiledMethod format --bf 2/12/2006" + (anObject class isPointers or: [ anObject isCompiledMethod ]) ifFalse: [ ^false]. + (anObject class isWeak or: [ + anObject class == self class or: [ + anObject isLiteral or: [ + parents includesKey: anObject ] ] ]) + ifTrue: [ ^false ]. - (anObject class isPointers or: [anObject isCompiledMethod]) ifFalse: [^ false]. - anObject class isWeak ifTrue: [^ false]. - (parents includesKey: anObject) - ifTrue: [^ false]. parents at: anObject put: parentObject. toDoNext add: anObject. ^ false! Item was removed: - ----- Method: PointerFinder>>isLiteral (in category 'application') ----- - isLiteral - "Horrible hack to omit other Pointer Finders from scanning." - - ^ true!

1 0

The Trunk: Compiler-ul.182.mcz
by commits＠source.squeak.org 23 Nov '10

23 Nov '10

Levente Uzonyi uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-ul.182.mcz ==================== Summary ==================== Name: Compiler-ul.182 Author: ul Time: 23 November 2010, 1:37:48.497 pm UUID: ee785fb8-9a21-9b4a-a451-03f648a97ded Ancestors: Compiler-nice.181 - removed #isLiteral from the ParseNode hierarchy, because it means something else. Added #isLiteralNode instead. =============== Diff against Compiler-nice.181 =============== Item was removed: - ----- Method: LiteralNode>>isLiteral (in category 'testing') ----- - isLiteral - - ^ true! Item was added: + ----- Method: LiteralNode>>isLiteralNode (in category 'testing') ----- + isLiteralNode + + ^ true! Item was removed: - ----- Method: ParseNode>>isLiteral (in category 'testing') ----- - isLiteral - - ^ false! Item was added: + ----- Method: ParseNode>>isLiteralNode (in category 'testing') ----- + isLiteralNode + + ^ false!

1 0

The Trunk: Graphics-ul.159.mcz
by commits＠source.squeak.org 23 Nov '10

23 Nov '10

Levente Uzonyi uploaded a new version of Graphics to project The Trunk: http://source.squeak.org/trunk/Graphics-ul.159.mcz ==================== Summary ==================== Name: Graphics-ul.159 Author: ul Time: 23 November 2010, 1:41:39.684 pm UUID: c544e4b7-24ef-f047-88e3-1c22e5e021a0 Ancestors: Graphics-tbn.157, Graphics-mt.158 - a forgotten merge =============== Diff against Graphics-tbn.157 =============== Item was changed: ----- Method: BitBlt>>installStrikeFont:foregroundColor:backgroundColor: (in category 'private') ----- installStrikeFont: aStrikeFont foregroundColor: foregroundColor backgroundColor: backgroundColor | lastSourceDepth targetColor | sourceForm ifNotNil:[lastSourceDepth := sourceForm depth]. sourceForm := aStrikeFont glyphs. "Ignore any halftone pattern since we use a color map approach here" halftoneForm := nil. sourceY := 0. height := aStrikeFont height. sourceForm depth = 1 ifTrue: [ self combinationRule: Form paint. (colorMap notNil and:[lastSourceDepth = sourceForm depth]) ifFalse: [ "Set up color map for a different source depth (color font)" "Uses caching for reasonable efficiency" colorMap := self cachedFontColormapFrom: sourceForm depth to: destForm depth. colorMap at: 1 put: (destForm pixelValueFor: backgroundColor)]. colorMap at: 2 put: (destForm pixelValueFor: foregroundColor). ] ifFalse: [ + (Preferences subPixelRenderFonts and: [ foregroundColor = Color black + "Only use rgbMul with opaque colors as alpha values get lost for translucent colors." + or: [ Preferences subPixelRenderColorFonts and: [foregroundColor isOpaque] ]]) ifTrue: [ - (Preferences subPixelRenderFonts and: [ foregroundColor = Color black or: [ Preferences subPixelRenderColorFonts ]]) ifTrue: [ destForm depth > 8 ifTrue: [ + "rgbMul is equivalent to component alpha blend if text is black (only faster, hehe)" + self combinationRule: Form rgbMul. - "Only force #rgbMul if color is not translucent for better result quality. Alpha values are ignored with #rgbMul." - foregroundColor isTranslucent - ifFalse: [self combinationRule: Form rgbMul]. colorMap := (destForm depth = 32 or: [ (foregroundColor = Color black) not ]) ifTrue: [ "rgbMul / rgbAdd IS component alpha blend for any color of text (neat trick, eh!!)" "This colorMap is to be used on the second pass with rule 20 (rgbAdd) See #displayString:from:to:at:strikeFont:kern:" "Note: In 32bpp we always need the second pass, as the source could have transparent pixels, and we need to add to the alpha channel" self colorConvertingMap: foregroundColor from: sourceForm depth to: destForm depth keepSubPixelAA: true]] ifFalse: [ + self combinationRule: Form paint. - self combinationRule: 25. "Paint" targetColor := foregroundColor = Color black ifFalse: [ foregroundColor ]. colorMap := self colorConvertingMap: targetColor from: sourceForm depth to: destForm depth keepSubPixelAA: true] ] ifFalse: [ "Do not use rule 34 for 16bpp display. TTCFont uses it, but it builds a glyphs cache for each color used!!" + self combinationRule: (destForm depth = 32 ifTrue: [Form blendAlphaScaled] ifFalse: [Form paint]). - self combinationRule: (destForm depth = 32 ifTrue: [34 "alphaBlendScaled"] ifFalse: [25 "Paint"]). colorMap := self colorConvertingMap: foregroundColor from: sourceForm depth to: destForm depth keepSubPixelAA: false ] ].! Item was added: + ----- Method: Form class>>blendAlphaScaled (in category 'mode constants') ----- + blendAlphaScaled + "Answer the integer denoting BitBlt's blend-with-alpha-scaled rule." + + ^ 34!

1 0

The Trunk: Tools-ul.280.mcz
by commits＠source.squeak.org 23 Nov '10

23 Nov '10

Levente Uzonyi uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-ul.280.mcz ==================== Summary ==================== Name: Tools-ul.280 Author: ul Time: 23 November 2010, 11:12:15.617 am UUID: e7340a84-6734-b44b-8a68-457846da8f87 Ancestors: Tools-ul.279 - fix: FileList2 open should work now - fix: the service used for project loading from FileList is also used by the drop handler, this should be probably changed in the future. =============== Diff against Tools-ul.279 =============== Item was changed: ----- Method: FileList2>>initialize (in category 'initialize-release') ----- initialize + super initialize. showDirsInFileList := false. fileSelectionBlock := [ :entry :myPattern | entry isDirectory ifTrue: [ showDirsInFileList ] ifFalse: [ myPattern = '*' or: [myPattern match: entry name] ] ]. dirSelectionBlock := [ :dirName | true].! Item was added: + ----- Method: StandardFileStream>>dirAndFileName (in category '*Tools-FileList') ----- + dirAndFileName + "A temporary solution for supporting project loading via drag and drop." + + ^{ self directory. self localName }!

1 0

The Trunk: Collections-ul.410.mcz
by commits＠source.squeak.org 23 Nov '10

23 Nov '10

Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.410.mcz ==================== Summary ==================== Name: Collections-ul.410 Author: ul Time: 23 November 2010, 8:24:12.434 am UUID: a68748b5-3380-9645-8686-fc80a9710dc6 Ancestors: Collections-ul.409 - added a translation table to String for exchanging cr and lf characters - simplified and enhanced String's #withSqueakLineEndings and #withUnixLineEndings =============== Diff against Collections-ul.409 =============== Item was changed: ArrayedCollection subclass: #String instanceVariableNames: '' + classVariableNames: 'AsciiOrder CSLineEnders CSNonSeparators CSSeparators CaseInsensitiveOrder CaseSensitiveOrder CrLfExchangeTable HtmlEntities LowercasingTable Tokenish UppercasingTable' - classVariableNames: 'AsciiOrder CSLineEnders CSNonSeparators CSSeparators CaseInsensitiveOrder CaseSensitiveOrder HtmlEntities LowercasingTable Tokenish UppercasingTable' poolDictionaries: '' category: 'Collections-Strings'! !String commentStamp: '<historical>' prior: 0! A String is an indexed collection of Characters. Class String provides the abstract super class for ByteString (that represents an array of 8-bit Characters) and WideString (that represents an array of 32-bit characters). In the similar manner of LargeInteger and SmallInteger, those subclasses are chosen accordingly for a string; namely as long as the system can figure out so, the String is used to represent the given string. Strings support a vast array of useful methods, which can best be learned by browsing and trying out examples as you find them in the code. Here are a few useful methods to look at... String match: String contractTo: String also inherits many useful methods from its hierarchy, such as SequenceableCollection , SequenceableCollection copyReplaceAll:with: ! Item was added: + ----- Method: String class>>crLfExchangeTable (in category 'accessing') ----- + crLfExchangeTable + + ^CrLfExchangeTable! Item was changed: ----- Method: String class>>initialize (in category 'initialization') ----- initialize "self initialize" | order | AsciiOrder := (0 to: 255) as: ByteArray. CaseInsensitiveOrder := AsciiOrder copy. ($a to: $z) do: [:c | CaseInsensitiveOrder at: c asciiValue + 1 put: (CaseInsensitiveOrder at: c asUppercase asciiValue +1)]. "Case-sensitive compare sorts space, digits, letters, all the rest..." CaseSensitiveOrder := ByteArray new: 256 withAll: 255. order := -1. ' 0123456789' do: "0..10" [:c | CaseSensitiveOrder at: c asciiValue + 1 put: (order := order+1)]. ($a to: $z) do: "11-64" [:c | CaseSensitiveOrder at: c asUppercase asciiValue + 1 put: (order := order+1). CaseSensitiveOrder at: c asciiValue + 1 put: (order := order+1)]. 1 to: CaseSensitiveOrder size do: [:i | (CaseSensitiveOrder at: i) = 255 ifTrue: [CaseSensitiveOrder at: i put: (order := order+1)]]. order = 255 ifFalse: [self error: 'order problem']. "a table for translating to lower case" LowercasingTable := String withAll: (Character allByteCharacters collect: [:c | c asLowercase]). "a table for translating to upper case" UppercasingTable := String withAll: (Character allByteCharacters collect: [:c | c asUppercase]). "a table for testing tokenish (for fast numArgs)" Tokenish := String withAll: (Character allByteCharacters collect: [:c | c tokenish ifTrue: [c] ifFalse: [$~]]). "CR and LF--characters that terminate a line" CSLineEnders := CharacterSet crlf. "separators and non-separators" CSSeparators := CharacterSet separators. + CSNonSeparators := CSSeparators complement. + + "a table for exchanging cr with lf and vica versa" + CrLfExchangeTable := Character allByteCharacters collect: [ :each | + each + caseOf: { + [ Character cr ] -> [ Character lf ]. + [ Character lf ] -> [ Character cr ] } + otherwise: [ each ] ]! - CSNonSeparators := CSSeparators complement.! Item was changed: ----- Method: String>>withSqueakLineEndings (in category 'internet') ----- withSqueakLineEndings "Assume the string is textual, and that CR, LF, and CRLF are all valid line endings. Replace each occurence with a single CR." - | cr lf indexLF indexCR | - lf := Character linefeed. - indexLF := self indexOf: lf startingAt: 1. - indexLF = 0 ifTrue: [^self]. - - cr := Character cr. - indexCR := self indexOf: cr startingAt: 1. - indexCR = 0 ifTrue: [^self copy replaceAll: lf with: cr]. + (self includes: Character lf) ifFalse: [ ^self ]. + (self includes: Character cr) ifFalse: [ + ^self translateWith: String crLfExchangeTable ]. ^self withLineEndings: String cr! Item was changed: ----- Method: String>>withUnixLineEndings (in category 'internet') ----- withUnixLineEndings "Assume the string is textual, and that CR, LF, and CRLF are all valid line endings. Replace each occurence with a single LF." - | cr lf indexLF indexCR | - cr := Character cr. - indexCR := self indexOf: cr startingAt: 1. - indexCR = 0 ifTrue: [^self]. - - lf := Character linefeed. - indexLF := self indexOf: lf startingAt: 1. - indexLF = 0 ifTrue: [^self copy replaceAll: cr with: lf]. + (self includes: Character cr) ifFalse: [ ^self ]. + (self includes: Character lf) ifFalse: [ + ^self translateWith: String crLfExchangeTable ]. ^self withLineEndings: String lf!

1 0

The Trunk: Collections-ul.409.mcz
by commits＠source.squeak.org 23 Nov '10

23 Nov '10

Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.409.mcz ==================== Summary ==================== Name: Collections-ul.409 Author: ul Time: 22 November 2010, 1:35:14.026 pm UUID: 849eb41a-5717-9e44-ab23-eae36fb603bb Ancestors: Collections-ul.408 - introduced String >> #withLineEndings: - simplified and unified String's line-ending changing methods: #withInternetLineEndings, #withSqueakLineEndings and #withUnixLineEndings =============== Diff against Collections-ul.408 =============== Item was changed: ----- Method: String>>withInternetLineEndings (in category 'internet') ----- withInternetLineEndings "change line endings from CR's and LF's to CRLF's. This is probably in prepration for sending a string over the Internet" + ^self withLineEndings: String crlf! - ^self class - new: self size * 16 // 15 "provisions for CR-LF pairs" - streamContents: [ :stream | - self lineIndicesDo: [:start :endWithoutDelimiters :end | - stream next: 1 + endWithoutDelimiters - start putAll: self startingAt: start. - endWithoutDelimiters = end ifFalse: [ - stream crlf ] ] ]! Item was added: + ----- Method: String>>withLineEndings: (in category 'internet') ----- + withLineEndings: lineEndingString + + | stream | + stream := nil. + self lineIndicesDo: [ :start :endWithoutDelimiters :end | + (stream isNil and: [ endWithoutDelimiters ~= end ]) ifTrue: [ + (self copyFrom: endWithoutDelimiters + 1 to: end) = lineEndingString ifFalse: [ + stream := WriteStream with: self copy. + stream position: start - 1 ] ]. + stream ifNotNil: [ + stream next: endWithoutDelimiters - start + 1 putAll: self startingAt: start. + endWithoutDelimiters = end ifFalse: [ + stream nextPutAll: lineEndingString ] ] ]. + ^stream + ifNil: [ self ] + ifNotNil: [ + stream position = self size + ifTrue: [ stream originalContents ] + ifFalse: [ stream contents ] ]! Item was changed: ----- Method: String>>withSqueakLineEndings (in category 'internet') ----- withSqueakLineEndings "Assume the string is textual, and that CR, LF, and CRLF are all valid line endings. Replace each occurence with a single CR." + | cr lf indexLF indexCR | - | cr lf inPos outPos outString newOutPos indexLF indexCR | lf := Character linefeed. indexLF := self indexOf: lf startingAt: 1. indexLF = 0 ifTrue: [^self]. cr := Character cr. indexCR := self indexOf: cr startingAt: 1. indexCR = 0 ifTrue: [^self copy replaceAll: lf with: cr]. + ^self withLineEndings: String cr! - inPos := outPos := 1. - outString := String new: self size. - - ["check if next CR (if any) is before next LF" - (indexCR > 0 and: [indexCR < indexLF]) - ifTrue: [ - newOutPos := outPos + 1 + indexCR - inPos. - outString replaceFrom: outPos to: newOutPos - 1 with: self startingAt: inPos. - outPos := newOutPos. - 1 + indexCR = indexLF - ifTrue: ["Caught a CR-LF pair" - inPos := 1 + indexLF. - indexLF := self indexOf: lf startingAt: inPos] - ifFalse: [inPos := 1 + indexCR]. - indexCR := self indexOf: cr startingAt: inPos] - ifFalse: [ - newOutPos := outPos + 1 + indexLF - inPos. - outString replaceFrom: outPos to: newOutPos - 2 with: self startingAt: inPos. - outString at: newOutPos - 1 put: cr. - outPos := newOutPos. - inPos := 1 + indexLF. - indexLF := self indexOf: lf startingAt: inPos]. - indexLF = 0] - whileFalse. - - "no more LF line endings. copy the rest" - newOutPos := outPos + (self size - inPos + 1). - outString replaceFrom: outPos to: newOutPos - 1 with: self startingAt: inPos. - ^outString copyFrom: 1 to: newOutPos - 1! Item was changed: ----- Method: String>>withUnixLineEndings (in category 'internet') ----- withUnixLineEndings "Assume the string is textual, and that CR, LF, and CRLF are all valid line endings. Replace each occurence with a single LF." + | cr lf indexLF indexCR | - | cr lf inPos outPos outString newOutPos indexLF indexCR | cr := Character cr. indexCR := self indexOf: cr startingAt: 1. indexCR = 0 ifTrue: [^self]. lf := Character linefeed. indexLF := self indexOf: lf startingAt: 1. indexLF = 0 ifTrue: [^self copy replaceAll: cr with: lf]. + ^self withLineEndings: String lf! - inPos := outPos := 1. - outString := String new: self size. - - ["check if next CR is before next LF or if there are no more LF" - (indexLF = 0 or: [indexCR < indexLF]) - ifTrue: [ - newOutPos := outPos + 1 + indexCR - inPos. - outString replaceFrom: outPos to: newOutPos - 2 with: self startingAt: inPos. - outString at: newOutPos - 1 put: lf. - outPos := newOutPos. - 1 + indexCR = indexLF - ifTrue: ["Caught a CR-LF pair" - inPos := 1 + indexLF. - indexLF := self indexOf: lf startingAt: inPos] - ifFalse: [inPos := 1 + indexCR]. - indexCR := self indexOf: cr startingAt: inPos] - ifFalse: [ - newOutPos := outPos + 1 + indexLF - inPos. - outString replaceFrom: outPos to: newOutPos - 1 with: self startingAt: inPos. - outPos := newOutPos. - inPos := 1 + indexLF. - indexLF := self indexOf: lf startingAt: inPos]. - indexCR = 0] - whileFalse. - - "no more CR line endings. copy the rest" - newOutPos := outPos + (self size - inPos + 1). - outString replaceFrom: outPos to: newOutPos - 1 with: self startingAt: inPos. - ^outString copyFrom: 1 to: newOutPos - 1!

1 0

The Trunk: Network-ar.98.mcz
by commits＠source.squeak.org 23 Nov '10

23 Nov '10

Andreas Raab uploaded a new version of Network to project The Trunk: http://source.squeak.org/trunk/Network-ar.98.mcz ==================== Summary ==================== Name: Network-ar.98 Author: ar Time: 23 November 2010, 12:12:58.498 am UUID: 5f0637f3-9b53-ab42-a6fa-55077db31f63 Ancestors: Network-ul.97 Fixes for SocketStream: 1) SocketStream>>receiveData: and SocketStream>>upToEnd: had incorrect conditions used to determine when to stop (#isConnected is wrong since there can be data pending on an unconnected socket which is why using #atEnd is the correct test). 2) The former was done to deal with non-signaling SocketStreams in cases where ConnectionClose was used to deal with end conditions (#upToEnd, #next:into:startingAt:, #readInto:startingAt:count:). This was fixed by making these places (temporarily) signaling so that the exception can be caught and handled properly. 3) SocketStream>>isDataAvailable should not attempt to shortcut prematurely; using 'socket dataAvailable' is bad for subclasses such as SecureSocketStream and unnecessary to boot (and has no performance impact). =============== Diff against Network-ul.97 =============== Item was added: + ----- Method: SocketStream>>beSignalingWhile: (in category 'private') ----- + beSignalingWhile: aBlock + "Temporarily turn a non-signaling SocketStream into a signaling one. + Required for some of operations that will catch ConnectionClosed in + order to find out that an operation completed" + + | signaling | + signaling := shouldSignal. + shouldSignal := true. + ^aBlock ensure:[shouldSignal := signaling] + ! Item was changed: ----- Method: SocketStream>>isDataAvailable (in category 'testing') ----- isDataAvailable + "Answer if more data can be read. It the inbuffer is empty, we read more data. - "Answer if more data can be read. It the inbuffer is empty, we check the socket for data. If it claims to have data available to read, we try to read some once and recursively call this method again. If something really was available it is now in the inBuffer. This is because there has been spurious dataAvailable when there really is no data to get. + Note: It is important not to rely on 'socket dataAvailable' here since this will + not work for subclasses such as SecureSocketStream (which can contain + undecrypted contents that has been read from the socket)." - Note: Some subclasses (such as SecureSocketStream) rely on the behavior here since even though data may be available in the underlying socket, it may not result in any output (yet)." self isInBufferEmpty ifFalse: [^true]. + ^self receiveAvailableData < inNextToWrite + ! - ^socket dataAvailable - ifFalse: [false] - ifTrue: [self receiveAvailableData; isDataAvailable]! Item was changed: ----- Method: SocketStream>>next:into:startingAt: (in category 'stream in') ----- next: anInteger into: aCollection startingAt: startIndex "Read n objects into the given collection. Return aCollection or a partial copy if less than n elements have been read." "Implementation note: This method DOES signal timeout if not enough elements are received. It does NOT signal ConnectionClosed as closing the connection is the only way by which partial data can be read." | start amount | + [self beSignalingWhile:[self receiveData: anInteger]] + on: ConnectionClosed do:[:ex| ex return]. - [self receiveData: anInteger] on: ConnectionClosed do:[:ex| ex return]. "Inlined version of nextInBuffer: to avoid copying the contents" amount := anInteger min: (inNextToWrite - lastRead - 1). start := lastRead + 1. lastRead := lastRead + amount. aCollection replaceFrom: startIndex to: startIndex + amount-1 with: inBuffer startingAt: start. ^amount < anInteger ifTrue:[aCollection copyFrom: 1 to: startIndex + amount-1] ifFalse:[aCollection]! Item was changed: ----- Method: SocketStream>>readInto:startingAt:count: (in category 'stream in') ----- readInto: aCollection startingAt: startIndex count: anInteger "Read n objects into the given collection starting at startIndex. Return number of elements that have been read." "Implementation note: This method DOES signal timeout if not enough elements are received. It does NOT signal ConnectionClosed as closing the connection is the only way by which partial data can be read." | start amount | + [self beSignalingWhile:[self receiveData: anInteger]] + on: ConnectionClosed do:[:ex| ex return]. - [self receiveData: anInteger] on: ConnectionClosed do:[:ex| ex return]. "Inlined version of nextInBuffer: to avoid copying the contents" amount := anInteger min: (inNextToWrite - lastRead - 1). start := lastRead + 1. lastRead := lastRead + amount. aCollection replaceFrom: startIndex to: startIndex + amount-1 with: inBuffer startingAt: start. ^amount! Item was changed: ----- Method: SocketStream>>receiveData: (in category 'control') ----- receiveData: nBytes "Keep reading the socket until we have nBytes in the inBuffer or we reach the end. This method does not return data, but can be used to make sure data has been read into the buffer from the Socket before actually reading it from the FastSocketStream. Mainly used internally. We could also adjust the buffer to the expected amount of data and avoiding several incremental grow operations. NOTE: This method doesn't honor timeouts if shouldSignal is false!! And frankly, I am not sure how to handle that case or if I care - I think we should always signal." + [self atEnd not and: [nBytes > self inBufferSize]] - [self isConnected and: [nBytes > self inBufferSize]] whileTrue: [self receiveData]! Item was changed: ----- Method: SocketStream>>upToEnd (in category 'stream in') ----- upToEnd "Answer all data coming in on the socket until the socket is closed by the other end, or we get a timeout. + This means this method catches ConnectionClosed by itself." - This means this method catches ConnectionClosed by itself. - - NOTE: Does not honour timeouts if shouldSignal is false!!" + [[self atEnd] whileFalse: [self beSignalingWhile:[self receiveData]]] - [[self isConnected] whileTrue: [self receiveData]] on: ConnectionClosed do: [:ex | "swallow it"]. ^self nextAllInBuffer!

1 0

Daily Commit Log
by commits＠source.squeak.org 23 Nov '10

23 Nov '10

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2010-November/003939.h… Name: Tests-ul.101 Ancestors: Tests-ul.100 - updated the tests to reflect the font changes ============================================= http://lists.squeakfoundation.org/pipermail/packages/2010-November/003940.h… Name: Graphics-mt.157 Ancestors: Graphics-ul.156 - fonts with translucent color used the wrong combination rule for rendering by default - use "Form blend" explicitly as combination rule for fonts with translucent color ============================================= http://lists.squeakfoundation.org/pipermail/packages/2010-November/003941.h… Name: Graphics-mt.158 Ancestors: Graphics-mt.157 - nicer version of fix for font rendering with translucent colors (thanks to Juan Vuletich) -> subpixel rendering will be disabled in that case - minor code clean-up (using Form-constants instead of magic numbers) ============================================= http://lists.squeakfoundation.org/pipermail/packages/2010-November/003942.h… Name: Monticello-bp.410 Ancestors: Monticello-ul.409 - printOn: for MCWorkingCopy prints the package name ============================================= http://lists.squeakfoundation.org/pipermail/packages/2010-November/003943.h… Name: Monticello-bp.411 Ancestors: Monticello-bp.410 - Changed MCWorkingCopy description so that the package name is not duplicated when, e.g. Kernel (dtl.517) instead of Kernel (Kernel-dtl.517). This makes the Monticello Browser easier to use. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2010-November/003944.h… Name: Monticello-bp.412 Ancestors: Monticello-bp.411 - use beginsWith: instead of the deprecated startsWith: ============================================= http://lists.squeakfoundation.org/pipermail/packages/2010-November/003945.h… Name: Morphic-laza.477 Ancestors: Morphic-cmm.476 In the "Extending the system" workspace: Change the snippet to load Omnibrowser work as a simple doIt =============================================

1 0

The Trunk: Morphic-laza.477.mcz
by commits＠source.squeak.org 22 Nov '10

22 Nov '10

Alexander Lazarević uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-laza.477.mcz ==================== Summary ==================== Name: Morphic-laza.477 Author: laza Time: 22 November 2010, 10:49:45.037 pm UUID: 5761bce9-0807-094c-81d9-605b9a072ad9 Ancestors: Morphic-cmm.476 In the "Extending the system" workspace: Change the snippet to load Omnibrowser work as a simple doIt =============== Diff against Morphic-cmm.476 =============== Item was changed: ----- Method: TheWorldMainDockingBar>>extendingTheSystem (in category 'submenu - help') ----- extendingTheSystem ^'"Note: Please edit this workspace and add your own contributions. To submit it to the inbox open the Monticello browser and submit it from there. Save the package ''* Morphic'' to the inbox." "Updating your system: The following will set the default update URL to receive development updates. For developers and dare-devils only." MCMcmUpdater defaultUpdateURL: ''http://source.squeak.org/trunk''. "Installing new packages: The following expression show how to load many interesting packages into Squeak." "FFI: http://source.squeak.org/FFI.html" (Installer repository: ''http://source.squeak.org/FFI'') install: ''FFI-Pools''; install: ''FFI-Kernel''; install: ''FFI-Tests''; install: ''FFI-Win32''; install: ''FFI-MacOS''; install: ''FFI-Unix''. "Omnibrowser, including Refactoring engine" (Installer ss project: ''MetacelloRepository'') install: ''ConfigurationOfOmniBrowser''. + ((Smalltalk at: #ConfigurationOfOmniBrowser) project perform: #lastVersion) load: #( Dev ). - (Smalltalk at: #ConfigurationOfOmniBrowser) project lastVersion load: #( Dev ). "Seaside 2.8 http://www.seaside.st" (Installer ss project: ''MetacelloRepository'') install: ''ConfigurationOfSeaside28''. "WAKom startOn: 9090" "Seaside 2.8 Examples http://www.seaside.st" (Installer ss project: ''MetacelloRepository'') install: ''ConfigurationOfSeaside28Examples''. (Smalltalk at: #ConfigurationOfSeaside28Examples) load. "Seaside 3.0 http://www.seaside.st" (Installer ss project: ''MetacelloRepository'') install: ''ConfigurationOfSeaside30''. (Smalltalk at: #ConfigurationOfSeaside30) load. (Smalltalk at: #WAPharoServerAdaptorBrowser) open. "Pier CMS: http://www.piercms.com" (Installer ss project: ''MetacelloRepository'') install: ''ConfigurationOfPier2''. (Smalltalk at: #ConfigurationOfPier2) load. (Installer lukas project: ''pier2'') install: ''Pier-Blog''. (Installer lukas project: ''pier2'') install: ''Pier-Book''. (Installer lukas project: ''pier2addons'') install: ''Pier-Setup''. (Smalltalk at: #PRDistribution) new register. !! + ]style[(189 2 139 15 17 1 32 3 108 2 40 12 11 1 30 3 8 1 11 3 8 1 12 3 8 1 11 3 8 1 11 3 8 1 11 3 8 1 10 3 44 11 2 1 8 1 21 2 8 1 28 14 3 1 1 28 7 11 11 2 5 4 3 5 35 12 2 1 8 1 21 2 8 1 26 2 21 2 44 12 2 1 8 1 21 2 8 1 34 13 3 1 33 2 4 3 35 12 2 1 8 1 21 2 8 1 26 13 3 1 25 2 4 13 3 1 28 2 4 3 34 12 2 1 8 1 21 2 8 1 22 13 3 1 21 2 4 14 5 1 8 1 7 2 8 1 11 13 5 1 8 1 7 2 8 1 11 13 5 1 8 1 13 2 8 1 12 13 3 1 15 3 3 1 8 2)c000123123,cblack;,c000123123,cblack;,c000000123,cblack;,c123000123,cblack;,c000123123,cblack;,c000123123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000123123,cblack;,c000000126,cblack;,c000000126,cblack;,c126000126,cblack;,c000000126,cblack;,c126000126,cblack;,c000000123,cblack;,c000000123,cblack;,c000000126,cblack;,c000000126,cblack;,c000000126,cblack;,c000000126,cblack;,c000123123,cblack;,c000000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000123123,cblack;,c000123123,cblack;,c000000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c000000123,cblack;,c000000123,cblack;,c000123123,cblack;,c000000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c000000123,cblack;,c000000123,cblack;,c000000123,cblack;,c000000123,cblack;,c000000123,cblack;,c000123123,cblack;,c000000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c000000123,cblack;,c000000123,cblack;,c000000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c123000123,cblack;,c000000123,cblack;,c000000123,cblack;,c000000123,cblack;,c000000123,cblack;!!' readStream nextChunkText! - ]style[(189 2 139 15 17 1 32 3 108 2 40 12 11 1 30 3 8 1 11 3 8 1 12 3 8 1 11 3 8 1 11 3 8 1 11 3 8 1 10 3 44 11 2 1 8 1 21 2 8 1 28 13 3 1 1 28 7 1 11 1 5 4 3 5 35 12 2 1 8 1 21 2 8 1 26 2 21 2 44 12 2 1 8 1 21 2 8 1 34 13 3 1 33 2 4 3 35 12 2 1 8 1 21 2 8 1 26 13 3 1 25 2 4 13 3 1 28 2 4 3 34 12 2 1 8 1 21 2 8 1 22 13 3 1 21 2 4 14 5 1 8 1 7 2 8 1 11 13 5 1 8 1 7 2 8 1 11 13 5 1 8 1 13 2 8 1 12 13 3 1 15 3 3 1 8 2)c000124124,cblack;,c000124124,cblack;,c000000124,cblack;,c124000124,cblack;,c000124124,cblack;,c000124124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000124124,cblack;,c000000127,cblack;,c000000127,cblack;,c127000127,cblack;,c000000127,cblack;,c127000127,cblack;,c000000124,cblack;,c000000124,cblack;,c000000127,cblack;,c000000127,cblack;,c000000127,cblack;,c000000127,cblack;,c000124124,cblack;,c000000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000124124,cblack;,c000124124,cblack;,c000000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c000000124,cblack;,c000000124,cblack;,c000124124,cblack;,c000000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c000000124,cblack;,c000000124,cblack;,c000000124,cblack;,c000000124,cblack;,c000000124,cblack;,c000124124,cblack;,c000000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c000000124,cblack;,c000000124,cblack;,c000000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c124000124,cblack;,c000000124,cblack;,c000000124,cblack;,c000000124,cblack;,c000000124,cblack;!!' readStream nextChunkText!

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
26
Older →

Jump to page: