Squeak-dev March 2022

squeak-dev@lists.squeakfoundation.org

33 participants
303 discussions

The Trunk: ToolsTests-ct.107.mcz
by commits＠source.squeak.org 22 May '22

22 May '22

Christoph Thiede uploaded a new version of ToolsTests to project The Trunk: http://source.squeak.org/trunk/ToolsTests-ct.107.mcz ==================== Summary ==================== Name: ToolsTests-ct.107 Author: ct Time: 16 December 2021, 2:29:44.341664 am UUID: 6b771eec-03fe-0a4d-91c9-50480d259573 Ancestors: ToolsTests-mt.106 Complements Kernel-ct.1434 (revised termination modi on Process). Adds end-to-end tests for abandoning vs. terminating a debugger inside an active unwind context. Makes proper use of new termination modi in clean-ups for other tests. =============== Diff against ToolsTests-mt.106 =============== Item was changed: ----- Method: DebuggerTests>>tearDown (in category 'running') ----- tearDown debugger ifNotNil: [debugger close]. + process ifNotNil: [process terminateAggressively]. - process ifNotNil: [process terminate]. process := nil. debugger := nil. window := nil. reset do: #value. super tearDown.! Item was changed: ----- Method: DebuggerTests>>test16HandleSimulationError (in category 'tests') ----- test16HandleSimulationError "Regression test. In the past, the scenario below led to an infinite debugger chain freezing your image. Be careful when running this test in an unpatched image!! For more information, see http://forum.world.st/I-broke-the-debugger-td5110752.html." | userProcess | process := Process forBlock: [ "the faulty user code" thisContext pc: nil]. debugger := process debug. [userProcess := [debugger stepThrough] fork. Processor yield. self deny: [process isTerminated]. self assert: [userProcess isSuspended]] ensure: [ + process destroy. - process suspendedContext: nil; terminate. debugger close. process := userProcess. self findDebugger "for correct tearDown"].! Item was changed: ----- Method: DebuggerTests>>test17HandleBlockCannotReturn (in category 'tests') ----- test17HandleBlockCannotReturn "Regression test. In the past, the scenario below led to an infinite debugger chain freezing your image. Be careful when running this test in an unpatched image!! For more information, see http://forum.world.st/I-broke-the-debugger-td5110752.html." | userProcess | process := Process forBlock: [ "the faulty user code" [] ensure: [thisContext privSender: nil]]. debugger := process debug. [userProcess := [debugger stepOver] fork. Processor yield. self assert: [process isTerminated]. self deny: [userProcess isRunnable]] ensure: [ + process terminateAggressively. - process terminate. debugger close. process := userProcess. self findDebugger "for correct tearDown"].! Item was changed: ----- Method: DebuggerTests>>test18HandleNestedBlockCannotReturn (in category 'tests') ----- test18HandleNestedBlockCannotReturn "Regression test. In the past, the scenario below led to an infinite debugger chain freezing your image. Be careful when running this test in an unpatched image!! For more information, see http://forum.world.st/I-broke-the-debugger-td5110752.html." | metaProcess metaDebugger userProcess | process := Process forBlock: [ "the faulty user code" [] ensure: [thisContext privSender: nil]]. debugger := process debug. metaProcess := Process forBlock: [ debugger stepOver]. metaDebugger := metaProcess debug. [userProcess := [metaDebugger stepOver] fork. Processor yield. self assert: [process isTerminated]. self deny: [userProcess isRunnable]] ensure: [ + process terminateAggressively. - process terminate. debugger close. + metaProcess terminateAggressively. - metaProcess terminate. metaDebugger close. process := userProcess. self findDebugger "for correct tearDown"].! Item was added: + ----- Method: DebuggerTests>>test19Abandon (in category 'tests') ----- + test19Abandon + "When the debugger is abandoned, the interrupted process is terminated aggressively, i.e., all not yet started unwind contexts are executed. Further errors that occur during unwinding lead to another debugger showing up. This is the acceptance test equivalent for ProcessTest >> #testTerminateNestedUnwindAggressively." + + | x y z userProcess | + process := Process + forBlock: + [x := 1. + [y := 1. + self error: #first. + y := 2] ensure: + [z := 1. + self error: #second. + z := 2]. + x := 2] + runUntil: [:ctx | y = 1]. + self should: {x. y. z} = {1. 1. nil}. + debugger := process debug. + + userProcess := [debugger proceed] forkAt: Processor activePriority + 1. + Processor yield. + self findDebugger. + + self deny: process isTerminated. + self assert: userProcess isTerminated. + self deny: debugger isNil. + self assert: {1. 1. nil} equals: {x. y. z}. + self assert: (debugger containingWindow label includesSubstring: #first). + + userProcess := [debugger abandon] forkAt: Processor activePriority + 1. + Processor yield. + self findDebugger. + + self deny: process isTerminated. + self assert: userProcess isTerminated. + self deny: debugger isNil. + self assert: {1. 1. 1} equals: {x. y. z}. + self assert: (debugger containingWindow label includesSubstring: #second). + + userProcess := [debugger proceed] forkAt: Processor activePriority + 1. + Processor yield. + self findDebugger. + + self assert: process isTerminated. + self assert: userProcess isTerminated. + self assert: debugger isNil. + self assert: {1. 1. 2} equals: {x. y. z}.! Item was added: + ----- Method: DebuggerTests>>test20TerminateProcess (in category 'tests') ----- + test20TerminateProcess + "When the debugger's process is terminated, all unwind contexts, including already entered ones, are executed. Further errors that occur during unwinding lead to another debugger showing up. This is the acceptance test equivalent for ProcessTest >> #testTerminateNestedUnwind." + + | x y z userProcess | + process := Process + forBlock: + [x := 1. + [y := 1. + self error: #first. + y := 2] ensure: + [z := 1. + self error: #second. + z := 2]. + x := 2] + runUntil: [:ctx | y = 1]. + self should: {x. y. z} = {1. 1. nil}. + debugger := process debug. + + userProcess := [debugger proceed] forkAt: Processor activePriority + 1. + Processor yield. + self findDebugger. + + self deny: process isTerminated. + self assert: userProcess isTerminated. + self deny: debugger isNil. + self assert: {1. 1. nil} equals: {x. y. z}. + self assert: (debugger containingWindow label includesSubstring: #first). + + userProcess := [debugger terminateProcess] forkAt: Processor activePriority + 1. + Processor yield. + self findDebugger. + + self deny: process isTerminated. + self assert: userProcess isTerminated. + self deny: debugger isNil. + self assert: {1. 2. 1} equals: {x. y. z}. + self assert: (debugger containingWindow label includesSubstring: #second). + + userProcess := [debugger proceed] forkAt: Processor activePriority + 1. + Processor yield. + self findDebugger. + + self assert: process isTerminated. + self assert: userProcess isTerminated. + self assert: debugger isNil. + self assert: {2. 2. 2} equals: {x. y. z}.!

4 7

The Trunk: TrueType-mt.73.mcz
by commits＠source.squeak.org 09 May '22

09 May '22

Marcel Taeumel uploaded a new version of TrueType to project The Trunk: http://source.squeak.org/trunk/TrueType-mt.73.mcz ==================== Summary ==================== Name: TrueType-mt.73 Author: mt Time: 25 February 2022, 10:37:20.57863 am UUID: 9a7bc579-7e0f-8c48-8a25-10f8a5466379 Ancestors: TrueType-mt.72 Move extral scale/gap from TTFontDescription up to TTCFont -- Step 2 of 2 Activate the use of TTCFont's #extraGlyphScale and #extraLineGap. (Note that this also fixes clipping artifacts of over-height and over-wide glyphs. That is, left/top/right/bottom bearings in a glyph are not respected.) =============== Diff against TrueType-mt.72 =============== Item was changed: TTCFont subclass: #LinedTTCFont instanceVariableNames: 'emphasis lineGlyph contourWidth' classVariableNames: '' poolDictionaries: '' category: 'TrueType-Fonts'! + + !LinedTTCFont commentStamp: 'mt 2/24/2022 16:24' prior: 0! + I am a TrueType font that uses the glyph for $_ to appear with underlined emphasis. If that glyph's decent is too close the baseline, the underlined font might look awkward.! Item was changed: ----- Method: LinedTTCFont>>computeForm: (in category 'private') ----- computeForm: char "Overwritten to add line glyph." + ^ ttcDescription renderGlyph: char height: self height extraScale: self extraGlyphScale fgColor: foregroundColor bgColor: Color transparent depth: self depth lineGlyph: lineGlyph lineGlyphWidth: contourWidth emphasis: emphasis! - ^ ttcDescription renderGlyph: char height: self height fgColor: foregroundColor bgColor: Color transparent depth: self depth lineGlyph: lineGlyph lineGlyphWidth: contourWidth emphasis: emphasis! Item was changed: ----- Method: TTCFont>>computeForm: (in category 'character shapes') ----- + computeForm: aCharacter - computeForm: char "Compute the glyph form for the given character" + + ^ ttcDescription + renderGlyph: aCharacter + height: self height "in pixels" + extraScale: self extraGlyphScale + fgColor: foregroundColor + bgColor: Color transparent + depth: self depth! - ^ttcDescription renderGlyph: char height: self height fgColor: foregroundColor bgColor: Color transparent depth: self depth! Item was changed: ----- Method: TTCFont>>displayString:on:from:to:at:kern:baselineY: (in category 'displaying') ----- displayString: aString on: aBitBlt from: startIndex to: stopIndex at: aPoint kern: kernDelta baselineY: baselineY | form glyphInfo destX destY hereX nextX actualFont | destX := aPoint x. glyphInfo := Array new: 5. startIndex to: stopIndex do: [:charIndex | self glyphInfoOf: (aString at: charIndex) into: glyphInfo. form := glyphInfo at: 1. hereX := glyphInfo at: 2. nextX := glyphInfo at: 3. (actualFont := glyphInfo at: 5) == aBitBlt lastFont ifFalse: [actualFont installOn: aBitBlt]. destY := baselineY - (glyphInfo at: 4). aBitBlt sourceForm: form. + aBitBlt destX: destX + form offset x. - aBitBlt destX: destX. aBitBlt destY: destY + form offset y. "Compensate overdraw. See #extraScale:." aBitBlt sourceX: hereX; sourceY: 0. + aBitBlt width: form width. - aBitBlt width: nextX - hereX. aBitBlt height: form height. aBitBlt copyBits. destX := destX + (nextX - hereX) + kernDelta. ]. ^ destX @ destY ! Item was changed: ----- Method: TTCFont>>glyphInfoOf:into: (in category 'displaying') ----- glyphInfoOf: aCharacter into: glyphInfoArray "return the glyph info for aCharacter; if I don't have such a character, try my fallback font" | form | (self hasGlyphOf: aCharacter) ifFalse: [ ^ self fallbackFont glyphInfoOf: aCharacter into: glyphInfoArray. ]. form := self formOf: aCharacter. glyphInfoArray at: 1 put: form; + at: 2 put: 0; "hereX -- relative, unlike StrikeFont" + at: 3 put: form advanceWidth; "nextX -- relative, unlike StrikeFont" - at: 2 put: 0; - at: 3 put: form width; at: 4 put: self ascent "(self ascentOf: aCharacter)"; at: 5 put: self. ^ glyphInfoArray. ! Item was changed: ----- Method: TTCFont>>lineGap (in category 'accessing') ----- lineGap + "Answer the line gap in pixels. Scale from #typographicLineGap to make larger texts more ledigble." - "Answer the line gap from the ttf description. Use #typographicLineGap to make larger tests more ledigble." + ^ lineGap ifNil: [lineGap := (self pixelTypoScale * (ttcDescription typographicLineGap + self extraLineGap)) rounded] + + "Do not use the non-typo values: + ^ (self pixelScale * (ttcDescription lineGap + ttcDescription extraGap) rounded + "! - "^ (self pixelScale * (ttcDescription lineGap + ttcDescription extraGap) rounded" - ^ lineGap ifNil: [lineGap := (self pixelTypoScale * (ttcDescription typographicLineGap + ttcDescription extraGap)) rounded]! Item was changed: + ----- Method: TTCFont>>widthOf: (in category 'measuring') ----- - ----- Method: TTCFont>>widthOf: (in category 'public') ----- widthOf: aCharacter + "Overwritten to use the #advanceWidth and not the #width of the form. See TTGlyphForm" + - "This method cannot use #formOf: because formOf: discriminates the color and causes unnecessary bitmap creation." (self hasGlyphOf: aCharacter) ifFalse: [^ self fallbackFont widthOf: aCharacter]. + ^(self formOf: aCharacter) advanceWidth! - ^(self formOf: aCharacter) width! Item was changed: ----- Method: TTFileDescription>>renderGlyph:height:fgColor:bgColor:depth: (in category 'rendering') ----- renderGlyph: code height: fontHeight fgColor: fgColor bgColor: bgColor depth: depth "Render the glyph with the given code point at the specified pixel height." + self flag: #deprecated. ^ self + renderGlyph: code height: fontHeight extraScale: 1.0 - renderGlyph: code height: fontHeight fgColor: fgColor bgColor: bgColor depth: depth lineGlyph: nil lineGlyphWidth: 0 emphasis: 0! Item was changed: ----- Method: TTFileDescription>>renderGlyph:height:fgColor:bgColor:depth:lineGlyph:lineGlyphWidth:emphasis: (in category 'rendering') ----- + renderGlyph: code height: fontHeight fgColor: fgColor bgColor: bgColor depth: depth lineGlyph: lineGlyphOrNil lineGlyphWidth: lWidth emphasis: emphasis - renderGlyph: code height: fontHeight fgColor: fgColor bgColor: bgColor depth: depth lineGlyph: lineGlyph lineGlyphWidth: lWidth emphasis: emphasis "Render the glyph with the given code point at the specified pixel height. Underline it with lineGlyph." + self flag: #deprecated. + ^ self + renderGlyph: code height: fontHeight extraScale: 1.0 - | form pixelScale offset | - pixelScale := fontHeight asFloat / self fontHeight. - offset := 0 @ ( (((self ascender) - ((self ascender) * self extraScale)) * pixelScale) truncated). - form := (self at: code) - asFormWithScale: pixelScale * self extraScale - ascender: self ascender - descender: self descender fgColor: fgColor bgColor: bgColor depth: depth + lineGlyph: lineGlyphOrNil lineGlyphWidth: lWidth emphasis: emphasis! - replaceColor: false - lineGlyph: lineGlyph lineGlyphWidth: lWidth - emphasis: emphasis. - form offset: offset. - ^ form! Item was changed: ----- Method: TTFontDescription>>renderGlyph:height:fgColor:bgColor:depth: (in category 'rendering') ----- renderGlyph: code height: fontHeight fgColor: fgColor bgColor: bgColor depth: depth "Render the glyph with the given code point at the specified pixel height." + self flag: #deprecated. ^ self + renderGlyph: code height: fontHeight extraScale: 1.0 - renderGlyph: code height: fontHeight fgColor: fgColor bgColor: bgColor depth: depth lineGlyph: nil lineGlyphWidth: 0 emphasis: 0! Item was changed: ----- Method: TTFontDescription>>renderGlyph:height:fgColor:bgColor:depth:lineGlyph:lineGlyphWidth:emphasis: (in category 'rendering') ----- renderGlyph: code height: fontHeight fgColor: fgColor bgColor: bgColor depth: depth lineGlyph: lineGlyphOrNil lineGlyphWidth: lWidth emphasis: emphasis "Render the glyph with the given code point at the specified pixel height. Underline it with lineGlyph." + self flag: #deprecated. + ^ self + renderGlyph: code height: fontHeight extraScale: 1.0 - | form pixelScale offset | - pixelScale := fontHeight asFloat / self fontHeight. - offset := 0 @ ( (((self ascender) - ((self ascender) * self extraScale)) * pixelScale) truncated). - form := (self at: code) - asFormWithScale: pixelScale * self extraScale - ascender: self ascender - descender: self descender fgColor: fgColor bgColor: bgColor depth: depth + lineGlyph: lineGlyphOrNil lineGlyphWidth: lWidth emphasis: emphasis! - replaceColor: false - lineGlyph: lineGlyphOrNil lineGlyphWidth: lWidth - emphasis: emphasis. - form offset: offset. - ^ form! Item was changed: ----- Method: TTGlyph>>asFormWithScale:ascender:descender:fgColor:bgColor:depth:replaceColor:lineGlyph:lineGlyphWidth:emphasis: (in category 'converting') ----- asFormWithScale: scale ascender: ascender descender: descender fgColor: fgColor bgColor: bgColor depth: depth replaceColor: replaceColorFlag lineGlyph: lineGlyph lineGlyphWidth: lWidth emphasis: code + | topBearing bottomBearing pixelBox pixelOutset form canvas newScale renderOffset | + topBearing := bounds bottom - ascender max: 0. + bottomBearing := bounds top - descender min: 0. + renderOffset := leftSideBearing abs @ (ascender+topBearing) negated. + + "Prepare the pixel box" + pixelBox := ((advanceWidth @ (ascender - descender)) * scale) rounded. + pixelOutset := ((leftSideBearing abs @ topBearing "abs" ) * scale) rounded + corner: ((rightSideBearing abs @ bottomBearing abs ) * scale) rounded. + form := TTGlyphForm extent: pixelBox + + pixelOutset left + pixelOutset top + + pixelOutset right + pixelOutset bottom + depth: depth. + form advanceWidth: pixelBox x. + form offset: pixelOutset topLeft negated. + - | form canvas newScale | - form := Form extent: ((advanceWidth @ (ascender - descender)) * scale) rounded depth: depth. form fillColor: bgColor. canvas := form getCanvas asBalloonCanvas. canvas aaLevel: 4. canvas transformBy: (MatrixTransform2x3 withScale: scale asPoint * (1 @ -1)). + canvas transformBy: (MatrixTransform2x3 withOffset: renderOffset). - canvas transformBy: (MatrixTransform2x3 withOffset: 0 @ ascender negated). canvas drawGeneralBezierShape: self contours color: fgColor borderWidth: 0 borderColor: fgColor. ((code bitAnd: 4) ~= 0 or: [(code bitAnd: 16) ~= 0]) ifTrue: [ + newScale := (pixelBox x + 1) asFloat / lineGlyph calculateWidth asFloat. - newScale := (form width + 1) asFloat / lineGlyph calculateWidth asFloat. canvas transformBy: (MatrixTransform2x3 withScale: (newScale / scale)(a)1.0). (code bitAnd: 4) ~= 0 ifTrue: [ canvas drawGeneralBezierShape: lineGlyph contours color: fgColor borderWidth: 0 borderColor: fgColor. ]. + (code bitAnd: 16) ~= 0 ifTrue: [ | renderLineOffset | + renderLineOffset := renderOffset x @ (renderOffset y negated // 2). + canvas transformBy: (MatrixTransform2x3 withOffset: renderLineOffset). - (code bitAnd: 16) ~= 0 ifTrue: [ - canvas transformBy: (MatrixTransform2x3 withOffset: 0@(ascender // 2)). canvas drawGeneralBezierShape: lineGlyph contours color: fgColor borderWidth: 0 borderColor: fgColor. ]. ]. replaceColorFlag ifTrue: [ form replaceColor: bgColor withColor: Color transparent. ]. ^ form! Item was added: + (PackageInfo named: 'TrueType') postscript: '"Moves extra glyph scale and extra line gap from font description (i.e., TTFontDescription) up to font instance (i.e., TTCFont). Restore glyph scale for default fonts. Note that we might want to rename their #familyName(:) in the future to make that clear. Scale factors were chosen to look good on various scale factors at 10.5 pt." + + #( + BitstreamVeraSans 1.059 24 + BitstreamVeraSansMono 1.059 24 + BitstreamVeraSerif 1.11 47 + ) groupsDo: [:name :scale :gap | + (TextStyle named: name) defaultFont + extraGlyphScale: scale; + extraLineGap: gap]. + TTCFont shutDown: true. "Reset glyph caches"'!

3 4

The Trunk: System-mt.1302.mcz
by commits＠source.squeak.org 06 May '22

06 May '22

Marcel Taeumel uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-mt.1302.mcz ==================== Summary ==================== Name: System-mt.1302 Author: mt Time: 5 February 2022, 4:08:47.918491 pm UUID: 947ea0f6-19a2-1147-aefe-55f0b773544b Ancestors: System-mt.1301 Tweaks Accujen point size. Resets recommended #extraScale for our BitstreamVera fonts, optimized for 75% to 150% scale factor. Update all texts to use the recommended #extraGap in each TrueType font. Note that you can adjust #extraScale and #extraGap in each TrueType font family via Help > Font Size Summary or About Squeak > Image Fonts. Also see #chooseExtraScale and #chooseExtraGap. =============== Diff against System-mt.1301 =============== Item was changed: + (PackageInfo named: 'System') postscript: '"Fixes Accujen point sizes." + (TextStyle named: #Accujen) ifNotNil: [:style | + (style fontArray at: 2) pointSize: 9.5. + (style fontArray at: 3) pointSize: 11.0]. - (PackageInfo named: 'System') postscript: '"Add missing sTypo values for our Bitstream Vera fonts." - TTFontDescription allInstancesDo: [:ea | (ea familyName beginsWith: ''Bitstream Vera'') - ifTrue: [ea setTypographicAscender: 1556 descender: -492 lineGap: 410 ]]. + "Reset extraScale for BitstreamVera fonts." + TTCFont allSubInstancesDo: [:ea | | tt | ((tt := ea ttcDescription) familyName beginsWith: ''Bitstream Vera'') ifTrue: [tt instVarNamed: #extraScale put: nil]]. + + "Update #leading in all text styles using the default font''s #lineGap. Also remove all cached glyphs. Supports #extraGap now." - "Update #leading in all text styles using the default font''s #lineGap. Also remove all cached glyphs." AbstractFont allSubInstancesDo: [ :font | font pixelsPerInchChanged ]. TextStyle allInstancesDo: [ :style | style pixelsPerInchChanged ]. + '! - - "Fix default font sizes in existing text styles according to the current UserInterfaceTheme." - UserInterfaceTheme current installSystemFont: TextStyle defaultFont.'!

4 4

The Inbox: Compiler-ct.452.mcz
by commits＠source.squeak.org 05 May '22

05 May '22

A new version of Compiler was added to project The Inbox: http://source.squeak.org/inbox/Compiler-ct.452.mcz ==================== Summary ==================== Name: Compiler-ct.452 Author: ct Time: 13 November 2020, 7:07:30.464415 pm UUID: a40e8327-95c2-f448-8edd-0aa087a5c930 Ancestors: Compiler-eem.451 Reworks public Compiler interface and documentation: - Parser: Do not use #fail in the event of an internal error unless compilation is interactive. This was a single precedent case. - Correct description of compilation error handling: failBlock is *not* evaluated any longer if the requestor is nil since I eliminated the above precedent (I validated that twice). Mention SyntaxErrorNotification explicitly instead of referring to the ToolSet-specific SyntaxError tool. - Provide new convenience selectors #compileNoPattern: and #compileNoPattern:in: on Compiler instance side. - Unify method comment format and phrases. - Ban ST80-specific term "controller" from the argument names. =============== Diff against Compiler-eem.451 =============== Item was changed: ----- Method: Compiler class>>evaluate: (in category 'evaluating') ----- evaluate: textOrString + "See Compiler|evaluate:for:notifying:logged:. If a compilation error occurs, a SyntaxErrorNotification is signaled rather than notifying any requestor. + Compilation is carried out with respect to nil, i.e., no object, and the invocation is not logged." - "See Compiler|evaluate:for:notifying:logged:. If a compilation error occurs, - a Syntax Error view is created rather than notifying any requestor. - Compilation is carried out with respect to nil, i.e., no object, and the - invocation is not logged." ^self evaluate: textOrString for: nil! Item was changed: ----- Method: Compiler class>>evaluate:for: (in category 'evaluating') ----- evaluate: textOrString for: anObject + "See Compiler|evaluate:for:notifying:. If a compilation error occurs, a SyntaxErrorNotification is signaled rather than notifying any requestor." - "See Compiler|evaluate:for:notifying:. If a compilation error occurs, - a Syntax Error view is created rather than notifying any requestor." ^self evaluate: textOrString for: anObject notifying: nil! Item was changed: ----- Method: Compiler class>>evaluate:for:logged: (in category 'evaluating logged') ----- evaluate: textOrString for: anObject logged: logFlag + "See Compiler|evaluate:for:notifying:logged:. If a compilation error occurs, a SyntaxErrorNotification is signaled rather than notifying any requestor." - "See Compiler|evaluate:for:notifying:logged:. If a compilation error occurs, - a Syntax Error view is created rather than notifying any requestor." ^self evaluate: textOrString for: anObject notifying: nil logged: logFlag! Item was changed: ----- Method: Compiler class>>evaluate:for:notifying: (in category 'evaluating') ----- + evaluate: textOrString for: anObject notifying: requestor + "Compile and execute the argument, textOrString with respect to the class of anObject. If a compilation error occurs, use requestor for interactive error correction." - evaluate: textOrString for: anObject notifying: aController - "Compile and execute the argument, textOrString with respect to the class - of anObject. If a compilation error occurs, notify aController." ^ self new evaluate: textOrString in: nil to: anObject + notifying: requestor - notifying: aController ifFail: [^nil]! Item was changed: ----- Method: Compiler class>>evaluate:for:notifying:logged: (in category 'evaluating logged') ----- + evaluate: textOrString for: anObject notifying: requestor logged: logFlag + "Compile and execute the argument, textOrString with respect to the class of anObject. + If a compilation error occurs, use requestor for interactive error correction. + If both compilation and execution are successful then, if logFlag is true, log (write) the text onto a system changes file so that it can be replayed if necessary." - evaluate: textOrString for: anObject notifying: aController logged: logFlag - "Compile and execute the argument, textOrString with respect to the class - of anObject. If a compilation error occurs, notify aController. If both - compilation and execution are successful then, if logFlag is true, log - (write) the text onto a system changes file so that it can be replayed if - necessary." ^ self new evaluate: textOrString in: nil to: anObject + notifying: requestor - notifying: aController ifFail: [^nil] logged: logFlag.! Item was changed: ----- Method: Compiler class>>evaluate:in:notifying:logged: (in category 'evaluating logged') ----- + evaluate: textOrString in: anEnvironment notifying: requestor logged: logFlag - evaluate: textOrString in: anEnvironment notifying: aController logged: logFlag "Compile and execute the argument, textOrString in anEnvironment. + If a compilation error occurs, use requestor for interactive error correction. + If both compilation and execution are successful then, if logFlag is true, log (write) the text onto a system changes file so that it can be replayed if necessary." - If a compilation error occurs, notify aController. If both - compilation and execution are successful then, if logFlag is true, log - (write) the text onto a system changes file so that it can be replayed if - necessary." ^ self new evaluate: textOrString in: anEnvironment + notifying: requestor - notifying: aController logged: logFlag.! Item was changed: ----- Method: Compiler class>>evaluate:logged: (in category 'evaluating logged') ----- evaluate: textOrString logged: logFlag + "See Compiler|evaluate:for:notifying:logged:. If a compilation error occurs, a SyntaxErrorNotification is raised rather than notifying any requestor. - "See Compiler|evaluate:for:notifying:logged:. If a compilation error occurs, - a Syntax Error view is created rather than notifying any requestor. Compilation is carried out with respect to nil, i.e., no object." ^self evaluate: textOrString for: nil logged: logFlag! Item was changed: ----- Method: Compiler class>>evaluate:notifying: (in category 'evaluating') ----- + evaluate: textOrString notifying: requestor + "See Compiler|evaluate:for:notifying:logged:. Compilation is carried out with respect to nil, i.e., no object." - evaluate: textOrString notifying: aController - "See Compiler|evaluate:for:notifying:logged:. Compilation is carried out - with respect to nil, i.e., no object." + ^self evaluate: textOrString for: nil notifying: requestor! - ^self evaluate: textOrString for: nil notifying: aController! Item was changed: ----- Method: Compiler class>>evaluate:notifying:logged: (in category 'evaluating logged') ----- + evaluate: textOrString notifying: requestor logged: logFlag + "See Compiler|evaluate:for:notifying:logged:. Compilation is carried out with respect to nil, i.e., no object." - evaluate: textOrString notifying: aController logged: logFlag - "See Compiler|evaluate:for:notifying:logged:. Compilation is carried out - with respect to nil, i.e., no object." + ^self evaluate: textOrString for: nil notifying: requestor logged: logFlag! - ^self evaluate: textOrString for: nil notifying: aController logged: logFlag! Item was changed: ----- Method: Compiler class>>format:in:notifying: (in category 'evaluating') ----- + format: textOrStream in: aClass notifying: requestor + ^self new format: textOrStream in: aClass notifying: requestor! - format: textOrStream in: aClass notifying: aRequestor - ^self new format: textOrStream in: aClass notifying: aRequestor! Item was changed: ----- Method: Compiler class>>format:in:notifying:decorated: (in category 'evaluating') ----- + format: textOrStream in: aClass notifying: requestor decorated: aBoolean + ^self new format: textOrStream in: aClass notifying: requestor decorated: aBoolean! - format: textOrStream in: aClass notifying: aRequestor decorated: aBoolean - ^self new format: textOrStream in: aClass notifying: aRequestor decorated: aBoolean! Item was changed: ----- Method: Compiler>>compile:ifFail: (in category 'public access') ----- compile: aCue ifFail: failBlock + "Answer a MethodNode. + If the cue requestor is not nil, use it for interactive error correction, and evaluate failBlock after the compilation has been aborted. + The MethodNode is the root of a parse tree. It can be told to generate a CompiledMethod to be installed in the method dictionary of the class specified by the context." - "Answer a MethodNode. If the MethodNode can not be created, notify - the requestor in the contxt. If the requestor is nil, evaluate failBlock - instead. The MethodNode is the root of a parse tree. It can be told - to generate a CompiledMethod to be installed in the method dictionary - of the class specified by the context." ^self compileCue: aCue noPattern: false + ifFail: failBlock! - ifFail: failBlock ! Item was changed: ----- Method: Compiler>>compile:in:environment:notifying:ifFail: (in category 'public access') ----- + compile: textOrStream in: aClass environment: anEnvironment notifying: requestor ifFail: failBlock + "Answer a MethodNode for the argument, textOrStream. + If requestor is not nil, use it for interactive error correction, and evaluate failBlock after the compilation has been aborted. + The MethodNode is the root of a parse tree. It can be told to generate a CompiledMethod to be installed in the method dictionary of the argument, aClass." - compile: textOrStream in: aClass environment: anEnvironment notifying: aRequestor ifFail: failBlock - "Answer a MethodNode for the argument, textOrStream. If the - MethodNode can not be created, notify the argument, aRequestor; if - aRequestor is nil, evaluate failBlock instead. The MethodNode is the root - of a parse tree. It can be told to generate a CompiledMethod to be - installed in the method dictionary of the argument, aClass." ^self compileCue: (CompilationCue source: textOrStream class: aClass environment: anEnvironment + requestor: requestor) - requestor: aRequestor) noPattern: false + ifFail: failBlock! - ifFail: failBlock - ! Item was changed: ----- Method: Compiler>>compile:in:notifying:ifFail: (in category 'public access') ----- + compile: textOrStream in: aClass notifying: requestor ifFail: failBlock + "Answer a MethodNode for the argument, textOrStream. + If requestor is not nil, use it for interactive error correction, and evaluate failBlock after the compilation has been aborted. + The MethodNode is the root of a parse tree. It can be told to generate a CompiledMethod to be installed in the method dictionary of the argument, aClass." - compile: textOrStream in: aClass notifying: aRequestor ifFail: failBlock - "Answer a MethodNode for the argument, textOrStream. If the - MethodNode can not be created, notify the argument, aRequestor; if - aRequestor is nil, evaluate failBlock instead. The MethodNode is the root - of a parse tree. It can be told to generate a CompiledMethod to be - installed in the method dictionary of the argument, aClass." ^self compileCue: (CompilationCue source: textOrStream class: aClass + requestor: requestor) - requestor: aRequestor) noPattern: false + ifFail: failBlock! - ifFail: failBlock - ! Item was changed: ----- Method: Compiler>>compileCue:noPattern:ifFail: (in category 'private') ----- compileCue: aCue noPattern: aBoolean ifFail: failBlock "Answer a MethodNode corresponding to cue source. + If the cue requestor is not nil, use it for interactive error correction, and evaluate failBlock after the compilation has been aborted. + The MethodNode is the root of a parse tree. It can be told to generate a CompiledMethod: - If the MethodNode can not be created, notify the cue requestor. - If the cue requestor is nil, evaluate failBlock instead. - The MethodNode is the root of a parse tree. - It can be told to generate a CompiledMethod - either to be evaluated in cue context if aBoolean is true, with cue receiver as method receiver, - or to be installed in the method dictionary of the target class specified by the cue if aBoolean is false." + - self setCue: aCue. ^self translateNoPattern: aBoolean ifFail: failBlock! Item was added: + ----- Method: Compiler>>compileNoPattern: (in category 'public access') ----- + compileNoPattern: textOrStream + + ^ self + compileNoPattern: textOrStream + in: nil class! Item was added: + ----- Method: Compiler>>compileNoPattern:in: (in category 'public access') ----- + compileNoPattern: textOrStream in: aClass + + ^ self + compileNoPattern: textOrStream + in: aClass + notifying: nil + ifFail: [^ nil]! Item was changed: ----- Method: Compiler>>compileNoPattern:in:context:environment:notifying:ifFail: (in category 'public access') ----- + compileNoPattern: textOrStream in: aClass context: aContext environment: anEnvironment notifying: requestor ifFail: failBlock - compileNoPattern: textOrStream in: aClass context: aContext environment: anEnvironment notifying: aRequestor ifFail: failBlock "Similar to #compile:in:notifying:ifFail:, but the compiled code is expected to be a do-it expression, with no message pattern, and it will be in an explicit environment." ^self compileCue: (CompilationCue source: textOrStream context: aContext class: aClass environment: anEnvironment + requestor: requestor) - requestor: aRequestor) noPattern: true + ifFail: failBlock! - ifFail: failBlock - ! Item was changed: ----- Method: Compiler>>compileNoPattern:in:context:notifying:ifFail: (in category 'public access') ----- + compileNoPattern: textOrStream in: aClass context: aContext notifying: requestor ifFail: failBlock - compileNoPattern: textOrStream in: aClass context: aContext notifying: aRequestor ifFail: failBlock "Similar to #compile:in:notifying:ifFail:, but the compiled code is expected to be a do-it expression, with no message pattern." ^self compileCue: (CompilationCue source: textOrStream context: aContext class: aClass + requestor: requestor) - requestor: aRequestor) noPattern: true + ifFail: failBlock! - ifFail: failBlock - ! Item was changed: ----- Method: Compiler>>compileNoPattern:in:notifying:ifFail: (in category 'public access') ----- + compileNoPattern: textOrStream in: aClass notifying: requestor ifFail: failBlock - compileNoPattern: textOrStream in: aClass notifying: aRequestor ifFail: failBlock "Similar to #compile:in:notifying:ifFail:, but the compiled code is expected to be a do-it expression, with no message pattern." ^self compileCue: (CompilationCue source: textOrStream class: aClass + requestor: requestor) - requestor: aRequestor) noPattern: true + ifFail: failBlock! - ifFail: failBlock - ! Item was changed: ----- Method: Compiler>>compiledMethodFor:in:to:notifying:ifFail: (in category 'public access') ----- + compiledMethodFor: textOrStream in: aContext to: receiver notifying: requestor ifFail: failBlock + "Compiles the sourceStream into a parse tree, then generates code into a method, and answers it. + If receiver is not nil, then the text can refer to instance variables of that receiver (the Inspector uses this). + If aContext is not nil, the text can refer to temporaries in that context (the Debugger uses this). + If requestor is not nil, use it for interactive error correction, and evaluate failBlock after the compilation has been aborted." - compiledMethodFor: textOrStream in: aContext to: receiver notifying: aRequestor ifFail: failBlock - "Compiles the sourceStream into a parse tree, then generates code - into a method, and answers it. If receiver is not nil, then the text can - refer to instance variables of that receiver (the Inspector uses this). - If aContext is not nil, the text can refer to temporaries in that context - (the Debugger uses this). If aRequestor is not nil, then it will receive a - notify:at: message before the attempt to evaluate is aborted." | methodNode method | methodNode := self compileNoPattern: textOrStream in: (self classForReceiver: receiver context: aContext) context: aContext + notifying: requestor - notifying: aRequestor ifFail: [^failBlock value]. method := self interactive ifTrue: [ methodNode generateWithTempNames ] ifFalse: [ methodNode generate ]. ^method! Item was changed: ----- Method: Compiler>>compiledMethodFor:in:to:notifying:ifFail:logged: (in category 'public access logging') ----- + compiledMethodFor: textOrStream in: aContext to: receiver notifying: requestor ifFail: failBlock logged: logFlag + "Compiles the sourceStream into a parse tree, then generates code into a method, and answers it. + If receiver is not nil, then the text can refer to instance variables of that receiver (the Inspector uses this). + If aContext is not nil, the text can refer to temporaries in that context (the Debugger uses this). + If requestor is not nil, use it for interactive compilation, and evaluate failBlock after the compilation has been aborted." - compiledMethodFor: textOrStream in: aContext to: receiver notifying: aRequestor ifFail: failBlock logged: logFlag - "Compiles the sourceStream into a parse tree, then generates code - into a method, and answers it. If receiver is not nil, then the text can - refer to instance variables of that receiver (the Inspector uses this). - If aContext is not nil, the text can refer to temporaries in that context - (the Debugger uses this). If aRequestor is not nil, then it will receive a - notify:at: message before the attempt to evaluate is aborted." | method | method := self compiledMethodFor: textOrStream in: aContext to: receiver + notifying: requestor - notifying: aRequestor ifFail: [^failBlock value]. logFlag ifTrue: [SystemChangeNotifier uniqueInstance evaluated: cue stringToLog context: aContext]. ^method! Item was changed: ----- Method: Compiler>>evaluate: (in category 'public access') ----- evaluate: textOrString + "See evaluate:for:notifying:logged:. If a compilation error occurs, a SyntaxErrorNotification is signaled rather than notifying any requestor. + Compilation is carried out with respect to nil, i.e., no object, and the invocation is not logged." - "See evaluate:for:notifying:logged:. If a compilation error occurs, - a Syntax Error view is created rather than notifying any requestor. - Compilation is carried out with respect to nil, i.e., no object, and the - invocation is not logged." ^self evaluate: textOrString for: nil! Item was changed: ----- Method: Compiler>>evaluate:for: (in category 'public access') ----- evaluate: textOrString for: anObject + "See evaluate:for:notifying:logged:. If a compilation error occurs, a SyntaxErrorNotification is signaled rather than notifying any requestor." - "See evaluate:for:notifying:logged:. If a compilation error occurs, - a Syntax Error view is created rather than notifying any requestor." ^self evaluate: textOrString for: anObject notifying: nil! Item was changed: ----- Method: Compiler>>evaluate:for:logged: (in category 'public access logging') ----- evaluate: textOrString for: anObject logged: logFlag + "See evaluate:for:notifying:logged:. If a compilation error occurs, a SyntaxError is signaled rather than notifying any requestor." - "See evaluate:for:notifying:logged:. If a compilation error occurs, - a Syntax Error view is created rather than notifying any requestor." ^self evaluate: textOrString for: anObject notifying: nil logged: logFlag! Item was changed: ----- Method: Compiler>>evaluate:for:notifying: (in category 'public access') ----- + evaluate: textOrString for: anObject notifying: requestor + "Compile and execute the argument, textOrString with respect to the class of anObject. If a compilation error occurs, use requestor for interactive compilation." - evaluate: textOrString for: anObject notifying: aController - "Compile and execute the argument, textOrString with respect to the class - of anObject. If a compilation error occurs, notify aController." ^ self evaluate: textOrString in: nil to: anObject + notifying: requestor - notifying: aController ifFail: [^nil]! Item was changed: ----- Method: Compiler>>evaluate:for:notifying:logged: (in category 'public access logging') ----- + evaluate: textOrString for: anObject notifying: requestor logged: logFlag + "Compile and execute the argument, textOrString with respect to the class of anObject. + If a compilation error occurs, use requestor for interactive compilation. + If both compilation and execution are successful then, if logFlag is true, log (write) the text onto a system changes file so that it can be replayed if necessary." - evaluate: textOrString for: anObject notifying: aController logged: logFlag - "Compile and execute the argument, textOrString with respect to the class - of anObject. If a compilation error occurs, notify aController. If both - compilation and execution are successful then, if logFlag is true, log - (write) the text onto a system changes file so that it can be replayed if - necessary." ^ self evaluate: textOrString in: nil to: anObject + notifying: requestor - notifying: aController ifFail: [^nil] logged: logFlag.! Item was changed: ----- Method: Compiler>>evaluate:in:environment:notifying:ifFail:logged: (in category 'public access logging') ----- + evaluate: textOrStream in: aContext environment: anEnvironment notifying: requestor ifFail: failBlock logged: logFlag + "Compiles the sourceStream into a parse tree, then generates code into a method. + If aContext is not nil, the text can refer to temporaries in that context (the Debugger uses this). + If requestor is not nil, use it for interactive compilation, and evaluate failBlock after the compilation has been aborted. + Finally, the compiled method is invoked from here via withArgs:executeMethod:, hence the system no longer creates Doit method litter on errors." - evaluate: textOrStream in: aContext environment: anEnvironment notifying: aRequestor ifFail: failBlock logged: logFlag - "Compiles the sourceStream into a parse tree, then generates code into - a method. If aContext is not nil, the text can refer to temporaries in that - context (the Debugger uses this). If aRequestor is not nil, then it will receive - a notify:at: message before the attempt to evaluate is aborted. Finally, the - compiled method is invoked from here via withArgs:executeMethod:, hence - the system no longer creates Doit method litter on errors." ^self evaluateCue: (CompilationCue source: textOrStream context: aContext receiver: nil class: UndefinedObject environment: anEnvironment + requestor: requestor) - requestor: aRequestor) ifFail: failBlock logged: logFlag! Item was changed: ----- Method: Compiler>>evaluate:in:notifying:logged: (in category 'public access logging') ----- + evaluate: textOrString in: anEnvironment notifying: requestor logged: logFlag - evaluate: textOrString in: anEnvironment notifying: aController logged: logFlag "Compile and execute the argument, textOrString in anEnvironment. + If a compilation error occurs, use requestor for interactive compilation. + If both compilation and execution are successful then, if logFlag is true, log (write) the text onto a system changes file so that it can be replayed if necessary." - If a compilation error occurs, notify aController. If both - compilation and execution are successful then, if logFlag is true, log - (write) the text onto a system changes file so that it can be replayed if - necessary." ^self evaluate: textOrString in: nil environment: anEnvironment + notifying: requestor - notifying: aController ifFail: [^nil] logged: logFlag! Item was changed: ----- Method: Compiler>>evaluate:in:to:environment:notifying:ifFail:logged: (in category 'public access logging') ----- + evaluate: textOrStream in: aContext to: receiver environment: anEnvironment notifying: requestor ifFail: failBlock logged: logFlag - evaluate: textOrStream in: aContext to: receiver environment: anEnvironment notifying: aRequestor ifFail: failBlock logged: logFlag "Same as #evaluate:in:to:notifying:ifFail:logged: but with an explicit environment" ^self evaluateCue: (CompilationCue source: textOrStream context: aContext receiver: receiver class: (self classForReceiver: receiver context: aContext) environment: anEnvironment + requestor: requestor) - requestor: aRequestor) ifFail: failBlock logged: logFlag! Item was changed: ----- Method: Compiler>>evaluate:in:to:notifying:ifFail: (in category 'public access') ----- + evaluate: textOrStream in: aContext to: receiver notifying: requestor ifFail: failBlock + "Compiles the sourceStream into a parse tree, then generates code into a method. + If aContext is not nil, the text can refer to temporaries in that context (the Debugger uses this). + If requestor is not nil, use it for interactive error correction, and evaluate failBlock if the compilation fails. + Finally, the compiled method is invoked from here via withArgs:executeMethod:, hence the system no longer creates Doit method litter on errors." + - evaluate: textOrStream in: aContext to: receiver notifying: aRequestor ifFail: failBlock - "Compiles the sourceStream into a parse tree, then generates code into - a method. If aContext is not nil, the text can refer to temporaries in that - context (the Debugger uses this). If aRequestor is not nil, then it will receive - a notify:at: message before the attempt to evaluate is aborted. Finally, the - compiled method is invoked from here via withArgs:executeMethod:, hence - the system no longer creates Doit method litter on errors." - | theClass | theClass := self classForReceiver: receiver context: aContext. ^self evaluateCue: (CompilationCue source: textOrStream context: aContext receiver: receiver class: theClass environment: theClass environment + requestor: requestor) - requestor: aRequestor) ifFail: failBlock! Item was changed: ----- Method: Compiler>>evaluate:in:to:notifying:ifFail:logged: (in category 'public access logging') ----- + evaluate: textOrStream in: aContext to: receiver notifying: requestor ifFail: failBlock logged: logFlag + "Compiles the sourceStream into a parse tree, then generates code into a method. + If aContext is not nil, the text can refer to temporaries in that context (the Debugger uses this). + If requestor is not nil, use it for interactive compilation, and evaluate failBlock if the compilation fails. + Finally, the compiled method is invoked from here via withArgs:executeMethod:, hence the system no longer creates Doit method litter on errors." + - evaluate: textOrStream in: aContext to: receiver notifying: aRequestor ifFail: failBlock logged: logFlag - "Compiles the sourceStream into a parse tree, then generates code into - a method. If aContext is not nil, the text can refer to temporaries in that - context (the Debugger uses this). If aRequestor is not nil, then it will receive - a notify:at: message before the attempt to evaluate is aborted. Finally, the - compiled method is invoked from here via withArgs:executeMethod:, hence - the system no longer creates Doit method litter on errors." | theClass | theClass := self classForReceiver: receiver context: aContext. ^self evaluateCue: (CompilationCue source: textOrStream context: aContext receiver: receiver class: theClass environment: theClass environment + requestor: requestor) - requestor: aRequestor) ifFail: failBlock logged: logFlag! Item was changed: ----- Method: Compiler>>evaluate:logged: (in category 'public access logging') ----- evaluate: textOrString logged: logFlag + "See evaluate:for:notifying:logged:. If a compilation error occurs, a SyntaxErrorNotification is signaled rather than notifying any requestor. - "See evaluate:for:notifying:logged:. If a compilation error occurs, - a Syntax Error view is created rather than notifying any requestor. Compilation is carried out with respect to nil, i.e., no object." ^self evaluate: textOrString for: nil logged: logFlag! Item was changed: ----- Method: Compiler>>evaluate:notifying: (in category 'public access') ----- + evaluate: textOrString notifying: requestor + "See evaluate:for:notifying:. Compilation is carried out with respect to nil, i.e., no object." - evaluate: textOrString notifying: aController - "See evaluate:for:notifying:. Compilation is carried out - with respect to nil, i.e., no object." + ^self evaluate: textOrString for: nil notifying: requestor! - ^self evaluate: textOrString for: nil notifying: aController! Item was changed: ----- Method: Compiler>>evaluate:notifying:logged: (in category 'public access logging') ----- + evaluate: textOrString notifying: requestor logged: logFlag + "See evaluate:for:notifying:logged:. Compilation is carried out with respect to nil, i.e., no object." - evaluate: textOrString notifying: aController logged: logFlag - "See evaluate:for:notifying:logged:. Compilation is carried out - with respect to nil, i.e., no object." + ^self evaluate: textOrString for: nil notifying: requestor logged: logFlag! - ^self evaluate: textOrString for: nil notifying: aController logged: logFlag! Item was changed: ----- Method: Compiler>>format:in:notifying: (in category 'public access') ----- + format: textOrStream in: aClass notifying: requestor + "Compile a parse tree from the argument, textOrStream. Answer a string containing the original code, formatted nicely. If aBoolean is true, then decorate the resulting text with color and hypertext actions." - format: textOrStream in: aClass notifying: aRequestor - "Compile a parse tree from the argument, textOrStream. Answer a string containing the original code, formatted nicely. If aBoolean is true, then decorate the resulting text with color and hypertext actions" | aNode | self from: textOrStream class: aClass + notifying: requestor. - notifying: aRequestor. aNode := self formatNoPattern: false ifFail: [^ nil]. - - "aSymbol == #colorPrint ifTrue: - [^aNode asColorizedSmalltalk80Text]." "deprecating #colorPrint in favor of Shout --Ron Spengler" - ^aNode decompileString! Item was changed: ----- Method: Compiler>>format:in:notifying:decorated: (in category 'public access') ----- + format: textOrStream in: aClass notifying: requestor decorated: aBoolean + "Compile a parse tree from the argument, textOrStream. Answer a string containing the original code, formatted nicely. If aBoolean is true, then decorate the resulting text with color and hypertext actions." + - format: textOrStream in: aClass notifying: aRequestor decorated: aBoolean - "Compile a parse tree from the argument, textOrStream. Answer a string containing the original code, formatted nicely. If aBoolean is true, then decorate the resulting text with color and hypertext actions" | aNode | self from: textOrStream class: aClass + notifying: requestor. - notifying: aRequestor. aNode := self formatNoPattern: false ifFail: [^ nil]. ^ aBoolean ifTrue: [aNode decompileText] ifFalse: [aNode decompileString]! Item was changed: ----- Method: Compiler>>parse:in:notifying: (in category 'public access') ----- parse: textOrStream in: aClass notifying: req + "Compile the argument, textOrStream, with respect to the class, aClass, and answer the MethodNode that is the root of the resulting parse tree. If an error occurs, use requestor for interactive error handling." - "Compile the argument, textOrStream, with respect to the class, aClass, and - answer the MethodNode that is the root of the resulting parse tree. Notify the - argument, req, if an error occurs. The failBlock is defaulted to an empty block." self from: textOrStream class: aClass notifying: req. ^self parser parseCue: cue noPattern: false ifFail: []! Item was changed: ----- Method: Parser>>notify:at: (in category 'error handling') ----- notify: string at: location | messageText | messageText := '"' , string , ' ->"'. cue requestor isNil ifTrue: [ | notification | (encoder == self or: [encoder isNil]) + ifTrue: [^ self interactive + ifTrue: [self fail] + ifFalse: [self error: 'failure setting up syntax error']]. - ifTrue: [^ self fail "failure setting up syntax error"]. (notification := SyntaxErrorNotification cue: (cue copy source: (source contents asText copyReplaceFrom: location to: location - 1 with: messageText); yourself) doitFlag: doitFlag errorMessage: string location: location) signal. notification tryNewSourceIfAvailable] ifFalse: [cue requestor notify: messageText at: location in: source]. ^ self fail!

4 3

bad MessageTrace regression (was: The Trunk: Morphic-mt.1652.mcz)
by Chris Muller 05 May '22

05 May '22

Hi Marcel, I'm doing some testing in trunk and just noticed this. When selecting a message in the code pane and browsing senders, **it must always spawn a new MessageTrace** instead of mangling the to the list at the top. The trace at the top is supposed to represent execution flow between the messages in the list, and NOT different random messages that derail the trace and make it a complete mess. I also noticed this has been backported to 5.3. - Chris On Mon, Apr 27, 2020 at 2:32 AM <commits(a)source.squeak.org> wrote: > Marcel Taeumel uploaded a new version of Morphic to project The Trunk: > http://source.squeak.org/trunk/Morphic-mt.1652.mcz > > ==================== Summary ==================== > > Name: Morphic-mt.1652 > Author: mt > Time: 27 April 2020, 9:31:57.493264 am > UUID: d23bbde5-4e42-3547-960d-39994fc21f56 > Ancestors: Morphic-ct.1651 > > Fixes regression #browseIt in TraceMessages, too. Now all recent hick-ups > with TraceMessages are gone. There are still some hooks missing such as > #browseAllAccessTo:from:. > > However, I think we should push down those backstops from Object to Model. > > Note that I already backported this fix to Squeak 5.3. > > =============== Diff against Morphic-ct.1651 =============== > > Item was changed: > ----- Method: TextEditor>>browseIt (in category 'menu messages') ----- > browseIt > "Launch a browser for the current selection, if appropriate." > > Preferences alternativeBrowseIt ifTrue: [^ self browseClassFromIt]. > > self lineSelectAndEmptyCheck: [^ morph flash]. > > "First, try to show all accesses to instance or class variables." > self selectedInstanceVariable ifNotNil: > [:nameToClass | self systemNavigation > browseAllAccessesTo: nameToClass key > from: nameToClass value]. > self selectedClassVariable ifNotNil: > + [:binding | self model browseAllCallsOn: binding]. > - [:binding | self systemNavigation browseAllCallsOn: > binding]. > > "Then, either browse the class (from a binding) or all > implementors of a selector." > self selectedBinding ifNotNil: > [:binding | ^ self systemNavigation browseClass: binding]. > self selectedSelector ifNotNil: > + [:selector | ^ self model browseAllImplementorsOf: > selector]. > - [:selector | ^ self systemNavigation > browseAllImplementorsOf: selector]. > > morph flash! > > >

8 45

The Inbox: ToolBuilder-Morphic-ct.286.mcz
by commits＠source.squeak.org 05 May '22

05 May '22

A new version of ToolBuilder-Morphic was added to project The Inbox: http://source.squeak.org/inbox/ToolBuilder-Morphic-ct.286.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-ct.286 Author: ct Time: 15 January 2022, 10:19:51.009373 pm UUID: 3c0068e7-ce8e-5f45-8782-34c92bc6ab5f Ancestors: ToolBuilder-Morphic-ct.285 Fixes a nil MNU when interrupting a pluggable dialog. Steps to reproduce (before): 1. Do it: Project uiManager chooseFrom: ((1 to: 10) collect: #asWords). 2. Interrupt/Debug invocation 3. Close/cancel the dialog 4. Abandon the debugger During the unwinding logic, the dialog window would attempt to close itself a second time, neglecting the fact that the model had already been released. Inbox because only 90% sure that this is the right fix. :-) =============== Diff against ToolBuilder-Morphic-ct.285 =============== Item was changed: ----- Method: PluggableDialogWindow>>delete (in category 'submorphs - add/remove') ----- delete + self model ifNil: [^ super delete]. self model okToClose ifFalse: [^ self]. self closeDialogSelector ifNotNil: [:sel | self model perform: sel]. self model windowIsClosing; release. self model: nil. super delete.!

3 7

Merge Request: defaultFocusMorph.cs
by christoph.thiede＠student.hpi.uni-potsdam.de 05 May '22

05 May '22

Hi all, if a new window is invoked via a keyboard gesture, with the proposed changeset, the keyboard focus is automatically passed to the new window. See SystemWindow >> #defaultFocusMorph. By default, the first keyboard-interested (sub)+morph is selected, but you can specify a different focus holder by setting the #defaultFocusMorph property of the window or the #defaultFocus parameter of the pluggable window spec. I think this improves the keyboard workflow in Squeak a bit. For instance, it enables the following workflows: - Ctrl + 0 (search bar), type '6 * 7', Alt + o (spawn), Alt + p (print it) - Ctrl + 3 (Tools menu), type 'browser', Enter, Alt + f (find), type 'Object', Enter Please review and merge if you don't have any objections. Happy squeaking! :-) Best, Christoph --- Sent from Squeak Inbox Talk

3 6

The Trunk: Collections-ul.1000.mcz
by commits＠source.squeak.org 05 May '22

05 May '22

Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.1000.mcz ==================== Summary ==================== Name: Collections-ul.1000 Author: ul Time: 28 March 2022, 8:25:48.093286 pm UUID: 37ba296b-06e0-48f5-bdc8-2101110f360e Ancestors: Collections-ct.998 Symbol changes: - comment the symbol table implemented in a non-object-oriented fashion in the class comment - both WeakSets of the symbol table are immutable (#beReadOnlyObject) - #condenseNewSymbols does nothing if the tables are already empty and compact - added a comment to all methods accessing the symbol table class variables - use a loop instead of recursion in #rehash and #condenseNewSymbols General: - methods of the HashedCollection hierachy that update the tally and modify the array variable will update the tally first, so that immutable hashed collections raise an error before their non-immutable array variable is updated - use #lookup: instead of #hasInterned:ifTrue: - speed up WeakSet >> #postCopy - added #isCompact to HashedCollection and Heap (thanks Christoph) - avoid compaction of Heap if it is already compact - updated the comment of various methods =============== Diff against Collections-ct.998 =============== Item was changed: ----- Method: Dictionary>>removeKey:ifAbsent: (in category 'removing') ----- removeKey: key ifAbsent: aBlock "Remove key (and its associated value) from the receiver. If key is not in the receiver, answer the result of evaluating aBlock. Otherwise, answer the value externally named by key." | index association | index := self scanFor: key. association := (array at: index) ifNil: [ ^aBlock value ]. + tally := tally - 1. "Update tally first, so that read-only hashed collections raise an error before modifying array." array at: index put: nil. - tally := tally - 1. self fixCollisionsFrom: index. ^association value! Item was changed: ----- Method: HashedCollection>>atNewIndex:put: (in category 'private') ----- atNewIndex: index put: anObject + tally := tally + 1. "Update tally first, so that read-only hashed collections raise an error before modifying array." array at: index put: anObject. - tally := tally + 1. "Keep array at least 1/4 free for decent hash behavior" array size * 3 < (tally * 4) ifTrue: [ self grow ]! Item was changed: ----- Method: HashedCollection>>growTo: (in category 'private') ----- growTo: anInteger + "Reallocate the elements array with the given size and reinsert the old elements. Do it even if the size of the array is the same as the argument because this method is also used to rehash the collection." + - "Grow the elements array and reinsert the old elements. Do it even if the size of the array is the same as the argument because this methods is also used to rehash the collection." - | oldElements | oldElements := array. array := self arrayType new: anInteger. self noCheckNoGrowFillFrom: oldElements! Item was added: + ----- Method: HashedCollection>>isCompact (in category 'testing') ----- + isCompact + "Answer true if I have the smallest possible capacity to store the elements." + + ^array size = (self class sizeFor: self slowSize)! Item was changed: ----- Method: Heap>>compact (in category 'growing') ----- compact "Remove any empty slots in the receiver." + self isCompact ifTrue: [ ^self ]. self growTo: self size.! Item was added: + ----- Method: Heap>>isCompact (in category 'growing') ----- + isCompact + "Answer true if I have the smallest possible capacity to store the elements." + + ^array size = tally! Item was changed: ----- Method: KeyedSet>>remove:ifAbsent: (in category 'removing') ----- remove: oldObject ifAbsent: aBlock | index | index := self scanFor: (keyBlock value: oldObject). (array at: index) ifNil: [ ^ aBlock value ]. + tally := tally - 1. "Update tally first, so that read-only hashed collections raise an error before modifying array." array at: index put: nil. - tally := tally - 1. self fixCollisionsFrom: index. ^ oldObject! Item was changed: ----- Method: KeyedSet>>removeKey:ifAbsent: (in category 'removing') ----- removeKey: key ifAbsent: aBlock | index obj | index := self scanFor: key. obj := (array at: index) ifNil: [ ^ aBlock value ]. + tally := tally - 1. "Update tally first, so that read-only hashed collections raise an error before modifying array." array at: index put: nil. - tally := tally - 1. self fixCollisionsFrom: index. ^ obj enclosedSetElement! Item was changed: ----- Method: Set>>remove:ifAbsent: (in category 'removing') ----- remove: oldObject ifAbsent: aBlock | index | index := self scanFor: oldObject. (array at: index) ifNil: [ ^ aBlock value ]. + tally := tally - 1. "Update tally first, so that read-only hashed collections raise an error before modifying array." array at: index put: nil. - tally := tally - 1. self fixCollisionsFrom: index. ^ oldObject! Item was changed: String subclass: #Symbol instanceVariableNames: '' classVariableNames: 'NewSymbols SymbolTable' poolDictionaries: '' category: 'Collections-Strings'! + !Symbol commentStamp: 'ul 3/28/2022 19:53' prior: 0! - !Symbol commentStamp: 'mt 4/13/2021 17:04' prior: 0! I represent Strings that are created uniquely. Thus, someString asSymbol == someString asSymbol. + On my class-side, there is an implementation of a symbol table which provides concurrent access (both read and write) without using locks (Semaphore, Mutex, Monitor). + The state of the symbol table is stored in two immutable (see #beReadOnlyObject) WeakSets stored by the class variables SymbolTable and NewSymbols. + SymbolTable holds most of the interned symbols, while new symbols are always added to NewSymbols. + Once the size of NewSymbols exceeds a limit (1000 currently, see #intern:), its content is merged into SymbolTable (see #condenseNewSymbols). + + To ensure a consistent view of the symbol table, all methods accessing it start with atomically creating a "snapshot" of the state, the two variables, by assigning them to two temporaries. Except for #intern:, which only accesses NewSymbols, hence it only creates a snapshot of that. + If the symbol table changes, NewSymbols will always be a different object, so it is enough to check whether NewSymbols is the same as before the operation to verify that the symbol table has not been modified. + + There are three methods that can update the symbol table: #condenseNewSymbols, #rehash and #intern:. They create a snapshot first as described above, then create copies of the updated parts, and finally check whether NewSymbols is the same as before, and if it is, they apply their changes. That all happens atomically because #==, #ifTrue: and assignments are executed by the VM without suspension points, hence atomically. If NewSymbols is different, the methods are repeated until they succeed. + ! - ATTENTION!! To ensure consistency and thread safety without using a mutex, the two WeakSets which make up the symbol table are treated as if they were immutable. Removing from them without creating a copy just breaks that contract.! Item was changed: ----- Method: Symbol class>>allSymbolTablesDo: (in category 'class initialization') ----- allSymbolTablesDo: aBlock + "See the class comment for details about the usage of the class variables before changing this method" + - | originalNewSymbols originalSymbolTable | originalNewSymbols := NewSymbols. originalSymbolTable := SymbolTable. originalNewSymbols do: aBlock. originalSymbolTable do: aBlock.! Item was changed: ----- Method: Symbol class>>allSymbolTablesDo:after: (in category 'class initialization') ----- allSymbolTablesDo: aBlock after: aSymbol + "See the class comment for details about the usage of the class variables before changing this method" | originalNewSymbols originalSymbolTable | originalNewSymbols := NewSymbols. originalSymbolTable := SymbolTable. (originalNewSymbols includes: aSymbol) ifTrue: [ originalNewSymbols do: aBlock after: aSymbol. originalSymbolTable do: aBlock after: aSymbol ] ifFalse: [ originalSymbolTable do: aBlock after: aSymbol. originalNewSymbols do: aBlock after: aSymbol ] ! Item was changed: ----- Method: Symbol class>>allSymbols (in category 'accessing') ----- allSymbols "Answer all interned symbols" + "See the class comment for details about the usage of the class variables before changing this method" + - | originalNewSymbols originalSymbolTable | originalNewSymbols := NewSymbols. originalSymbolTable := SymbolTable. ^Array new: originalNewSymbols slowSize + originalSymbolTable slowSize + streamContents: [ :stream | - streamContents:[ :stream | stream nextPutAll: originalNewSymbols; nextPutAll: originalSymbolTable ] ! Item was changed: ----- Method: Symbol class>>condenseNewSymbols (in category 'private') ----- condenseNewSymbols + "Move all symbols from NewSymbols to SymbolTable, and compact SymbolTable if needed." + "See the class comment for details about the usage of the class variables before changing this method." - "Move all symbols from NewSymbols to SymbolTable, and compact SymbolTable." | originalNewSymbols originalSymbolTable newNewSymbols newSymbolTable | + [ + originalNewSymbols := NewSymbols. + originalSymbolTable := SymbolTable. + (originalNewSymbols isEmpty and: [ originalSymbolTable isCompact ]) ifTrue: [ + "Only recreate the sets if necessary" + ^self ]. + (newNewSymbols := WeakSet new) + beReadOnlyObject. + (newSymbolTable := WeakSet new: originalNewSymbols slowSize + originalSymbolTable slowSize) + addAll: originalSymbolTable; + addAll: originalNewSymbols; + beReadOnlyObject. + originalNewSymbols == NewSymbols ifTrue: [ + NewSymbols := newNewSymbols. + SymbolTable := newSymbolTable. + ^self ]. + "Some other process has modified the symbol table. Try again." ] repeat! - originalNewSymbols := NewSymbols. - originalSymbolTable := SymbolTable. - newNewSymbols := WeakSet new. - newSymbolTable := originalSymbolTable copy - addAll: originalNewSymbols; - compact; - yourself. - originalNewSymbols == NewSymbols ifFalse: [ - "Some other process has modified the symbols. Try again." - ^self condenseNewSymbols ]. - NewSymbols := newNewSymbols. - SymbolTable := newSymbolTable! Item was changed: ----- Method: Symbol class>>intern: (in category 'instance creation') ----- intern: aStringOrSymbol "Answer the unique Symbol formed with given String. If it does not exist yet, create it and intern it in the NewSymbols. Interning a Symbol should return the Symbol itself, no Symbol should be duplicated" + "See the class comment for details about the usage of the class variables before changing this method" | originalNewSymbols | originalNewSymbols := NewSymbols. ^(self lookup: aStringOrSymbol) ifNil:[ | aSymbol newNewSymbols | aStringOrSymbol isSymbol ifTrue:[ aSymbol := aStringOrSymbol. ] ifFalse:[ aSymbol := (aStringOrSymbol isOctetString ifTrue:[ByteSymbol] ifFalse:[WideSymbol]) new: aStringOrSymbol size. aSymbol copyFrom: aStringOrSymbol; beReadOnlyObject. ]. newNewSymbols := originalNewSymbols copyWith: aSymbol. + newNewSymbols beReadOnlyObject. originalNewSymbols == NewSymbols ifTrue: [ NewSymbols := newNewSymbols. newNewSymbols size > 1000 ifTrue: [ self condenseNewSymbols ]. aSymbol ] ifFalse: [ "Some other process has modified the symbols. Try again." self intern: aStringOrSymbol ] ]! Item was changed: ----- Method: Symbol class>>lookup: (in category 'instance creation') ----- lookup: aStringOrSymbol "Answer the unique Symbol formed with given String, if it exists. Answer nil if no such Symbol does exist yet. Looking up a Symbol should return the Symbol itself - no Symbol should be duplicated - every Symbol should be registered in one of the two Symbol tables" + "See the class comment for details about the usage of the class variables before changing this method" | originalNewSymbols originalSymbolTable | originalNewSymbols := NewSymbols. originalSymbolTable := SymbolTable. + ^(originalSymbolTable like: aStringOrSymbol) ifNil: [ "Most symbols are in originalSymbolTable, so look for existing symbols in there first" - ^(originalSymbolTable like: aStringOrSymbol) ifNil: [ originalNewSymbols like: aStringOrSymbol ]! Item was changed: ----- Method: Symbol class>>possibleSelectorsFor: (in category 'private') ----- possibleSelectorsFor: misspelled "Answer an ordered collection of possible corrections for the misspelled selector in order of likelyhood" | numArgs candidates lookupString best binary short long first | lookupString := misspelled asLowercase. "correct uppercase selectors to lowercase" numArgs := lookupString numArgs. (numArgs < 0 or: [lookupString size < 2]) ifTrue: [^ OrderedCollection new: 0]. first := lookupString first. short := lookupString size - (lookupString size // 4 max: 3) max: 2. long := lookupString size + (lookupString size // 4 max: 3). "First assemble candidates for detailed scoring" candidates := OrderedCollection new. self allSymbolTablesDo: [:s | | ss | (((ss := s size) >= short "not too short" and: [ss <= long "not too long" or: [(s at: 1) = first]]) "well, any length OK if starts w/same letter" and: [s numArgs = numArgs]) "and numArgs is the same" ifTrue: [candidates add: s]]. "Then further prune these by correctAgainst:" best := lookupString correctAgainst: candidates. ((misspelled last ~~ $:) and: [misspelled size > 1]) ifTrue: [ binary := misspelled, ':'. "try for missing colon" + (self lookup: binary) ifNotNil: [:him | best addFirst: him]]. - Symbol hasInterned: binary ifTrue: [:him | best addFirst: him]]. ^ best! Item was changed: ----- Method: Symbol class>>rehash (in category 'private') ----- rehash "Rebuild the hash table, reclaiming unreferenced Symbols. This method will intern all symbols. You're probably looking for #condenseNewSymbols instead." + "See the class comment for details about the usage of the class variables before changing this method" | originalNewSymbols originalSymbolTable newNewSymbols newSymbolTable | + [ + originalNewSymbols := NewSymbols. + originalSymbolTable := SymbolTable. + newNewSymbols := WeakSet new. + newSymbolTable := WeakSet withAll: self allSubInstances. + newNewSymbols beReadOnlyObject. + newSymbolTable beReadOnlyObject. + originalNewSymbols == NewSymbols ifTrue: [ + NewSymbols := newNewSymbols. + SymbolTable := newSymbolTable. + ^self ]. + "Some other process has modified the symbol table. Try again." ] repeat + ! - originalNewSymbols := NewSymbols. - originalSymbolTable := SymbolTable. - newNewSymbols := WeakSet new. - newSymbolTable := WeakSet withAll: self allSubInstances. - originalNewSymbols == NewSymbols ifFalse: [ - "Some other process has modified the symbols. Try again." - ^self rehash ]. - NewSymbols := newNewSymbols. - SymbolTable := newSymbolTable! Item was changed: ----- Method: WeakIdentityDictionary>>removeKey:ifAbsent: (in category 'removing') ----- removeKey: key ifAbsent: aBlock "Remove key (and its associated value) from the receiver. If key is not in the receiver, answer the result of evaluating aBlock. Otherwise, answer the value externally named by key." | index association | index := self scanFor: key. (association := (array at: index)) == vacuum ifTrue: [ ^aBlock value ]. + tally := tally - 1. "Update tally first, so that read-only hashed collections raise an error before modifying array." array at: index put: vacuum. - tally := tally - 1. self fixCollisionsFrom: index. ^association value! Item was changed: ----- Method: WeakSet>>postCopy (in category 'copying') ----- postCopy + | oldFlag | super postCopy. oldFlag := flag. flag := Object new. + 1 to: array size do: [ :index | + (array at: index) == oldFlag ifTrue: [ + array at: index put: flag ] ]! - array replaceAll: oldFlag with: flag.! Item was changed: ----- Method: WeakSet>>remove:ifAbsent: (in category 'removing') ----- remove: oldObject ifAbsent: aBlock | index | index := self scanFor: oldObject. (array at: index) == flag ifTrue: [ ^ aBlock value ]. + tally := tally - 1. "Update tally first, so that read-only hashed collections raise an error before modifying array." array at: index put: flag. - tally := tally - 1. self fixCollisionsFrom: index. ^oldObject! Item was changed: + (PackageInfo named: 'Collections') postscript: '"Make sure the symbol table consists of immutable sets" + #(SymbolTable NewSymbols) do: [ :variableName | + (Symbol classPool at: variableName) beReadOnlyObject ]'! - (PackageInfo named: 'Collections') postscript: '"Definition of separators has been updated, update CharacterSet caches too" - CharacterSet cleanUp: false.'!

4 4

The Trunk: Collections-ct.999.mcz
by commits＠source.squeak.org 04 May '22

04 May '22

Christoph Thiede uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ct.999.mcz ==================== Summary ==================== Name: Collections-ct.999 Author: ct Time: 28 March 2022, 10:08:58.886426 pm UUID: d938acc0-5012-9649-960f-9b374a010b83 Ancestors: Collections-ct.998 Restores line breaks in Text codeSample that are required indeed for the FontImporterTool. =============== Diff against Collections-ct.998 =============== Item was changed: ----- Method: Text class>>codeSample (in category 'filler text') ----- codeSample + self flag: #linebreaks. "Samples are used in FontImporterTool and must contain manual linebreaks (visually stable example texts per line)." ^ 'exampleWithNumber: x + "A method that illustrates every part of Smalltalk method syntax + including primitives. It has unary, binary, and keyboard messages; + declares arguments and temporaries; accesses a global variable + (but not an instance variable); uses literals (array, nested array, + character, symbol, string, integer, float, scaled decimal, and byte + array); uses the pseudo variables nil, true, false, self, super, and + thisContext; shows that within a literal array nil, true, and false are + symbols not pseudo variables; and has sequence, assignment, + return, cascade, and tuple (array) creation. It has both zero + argument and one argument blocks, and has a block temporary." - "A method that illustrates every part of Smalltalk method syntax including primitives. It has unary, binary, and keyboard messages; declares arguments and temporaries; accesses a global variable (but not an instance variable); uses literals (array, nested array, character, symbol, string, integer, float, scaled decimal, and byte array); uses the pseudo variables nil, true, false, self, super, and thisContext; shows that within a literal array nil, true, and false are symbols not pseudo variables; and has sequence, assignment, return, cascade, and tuple (array) creation. It has both zero argument and one argument blocks, and has a block temporary." <primitive: ''primitiveCopyBits'' module: #BitBltPlugin error: ec> | y | true & false not & (nil isNil) ifFalse: [self halt]. y := self size + super size. #($a #a ''a'' "a" (1 1.0 1.0s2) nil true false), { #[65]. thisContext. nil. true. false } do: [ :each | | class | class := each class. Transcript show: (class name); show: '' '']. ^ x < y'!

12 24

The Inbox: Collections-ct.877.mcz
by commits＠source.squeak.org 04 May '22

04 May '22

Christoph Thiede uploaded a new version of Collections to project The Inbox: http://source.squeak.org/inbox/Collections-ct.877.mcz ==================== Summary ==================== Name: Collections-ct.877 Author: ct Time: 17 February 2020, 8:57:49.278239 pm UUID: bf652ba0-43cc-734d-ac03-7a226cc80463 Ancestors: Collections-ul.875 Extends and realigns version of #findFirst: and #findLast:. Second, optimized version after many helpful comments by Levente (ul). Thank you! Replaces Collections-ct.875. --- Performance analysis: #findFirst: - '238 per second. 4.2 milliseconds per run. 0.73956 % GC time.' #findFirst:startingAt: - '1,510 per second. 660 microseconds per run. 1.56 % GC time.' #findFirst:startingAt:ifNone: - '1,210 per second. 828 microseconds per run. 2.06 % GC time.' #findFirst:ifNone: - '214 per second. 4.68 milliseconds per run. 0.65987 % GC time.' #findLast: - '210 per second. 4.76 milliseconds per run. 0.66 % GC time.' #findLast:startingAt: - '1,380 per second. 724 microseconds per run. 1.72 % GC time.' #findLast:startingAt:ifNone: - '1,130 per second. 887 microseconds per run. 2 % GC time.' #findLast:ifNone: - '206 per second. 4.86 milliseconds per run. 0.81967 % GC time.' Comparing to previous version: #findFirst: - '193 per second. 5.19 milliseconds per run. 0.5994 % GC time.' (NOW 23.3% faster) #findLast: - '213 per second. 4.69 milliseconds per run. 0.71986 % GC time.' (NOW 1.4% slower) #findLast:startingAt: - '1,360 per second. 736 microseconds per run. 1.72 % GC time.' (NOW 1.4% faster) Measurements code: random := Random new. range := 1 to: 256. array := (1 to: 128) collect: [:i | range atRandom: random]. values := (1 to: 4096) collect: [:i | range atRandom: random]. ({ #findFirst: -> [ values do: [:x | array findFirst: [:y | x = y]]]. #findFirst:startingAt: -> [ values pairsDo: [:x :s | array findFirst: [:y | x = y] startingAt: s]]. #findFirst:ifNone: -> [ values do: [:x | array findFirst: [:y | x = y] ifNone: [123456789 sqrt]]]. #findFirst:startingAt:ifNone: -> [ values pairsDo: [:x :s | array findFirst: [:y | x = y] startingAt: s ifNone: [123456789 sqrt]]]. #findLast: -> [ values do: [:x | array findLast: [:y | x = y]]]. #findLast:startingAt: -> [ values pairsDo: [:x :s | array findLast: [:y | x = y] startingAt: s]]. #findLast:ifNone: -> [ values do: [:x | array findLast: [:y | x = y] ifNone: [123456789 sqrt]]]. #findLast:startingAt:ifNone: -> [ values pairsDo: [:x :s | array findLast: [:y | x = y] startingAt: s ifNone: [123456789 sqrt]]]. } select: [:assoc | array respondsTo: assoc key]) collect: [:assoc | assoc key -> assoc value bench] as: Dictionary =============== Diff against Collections-ul.875 =============== Item was changed: ----- Method: SequenceableCollection>>findFirst: (in category 'enumerating') ----- findFirst: aBlock "Return the index of my first element for which aBlock evaluates as true." + ^ self findFirst: aBlock startingAt: 1! - | index | - index := 0. - [(index := index + 1) <= self size] whileTrue: - [(aBlock value: (self at: index)) ifTrue: [^index]]. - ^ 0! Item was added: + ----- Method: SequenceableCollection>>findFirst:ifNone: (in category 'enumerating') ----- + findFirst: aBlock ifNone: anotherBlock + "Return the index of my first element for which aBlock evaluates as true. If no element is found, return the value of anotherBlock." + + | index | + (index := self findFirst: aBlock) = 0 + ifTrue: [^ anotherBlock value]. + ^ index! Item was added: + ----- Method: SequenceableCollection>>findFirst:startingAt: (in category 'enumerating') ----- + findFirst: aBlock startingAt: minIndex + "Return the index of my first element with index >= minIndex for which aBlock evaluates as true." + + minIndex to: self size do: [:index | + (aBlock value: (self at: index)) ifTrue: [^index]]. + ^ 0! Item was added: + ----- Method: SequenceableCollection>>findFirst:startingAt:ifNone: (in category 'enumerating') ----- + findFirst: aBlock startingAt: minIndex ifNone: anotherBlock + "Return the index of my first element with index >= minIndex for which aBlock evaluates as true. If no element is found, return the value of anotherBlock." + + | index | + (index := self findFirst: aBlock startingAt: minIndex) = 0 + ifTrue: [^ anotherBlock value]. + ^ index! Item was changed: ----- Method: SequenceableCollection>>findLast: (in category 'enumerating') ----- findLast: aBlock "Return the index of my last element for which aBlock evaluates as true." + ^ self findLast: aBlock startingAt: 1! - | index | - index := self size + 1. - [(index := index - 1) >= 1] whileTrue: - [(aBlock value: (self at: index)) ifTrue: [^index]]. - ^ 0! Item was added: + ----- Method: SequenceableCollection>>findLast:ifNone: (in category 'enumerating') ----- + findLast: aBlock ifNone: anotherBlock + "Return the index of my last element for which aBlock evaluates as true. If no element is found, return the value of anotherBlock." + + | index | + (index := self findLast: aBlock) = 0 + ifTrue: [^ anotherBlock value]. + ^ index! Item was changed: ----- Method: SequenceableCollection>>findLast:startingAt: (in category 'enumerating') ----- + findLast: aBlock startingAt: minIndex + "Return the index of my last element with index >= minIndex for which aBlock evaluates as true." - findLast: aBlock startingAt: i - "Return the index of my last element with index >= i for which aBlock evaluates as true." + self size to: minIndex by: -1 do: [:index | + (aBlock value: (self at: index)) ifTrue: [^index]]. - | index | - index := self size + 1. - [(index := index - 1) >= i] whileTrue: - [(aBlock value: (self at: index)) ifTrue: [^index]]. ^ 0! Item was added: + ----- Method: SequenceableCollection>>findLast:startingAt:ifNone: (in category 'enumerating') ----- + findLast: aBlock startingAt: minIndex ifNone: anotherBlock + "Return the index of my last element with index >= minIndex for which aBlock evaluates as true. If no element is found, return the value of anotherBlock." + + | index | + (index := self findLast: aBlock startingAt: minIndex) = 0 + ifTrue: [^ anotherBlock value]. + ^ index!

3 2

← Newer
1
2
3
4
5
6
7
8
9
...
31
Older →

Jump to page: