- Pharo-dev - lists.pharo.org

[Pharo-project] Issue 3347 in pharo: simplified and unified String's line-ending changing methods
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: FixedWaitingToBePharoed Owner: stephane.ducasse Labels: Milestone-1.3 Type-Squeak New issue 3347 by stephane.ducasse: simplified and unified String's line-ending changing methods http://code.google.com/p/pharo/issues/detail?id=3347 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 2

[Pharo-project] Issue 3773 in pharo: should get a better completionDialog
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: Accepted Owner: stephane...@gmail.com Labels: Milestone-1.3 New issue 3773 by stephane...@gmail.com: should get a better completionDialog http://code.google.com/p/pharo/issues/detail?id=3773 OBCompletionDialog / OBCompletionRequest come with the OB from Pharo 1.2. The way to use it is like: OBCompletionRequest new prompt: 'Find Class'; searchBlock: [ :string | OBCmdFindClass new findClassIn: Smalltalk pattern: string ]; labelBlock: [ :class | class name ]; iconBlock: [ :class | class browserIcon ]; signal.

1 2

[Pharo-project] Issue 3340 in pharo: ThreadSafe DebuggerMethodMap
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: Accepted Owner: stephane.ducasse Labels: Milestone-1.3 Type-Squeak New issue 3340 by stephane.ducasse: ThreadSafe DebuggerMethodMap http://code.google.com/p/pharo/issues/detail?id=3340 We should have a look at that fix from squeak A new version of Tools was added to project The Inbox: http://source.squeak.org/inbox/Tools-ul.278.mcz ==================== Summary ==================== Name: Tools-ul.278 Author: ul Time: 15 November 2010, 8:46:10.672 am UUID: d03d7286-1db1-f943-9e1c-6e86626b5f89 Ancestors: Tools-ul.277 Thread-safe DebuggerMethodMap =============== Diff against Tools-ul.277 =============== Item was changed: Object subclass: #DebuggerMethodMap instanceVariableNames: 'timestamp methodReference methodNode abstractSourceRanges sortedSourceMap' + classVariableNames: 'AccessLock MapCache MapCacheEntries' - classVariableNames: 'MapCache MapCacheEntries' poolDictionaries: '' category: 'Tools-Debugger'! !DebuggerMethodMap commentStamp: '<historical>' prior: 0! I am a place-holder for information needed by the Debugger to inspect method activations. I insulate the debugger from details of code generation such as exact bytecode offsets and temporary variable locations. I have two concreate subclasses, one for methods compiled using BlueBook blocks and one for methods compiled using Closures. These classes deal with temporary variable access. My function is to abstract the source map away from actual bytecode pcs to abstract bytecode pcs. To reduce compilation time I try and defer as much computation to access time as possible as instances of me will be created after each compilation. I maintain a WeakIdentityDictionary of method to DebuggerMethodMap to cache maps. I refer to my method through a WeakArray to keep the map cache functional. If the reference from a DebuggerMethodMap to its method were strong then the method would never be dropped from the cache because the reference from its map would keep it alive.! Item was changed: ----- Method: DebuggerMethodMap class>>cacheDebugMap:forMethod: (in category 'debugger support') ----- cacheDebugMap: aDebuggerMethodMap forMethod: aCompiledMethod + + ^self protected: [ + MapCache size >= MapCacheEntries ifTrue: [ + MapCache slowSize >= MapCacheEntries + ifFalse: [ MapCache rehash ] + ifTrue: [ + | mapsByAge | + mapsByAge := MapCache keys sort: [ :m1 :m2 | + "We are holding strongly on the keys, so #at: is suitable." + (MapCache at: m1) timestamp < (MapCache at: m2) timestamp]. + mapsByAge from: 1 to: mapsByAge size - MapCacheEntries do: [ :each | + MapCache removeKey: each ] ] ]. + MapCache + at: aCompiledMethod + put: aDebuggerMethodMap ]! - MapCache finalizeValues. - [MapCache size >= MapCacheEntries] whileTrue: - [| mapsByAge | - mapsByAge := MapCache keys asArray sort: - [:m1 :m2| - (MapCache at: m1) timestamp - < (MapCache at: m2) timestamp]. - mapsByAge notEmpty ifTrue: "There be race conditions and reentrancy issues here" - [MapCache removeKey: mapsByAge last]]. - - ^MapCache - at: aCompiledMethod - put: aDebuggerMethodMap! Item was changed: ----- Method: DebuggerMethodMap class>>forMethod: (in category 'instance creation') ----- forMethod: aMethod "<CompiledMethod>" "Answer a DebuggerMethodMap suitable for debugging activations of aMethod. Answer an existing instance from the cache if it exists, cacheing a new one if required." + + ^self protected: [ + MapCache + at: aMethod + ifAbsent: [self + cacheDebugMap: + (self + forMethod: aMethod + methodNode: aMethod methodNode) + forMethod: aMethod] ]! - ^MapCache - at: aMethod - ifAbsent: [self - cacheDebugMap: - (self - forMethod: aMethod - methodNode: aMethod methodNode) - forMethod: aMethod]! Item was added: + ----- Method: DebuggerMethodMap class>>protected: (in category 'synchronization') ----- + protected: aBlock + + ^(AccessLock ifNil: [ AccessLock := Mutex new ]) critical: aBlock! Item was changed: ----- Method: DebuggerMethodMap class>>voidMapCache (in category 'class initialization') ----- voidMapCache + + self protected: [ + MapCache := WeakIdentityKeyDictionary new. + MapCacheEntries := 16 ]! - MapCache := WeakIdentityKeyDictionary new. - MapCacheEntries := 16!

1 1

[Pharo-project] Issue 3329 in pharo: Object>>closeTo:
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: Accepted Owner: alexandre.bergel Labels: Milestone-1.3 New issue 3329 by alexandre.bergel: Object>>closeTo: http://code.google.com/p/pharo/issues/detail?id=3329 closeTo: is used to compare floats. closeTo: is defined on Object, which really does not make sense.

1 3

[Pharo-project] Issue 3615 in pharo: Debug log should use platform line endings
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: Accepted Owner: marcus.d...@gmail.com Labels: Milestone-1.3 New issue 3615 by marcus.d...@gmail.com: Debug log should use platform line endings http://code.google.com/p/pharo/issues/detail?id=3615 else it is not readable on unix

1 1

[Pharo-project] Issue 3435 in pharo: Don't draw transparent fillStules
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: FixedWaitingToBePharoed Owner: stephane.ducasse Labels: Milestone-1.3 New issue 3435 by stephane.ducasse: Don't draw transparent fillStules http://code.google.com/p/pharo/issues/detail?id=3435 don't draw transparent fillStyles. Needed by Tweak. Imported from OpenCobalt =============== Diff against Morphic-ul.490 =============== Item was changed: ----- Method: Canvas>>fillRectangle:fillStyle:borderStyle: (in category 'drawing-rectangles') ----- fillRectangle: aRectangle fillStyle: aFillStyle borderStyle: aBorderStyle "Fill the given rectangle." + aFillStyle isTransparent ifFalse:[ + self fillRectangle: (aRectangle insetBy: aBorderStyle width) fillStyle: aFillStyle]. + aBorderStyle ifNil:[^self]. + aBorderStyle width <= 0 ifTrue:[^self]. + aBorderStyle frameRectangle: aRectangle on: self + ! - self fillRectangle: (aRectangle insetBy: aBorderStyle width) fillStyle: aFillStyle. - aBorderStyle frameRectangle: aRectangle on: self!

1 1

[Pharo-project] Issue 3392 in pharo: Class finder should probably use a different editor
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: Accepted Owner: rydier Labels: Milestone-1.3 New issue 3392 by rydier: Class finder should probably use a different editor http://code.google.com/p/pharo/issues/detail?id=3392 The editor used is a TextEditor, yet the class finder should be smalltalk aware (to f.ex. be able to use OCompletion without having a model accessor) See discussion at http://forum.world.st/Issue-3385-in-pharo-TextEditor-doest-not-understand-m… and the related resolution for 1.2 at http://code.google.com/p/pharo/issues/detail?id=3385

1 1

[Pharo-project] Issue 3766 in pharo: Lets fix this one (which is not broken)
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: Accepted Owner: siguc...@gmail.com Labels: Milestone-1.3 New issue 3766 by siguc...@gmail.com: Lets fix this one (which is not broken) http://code.google.com/p/pharo/issues/detail?id=3766 PlugonMorph>>wantsSteps super wantsSteps ifTrue: [^true]. "For crawling ants effect of dashed line." borderDashSpec ifNil: [^false]. ^borderDashSpec size = 5 and: [(borderDashSpec fifth) > 0] it looks like that dash spec could carry information that its actually animated. And instead of asking directly, if it needs to be animated, like borderDashSpec isAnimated morph tries to do some mumbo-jumbo to determine this.

1 2

Re: [Pharo-project] Issue 3236 in pharo: Cuis DateAndTime Enhancement
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Updates: Labels: Milestone-1.3 Comment #2 on issue 3236 by stephane...@gmail.com: Cuis DateAndTime Enhancement http://code.google.com/p/pharo/issues/detail?id=3236 (No comment was entered for this change.)

1 1

Re: [Pharo-project] Issue 2816 in pharo: Improve GeneralScrollPane
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Updates: Labels: -Milestone-1.3 Comment #1 on issue 2816 by marcus.d...@gmail.com: Improve GeneralScrollPane http://code.google.com/p/pharo/issues/detail?id=2816 (No comment was entered for this change.)

1 0