Packages November 2011

packages@lists.squeakfoundation.org

1 participants
159 discussions

The Trunk: Compiler-ul.220.mcz
by commits＠source.squeak.org 15 Nov '11

15 Nov '11

Levente Uzonyi uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-ul.220.mcz ==================== Summary ==================== Name: Compiler-ul.220 Author: ul Time: 15 November 2011, 4:25:41.558 am UUID: 1afd47cf-c700-2f43-a87b-e46ee1bcba39 Ancestors: Compiler-nice.219 Integrated the Parser changes from http://bugs.squeak.org/view.php?id=7572 : Change Set: parser-lw Date: 31 May 2011 Author: Lars Wassermann Changed the Parser to remove Block Local Temporaries ask even if there are no method local temporaries don't ask several times for removal don't recommend to remove temporaries which are assigned to =============== Diff against Compiler-nice.219 =============== Item was changed: Scanner subclass: #Parser + instanceVariableNames: 'here hereType hereMark hereEnd prevMark prevEnd encoder requestor parseNode failBlock requestorOffset tempsMark doitFlag properties category queriedUnusedTemporaries' - instanceVariableNames: 'here hereType hereMark hereEnd prevMark prevEnd encoder requestor parseNode failBlock requestorOffset tempsMark doitFlag properties category' classVariableNames: '' poolDictionaries: '' category: 'Compiler-Kernel'! !Parser commentStamp: '<historical>' prior: 0! I parse Smalltalk syntax and create a MethodNode that is the root of the parse tree. I look one token ahead.! Item was added: + ----- Method: Parser>>collectTemporaryDeclarationsFrom: (in category 'error correction') ----- + collectTemporaryDeclarationsFrom: methodNode + | tempsMarks str | + tempsMarks := OrderedCollection new. + str := requestor text asString. + methodNode accept: (ParseNodeEnumerator + ofBlock: [ :aNode | + | mark | + (aNode class canUnderstand: #tempsMark) + ifTrue: + [mark := aNode tempsMark. + (mark notNil and: [ mark between: 1 and: str size ] and: [ (str at: mark) = $| ]) + ifTrue: [ tempsMarks addLast: aNode ]]]). + (tempsMark notNil and: [ tempsMark between: 1 and: str size ] and: [ (str at: tempsMark) = $| ]) + ifTrue: [ tempsMarks addLast: self ]. + ^ tempsMarks sorted: [ :a :b | a tempsMark > b tempsMark ]! Item was changed: ----- Method: Parser>>method:context: (in category 'expression types') ----- method: doit context: ctxt " pattern [ | temporaries ] block => MethodNode." | sap blk prim temps messageComment methodNode | sap := self pattern: doit inContext: ctxt. "sap={selector, arguments, precedence}" self properties selector: (sap at: 1). encoder selector: (sap at: 1). (sap at: 2) do: [:argNode | argNode beMethodArg]. doit ifFalse: [self pragmaSequence]. temps := self temporaries. messageComment := currentComment. currentComment := nil. doit ifFalse: [self pragmaSequence]. prim := self pragmaPrimitives. self statements: #() innerBlock: doit. blk := parseNode. doit ifTrue: [blk returnLast] ifFalse: [blk returnSelfIfNoOther: encoder]. hereType == #doIt ifFalse: [^self expected: 'Nothing more']. methodNode := self newMethodNode comment: messageComment. methodNode selector: (sap at: 1) arguments: (sap at: 2) precedence: (sap at: 3) temporaries: temps block: blk encoder: encoder primitive: prim properties: properties. self interactive ifTrue: [self declareUndeclaredTemps: methodNode. + self removeUnusedTemps: methodNode]. - self removeUnusedTemps]. ^methodNode! Item was added: + ----- Method: Parser>>queriedUnusedTemporaries (in category 'accessing') ----- + queriedUnusedTemporaries + + queriedUnusedTemporaries ifNil: + [queriedUnusedTemporaries := Dictionary new]. + ^queriedUnusedTemporaries! Item was added: + ----- Method: Parser>>removeEmptyTempDeclarationsFrom: (in category 'error correction') ----- + removeEmptyTempDeclarationsFrom: methodNode + + | sourceCode madeChanges tempsMarkHolder | + sourceCode := requestor text asString. + tempsMarkHolder := self collectTemporaryDeclarationsFrom: methodNode. + madeChanges := false. + tempsMarkHolder do: [ :currentBlock | | tempsMarkChar0 tempsMarkChar1 tempsMarkChar2 end start | + tempsMarkChar0 := (sourceCode at: currentBlock tempsMark). + tempsMarkChar1 := (sourceCode at: currentBlock tempsMark - 1). + tempsMarkChar2 := (sourceCode at: currentBlock tempsMark - 2). + tempsMarkChar0 = $| & tempsMarkChar1 = $| + ifTrue: + [ end := currentBlock tempsMark. + start := end - 1]. + tempsMarkChar0 = $| & tempsMarkChar1 = $ & tempsMarkChar2 = $| + ifTrue: + [ end := currentBlock tempsMark. + start := end - 2]. + + start notNil & end notNil + ifTrue: + [requestor correctFrom: start to: end with: ''. + madeChanges := true. + currentBlock tempsMark: nil]]. + madeChanges ifTrue: [ReparseAfterSourceEditing signal]! Item was added: + ----- Method: Parser>>removeUnusedTemporaryNamed:from:lookingAt:movingTempMarksOf: (in category 'error correction') ----- + removeUnusedTemporaryNamed: temp from: str lookingAt: currentBlock movingTempMarksOf: someBlocks + + | start end | + end := currentBlock tempsMark - 1. + ["Beginning at right temp marker..." + start := end - temp size + 1. + end < temp size or: [ (str at: start) = $| ] + or: [ temp = (str copyFrom: start to: end) + and: [ ((str at: start - 1) = $| | (str at: start - 1) isSeparator) + & ((str at: end + 1) = $| | (str at: end + 1) isSeparator) ] ]] + whileFalse: [ + "Search left for the unused temp" + end := requestor nextTokenFrom: end direction: -1 ]. + (end < temp size or: [ (str at: start) = $| ]) + ifFalse: + [(str at: start - 1) = $ + ifTrue: [ start := start - 1 ]. + requestor correctFrom: start to: end with: ''. + someBlocks do: [ :aBlock | aBlock tempsMark: aBlock tempsMark - (end - start + 1)]. + ^true ]. + ^false! Item was removed: - ----- Method: Parser>>removeUnusedTemps (in category 'error correction') ----- - removeUnusedTemps - "Scan for unused temp names, and prompt the user about the prospect of removing each one found" - - | str madeChanges | - madeChanges := false. - str := requestor text asString. - ((tempsMark between: 1 and: str size) - and: [(str at: tempsMark) = $|]) ifFalse: [^ self]. - encoder unusedTempNames do: - [:temp | | start end | - (UnusedVariable name: temp) ifTrue: - [(encoder lookupVariable: temp ifAbsent: []) isUndefTemp - ifTrue: - [end := tempsMark. - ["Beginning at right temp marker..." - start := end - temp size + 1. - end < temp size or: [temp = (str copyFrom: start to: end) - and: [(str at: start-1) isSeparator & (str at: end+1) isSeparator]]] - whileFalse: - ["Search left for the unused temp" - end := requestor nextTokenFrom: end direction: -1]. - end < temp size ifFalse: - [(str at: start-1) = $ ifTrue: [start := start-1]. - requestor correctFrom: start to: end with: ''. - str := str copyReplaceFrom: start to: end with: ''. - madeChanges := true. - tempsMark := tempsMark - (end-start+1)]] - ifFalse: - [self inform: - 'You''ll first have to remove the\statement where it''s stored into' withCRs]]]. - madeChanges ifTrue: [ReparseAfterSourceEditing signal]! Item was added: + ----- Method: Parser>>removeUnusedTemps: (in category 'error correction') ----- + removeUnusedTemps: methodNode + "Scan for unused temp names, and prompt the user about the prospect of removing each one found" + + | madeChanges tempsMarkHolder unusedTempNames tempMarkHoldersToChange | + madeChanges := false. + tempMarkHoldersToChange := OrderedCollection new. + tempsMarkHolder := self collectTemporaryDeclarationsFrom: methodNode. + unusedTempNames := encoder unusedTempNames select: + [ :temp | (encoder lookupVariable: temp ifAbsent: [ ]) isUndefTemp + and: [ self queriedUnusedTemporaries at: temp ifAbsentPut: [UnusedVariable name: temp] ]]. + tempsMarkHolder do: [ :currentBlock | + tempMarkHoldersToChange add: currentBlock. + unusedTempNames do: + [ :temp | + (self + removeUnusedTemporaryNamed: temp + from: requestor text asString + lookingAt: currentBlock + movingTempMarksOf: tempMarkHoldersToChange) ifTrue: [ madeChanges := true ]]]. + madeChanges + ifTrue: [ self removeEmptyTempDeclarationsFrom: methodNode. + ReparseAfterSourceEditing signal ]! Item was added: + ----- Method: Parser>>tempsMark (in category 'accessing') ----- + tempsMark + ^ tempsMark! Item was added: + ----- Method: Parser>>tempsMark: (in category 'accessing') ----- + tempsMark: aNumber + tempsMark := aNumber!

1 0

The Trunk: Tests-ul.134.mcz
by commits＠source.squeak.org 15 Nov '11

15 Nov '11

Levente Uzonyi uploaded a new version of Tests to project The Trunk: http://source.squeak.org/trunk/Tests-ul.134.mcz ==================== Summary ==================== Name: Tests-ul.134 Author: ul Time: 15 November 2011, 4:23:21.59 am UUID: f39f56b4-97a3-284c-8859-b96d40ec5391 Ancestors: Tests-nice.133 Integrated BlockLocalTemporariesRemoval from http://bugs.squeak.org/view.php?id=7572 . =============== Diff against Tests-nice.133 =============== Item was added: + TestCase subclass: #BlockLocalTemporariesRemovalTest + instanceVariableNames: 'sourceCode' + classVariableNames: '' + poolDictionaries: '' + category: 'Tests-Compiler'! + + !BlockLocalTemporariesRemovalTest commentStamp: 'ul 11/15/2011 04:22' prior: 0! + I test if the parser can remove unused temporaries properly from methods and blocks. I implement several methods to be able to act like a TextEditor.! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>assert:isChangedDuringParsingTo:withRemovalOfTemporariesNamed: (in category 'test helper') ----- + assert: someCode isChangedDuringParsingTo: someOtherCode withRemovalOfTemporariesNamed: someTempNames + + | failBlock | + self sourceCode: someCode. + failBlock := [self fail]. + [self class + compile: self sourceCode + classified: nil + notifying: self + trailer: self class defaultMethodTrailer + ifFail: failBlock] + on: UnusedVariable + do: [:aNotification | aNotification + openMenuIn: [:options :emptyCollection :someText | + (someTempNames anySatisfy: [:tempName | someText startsWith: tempName]) + ifTrue: [aNotification resume: true] + ifFalse: [aNotification resume: false]]]. + self assert: self sourceCode = someOtherCode! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>correctFrom:to:with: (in category 'requesting') ----- + correctFrom: start to: stop with: aString + + | loc | + aString = '#insert period' ifTrue: + [loc := start. + [(loc := loc-1)>0 and: [(self sourceCode at: loc) isSeparator]] + whileTrue: [loc := loc-1]. + ^ self correctFrom: loc+1 to: loc with: '.']. + + self sourceCode: (self sourceCode copyReplaceFrom: start to: stop with: aString)! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>deselect (in category 'requesting') ----- + deselect! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>methodWithBlockVariable (in category 'examples') ----- + methodWithBlockVariable + + | foo | + [ | bar | ] value! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>nextTokenFrom:direction: (in category 'requesting') ----- + nextTokenFrom: start direction: dir + "simple token-finder for compiler automated corrections" + | loc | + loc := start + dir. + [(loc between: 1 and: self sourceCode size) and: [(self sourceCode at: loc) isSeparator]] + whileTrue: [loc := loc + dir]. + ^ loc! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>select (in category 'requesting') ----- + select! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>selectFrom:to: (in category 'requesting') ----- + selectFrom: aPoisition to: anotherPosition! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>selectInvisiblyFrom:to: (in category 'requesting') ----- + selectInvisiblyFrom: userSelection to: last! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>selectionInterval (in category 'requesting') ----- + selectionInterval + + ^ Interval from: 0 to: 0! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>sourceCode (in category 'accessing') ----- + sourceCode + ^ sourceCode! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>sourceCode: (in category 'accessing') ----- + sourceCode: anObject + sourceCode := anObject! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>testBlockTemporaries (in category 'testing') ----- + testBlockTemporaries + + | someCode someOtherCode | + + someCode := 'test + | temp | + [ | foo | ]'. + someOtherCode := 'test + | temp | + [ ]'. + self assert: someCode isChangedDuringParsingTo: someOtherCode withRemovalOfTemporariesNamed: #('foo'). + + someCode := 'test + [ | foo | ]'. + someOtherCode := 'test + [ ]'. + self assert: someCode isChangedDuringParsingTo: someOtherCode withRemovalOfTemporariesNamed: #('foo'). + + someCode := 'test + | temp | + [ | foo | ]'. + someOtherCode := 'test + + [ ]'. + self assert: someCode isChangedDuringParsingTo: someOtherCode withRemovalOfTemporariesNamed: #('foo' 'temp').! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>testComplex (in category 'testing') ----- + testComplex + + | someCode someOtherCode | + + someCode := 'removeUnusedTemps: methodNode + "Scan for unused temp names, and prompt the user about the prospect of removing each one found" + + | madeChanges tempsMarkHolder unusedTempNames tempMarkHoldersToChange encoder requestor| + encoder := requestor := 1. + madeChanges := false. + tempMarkHoldersToChange := OrderedCollection new. + tempsMarkHolder := self collectTemporaryDeclarationsFrom: methodNode. + unusedTempNames := encoder unusedTempNames select: + [ :temp | (encoder lookupVariable: temp ifAbsent: [ ]) isUndefTemp + and: [ UnusedVariable name: temp ]]. + tempsMarkHolder do: [ :currentBlock | || + tempMarkHoldersToChange add: currentBlock. + unusedTempNames do: + [ :temp || someAdditionalTemps | + (self + removeUnusedTemporaryNamed: temp + from: requestor text asString + lookingAt: currentBlock + movingTempMarksOf: tempMarkHoldersToChange) ifTrue: [ madeChanges := true ]]]. + madeChanges + ifTrue: [ self removeEmptyTempDeclarationsFrom: methodNode. + ReparseAfterSourceEditing signal ]'. + someOtherCode := 'removeUnusedTemps: methodNode + "Scan for unused temp names, and prompt the user about the prospect of removing each one found" + + | madeChanges tempsMarkHolder unusedTempNames tempMarkHoldersToChange encoder requestor| + encoder := requestor := 1. + madeChanges := false. + tempMarkHoldersToChange := OrderedCollection new. + tempsMarkHolder := self collectTemporaryDeclarationsFrom: methodNode. + unusedTempNames := encoder unusedTempNames select: + [ :temp | (encoder lookupVariable: temp ifAbsent: [ ]) isUndefTemp + and: [ UnusedVariable name: temp ]]. + tempsMarkHolder do: [ :currentBlock | + tempMarkHoldersToChange add: currentBlock. + unusedTempNames do: + [ :temp | + (self + removeUnusedTemporaryNamed: temp + from: requestor text asString + lookingAt: currentBlock + movingTempMarksOf: tempMarkHoldersToChange) ifTrue: [ madeChanges := true ]]]. + madeChanges + ifTrue: [ self removeEmptyTempDeclarationsFrom: methodNode. + ReparseAfterSourceEditing signal ]'. + self assert: someCode isChangedDuringParsingTo: someOtherCode withRemovalOfTemporariesNamed: #('someAdditionalTemps')! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>testRegression (in category 'testing') ----- + testRegression + + | someCode someOtherCode | + + someCode := 'test + | temp |'. + someOtherCode := 'test + '. + self assert: someCode isChangedDuringParsingTo: someOtherCode withRemovalOfTemporariesNamed: #('temp'). + + someCode := 'test + | temp |'. + someOtherCode := 'test + | temp |'. + self assert: someCode isChangedDuringParsingTo: someOtherCode withRemovalOfTemporariesNamed: #(). + + someCode := 'test + | temp temptemp |'. + someOtherCode := 'test + | temp |'. + self assert: someCode isChangedDuringParsingTo: someOtherCode withRemovalOfTemporariesNamed: #('temptemp'). + ! Item was added: + ----- Method: BlockLocalTemporariesRemovalTest>>text (in category 'requesting') ----- + text + + ^ self sourceCode!

1 0

The Trunk: Tests-ul.134.mcz
by commits＠source.squeak.org 15 Nov '11

15 Nov '11

1 0

The Trunk: Tests-ul.134.mcz
by commits＠source.squeak.org 15 Nov '11

15 Nov '11

1 0

The Trunk: Morphic-cmm.589.mcz
by commits＠source.squeak.org 15 Nov '11

15 Nov '11

Chris Muller uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-cmm.589.mcz ==================== Summary ==================== Name: Morphic-cmm.589 Author: cmm Time: 14 November 2011, 8:41:29.164 pm UUID: 96bd579f-4be0-41a3-9378-62deea68643b Ancestors: Morphic-cmm.588, Morphic-bf.588 Merged. =============== Diff against Morphic-cmm.588 =============== Item was changed: ----- Method: TransferMorph>>step (in category 'stepping and presenter') ----- step + self shouldCopy: self primaryHand lastEvent shiftPressed. - self shouldCopy: Sensor shiftPressed. self updateCopyIcon!

1 0

The Trunk: Morphic-cmm.589.mcz
by commits＠source.squeak.org 15 Nov '11

15 Nov '11

1 0

The Trunk: Morphic-cmm.589.mcz
by commits＠source.squeak.org 15 Nov '11

15 Nov '11

1 0

The Trunk: Morphic-cmm.588.mcz
by commits＠source.squeak.org 15 Nov '11

15 Nov '11

Chris Muller uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-cmm.588.mcz ==================== Summary ==================== Name: Morphic-cmm.588 Author: cmm Time: 9 November 2011, 10:18:08.112 pm UUID: 8657a30a-d7e4-4e13-8ded-4901eef80588 Ancestors: Morphic-ul.587 - Enhance the best IDE-enhancement of 2010 -- Bert's gesture to grow any window (Morph, actually) with a Control + Blue-click + drag. This makes it possible to rapidly move and size windows, which developers do 1000 times per day. However, when the window is near the edge of the desktop, growing a window requires at least two gestures: one to grow the window, another to reposition it fully onto the desktop so the contents can be seen. This tweak reduces growing any window to one gesture by ensuring it stays positioned within the desktop. This also now allows rapid vertical or horizontal maximizing with only a gross-motor gesture instead of a fine one. =============== Diff against Morphic-ul.587 =============== Item was changed: ----- Method: HaloMorph>>mouseMove: (in category 'event handling') ----- mouseMove: evt "Drag our target around or resize it" growingOrRotating ifTrue: [ | oldExtent newExtent newPosition | newExtent := originalExtent + (evt position - positionOffset * 2). (newExtent x > 1 and: [newExtent y > 1]) ifTrue: [ oldExtent := target extent. + target setExtentFromHalo: (newExtent min: owner extent). - target setExtentFromHalo: newExtent. newPosition := target position - (target extent - oldExtent // 2). + newPosition := (newPosition x min: owner extent x - newExtent x max: 0) @ (newPosition y min: owner extent y - newExtent y max: 0). target setConstrainedPosition: newPosition hangOut: true]] ifFalse: [ | thePoint | thePoint := target point: (evt position - positionOffset) from: owner. target setConstrainedPosition: thePoint hangOut: true. ]!

1 0

The Trunk: Morphic-cmm.588.mcz
by commits＠source.squeak.org 15 Nov '11

15 Nov '11

1 0

The Trunk: Morphic-cmm.588.mcz
by commits＠source.squeak.org 15 Nov '11

15 Nov '11

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages November 2011