Squeak-dev October 2013

squeak-dev@lists.squeakfoundation.org

35 participants
262 discussions

The Trunk: System-fbs.599.mcz
by commits＠source.squeak.org 02 Oct '13

02 Oct '13

Frank Shearar uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-fbs.599.mcz ==================== Summary ==================== Name: System-fbs.599 Author: fbs Time: 1 October 2013, 11:19:18.501 pm UUID: ec7dbcc2-93e6-4143-bfee-4d52d9368951 Ancestors: System-fbs.598 Minor spelling corrections. =============== Diff against System-fbs.598 =============== Item was changed: TextDiffBuilder subclass: #ClassDiffBuilder instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'System-FilePackage'! + !ClassDiffBuilder commentStamp: 'fbs 9/23/2013 08:58' prior: 0! + I'm like TextDiffBuilder, but I split the input text by Character >> #separators, instead of new lines. I'm probably meant to create diffs of class definitions.! - !ClassDiffBuilder commentStamp: 'klub 12/28/2009 05:14' prior: 0! - I'm like TextDiffBuilder, but I split the input text by Character >> #separators, instead of new lines. I'm probably ment to create diffs of class definitions.! Item was changed: Object subclass: #TextDiffBuilder instanceVariableNames: 'xLines yLines ignoreLineEndings' classVariableNames: 'IgnoreLineEndings InsertTextAttributes NormalTextAttributes RemoveTextAttributes' poolDictionaries: '' category: 'System-FilePackage'! + !TextDiffBuilder commentStamp: 'fbs 9/23/2013 08:58' prior: 0! - !TextDiffBuilder commentStamp: 'ul 9/11/2013 01:05' prior: 0! I implement the diff algorithm. I can show the differences between two texts. See my method comments for further information. Instance Variables xLines: <Array> yLines: <Array> ignoreLineEndings: <Boolean> xLines - an Array of DiffElements which is created from the first input text yLines - an Array of DiffElements which is created from the second input text ignoreLineEndings + - a Boolean describing whether lines only differing in the line endings should be reported as a difference, or not! - - a Boolean describing wether lines only differing in the line endings should be reported as a difference, or not! Item was changed: ----- Method: TextDiffBuilder>>lcsFor:and: (in category 'private') ----- lcsFor: xFilteredLines and: yFilteredLines + "I find one of the longest common subsequences of my arguments. I assume that none of my arguments are empty. I return nil, or an Array which represents a list. The first two elements are the matching ''line'' numbers, the third (and last) is the next node in the list, or nil, if there are no more elements. The list contains the longest common subsequence. I'm a modified version of the Greedy LCS/SES Algorithm from the 6th page of 'An O(ND) Difference Algorithm and Its Variations (1986)' by Eugene W. Myers." - "I find one of the longest common subsequences of my arguments. I assume that none of my arguments are empty. I return nil, or an Array which represents a list. The first two elements are the matching ''line'' numbers, the third (and last) is the next node in the list, or nil, if there are no more elements. The list containts the longest common subsequence. I'm a modified version of the Greedy LCS/SES Algorithm from the 6th page of 'An O(ND) Difference Algorithm and Its Variations (1986)' by Eugene W. Myers" | n m v lcss max index lcs x y | n := xFilteredLines size. m := yFilteredLines size. max := m + n. v := Array new: 2 * max + 1. lcss := Array new: 2 * max + 1. "Unrolled first iteration (d = 0, k = 0)" index := max + 2. y := x := v at: index put: 0. lcs := lcss at: index. [ x < n and: [ y < m and: [ (xFilteredLines at: x + 1) = (yFilteredLines at: y + 1) ] ] ] whileTrue: [ lcs := { x := x + 1. y := y + 1. lcs } ]. x >= n ifTrue: [ y >= m ifTrue: [ ^lcs ] ]. v at: max + 1 put: x. lcss at: max + 1 put: lcs. 1 to: max do: [ :d | "Unrolled lowest diagonal checks (k = -d)." index := max - d + 2. x := v at: index. y := x + d. lcs := lcss at: index. [ x < n and: [ y < m and: [ (xFilteredLines at: x + 1) = (yFilteredLines at: y + 1) ] ] ] whileTrue: [ lcs := { x := x + 1. y := y + 1. lcs } ]. x >= n ifTrue: [ y >= m ifTrue: [ ^lcs ] ]. v at: max - d + 1 put: x. lcss at: max - d + 1 put: lcs. "Inner diagonals. (k in [2-d..d-2])" 2 - d to: d - 2 by: 2 do: [ :k | index := max + k. (v at: index) < (v at: index + 2) ifTrue: [ x := v at: (index := index + 2) ] ifFalse: [ x := (v at: index) + 1 ]. y := x - k. lcs := lcss at: index. [ x < n and: [ y < m and: [ (xFilteredLines at: x + 1) = (yFilteredLines at: y + 1) ] ] ] whileTrue: [ lcs := { x := x + 1. y := y + 1. lcs } ]. x >= n ifTrue: [ y >= m ifTrue: [ ^lcs ] ]. v at: max + k + 1 put: x. lcss at: max + k + 1 put: lcs ]. "Unrolled highest diagonal checks (k = d)." index := max + d. x := (v at: index) + 1. y := x - d. lcs := lcss at: index. [ x < n and: [ y < m and: [ (xFilteredLines at: x + 1) = (yFilteredLines at: y + 1) ] ] ] whileTrue: [ lcs := { x := x + 1. y := y + 1. lcs } ]. x >= n ifTrue: [ y >= m ifTrue: [ ^lcs ] ]. v at: max + d + 1 put: x. lcss at: max + d + 1 put: lcs ]. self error "We should never reach this point."!

1 0

EncodedCharSet class>charsetAt:
by tim Rowledge 01 Oct '13

01 Oct '13

So far as I can tell, this method cannot return nil (well, unless somebody subverts things) and yet two senders try to handle the result being nil. EncodedCharSet class>scanSelectorAt: and CompoundTextConvertor>nextPutValue:toStream:withShiftSequenceIfNeededForLeadingChar: If the intent was that something ought to sometimes happen that actually can't, maybe the code needs checking, just in case. All the other senders rely on the result being non-nil. tim -- tim Rowledge; tim(a)rowledge.org; http://www.rowledge.org/tim Fractured Idiom:- POSH MORTEM - Death styles of the rich and famous

2 3

The Trunk: Tools-cmm.500.mcz
by commits＠source.squeak.org 01 Oct '13

01 Oct '13

Chris Muller uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-cmm.500.mcz ==================== Summary ==================== Name: Tools-cmm.500 Author: cmm Time: 1 October 2013, 2:19:25.118 pm UUID: 426c84cf-2b9c-4c84-8a06-489fabc91907 Ancestors: Tools-fbs.499 - Ensure RecentMessages startUp is executed in postScript. - Employ "Meaningless Behavior" (from CHECKS PLII) rather than a modal dialog by putting up an empty RecentMessageSet rather than a modal alert. =============== Diff against Tools-fbs.499 =============== Item was changed: ----- Method: RecentMessageSet>>updateListsAndCodeIn: (in category 'update') ----- updateListsAndCodeIn: aWindow | recentFromUtilities | "RAA 20 june 2000 - a recent change to how messages were displayed in the list caused them not to match what was stored in Utilities. This caused the recent submissions to be continuously updated. The hack below fixed that problem" self flag: #mref. "in second pass, use simpler test" self canDiscardEdits ifFalse: [^ self]. + RecentMessages default isEmpty ifTrue: [ ^ self ]. recentFromUtilities := RecentMessages default mostRecent asString,' '. (messageList first asStringOrText asString beginsWith: recentFromUtilities) ifFalse: [self reformulateList] ifTrue: [self updateCodePaneIfNeeded]! Item was changed: ----- Method: Utilities class>>browseRecentSubmissions (in category '*Tools') ----- browseRecentSubmissions "Open up a browser on the most recent methods submitted in the image. 5/96 sw." "Utilities browseRecentSubmissions" + | recentMessages | - | recentMessages | - - RecentMessages default isEmpty ifTrue: - [^ self inform: 'There are no recent submissions']. - recentMessages := RecentMessages default methodReferences reversed. ^ RecentMessageSet openMessageList: recentMessages name: 'Recent submissions -- youngest first ' autoSelect: nil.! Item was changed: (PackageInfo named: 'Tools') postscript: 'Workspace allSubInstancesDo: [ :each | (each instVarNamed: #bindings) ifNil: [ each initializeBindings ] ]. + World initializeDesktopCommandKeySelectors. + RecentMessages startUp.'! - World initializeDesktopCommandKeySelectors'!

1 0

Recent Submissions is broken!
by Chris Muller 01 Oct '13

01 Oct '13

After just updating from trunk, all of my Recent Submissions have been blown away and it appears it is not accepting new submissions! I use this all the time, doesn't everyone? Frank is this you?

4 7

Re: [squeak-dev] The Trunk: Collections-tpr.537.mcz
by Levente Uzonyi 01 Oct '13

01 Oct '13

Does this method belong to Collections? Shouldn't it be an extension method? Levente On Mon, 30 Sep 2013, commits(a)source.squeak.org wrote: > tim Rowledge uploaded a new version of Collections to project The Trunk: > http://source.squeak.org/trunk/Collections-tpr.537.mcz > > ==================== Summary ==================== > > Name: Collections-tpr.537 > Author: tpr > Time: 30 September 2013, 4:06:41.402 pm > UUID: b3a96179-9642-40b1-93f3-3f1d82f3e256 > Ancestors: Collections-fbs.536 > > Add Character class>>characterForColumnBreak - to replace TextComposer equivalent. See Mantis 4814 > > =============== Diff against Collections-fbs.536 =============== > > Item was added: > + ----- Method: Character class>>characterForColumnBreak (in category 'accessing untypeable characters') ----- > + characterForColumnBreak > + "use a newPage to split columns in character scanners" > + ^self newPage! > > >

3 3

A browser for some old squeak changesets
by Bob Arning 01 Oct '13

01 Oct '13

A browser for some old squeak changesets: http://69.251.218.6:9116/ Cheers, Bob

8 15

Re: [squeak-dev] The Trunk: Morphic-nice.687.mcz
by Chris Muller 01 Oct '13

01 Oct '13

These version comments are redundant with the code-diff; we can see that 'presenatation' vars are being removed, so could you also please explain _why_ changes are being made in version comments? Is this a cleanup? And may we expect no impact to any paragraph / text-editor behaviors? On Tue, Sep 24, 2013 at 3:40 PM, <commits(a)source.squeak.org> wrote: > Nicolas Cellier uploaded a new version of Morphic to project The Trunk: > http://source.squeak.org/trunk/Morphic-nice.687.mcz > > ==================== Summary ==================== > > Name: Morphic-nice.687 > Author: nice > Time: 24 September 2013, 10:40:04.266 pm > UUID: a0a8b7f9-f0a3-4071-b95b-06124aa146a4 > Ancestors: Morphic-nice.686 > > Expunge presentation* from MultiNewParagraph & MultiTextComposer. > Also remove those methods same as super. > Note the small difference in displaying method: NewPragraph has offset truncated. > Prepare MultiNewParagraph funerals by mutating its instances -> NewParagraph > > =============== Diff against Morphic-nice.686 =============== > > Item was changed: > NewParagraph subclass: #MultiNewParagraph > + instanceVariableNames: '' > - instanceVariableNames: 'presentationText presentationLines' > classVariableNames: '' > poolDictionaries: 'TextConstants' > category: 'Morphic-Multilingual'! > > Item was added: > + ----- Method: MultiNewParagraph class>>initialize (in category 'class initialization') ----- > + initialize > + "Prepare our own funeral" > + > + MultiNewParagraph allInstancesDo:[:mnp| mnp becomeForward: (mnp as: NewParagraph)]! > > Item was removed: > - ----- Method: MultiNewParagraph>>multiComposeLinesFrom:to:delta:into:priorLines:atY: (in category 'composition') ----- > - multiComposeLinesFrom: start to: stop delta: delta into: lineColl priorLines: priorLines > - atY: startingY > - "While the section from start to stop has changed, composition may ripple all the way to the end of the text. However in a rectangular container, if we ever find a line beginning with the same character as before (ie corresponding to delta in the old lines), then we can just copy the old lines from there to the end of the container, with adjusted indices and y-values" > - > - | newResult composer presentationInfo | > - > - composer := MultiTextComposer new. > - presentationLines := nil. > - presentationText := nil. > - newResult := composer > - multiComposeLinesFrom: start > - to: stop > - delta: delta > - into: lineColl > - priorLines: priorLines > - atY: startingY > - textStyle: textStyle > - text: text > - container: container > - wantsColumnBreaks: wantsColumnBreaks == true. > - lines := newResult first asArray. > - maxRightX := newResult second. > - presentationInfo := composer getPresentationInfo. > - presentationLines := presentationInfo first asArray. > - presentationText := presentationInfo second. > - "maxRightX printString displayAt: 0@0." > - ^maxRightX > - ! > > Item was removed: > - ----- Method: MultiNewParagraph>>presentationLines (in category 'accessing') ----- > - presentationLines > - > - ^ presentationLines. > - ! > > Item was removed: > - ----- Method: MultiNewParagraph>>presentationText (in category 'accessing') ----- > - presentationText > - > - ^ presentationText. > - ! > > Item was changed: > TextComposer subclass: #MultiTextComposer > + instanceVariableNames: '' > - instanceVariableNames: 'presentation presentationLines' > classVariableNames: '' > poolDictionaries: 'TextConstants' > category: 'Morphic-Multilingual'! > > Item was removed: > - ----- Method: MultiTextComposer>>composeEachRectangleIn: (in category 'as yet unclassified') ----- > - composeEachRectangleIn: rectangles > - > - | myLine lastChar | > - > - 1 to: rectangles size do: [:i | > - currCharIndex <= theText size ifFalse: [^false]. > - myLine := scanner > - composeFrom: currCharIndex > - inRectangle: (rectangles at: i) > - firstLine: isFirstLine > - leftSide: i=1 > - rightSide: i=rectangles size. > - lines addLast: myLine. > - presentationLines addLast: scanner getPresentationLine. > - presentation ifNil: [presentation := scanner getPresentation] > - ifNotNil: [presentation := presentation, scanner getPresentation]. > - actualHeight := actualHeight max: myLine lineHeight. "includes font changes" > - currCharIndex := myLine last + 1. > - lastChar := theText at: myLine last. > - (CharacterSet crlf includes: lastChar) ifTrue: [^#cr]. > - wantsColumnBreaks ifTrue: [ > - lastChar = TextComposer characterForColumnBreak ifTrue: [^#columnBreak]. > - ]. > - ]. > - ^false! > > Item was removed: > - ----- Method: MultiTextComposer>>getPresentationInfo (in category 'as yet unclassified') ----- > - getPresentationInfo > - > - ^ Array with: presentationLines with: presentation. > - ! > > Item was changed: > ----- Method: MultiTextComposer>>multiComposeLinesFrom:to:delta:into:priorLines:atY:textStyle:text:container:wantsColumnBreaks: (in category 'as yet unclassified') ----- > multiComposeLinesFrom: argStart to: argStop delta: argDelta into: argLinesCollection priorLines: argPriorLines atY: argStartY textStyle: argTextStyle text: argText container: argContainer wantsColumnBreaks: argWantsColumnBreaks > > wantsColumnBreaks := argWantsColumnBreaks. > lines := argLinesCollection. > - presentationLines := argLinesCollection copy. > theTextStyle := argTextStyle. > theText := argText. > theContainer := argContainer. > deltaCharIndex := argDelta. > currCharIndex := startCharIndex := argStart. > stopCharIndex := argStop. > prevLines := argPriorLines. > currentY := argStartY. > defaultLineHeight := theTextStyle lineGrid. > maxRightX := theContainer left. > possibleSlide := stopCharIndex < theText size and: [theContainer isMemberOf: Rectangle]. > nowSliding := false. > prevIndex := 1. > scanner := MultiCompositionScanner new text: theText textStyle: theTextStyle. > scanner wantsColumnBreaks: wantsColumnBreaks. > isFirstLine := true. > self composeAllLines. > isFirstLine ifTrue: ["No space in container or empty text" > self > addNullLineWithIndex: startCharIndex > andRectangle: (theContainer topLeft extent: 0@defaultLineHeight) > ] ifFalse: [ > self fixupLastLineIfCR > ]. > ^{lines asArray. maxRightX} > > ! > > Item was removed: > - ----- Method: NewParagraph>>testNewComposeAll3 (in category 'composition') ----- > - testNewComposeAll3 > - | newResult | > - newResult := TextComposer new > - multiComposeLinesFrom: firstCharacterIndex > - to: text size > - delta: 0 > - into: OrderedCollection new > - priorLines: Array new > - atY: container top > - textStyle: textStyle > - text: text > - container: (0@0 extent: 31@60) > - wantsColumnBreaks: false. > - ^{newResult. {lines. maxRightX}} > - ! > >

4 5

The Trunk: Environments-cmm.33.mcz
by commits＠source.squeak.org 01 Oct '13

01 Oct '13

Chris Muller uploaded a new version of Environments to project The Trunk: http://source.squeak.org/trunk/Environments-cmm.33.mcz ==================== Summary ==================== Name: Environments-cmm.33 Author: cmm Time: 30 September 2013, 7:53:24.291 pm UUID: 5f0a2674-9bae-44ec-9526-37d24814878e Ancestors: Environments-fbs.32 Remove isVariableBinding redundant with super impl. =============== Diff against Environments-fbs.32 =============== Item was removed: - ----- Method: Binding>>isVariableBinding (in category 'as yet unclassified') ----- - isVariableBinding - ^ true!

1 0

Re: [squeak-dev] The Trunk: Graphics-nice.242.mcz
by Nicolas Cellier 01 Oct '13

01 Oct '13

I did not find regressions, but this part lacks automated tests (really). Having a space crossing rightMargin on last line is not handled correctly despite the machinery found in crossedX... But is wasn't before those changes... Though, a MVC Paragraph makes a better job in this case... I can't understand why theFirstCharCrossedX is required, nor this section of endOfRun: characterIndex ~~ nil ifTrue: ["If scanning for an index and we've stopped on that index, then we back destX off by the width of the character stopped on (it will be pointing at the right side of the character) and return" runStopIndex = characterIndex ifTrue: [characterPoint := destX - lastCharacterWidth @ destY. ^true]. They might be related, but not sure... rightFlush still is messy like it was, but it might be at composition stage too. 2013/10/1 <commits(a)source.squeak.org> > Nicolas Cellier uploaded a new version of Graphics to project The Trunk: > http://source.squeak.org/trunk/Graphics-nice.242.mcz > > ==================== Summary ==================== > > Name: Graphics-nice.242 > Author: nice > Time: 1 October 2013, 2:39:06.884 am > UUID: ca886e46-dd2e-448d-a639-6cf5060948aa > Ancestors: Graphics-tpr.241 > > More simplification of CharacterBlockScanner > 1) Replace lastCharacterExtent with lastCharacterWidth : more simple. > Thus we can remove lastCharacterExtentSetX: > 2) Don't record lastCharacterExtent + lastSpaceOrTabExtent it's too much. > - A stopCondition will set the lastCharacterWidth. > - For any other character, this can be retrieved on demand by > retrieveLastCharacterWidth. > So in the end, lastCharacterWidth is all we ever wanted. > Thus we can remove lastSpaceOrTabExtentSetX: > 3) Move the hack for click after middle of last char with his colleagues > in the stopCondition. > This restores some homogeneity between MVC and Morphic code. > Remove Yukky code. > > =============== Diff against Graphics-tpr.241 =============== > > Item was changed: > CharacterScanner subclass: #CharacterBlockScanner > + instanceVariableNames: 'characterPoint characterIndex > nextLeftMargin specialWidth lastCharacterWidth' > - instanceVariableNames: 'characterPoint characterIndex > lastCharacterExtent lastSpaceOrTabExtent nextLeftMargin specialWidth' > classVariableNames: '' > poolDictionaries: '' > category: 'Graphics-Text'! > > !CharacterBlockScanner commentStamp: '<historical>' prior: 0! > My instances are used to scan text to compute the CharacterBlock for a > character specified by its index in the text or its proximity to the cursor > location.! > > Item was changed: > ----- Method: CharacterBlockScanner>>buildCharacterBlockIn: (in category > 'private') ----- > buildCharacterBlockIn: para > "This method is used by the MVC version only." > > | lineIndex runLength lineStop stopCondition | > "handle nullText" > (para numberOfLines = 0 or: [text size = 0]) > ifTrue: [^ CharacterBlock new stringIndex: 1 "like being > off end of string" > text: para text > topLeft: (para > leftMarginForDisplayForLine: 1 alignment: (alignment ifNil:[textStyle > alignment])) > @ para > compositionRectangle top > extent: 0 @ textStyle lineGrid]. > "find the line" > lineIndex := para lineIndexOfTop: characterPoint y. > destY := para topAtLineIndex: lineIndex. > line := para lines at: lineIndex. > lastIndex := line first. > rightMargin := para rightMarginForDisplay. > self setStopConditions. " also loads the font, alignment and all > emphasis attributes " > > (lineIndex = para numberOfLines and: > [(destY + line lineHeight) < characterPoint y]) > ifTrue: ["if beyond lastLine, force search to last > character" > self characterPointSetX: > rightMargin] > ifFalse: [characterPoint y < (para > compositionRectangle) top > ifTrue: ["force search to > first line" > > characterPoint := (para compositionRectangle) topLeft]. > characterPoint x > rightMargin > ifTrue: [self > characterPointSetX: rightMargin]]. > destX := leftMargin := para leftMarginForDisplayForLine: lineIndex > alignment: alignment. > nextLeftMargin:= para leftMarginForDisplayForLine: lineIndex+1 > alignment: alignment. > runLength := text runLengthFor: line first. > lineStop := characterIndex "scanning for index" > ifNil: [ line last ]. "scanning for > point" > runStopIndex := lastIndex + (runLength - 1) min: lineStop. > + lastCharacterWidth := 0. > - lastCharacterExtent := 0 @ line lineHeight. > spaceCount := 0. > self handleIndentation. > > [stopCondition := self scanCharactersFrom: lastIndex to: > runStopIndex > in: text string rightX: characterPoint x > stopConditions: stopConditions kern: kern. > "see setStopConditions for stopping conditions for character block > operations." > - self lastCharacterExtentSetX: (font widthOf: (text at: lastIndex)). > self perform: stopCondition] whileFalse. > > ^characterIndex == nil > ifTrue: ["characterBlockAtPoint" > ^ CharacterBlock new stringIndex: > lastIndex text: text > topLeft: characterPoint + > (font descentKern @ 0) > + extent: lastCharacterWidth > @ line lineHeight] > - extent: > lastCharacterExtent] > ifFalse: ["characterBlockForIndex" > ^ CharacterBlock new stringIndex: > lastIndex text: text > topLeft: characterPoint + > ((font descentKern) - kern @ 0) > + extent: lastCharacterWidth > @ line lineHeight]! > - extent: > lastCharacterExtent]! > > Item was changed: > ----- Method: CharacterBlockScanner>>characterBlockAtPoint:index:in: (in > category 'scanning') ----- > characterBlockAtPoint: aPoint index: index in: textLine > "This method is the Morphic characterBlock finder. It combines > MVC's characterBlockAtPoint:, -ForIndex:, and > buildCharacterBlockIn:" > | runLength lineStop stopCondition | > line := textLine. > rightMargin := line rightMargin. > lastIndex := line first. > self setStopConditions. "also sets font" > characterIndex := index. " == nil means scanning for point" > characterPoint := aPoint. > (characterPoint isNil or: [characterPoint y > line bottom]) > ifTrue: [characterPoint := line bottomRight]. > destX := leftMargin := line leftMarginForAlignment: alignment. > destY := line top. > (text isEmpty or: [(characterPoint y < destY or: [characterPoint x > < destX]) > or: [characterIndex notNil and: > [characterIndex < line first]]]) > ifTrue: [^ (CharacterBlock new stringIndex: line first > text: text > topLeft: destX@destY extent: 0 @ > textStyle lineGrid) > textLine: line]. > runLength := text runLengthFor: line first. > lineStop := characterIndex "scanning for index" > ifNil: [ line last ]. "scanning for > point" > runStopIndex := lastIndex + (runLength - 1) min: lineStop. > + lastCharacterWidth := 0. > - lastCharacterExtent := 0 @ line lineHeight. > spaceCount := 0. > > [ > stopCondition := self scanCharactersFrom: lastIndex to: > runStopIndex > in: text string rightX: characterPoint x > stopConditions: stopConditions kern: kern. > "see setStopConditions for stopping conditions for > character block operations." > - self lastCharacterExtentSetX: (specialWidth ifNil: [font > widthOf: (text at: lastIndex)]). > self perform: stopCondition > ] whileFalse. > characterIndex > + ifNil: ["Result for characterBlockAtPoint: " > - ifNil: [ > - "Result for characterBlockAtPoint: " > - (stopCondition ~~ #cr and: [ lastIndex = line last > - and: [ aPoint x > ((characterPoint x) + > (lastCharacterExtent x / 2)) ]]) > - ifTrue: [ "Correct for right half > of last character in line" > - ^ (CharacterBlock new > stringIndex: lastIndex + 1 > - text: text > - topLeft: > characterPoint + (lastCharacterExtent x @ 0) + (font descentKern @ 0) > - extent: 0 > @ lastCharacterExtent y) > - textLine: line ]. > ^ (CharacterBlock new > stringIndex: lastIndex > text: text topLeft: characterPoint > + (font descentKern @ 0) > + extent: lastCharacterWidth @ line > lineHeight - (font baseKern @ 0)) > - extent: lastCharacterExtent - > (font baseKern @ 0)) > textLine: line] > ifNotNil: ["Result for characterBlockForIndex: " > ^ (CharacterBlock new > stringIndex: characterIndex > text: text topLeft: characterPoint > + ((font descentKern) - kern @ 0) > + extent: lastCharacterWidth @ line > lineHeight) > - extent: lastCharacterExtent) > textLine: line]! > > Item was changed: > ----- Method: CharacterBlockScanner>>cr (in category 'stop conditions') > ----- > cr > "Answer a CharacterBlock that specifies the current location of > the mouse > relative to a carriage return stop condition that has just been > encountered. The ParagraphEditor convention is to denote > selections by > CharacterBlocks, sometimes including the carriage return (cursor > is at > the end) and sometimes not (cursor is in the middle of the text)." > > ((characterIndex ~= nil > and: [characterIndex > text size]) > or: [(line last = text size) > and: [(destY + line lineHeight) < > characterPoint y]]) > ifTrue: ["When off end of string, give data for next > character" > destY := destY + line lineHeight. > characterPoint := (nextLeftMargin ifNil: > [leftMargin]) @ destY. > (lastIndex < text size and: [(text at: > lastIndex) = CR and: [(text at: lastIndex+1) = Character lf]]) > ifTrue: [lastIndex := lastIndex + > 2] > ifFalse: [lastIndex := lastIndex + > 1]. > + lastCharacterWidth := 0. > - self lastCharacterExtentSetX: 0. > ^ true]. > characterPoint := destX @ destY. > + lastCharacterWidth := rightMargin - destX. > - self lastCharacterExtentSetX: rightMargin - destX. > ^true! > > Item was changed: > ----- Method: CharacterBlockScanner>>crossedX (in category 'stop > conditions') ----- > crossedX > "Text display has wrapping. The scanner just found a character > past the x > location of the cursor. We know that the cursor is pointing at a > character > or before one." > > + self retrieveLastCharacterWidth. > + > - | currentX lastCharacter | > characterIndex == nil ifFalse: [ > "If the last character of the last line is a space, > and it crosses the right margin, then locating > the character block after it is impossible without this > hack." > characterIndex > text size ifTrue: [ > lastIndex := characterIndex. > characterPoint := (nextLeftMargin ifNil: > [leftMargin]) @ (destY + line lineHeight). > ^true]]. > + characterPoint x <= (destX + (lastCharacterWidth // 2)) > - characterPoint x <= (destX + (lastCharacterExtent x // 2)) > ifTrue: [characterPoint := destX @ destY. > ^true]. > lastIndex >= line last > ifTrue: [characterPoint := destX @ destY. > ^true]. > > "Pointing past middle of a character, return the next character." > lastIndex := lastIndex + 1. > + characterPoint := destX + lastCharacterWidth + kern @ destY. > - lastCharacter := text at: lastIndex. > - currentX := destX + lastCharacterExtent x + kern. > - self lastCharacterExtentSetX: (font widthOf: lastCharacter). > - characterPoint := currentX @ destY. > - lastCharacter = Space ifFalse: [^ true]. > - > - "Yukky if next character is space or tab." > - alignment = Justified ifTrue: > - [self lastCharacterExtentSetX: > - (lastCharacterExtent x + (line > justifiedPadFor: (spaceCount + 1) font: font))]. > - > ^ true! > > Item was changed: > ----- Method: CharacterBlockScanner>>endOfRun (in category 'stop > conditions') ----- > endOfRun > "Before arriving at the cursor location, the selection has > encountered an > end of run. Answer false if the selection continues, true > otherwise. Set > up indexes for building the appropriate CharacterBlock." > > + | runLength lineStop | > + > - | runLength lineStop lastCharacter | > (((characterIndex ~~ nil and: > [runStopIndex < characterIndex and: [runStopIndex < text > size]]) > or: [characterIndex == nil and: [lastIndex < > line last]]) or: [ > ((lastIndex < line last) > and: [((text at: lastIndex) leadingChar ~= > (text at: lastIndex+1) leadingChar) > and: [lastIndex ~= > characterIndex]])]) > ifTrue: ["We're really at the end of a real run." > + runLength := text runLengthFor: (lastIndex > := lastIndex + 1). > + lineStop := characterIndex "scanning > for index" > + ifNil: [line last]. > "scanning for point". > - runLength := (text runLengthFor: > (lastIndex := lastIndex + 1)). > - characterIndex ~~ nil > - ifTrue: [lineStop := > characterIndex "scanning for index"] > - ifFalse: [lineStop := line > last "scanning for point"]. > (runStopIndex := lastIndex + (runLength - > 1)) > lineStop > + ifTrue: [runStopIndex := lineStop]. > - ifTrue: [runStopIndex := > lineStop]. > self setStopConditions. > ^false]. > > + self retrieveLastCharacterWidth. > + > + (characterIndex == nil and: [lastIndex = line last]) > + ifTrue: [characterPoint x > (destX + (lastCharacterWidth > // 2)) > + ifTrue: > + [ "Correct for clicking right half of last > character in line > + means selecting AFTER the char" > + lastIndex := lastIndex + 1. > + lastCharacterWidth := 0. > + characterPoint := destX + > lastCharacterWidth @ destY. > + ^true]]. > + > - lastCharacter := text at: lastIndex. > characterPoint := destX @ destY. > - ((lastCharacter = Space and: [alignment = Justified]) > - or: [lastCharacter = Tab and: [lastSpaceOrTabExtent > notNil]]) > - ifTrue: [lastCharacterExtent := lastSpaceOrTabExtent]. > characterIndex ~~ nil > ifTrue: ["If scanning for an index and we've stopped on > that index, > then we back destX off by the width of the > character stopped on > (it will be pointing at the right side of > the character) and return" > runStopIndex = characterIndex > + ifTrue: [characterPoint := destX - > lastCharacterWidth @ destY. > - ifTrue: [self characterPointSetX: > destX - lastCharacterExtent x. > ^true]. > "Otherwise the requested index was greater > than the length of the > string. Return string size + 1 as index, > indicate further that off the > string by setting character to nil and the > extent to 0." > lastIndex := lastIndex + 1. > + lastCharacterWidth := 0. > - self lastCharacterExtentSetX: 0. > ^true]. > > "Scanning for a point and either off the end of the line or off > the end of the string." > runStopIndex = text size > ifTrue: ["off end of string" > lastIndex := lastIndex + 1. > + lastCharacterWidth := 0. > - self lastCharacterExtentSetX: 0. > ^true]. > "just off end of line without crossing x" > lastIndex := lastIndex + 1. > ^true! > > Item was removed: > - ----- Method: CharacterBlockScanner>>lastCharacterExtentSetX: (in > category 'private') ----- > - lastCharacterExtentSetX: xVal > - lastCharacterExtent := xVal @ lastCharacterExtent y! > > Item was removed: > - ----- Method: CharacterBlockScanner>>lastSpaceOrTabExtentSetX: (in > category 'private') ----- > - lastSpaceOrTabExtentSetX: xVal > - lastSpaceOrTabExtent := xVal @ lastSpaceOrTabExtent y! > > Item was changed: > ----- Method: CharacterBlockScanner>>paddedSpace (in category 'stop > conditions') ----- > paddedSpace > "When the line is justified, the spaces will not be the same as > the font's > space character. A padding of extra space must be considered in > trying > to find which character the cursor is pointing at. Answer whether > the > scanning has crossed the cursor." > > | pad | > - pad := 0. > spaceCount := spaceCount + 1. > pad := line justifiedPadFor: spaceCount font: font. > + lastCharacterWidth := spaceWidth + pad. > + (destX + lastCharacterWidth) >= characterPoint x > + ifTrue: > + [^self crossedX]. > - lastSpaceOrTabExtent := lastCharacterExtent. > - self lastSpaceOrTabExtentSetX: spaceWidth + pad. > - (destX + lastSpaceOrTabExtent x) >= characterPoint x > - ifTrue: [lastCharacterExtent := lastSpaceOrTabExtent. > - ^self crossedX]. > lastIndex := lastIndex + 1. > + destX := destX + lastCharacterWidth. > - destX := destX + lastSpaceOrTabExtent x. > ^ false > ! > > Item was added: > + ----- Method: CharacterBlockScanner>>retrieveLastCharacterWidth (in > category 'private') ----- > + retrieveLastCharacterWidth > + | lastCharacter | > + lastIndex > text size ifTrue: [^lastCharacterWidth := 0]. > + lastCharacter := text at: lastIndex. > + (lastCharacter charCode >= 256 or: [(stopConditions at: > lastCharacter charCode + 1) isNil]) > + ifTrue: [lastCharacterWidth := font widthOf: (text at: > lastIndex)]. > + "if last character was a stop condition, then the width is already > set" > + ^lastCharacterWidth! > > Item was changed: > ----- Method: CharacterBlockScanner>>space (in category 'stop > conditions') ----- > space > "Account for spaceWidth" > > spaceCount := spaceCount + 1. > + lastCharacterWidth := spaceWidth. > + (destX + lastCharacterWidth) >= characterPoint x > + ifTrue: > + [^self crossedX]. > - lastSpaceOrTabExtent := lastCharacterExtent. > - self lastSpaceOrTabExtentSetX: spaceWidth. > - (destX + spaceWidth) >= characterPoint x > - ifTrue: [lastCharacterExtent := lastSpaceOrTabExtent. > - ^self crossedX]. > lastIndex := lastIndex + 1. > + destX := destX + lastCharacterWidth. > + ^ false! > - destX := destX + spaceWidth. > - ^ false > - ! > > Item was changed: > ----- Method: CharacterBlockScanner>>tab (in category 'stop conditions') > ----- > tab > | currentX | > currentX := (alignment = Justified and: [self leadingTab not]) > ifTrue: "imbedded tabs in justified text are weird" > [destX + (textStyle tabWidth - (line > justifiedTabDeltaFor: spaceCount)) max: destX] > ifFalse: > [textStyle > nextTabXFrom: destX > leftMargin: leftMargin > rightMargin: rightMargin]. > + lastCharacterWidth := currentX - destX max: 0. > - lastSpaceOrTabExtent := lastCharacterExtent. > - self lastSpaceOrTabExtentSetX: (currentX - destX max: 0). > currentX >= characterPoint x > ifTrue: > + [^ self crossedX]. > - [lastCharacterExtent := lastSpaceOrTabExtent. > - ^ self crossedX]. > destX := currentX. > lastIndex := lastIndex + 1. > ^false! > > >

1 0

The Trunk: Collections-cmm.538.mcz
by commits＠source.squeak.org 01 Oct '13

01 Oct '13

Chris Muller uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-cmm.538.mcz ==================== Summary ==================== Name: Collections-cmm.538 Author: cmm Time: 30 September 2013, 7:50:52.954 pm UUID: f041f162-9c02-499f-866e-27d2e1a31b6b Ancestors: Collections-tpr.537 - Logging output to a #endEntry is sometimes necessary. So let's still allow switching to another kind of WriteStream. =============== Diff against Collections-tpr.537 =============== Item was added: + ----- Method: WriteStream>>endEntry (in category 'compatibility') ----- + endEntry + "No-op for compatibility with TranscriptStream."! Item was changed: + ----- Method: WriteStream>>flush (in category 'compatibility') ----- - ----- Method: WriteStream>>flush (in category 'file open/close') ----- flush!

1 0

Jump to page: