Squeak-dev October 2012

squeak-dev@lists.squeakfoundation.org

53 participants
109 discussions

Re: [squeak-dev] The Inbox: Collections-cwp.493.mcz
by Levente Uzonyi 25 Oct '12

25 Oct '12

On Wed, 24 Oct 2012, commits(a)source.squeak.org wrote: > A new version of Collections was added to project The Inbox: > http://source.squeak.org/inbox/Collections-cwp.493.mcz > > ==================== Summary ==================== > > Name: Collections-cwp.493 > Author: cwp > Time: 24 October 2012, 2:51:20.618 pm > UUID: 0c1728e3-2bdf-4f5b-98d8-1a49539bc32c > Ancestors: Collections-cwp.492 > > Removed leading- and trailing-keywords support from String>>numArgs. Also extracted the class-specific differences into #canBeToken, so that only String need implement #numArgs. Thanks, this looks great. Instead of writing a mail about my ideas, I decided to push another version to the Inbox. Levente > > =============== Diff against Collections-cwp.492 =============== > > Item was added: > + ----- Method: ByteString>>canBeToken (in category 'testing') ----- > + canBeToken > + "Optimized version for the common case." > + > + ^ (self findSubstring: '~' in: self startingAt: 1 matchTable: Tokenish) = 0 > + ! > > Item was added: > + ----- Method: String>>canBeToken (in category 'testing') ----- > + canBeToken > + "Extracted from #numArgs to allow specialization by subclasses" > + > + ^ self allSatisfy: [:c | c tokenish]! > > Item was changed: > ----- Method: String>>numArgs (in category 'accessing') ----- > numArgs > "Answer either the number of arguments that the receiver would take if considered a selector. Answer -1 if it couldn't be a selector. Note that currently this will answer -1 for anything begining with an uppercase letter even though the system will accept such symbols as selectors. It is intended mostly for the assistance of spelling correction." > > + | firstChar numColons start ix | > - | firstChar numColons excess start ix | > self size = 0 ifTrue: [^ -1]. > firstChar := self at: 1. > + firstChar isLetter ifTrue: > + [self canBeToken ifFalse: [^ -1]. > - (firstChar isLetter or: [firstChar = $:]) ifTrue: > - ["Fast reject if any chars are non-alphanumeric > - NOTE: fast only for Byte things - Broken for Wide" > - self class isBytes > - ifTrue: [(self findSubstring: '~' in: self startingAt: 1 matchTable: Tokenish) > 0 ifTrue: [^ -1]] > - ifFalse: [2 to: self size do: [:i | (self at: i) tokenish ifFalse: [^ -1]]]. > "Fast colon count" > numColons := 0. start := 1. > + [(ix := self indexOf: $: startingAt: start) > 0] whileTrue: > + [numColons := numColons + 1. > + start := ix + 1]. > + ^ (numColons > 0 and: [self last ~= $:]) > + ifTrue: [^ -1] > + ifFalse: [numColons]]. > - [(ix := self indexOf: $: startingAt: start) > 0] > - whileTrue: > - [numColons := numColons + 1. > - start := ix + 1]. > - numColons = 0 ifTrue: [^ 0]. > - firstChar = $: > - ifTrue: [excess := 2 "Has an initial keyword, as #:if:then:else:"] > - ifFalse: [excess := 0]. > - self last = $: > - ifTrue: [^ numColons - excess] > - ifFalse: [^ numColons - excess - 1 "Has a final keywords as #nextPut::andCR"]]. > firstChar isSpecial ifTrue: > [self size = 1 ifTrue: [^ 1]. > 2 to: self size do: [:i | (self at: i) isSpecial ifFalse: [^ -1]]. > ^ 1]. > ^ -1.! > > Item was added: > + ----- Method: Symbol>>canBeToken (in category 'testing') ----- > + canBeToken > + "Since definition of #tokenish depends on a preference, we want to make sure > + that underscores are always considered tokenish. This is so that selectors created > + when the preference was turned on don't suddenly become invalid when the > + preference is turned off." > + > + ^ self allSatisfy: [:c | c = $_ or: [c tokenish]]! > > Item was removed: > - ----- Method: Symbol>>numArgs (in category 'accessing') ----- > - numArgs > - "Answer either the number of arguments that the receiver would take if considered a selector. Answer -1 if it couldn't be a selector. Note that currently this will answer -1 for anything begining with an uppercase letter even though the system will accept such symbols as selectors. It is intended mostly for the assistance of spelling correction." > - > - | firstChar numColons excess start ix | > - self size = 0 ifTrue: [^ -1]. > - firstChar := self at: 1. > - (firstChar isLetter or: [firstChar = $:]) ifTrue: > - [2 to: self size do: > - [:i || c | > - c := self at: i. > - (c = $_ or: [c tokenish]) ifFalse: [^ -1]]. > - "Fast colon count" > - numColons := 0. start := 1. > - [(ix := self indexOf: $: startingAt: start) > 0] > - whileTrue: > - [numColons := numColons + 1. > - start := ix + 1]. > - numColons = 0 ifTrue: [^ 0]. > - firstChar = $: > - ifTrue: [excess := 2 "Has an initial keyword, as #:if:then:else:"] > - ifFalse: [excess := 0]. > - self last = $: > - ifTrue: [^ numColons - excess] > - ifFalse: [^ numColons - excess - 1 "Has a final keywords as #nextPut::andCR"]]. > - firstChar isSpecial ifTrue: > - [self size = 1 ifTrue: [^ 1]. > - 2 to: self size do: [:i | (self at: i) isSpecial ifFalse: [^ -1]]. > - ^ 1]. > - ^ -1.! > > >

2 1

The Inbox: Monticello-nm.320.mcz
by commits＠source.squeak.org 25 Oct '12

25 Oct '12

A new version of Monticello was added to project The Inbox: http://source.squeak.org/inbox/Monticello-nm.320.mcz ==================== Summary ==================== Name: Monticello-nm.320 Author: nm Time: 25 October 2012, 11:00:58 am UUID: ca5fbbe6-6635-3140-85ab-ddf5181051fa Ancestors: Monticello-nm.320 =============== Diff against Monticello-nm.320 ===============

1 0

The Inbox: Collections-ul.494.mcz
by commits＠source.squeak.org 25 Oct '12

25 Oct '12

A new version of Collections was added to project The Inbox: http://source.squeak.org/inbox/Collections-ul.494.mcz ==================== Summary ==================== Name: Collections-ul.494 Author: ul Time: 25 October 2012, 1:56:50.407 am UUID: 1b62455b-152d-4ffc-8072-5b6086cb26a8 Ancestors: Collections-cwp.493 - more straightforward String >> #numArgs implementation (early returns, less branches) - added an optimized version of #canBeToken to ByteSymbol - removed the sentence about uppercase first letter from String >> #numArgs, because it wasn't true even in 2004 =============== Diff against Collections-cwp.493 =============== Item was added: + ----- Method: ByteSymbol>>canBeToken (in category 'testing') ----- + canBeToken + "Optimized version for the common case." + + | index | + index := 0. + [ (index := self findSubstring: '~' in: self startingAt: index + 1 matchTable: Tokenish) = 0 ] + whileFalse: [ + (self at: index) == $_ ifFalse: [ ^false ] ]. + ^true + ! Item was changed: ----- Method: String>>numArgs (in category 'accessing') ----- numArgs + "Answer either the number of arguments that the receiver would take if considered a selector. Answer -1 if it couldn't be a selector. It is intended mostly for the assistance of spelling correction." - "Answer either the number of arguments that the receiver would take if considered a selector. Answer -1 if it couldn't be a selector. Note that currently this will answer -1 for anything begining with an uppercase letter even though the system will accept such symbols as selectors. It is intended mostly for the assistance of spelling correction." | firstChar numColons start ix | + self size = 0 ifTrue: [ ^-1 ]. - self size = 0 ifTrue: [^ -1]. firstChar := self at: 1. + firstChar isSpecial ifTrue: [ + 2 to: self size do: [ :i | (self at: i) isSpecial ifFalse: [ ^-1 ] ]. + ^1 ]. + firstChar isLetter ifFalse: [ ^-1 ]. + self canBeToken ifFalse: [ ^-1 ]. + "Fast colon count" + numColons := 0. + start := 1. + [ (ix := self indexOf: $: startingAt: start) > 0 ] whileTrue: [ + numColons := numColons + 1. + start := ix + 1]. + (numColons > 0 and: [ self last ~= $: ]) ifTrue: [ ^-1 ]. + ^numColons! - firstChar isLetter ifTrue: - [self canBeToken ifFalse: [^ -1]. - "Fast colon count" - numColons := 0. start := 1. - [(ix := self indexOf: $: startingAt: start) > 0] whileTrue: - [numColons := numColons + 1. - start := ix + 1]. - ^ (numColons > 0 and: [self last ~= $:]) - ifTrue: [^ -1] - ifFalse: [numColons]]. - firstChar isSpecial ifTrue: - [self size = 1 ifTrue: [^ 1]. - 2 to: self size do: [:i | (self at: i) isSpecial ifFalse: [^ -1]]. - ^ 1]. - ^ -1.!

1 0

Daily Commit Log
by commits＠source.squeak.org 25 Oct '12

25 Oct '12

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2012-October/005537.ht… Name: Kernel-eem.713 Ancestors: Kernel-eem.712 Make ClosureExtractor produce properly nested closures. If the closures ever get passed on to DebuggerMethodMap instances they can confuse the debugger if not properly nested. ============================================= http://lists.squeakfoundation.org/pipermail/packages/2012-October/005538.ht… Name: ToolBuilder-Morphic-cwp.87 Ancestors: ToolBuilder-Morphic-bf.86 Fixed a cosmetic issue: PluggableListMorphs created by ToolBuilder should have unobtrusive borders even if they aren't embedded directly in a system window. =============================================

1 0

The Trunk: ToolBuilder-Morphic-cwp.87.mcz
by commits＠source.squeak.org 25 Oct '12

25 Oct '12

Colin Putney uploaded a new version of ToolBuilder-Morphic to project The Trunk: http://source.squeak.org/trunk/ToolBuilder-Morphic-cwp.87.mcz ==================== Summary ==================== Name: ToolBuilder-Morphic-cwp.87 Author: cwp Time: 24 October 2012, 4:04:09.791 pm UUID: 41d57ed4-1d8c-40df-8b66-13218e0b3c3c Ancestors: ToolBuilder-Morphic-bf.86 Fixed a cosmetic issue: PluggableListMorphs created by ToolBuilder should have unobtrusive borders even if they aren't embedded directly in a system window. =============== Diff against ToolBuilder-Morphic-bf.86 =============== Item was changed: ----- Method: MorphicToolBuilder>>buildPluggableList: (in category 'pluggable widgets') ----- buildPluggableList: aSpec | widget listClass getIndex setIndex | aSpec getSelected ifNil:[ listClass := self listClass. getIndex := aSpec getIndex. setIndex := aSpec setIndex. ] ifNotNil:[ listClass := self listByItemClass. getIndex := aSpec getSelected. setIndex := aSpec setSelected. ]. widget := listClass on: aSpec model list: aSpec list selected: getIndex changeSelected: setIndex menu: aSpec menu keystroke: aSpec keyPress. self register: widget id: aSpec name. widget getListElementSelector: aSpec listItem. widget getListSizeSelector: aSpec listSize. widget getIconSelector: aSpec icon. widget doubleClickSelector: aSpec doubleClick. widget dragItemSelector: aSpec dragItem. widget dropItemSelector: aSpec dropItem. widget wantsDropSelector: aSpec dropAccept. widget autoDeselect: aSpec autoDeselect. widget keystrokePreviewSelector: aSpec keystrokePreview. + aSpec color isNil + ifTrue: [widget + borderWidth: 1; + borderColor: Color lightGray; + color: Color white] + ifFalse: [widget color: aSpec color]. - aSpec color isNil ifFalse: [widget color: aSpec color]. self buildHelpFor: widget spec: aSpec. self setFrame: aSpec frame in: widget. parent ifNotNil:[self add: widget to: parent]. panes ifNotNil:[ aSpec list ifNotNil:[panes add: aSpec list]. ]. ^widget!

1 0

The Trunk: Kernel-eem.713.mcz
by commits＠source.squeak.org 25 Oct '12

25 Oct '12

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.713.mcz ==================== Summary ==================== Name: Kernel-eem.713 Author: eem Time: 24 October 2012, 4:04:09.929 pm UUID: e8650d8a-3b37-4fb3-9e2f-8bc074c2d3d6 Ancestors: Kernel-eem.712 Make ClosureExtractor produce properly nested closures. If the closures ever get passed on to DebuggerMethodMap instances they can confuse the debugger if not properly nested. =============== Diff against Kernel-eem.712 =============== Item was changed: InstructionClient subclass: #ClosureExtractor + instanceVariableNames: 'action scanner currentContext' - instanceVariableNames: 'action scanner' classVariableNames: '' poolDictionaries: '' category: 'Kernel-Methods'! !ClosureExtractor commentStamp: 'mha 9/21/2010 11:16' prior: 0! A ClosureExtractor is a utility class that is used to extract all BlockClosures from a CompiledMethod. It inherits from InstructionClient and understands only one single message, namely that corresponding to the push closure bytecode instruction. Being sent this message, a ClosureExtractor will create a BlockClosure instance and evaluate the block it holds as an instance variable with that closure as parameter.! Item was added: + ----- Method: ClosureExtractor>>blockReturnTop (in category 'instruction decoding') ----- + blockReturnTop + currentContext := currentContext sender! Item was changed: ----- Method: ClosureExtractor>>pushClosureCopyNumCopiedValues:numArgs:blockSize: (in category 'instruction decoding') ----- pushClosureCopyNumCopiedValues: numCopied numArgs: numArgs blockSize: blockSize - "Create a BlockClosure corresponding to the closure bytecode + and execute the action block with it. The created BlockClosure is only a pseudo value, + it is not populated with meaningful context and argument information." + | block | + block := BlockClosure + outerContext: currentContext + startpc: scanner pc + numArgs: numArgs + copiedValues: (Array new: numCopied).. + currentContext := block asContextWithSender: currentContext. + action value: block! - and execute the action block with it. The created BlockClosure is only a pseudo value, - it is not populated with meaningful context and argument information." - - action value: - (BlockClosure - outerContext: (MethodContext - sender: thisContext - receiver: self - method: scanner method - arguments: (Array new: scanner method numArgs)) - startpc: scanner pc - numArgs: numArgs - copiedValues: (Array new: numCopied))! Item was changed: ----- Method: ClosureExtractor>>scanner: (in category 'accessing') ----- scanner: anInstructionStream + scanner := anInstructionStream. + currentContext := MethodContext + sender: nil + receiver: self + method: scanner method + arguments: (Array new: scanner method numArgs)! - scanner := anInstructionStream!

1 0

The Inbox: Tests-cwp.175.mcz
by commits＠source.squeak.org 24 Oct '12

24 Oct '12

A new version of Tests was added to project The Inbox: http://source.squeak.org/inbox/Tests-cwp.175.mcz ==================== Summary ==================== Name: Tests-cwp.175 Author: cwp Time: 24 October 2012, 2:51:57.527 pm UUID: 6a009ff2-a82e-4905-ab57-4f4d5b4a9818 Ancestors: Tests-cwp.174 Added more #numArgs tests. =============== Diff against Tests-cwp.174 =============== Item was added: + ----- Method: UnderscoreSelectorsTest>>testInvalidUnderscoreAllowed (in category 'tests') ----- + testInvalidUnderscoreAllowed + self pref: true during: [self assertString: '3' hasNumArgs: -1]! Item was added: + ----- Method: UnderscoreSelectorsTest>>testInvalidUnderscoreForbidden (in category 'tests') ----- + testInvalidUnderscoreForbidden + self pref: false during: [self assertString: '3' hasNumArgs: -1]! Item was added: + ----- Method: UnderscoreSelectorsTest>>testLeadingColonAllowed (in category 'tests') ----- + testLeadingColonAllowed + self pref: true during: [self assertString: ':if:then:else:' hasNumArgs: -1]! Item was added: + ----- Method: UnderscoreSelectorsTest>>testLeadingColonForbidden (in category 'tests') ----- + testLeadingColonForbidden + self pref: false during: [self assertString: #':if:then:else:' hasNumArgs: -1]! Item was added: + ----- Method: UnderscoreSelectorsTest>>testNoTrailingColonAllowed (in category 'tests') ----- + testNoTrailingColonAllowed + self pref: true during: [self assertString: 'nextPut:andCR' hasNumArgs: -1]! Item was added: + ----- Method: UnderscoreSelectorsTest>>testNoTrailingColonForbidden (in category 'tests') ----- + testNoTrailingColonForbidden + self pref: false during: [self assertString: 'nextPut:andCR' hasNumArgs: -1]! Item was added: + ----- Method: UnderscoreSelectorsTest>>testSelEmpty (in category 'tests') ----- + testSelEmpty + self assertString: #'' hasNumArgs: -1! Item was added: + ----- Method: UnderscoreSelectorsTest>>testSelInvalidUnderscoreAllowed (in category 'tests') ----- + testSelInvalidUnderscoreAllowed + self pref: true during: [self assertString: #'3' hasNumArgs: -1]! Item was added: + ----- Method: UnderscoreSelectorsTest>>testSelInvalidUnderscoreForbidden (in category 'tests') ----- + testSelInvalidUnderscoreForbidden + self pref: false during: [self assertString: #'3' hasNumArgs: -1]! Item was added: + ----- Method: UnderscoreSelectorsTest>>testSelLeadingColonAllowed (in category 'tests') ----- + testSelLeadingColonAllowed + self pref: true during: [self assertString: #':if:then:else:' hasNumArgs: -1]! Item was added: + ----- Method: UnderscoreSelectorsTest>>testSelNoTrailingColonAllowed (in category 'tests') ----- + testSelNoTrailingColonAllowed + self pref: true during: [self assertString: #'nextPut:andCR' hasNumArgs: -1]! Item was added: + ----- Method: UnderscoreSelectorsTest>>testSelNoTrailingColonForbidden (in category 'tests') ----- + testSelNoTrailingColonForbidden + self pref: false during: [self assertString: #'nextPut:andCR' hasNumArgs: -1]!

1 0

The Inbox: Collections-cwp.493.mcz
by commits＠source.squeak.org 24 Oct '12

24 Oct '12

A new version of Collections was added to project The Inbox: http://source.squeak.org/inbox/Collections-cwp.493.mcz ==================== Summary ==================== Name: Collections-cwp.493 Author: cwp Time: 24 October 2012, 2:51:20.618 pm UUID: 0c1728e3-2bdf-4f5b-98d8-1a49539bc32c Ancestors: Collections-cwp.492 Removed leading- and trailing-keywords support from String>>numArgs. Also extracted the class-specific differences into #canBeToken, so that only String need implement #numArgs. =============== Diff against Collections-cwp.492 =============== Item was added: + ----- Method: ByteString>>canBeToken (in category 'testing') ----- + canBeToken + "Optimized version for the common case." + + ^ (self findSubstring: '~' in: self startingAt: 1 matchTable: Tokenish) = 0 + ! Item was added: + ----- Method: String>>canBeToken (in category 'testing') ----- + canBeToken + "Extracted from #numArgs to allow specialization by subclasses" + + ^ self allSatisfy: [:c | c tokenish]! Item was changed: ----- Method: String>>numArgs (in category 'accessing') ----- numArgs "Answer either the number of arguments that the receiver would take if considered a selector. Answer -1 if it couldn't be a selector. Note that currently this will answer -1 for anything begining with an uppercase letter even though the system will accept such symbols as selectors. It is intended mostly for the assistance of spelling correction." + | firstChar numColons start ix | - | firstChar numColons excess start ix | self size = 0 ifTrue: [^ -1]. firstChar := self at: 1. + firstChar isLetter ifTrue: + [self canBeToken ifFalse: [^ -1]. - (firstChar isLetter or: [firstChar = $:]) ifTrue: - ["Fast reject if any chars are non-alphanumeric - NOTE: fast only for Byte things - Broken for Wide" - self class isBytes - ifTrue: [(self findSubstring: '~' in: self startingAt: 1 matchTable: Tokenish) > 0 ifTrue: [^ -1]] - ifFalse: [2 to: self size do: [:i | (self at: i) tokenish ifFalse: [^ -1]]]. "Fast colon count" numColons := 0. start := 1. + [(ix := self indexOf: $: startingAt: start) > 0] whileTrue: + [numColons := numColons + 1. + start := ix + 1]. + ^ (numColons > 0 and: [self last ~= $:]) + ifTrue: [^ -1] + ifFalse: [numColons]]. - [(ix := self indexOf: $: startingAt: start) > 0] - whileTrue: - [numColons := numColons + 1. - start := ix + 1]. - numColons = 0 ifTrue: [^ 0]. - firstChar = $: - ifTrue: [excess := 2 "Has an initial keyword, as #:if:then:else:"] - ifFalse: [excess := 0]. - self last = $: - ifTrue: [^ numColons - excess] - ifFalse: [^ numColons - excess - 1 "Has a final keywords as #nextPut::andCR"]]. firstChar isSpecial ifTrue: [self size = 1 ifTrue: [^ 1]. 2 to: self size do: [:i | (self at: i) isSpecial ifFalse: [^ -1]]. ^ 1]. ^ -1.! Item was added: + ----- Method: Symbol>>canBeToken (in category 'testing') ----- + canBeToken + "Since definition of #tokenish depends on a preference, we want to make sure + that underscores are always considered tokenish. This is so that selectors created + when the preference was turned on don't suddenly become invalid when the + preference is turned off." + + ^ self allSatisfy: [:c | c = $_ or: [c tokenish]]! Item was removed: - ----- Method: Symbol>>numArgs (in category 'accessing') ----- - numArgs - "Answer either the number of arguments that the receiver would take if considered a selector. Answer -1 if it couldn't be a selector. Note that currently this will answer -1 for anything begining with an uppercase letter even though the system will accept such symbols as selectors. It is intended mostly for the assistance of spelling correction." - - | firstChar numColons excess start ix | - self size = 0 ifTrue: [^ -1]. - firstChar := self at: 1. - (firstChar isLetter or: [firstChar = $:]) ifTrue: - [2 to: self size do: - [:i || c | - c := self at: i. - (c = $_ or: [c tokenish]) ifFalse: [^ -1]]. - "Fast colon count" - numColons := 0. start := 1. - [(ix := self indexOf: $: startingAt: start) > 0] - whileTrue: - [numColons := numColons + 1. - start := ix + 1]. - numColons = 0 ifTrue: [^ 0]. - firstChar = $: - ifTrue: [excess := 2 "Has an initial keyword, as #:if:then:else:"] - ifFalse: [excess := 0]. - self last = $: - ifTrue: [^ numColons - excess] - ifFalse: [^ numColons - excess - 1 "Has a final keywords as #nextPut::andCR"]]. - firstChar isSpecial ifTrue: - [self size = 1 ifTrue: [^ 1]. - 2 to: self size do: [:i | (self at: i) isSpecial ifFalse: [^ -1]]. - ^ 1]. - ^ -1.!

1 0

Traits in Trunk - how to remove a trait from a class?
by Chris Cunningham 22 Oct '12

22 Oct '12

Hi. I've recently been playing around/using Traits in squeak. I am building a parser, and wanted to capture parts of the source that I couldn't parse and attach it to the most recently parsed part of the source. I used Traits to implement this (as opposed to making all the AST classes sub-class a master class to handle this, or adding these methods to all of the classes just to handle this temporary function), and it worked really well. Well enough I might try using traits for other uses going forward. However, I had as an original intent to remove the Trait from these classes in the future, but I can't figure out how to do this at all in the tools (or with the code) currently in Squeak. I could file out the code and remove the trait parts there, remove the classes from the system, and file in the modified code, but that seem way to manual for my purposes. Is there a way (UI, code) to make a class NOT use any traits after a class has a Trait assigned to it? -Chris

4 8

Re: [squeak-dev] The Inbox: Collections-cwp.492.mcz
by Colin Putney 22 Oct '12

22 Oct '12

On Mon, Oct 22, 2012 at 12:42 AM, <commits(a)source.squeak.org> wrote: > Tweak #numArgs, so that Strings respect the #allowUnderscoreSelectors preference, but Symbols don't. I think this batch of changes means we can turn #allowUnderscoreSelectors on by default. Looking through the senders of #numArgs, I noticed that many of them were messages to a selector. In those cases, the selector might contain underscores, even though the preference disallows them, so I made Symbol>>numArgs behave differently than String>>numArgs. Unless somebody objects, I'll move these to the trunk soonish.

2 2

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