<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Exchange Server">
<!-- converted from text --><style><!-- .EmailQuote { margin-left: 1pt; padding-left: 4pt; border-left: #800000 2px solid; } --></style>
</head>
<body>
<meta content="text/html; charset=UTF-8">
<style type="text/css" style="">
<!--
p
{margin-top:0;
margin-bottom:0}
-->
</style>
<div dir="ltr">
<div id="x_divtagdefaultwrapper" dir="ltr" style="font-size:12pt; color:#000000; font-family:Calibri,Helvetica,sans-serif">
<p>FYI: <span>Tools-ct.931 depends directly on this. :-)</span></p>
<div id="x_Signature">
<div id="x_divtagdefaultwrapper" dir="ltr" style="font-size:12pt; color:rgb(0,0,0); font-family:Calibri,Helvetica,sans-serif,EmojiFont,"Apple Color Emoji","Segoe UI Emoji",NotoColorEmoji,"Segoe UI Symbol","Android Emoji",EmojiSymbols">
<div name="x_divtagdefaultwrapper" style="font-family:Calibri,Arial,Helvetica,sans-serif; font-size:; margin:0">
<div>
<div class="x__rp_T4" id="x_Item.MessagePartBody">
<div class="x__rp_U4 x_ms-font-weight-regular x_ms-font-color-neutralDark x_rpHighlightAllClass x_rpHighlightBodyClass" id="x_Item.MessageUniqueBody" style="font-family:wf_segoe-ui_normal,"Segoe UI","Segoe WP",Tahoma,Arial,sans-serif,serif,EmojiFont">
<div dir="ltr">
<div id="x_divtagdefaultwrapper"><font face="Calibri,Helvetica,sans-serif,EmojiFont,Apple Color Emoji,Segoe UI Emoji,NotoColorEmoji,Segoe UI Symbol,Android Emoji,EmojiSymbols">
<div id="x_Signature">
<div style="margin:0px"><font style="font-family:Calibri,Arial,Helvetica,sans-serif,serif,EmojiFont">
<div><font size="3" color="black"><span style="font-size:12pt"><a href="http://www.hpi.de/" target="_blank" rel="noopener noreferrer" id="LPNoLP"><font size="2"><span id="LPlnk909538"><font color="#757B80"></font></span></font></a></span></font></div>
</font></div>
</div>
</font></div>
</div>
</div>
</div>
<div class="x__rp_T4" id="x_Item.MessagePartBody"><br>
</div>
<div class="x__rp_T4" id="x_Item.MessagePartBody">Best,</div>
<div class="x__rp_T4" id="x_Item.MessagePartBody">Christoph</div>
</div>
<div><font size="2" color="#808080"></font></div>
</div>
</div>
</div>
</div>
<hr tabindex="-1" style="display:inline-block; width:98%">
<div id="x_divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>Von:</b> Squeak-dev <squeak-dev-bounces@lists.squeakfoundation.org> im Auftrag von commits@source.squeak.org <commits@source.squeak.org><br>
<b>Gesendet:</b> Freitag, 21. Februar 2020 16:36:36<br>
<b>An:</b> squeak-dev@lists.squeakfoundation.org; packages@lists.squeakfoundation.org<br>
<b>Betreff:</b> [squeak-dev] The Trunk: System-ct.1132.mcz</font>
<div> </div>
</div>
</div>
<font size="2"><span style="font-size:10pt;">
<div class="PlainText">Marcel Taeumel uploaded a new version of System to project The Trunk:<br>
<a href="http://source.squeak.org/trunk/System-ct.1132.mcz">http://source.squeak.org/trunk/System-ct.1132.mcz</a><br>
<br>
==================== Summary ====================<br>
<br>
Name: System-ct.1132<br>
Author: ct<br>
Time: 18 January 2020, 3:57:40.447813 pm<br>
UUID: 252e88e7-b8dc-7048-9fb7-78bf5dc98138<br>
Ancestors: System-cmm.1129<br>
<br>
Fix & refactor ChangeSet >> #scanVersionsOf:class:meta:category:selector:<br>
<br>
Bug was:<br>
(Context changeRecordsAt: #methodClass) collect: #category as: Array<br>
Output before: #(accessing accessing accessing)<br>
Output after: #('accessing' 'debugger access' 'debugger access')<br>
<br>
=============== Diff against System-cmm.1129 ===============<br>
<br>
Item was changed:<br>
----- Method: ChangeSet class>>scanVersionsOf:class:meta:category:selector: (in category 'scanning') -----<br>
+ scanVersionsOf: method class: class meta: meta category: category selector: selector<br>
+ <br>
+ | changeList cat position sourceFilesCopy file |<br>
- scanVersionsOf: method class: class meta: meta category: cat selector: selector<br>
- | position prevPos prevFileIndex preamble tokens sourceFilesCopy stamp changeList file |<br>
changeList := OrderedCollection new.<br>
+ cat := category ifNil: [''].<br>
position := method filePosition.<br>
+ sourceFilesCopy := SourceFiles collect: [:x |<br>
+ x ifNotNil: [x readOnlyCopy]].<br>
+ method fileIndex isZero ifTrue: [^ nil].<br>
- sourceFilesCopy := SourceFiles collect:[:x | x ifNotNil:[x readOnlyCopy]].<br>
- method fileIndex = 0 ifTrue: [^ nil].<br>
file := sourceFilesCopy at: method fileIndex.<br>
+ [position notNil and: [file notNil]] whileTrue: [<br>
+ | preamble prevFileIndex prevPos stamp tokens |<br>
- [position notNil & file notNil] whileTrue:[<br>
preamble := method getPreambleFrom: file at: (0 max: position - 3).<br>
+ "Preamble is likely a linked method preamble, if we're in a changes file (not the sources file).<br>
+ Try to parse it for prior source position and file index."<br>
- "Preamble is likely a linked method preamble, if we're in<br>
- a changes file (not the sources file). Try to parse it<br>
- for prior source position and file index"<br>
prevPos := nil.<br>
stamp := ''.<br>
+ tokens := (preamble findString: 'methodsFor:' startingAt: 1) > 0<br>
+ ifTrue: [[Scanner new scanTokens: preamble] ifError: [#()]]<br>
+ ifFalse: [#() "ie cant be back ref"].<br>
- (preamble findString: 'methodsFor:' startingAt: 1) > 0<br>
- ifTrue: [tokens := [Scanner new scanTokens: preamble] on: Error do:[#()]]<br>
- ifFalse: [tokens := Array new "ie cant be back ref"].<br>
((tokens size between: 7 and: 8)<br>
+ and: [(tokens at: tokens size - 5) = #methodsFor:])<br>
+ ifTrue: [<br>
+ (tokens at: tokens size - 3) = #stamp:<br>
+ ifTrue: [ "New format gives change stamp and unified prior pointer"<br>
+ stamp := tokens at: tokens size - 2.<br>
+ prevPos := tokens last.<br>
+ prevFileIndex := sourceFilesCopy fileIndexFromSourcePointer: prevPos.<br>
+ prevPos := sourceFilesCopy filePositionFromSourcePointer: prevPos]<br>
+ ifFalse: [ "Old format gives no stamp; prior pointer in two parts"<br>
+ prevPos := tokens at: tokens size - 2.<br>
+ prevFileIndex := tokens last].<br>
+ cat := tokens at: tokens size - 4.<br>
+ (prevPos = 0 or: [prevFileIndex = 0]) ifTrue: [prevPos := nil]].<br>
- and: [(tokens at: tokens size-5) = #methodsFor:]) ifTrue:[<br>
- (tokens at: tokens size-3) = #stamp: ifTrue:[<br>
- "New format gives change stamp and unified prior pointer"<br>
- stamp := tokens at: tokens size-2.<br>
- prevPos := tokens last.<br>
- prevFileIndex := sourceFilesCopy fileIndexFromSourcePointer: prevPos.<br>
- prevPos := sourceFilesCopy filePositionFromSourcePointer: prevPos.<br>
- ] ifFalse: ["Old format gives no stamp; prior pointer in two parts"<br>
- prevPos := tokens at: tokens size-2.<br>
- prevFileIndex := tokens last.<br>
- ].<br>
- (prevPos = 0 or: [prevFileIndex = 0]) ifTrue: [prevPos := nil]<br>
- ].<br>
((tokens size between: 5 and: 6)<br>
+ and: [(tokens at: tokens size - 3) = #methodsFor:])<br>
+ ifTrue: [<br>
+ (tokens at: tokens size - 1) = #stamp:<br>
+ ifTrue: [ "New format gives change stamp and unified prior pointer"<br>
+ stamp := tokens at: tokens size].<br>
+ cat := tokens at: tokens size - 2].<br>
+ changeList add: (ChangeRecord new<br>
+ file: file position: position type: #method<br>
+ class: class name category: cat meta: meta stamp: stamp).<br>
- and: [(tokens at: tokens size-3) = #methodsFor:]) ifTrue:[<br>
- (tokens at: tokens size-1) = #stamp: ifTrue: [<br>
- "New format gives change stamp and unified prior pointer"<br>
- stamp := tokens at: tokens size.<br>
- ]<br>
- ].<br>
- changeList add: (ChangeRecord new file: file position: position type: #method<br>
- class: class name category: cat meta: meta stamp: stamp).<br>
position := prevPos.<br>
+ prevPos ifNotNil: [file := sourceFilesCopy at: prevFileIndex]].<br>
+ sourceFilesCopy do: [:x | x ifNotNil: [x close]]. self flag: #ct "ensure?".<br>
+ ^ changeList!<br>
- prevPos notNil ifTrue:[file := sourceFilesCopy at: prevFileIndex].<br>
- ].<br>
- sourceFilesCopy do: [:x | x ifNotNil:[x close]].<br>
- ^changeList!<br>
<br>
<br>
</div>
</span></font>
</body>
</html>