Squeak-dev February 2013

squeak-dev@lists.squeakfoundation.org

61 participants
225 discussions

The Trunk: Kernel-eem.732.mcz
by commits＠source.squeak.org 06 Feb '13

06 Feb '13

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.732.mcz ==================== Summary ==================== Name: Kernel-eem.732 Author: eem Time: 6 February 2013, 1:10:49.952 pm UUID: d9c124ab-9da1-4785-bfa3-341b385fffcb Ancestors: Kernel-nice.731 Make CompiledMethod>>removeProperty:[ifAbsent:] get rid of the AdditionalMethodState if the resulting state is empty. Streamline BlockClosure>>newProcess[With:] which does not need to run unwinds if control reaches the end of the process. Use the abstract blockCreationBytecodeMessage to compute BlockClosure's size instead of accessing bytecodes directly. =============== Diff against Kernel-nice.731 =============== Item was changed: ----- Method: BlockClosure>>newProcess (in category 'scheduling') ----- newProcess "Answer a Process running the code in the receiver. The process is not scheduled." <primitive: 19> "Simulation guard" ^Process forContext: [self value. + "Since control is now at the bottom there is no need to terminate (which + runs unwinds) since all unwnds have been run. Simply suspend. + Note that we must use this form rather than e.g. Processor suspendActive + so that isTerminated answers true. isTerminated requires that if there is a + suspended context it is the bottom-most, but using a send would result in + the process's suspendedContext /not/ being the bottom-most." + Processor activeProcess suspend] asContext - Processor terminateActive] asContext priority: Processor activePriority! Item was changed: ----- Method: BlockClosure>>newProcessWith: (in category 'scheduling') ----- newProcessWith: anArray "Answer a Process running the code in the receiver. The receiver's block arguments are bound to the contents of the argument, anArray. The process is not scheduled." <primitive: 19> "Simulation guard" ^Process forContext: [self valueWithArguments: anArray. + "Since control is now at the bottom there is no need to terminate (which + runs unwinds) since all unwnds have been run. Simply suspend. + Note that we must use this form rather than e.g. Processor suspendActive + so that isTerminated answers true. isTerminated requires that if there is a + suspended context it is the bottom-most, but using a send would result in + the process's suspendedContext /not/ being the bottom-most." + Processor activeProcess suspend] asContext - Processor terminateActive] asContext priority: Processor activePriority! Item was changed: ----- Method: BlockClosure>>size (in category 'accessing') ----- size + "Extract this closure's bytecode size (number of bytes) by accessing + the closure creation bytecode in the enclosing method." - "Extract this closure's bytecode size (number of bytes) by accessing the closure - creation bytecode in the enclosing method." + ^self blockCreationBytecodeMessage arguments last! - ^ ((self method at: self startpc - 2) bitShift: 8) + (self method at: self startpc - 1)! Item was changed: ----- Method: CompiledMethod>>removeProperty: (in category 'accessing-pragmas & properties') ----- removeProperty: propName "Remove the property propName if it exists. Do _not_ raise an error if the property is missing." + | value newAdditionalState | - | value | value := self propertyValueAt: propName ifAbsent: [^nil]. + newAdditionalState := self penultimateLiteral copyWithout: - self penultimateLiteral: (self penultimateLiteral copyWithout: (Association key: propName + value: value). + self penultimateLiteral: (newAdditionalState isEmpty + ifTrue: [newAdditionalState selector] + ifFalse: [newAdditionalState]). - value: value)). ^value! Item was changed: ----- Method: CompiledMethod>>removeProperty:ifAbsent: (in category 'accessing-pragmas & properties') ----- removeProperty: propName ifAbsent: aBlock "Remove the property propName if it exists. Answer the evaluation of aBlock if the property is missing." + | value newAdditionalState | - | value | value := self propertyValueAt: propName ifAbsent: [^aBlock value]. + newAdditionalState := self penultimateLiteral copyWithout: - self penultimateLiteral: (self penultimateLiteral copyWithout: (Association key: propName + value: value). + self penultimateLiteral: (newAdditionalState isEmpty + ifTrue: [newAdditionalState selector] + ifFalse: [newAdditionalState]). - value: value)). ^value!

1 0

Re: [squeak-dev] The Trunk: SUnit-cmm.90.mcz
by Frank Shearar 06 Feb '13

06 Feb '13

On 5 February 2013 03:47, <commits(a)source.squeak.org> wrote: > Chris Muller uploaded a new version of SUnit to project The Trunk: > http://source.squeak.org/trunk/SUnit-cmm.90.mcz > > ==================== Summary ==================== > > Name: SUnit-cmm.90 > Author: cmm > Time: 4 January 2013, 3:33:36.616 pm > UUID: 8533f0b4-2587-412b-b465-4ad7f20331d0 > Ancestors: SUnit-ul.89 > > - Do not wipe out pre-initialized state on TestCases. Tests do not need to be prevented from running more than once if proper setUp/tearDown methods are present. > > =============== Diff against SUnit-ul.89 =============== > > Item was changed: > ----- Method: TestCase>>debug (in category 'running') ----- > debug > + self resources do: > + [ : res | res isAvailable ifFalse: [ ^ res signalInitializationError ] ]. > + [ self runCase ] ensure: > + [ self resources do: > + [ : each | each reset ] ]! > - self resources do: [:res | > - res isAvailable ifFalse: [^res signalInitializationError]]. > - [(self class selector: testSelector) runCase] > - ensure: [self resources do: [:each | each reset]] > - ! > > I think this breaks a test: http://build.squeak.org/job/SqueakTrunk/148/testReport/junit/SUnit.Tests/SU… Error Message Assertion failed Stacktrace SUnitTest(TestCase)>>signalFailure: SUnitTest(TestCase)>>assert: SUnitTest>>testRanOnlyOnce SUnitTest(TestCase)>>performTest [] in [] in SUnitTest(TestCase)>>runCase BlockClosure>>on:do: [] in SUnitTest(TestCase)>>timeout:after: BlockClosure>>ensure: SUnitTest(TestCase)>>timeout:after: [] in SUnitTest(TestCase)>>runCase BlockClosure>>ensure: SUnitTest(TestCase)>>runCase [] in SUnitTest(TestCase)>>debug BlockClosure>>ensure: SUnitTest(TestCase)>>debug SUnitTest>>testIsNotRerunOnDebug SUnitTest(TestCase)>>performTest frank

1 0

The Inbox: Tests.quasiquote-eem.189.mcz
by commits＠source.squeak.org 06 Feb '13

06 Feb '13

A new version of Tests was added to project The Inbox: http://source.squeak.org/inbox/Tests.quasiquote-eem.189.mcz ==================== Summary ==================== Name: Tests.quasiquote-eem.189 Author: eem Time: 6 February 2013, 9:34:54.456 am UUID: bab75eb5-564e-49ef-bc98-58a00de60cb4 Ancestors: Tests.quasiquote-eem.188 Tests for the quasi-quote implemented by Compiler.quasiquote-eem.249. Tests new version that uses $ for escaping $ ` and [. =============== Diff against Tests.quasiquote-eem.188 =============== Item was changed: ----- Method: QuasiQuoteTest>>testDecompilation (in category 'tests') ----- testDecompilation + self assert: (self evaluate: '`[thisContext method decompile]`') asString - self assert: (self evaluate: '`[thisContext method decompile]`') equals: 'DoIt\ ^ `[thisContext method decompile]`' withCRs. + self assert: (self evaluate: '`hello [thisContext method decompile] world!!`') asString - self assert: (self evaluate: '`hello [thisContext method decompile] world!!`') equals: 'hello DoIt\ ^ `hello [thisContext method decompile] world!!` world!!' withCRs. + self assert: (self evaluate: '| s | `hello [s := thisContext method decompile asString. ''yo''] world!!`. s') asString + equals: 'DoIt\ | t1 |\ `hello [t1 := thisContext method decompile asString.\ ''yo''] world!!`.\ ^ t1' withCRs. + self assert: (self evaluate: '`$$$`$[`. thisContext method decompile') asString + equals: 'DoIt\ `$$$`$[`.\ ^ thisContext method decompile' withCRs! - self assert: (self evaluate: '| s | `hello [s := thisContext method decompile asString. ''yo''] world!!`. s') - equals: 'DoIt\ | t1 |\ `hello [t1 := thisContext method decompile asString.\ ''yo''] world!!`.\ ^ t1' withCRs! Item was added: + ----- Method: QuasiQuoteTest>>testEscapes (in category 'tests') ----- + testEscapes + self assert: (self evaluate: '`$$$`$[`') equals: '$`['. + self assert: (self evaluate: '`$a$1 $!!$@$#$%$^$&$*$($)$_$-$+$=${$}$:$;$"$''$<$>$,$.$?$/`') + equals: '$a$1 $!!$@$#$%$^$&$*$($)$_$-$+$=${$}$:$;$"$''$<$>$,$.$?$/'. + + "no need to escape \ in \n" + self assert: (self evaluate: '`printf("hello world!!\n");`') + equals: 'printf("hello world!!\n");'. + "no need to escape or double ' in '!!'" + self assert: (self evaluate: '`printf("%s %s %c\n", "hello", "world", ''!!'');`') + equals: 'printf("%s %s %c\n", "hello", "world", ''!!'');'. + + "no need to escape $ unless it is followed by $, ` or [" + self assert: (self evaluate: '`when (/^\d+$/ && $_ < 75) { $1; $foo }`') + equals: 'when (/^\d+$/ && $_ < 75) { $1; $foo }'. + + self assert: (self evaluate: '`alert(''$'' + 3 + 4); // displays $34, but $7 may have been expected`') + equals: 'alert(''$'' + 3 + 4); // displays $34, but $7 may have been expected'.!

1 0

The Inbox: Compiler.quasiquote-eem.249.mcz
by commits＠source.squeak.org 06 Feb '13

06 Feb '13

A new version of Compiler was added to project The Inbox: http://source.squeak.org/inbox/Compiler.quasiquote-eem.249.mcz ==================== Summary ==================== Name: Compiler.quasiquote-eem.249 Author: eem Time: 6 February 2013, 9:33:57.257 am UUID: e3c0a389-e2f8-4b65-b611-4d09089f4237 Ancestors: Compiler.quasiquote-eem.248 New version that uses $ for escaping $ ` and [. Add a quasi-quote form that allows convenient embedding of substrings within a format string, and provides a convenient way of embedding literal strings within an alternative literal string whose string delimiter is different. e.g. `hello [#cruel] world!` evaluates to 'hello cruel world'. `S1[B1]...SN[BN]SN+1` is equivalent to { 'S1'. [B1] value. ... 'SN'. [BN] value. 'SN+1' } concatenateQuasiQuote where concatenateQuasiQuote sends asString to each element and answers the concatenation of those elements. however, single-statement blocks are inlined, so e.g. the above `hello [#cruel] world!` is compiled as { 'hello '. #cruel. ' world!' } concatenateQuasiQuote See Tests.quasiquote-eem.189 for tests and examples. =============== Diff against Compiler.quasiquote-eem.248 =============== Item was changed: ----- Method: MessageNode>>printQuasiQuoteOn:indent: (in category 'printing') ----- printQuasiQuoteOn: aStream indent: level aStream nextPut: $`. receiver elements do: [:parseNode| (parseNode isLiteralNode and: [parseNode key class == 'literal' class]) ifTrue: [parseNode key do: [:char| + ('$`[' includes: char) ifTrue: + [aStream nextPut: $$]. - ('`[\' includes: char) ifTrue: - [aStream nextPut: $\]. aStream nextPut: char]] ifFalse: [(parseNode isMessageNode and: [parseNode selector key == #value and: [parseNode receiver isBlockNode]]) ifTrue: [parseNode receiver printOn: aStream indent: 0] ifFalse: [aStream nextPut: $[. parseNode printOn: aStream indent: 0. aStream nextPut: $]]]]. aStream nextPut: $`! Item was changed: ----- Method: Parser>>scanQuasiQuoteCharactersUsing: (in category 'scanning') ----- scanQuasiQuoteCharactersUsing: stringStream "Answer the next non-empty sequence of characters in a quasi-quote string, or nil, if none." stringStream reset. [hereChar ~~ $` and: [hereChar ~~ $[ and: [hereChar ~~ DoItCharacter]]] whileTrue: + [(hereChar == $$ and: ['`[$' includes: aheadChar]) - [hereChar == $\ ifTrue: [stringStream nextPut: aheadChar. self step] ifFalse: [stringStream nextPut: hereChar]. self step]. self setHereTypeForQuasiQuote. ^stringStream position > 0 ifTrue: [encoder encodeLiteral: stringStream contents]!

1 0

Re: [squeak-dev] The Trunk: SUnit-eem.91.mcz
by Levente Uzonyi 06 Feb '13

06 Feb '13

Wouldn't it be better to use #print:? E.g.: aStream print: self class; nextPutAll: '>>'; print: testSelector Levente On Wed, 6 Feb 2013, commits(a)source.squeak.org wrote: > Eliot Miranda uploaded a new version of SUnit to project The Trunk: > http://source.squeak.org/trunk/SUnit-eem.91.mcz > > ==================== Summary ==================== > > Name: SUnit-eem.91 > Author: eem > Time: 5 February 2013, 9:45:22.157 pm > UUID: 563010a6-5bbc-4312-ae7c-b09410b24fad > Ancestors: SUnit-cmm.90 > > Robust testCase printing. i.e. TestCase new asString should > not raise an error. > > =============== Diff against SUnit-cmm.90 =============== > > Item was changed: > ----- Method: TestCase>>printOn: (in category 'printing') ----- > printOn: aStream > > + testSelector > + ifNil: [super printOn: aStream] > + ifNotNil: > + [aStream > + nextPutAll: self class printString; > + nextPutAll: '>>#'; > + nextPutAll: testSelector] ! > - aStream > - nextPutAll: self class printString; > - nextPutAll: '>>#'; > - nextPutAll: testSelector > - ! > > >

2 2

Re: [JIRA] Commented: (SQ-1119) Rotating flaps DNU and other mishaps
by karl ramberg 06 Feb '13

06 Feb '13

In the Etoys image we found a very old bug in morphic that I'm not sure how to fix. You can test it by trying to rotate a FlapTab in any Squeak image older than 3.1b. For a very hard image lockup try rotating the FlapTab with the flap open. Then opening the debugger fails also. The bug appeared between images Squeak 3.1b and Squeak 3.2 so it has been around a while. The bug is with creating a TransformationMorph that has fullBounds nil. TransformMorph overrides fullBounds: fullBounds ifNotNil:[^ fullBounds]. fullBounds := bounds. submorphs do: [:m| m ownerChanged]. ^ fullBounds Even if bounds are not nil, fullBounds gets nil'ed again when calling submorphs ownerChanged. Any hints and good solutions appreciated :-) Karl On Sun, Feb 3, 2013 at 9:18 PM, Karl Ramberg (JIRA) <tracker(a)squeakland.org>wrote: > > [ > http://tracker.squeakland.org/browse/SQ-1119?page=com.atlassian.jira.plugin…] > > Karl Ramberg commented on SQ-1119: > ---------------------------------- > > It is really the FlapTab that has some issues with rotation. > > Somehow the TransformationMorph fails with nil fullBounds. > > I'm not sure how that can happen... > > > VM: Win32 - a SmalltalkImage > Image: etoys5.0 [latest update: #2409] > > > UndefinedObject(Object)>>doesNotUnderstand: #hasPositiveExtent > Receiver: nil > Arguments and temporary variables: > aMessage: hasPositiveExtent > Receiver's instance variables: > nil > > TransformationMorph(Morph)>>invalidRect:from: > Receiver: a TransformationMorph(2153) on a FlapTab<Flap>(1211) "My > Flap" > Arguments and temporary variables: > aRectangle: nil > aMorph: a TransformationMorph(2153) on a > FlapTab<Flap>(1211) "My Flap" > damageRect: nil > Receiver's instance variables: > bounds: 99@105 corner: 207@132 > owner: nil > submorphs: #(a FlapTab<Flap>(1211) "My Flap") > fullBounds: nil > color: Color lightGreen > extension: nil > transform: a MorphicTransform(angle = 0.0; scale = > 1.0; offset = 0@0) > smoothing: 1 > localBounds: nil > > TransformationMorph(TransformMorph)>>invalidRect:from: > Receiver: a TransformationMorph(2153) on a FlapTab<Flap>(1211) "My > Flap" > Arguments and temporary variables: > damageRect: nil > aMorph: a TransformationMorph(2153) on a > FlapTab<Flap>(1211) "My Flap" > Receiver's instance variables: > bounds: 99@105 corner: 207@132 > owner: nil > submorphs: #(a FlapTab<Flap>(1211) "My Flap") > fullBounds: nil > color: Color lightGreen > extension: nil > transform: a MorphicTransform(angle = 0.0; scale = > 1.0; offset = 0@0) > smoothing: 1 > localBounds: nil > > TransformationMorph(Morph)>>invalidRect: > Receiver: a TransformationMorph(2153) on a FlapTab<Flap>(1211) "My > Flap" > Arguments and temporary variables: > damageRect: nil > Receiver's instance variables: > bounds: 99@105 corner: 207@132 > owner: nil > submorphs: #(a FlapTab<Flap>(1211) "My Flap") > fullBounds: nil > color: Color lightGreen > extension: nil > transform: a MorphicTransform(angle = 0.0; scale = > 1.0; offset = 0@0) > smoothing: 1 > localBounds: nil > > > --- The full stack --- > UndefinedObject(Object)>>doesNotUnderstand: #hasPositiveExtent > TransformationMorph(Morph)>>invalidRect:from: > TransformationMorph(TransformMorph)>>invalidRect:from: > TransformationMorph(Morph)>>invalidRect: > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > TransformationMorph(Morph)>>position: > TransformationMorph>>asFlexOf: > FlapTab(Morph)>>addFlexShell > FlapTab(Morph)>>addFlexShellIfNecessary > HaloMorph>>startRot:with: > EventHandler>>send:to:withEvent:fromMorph: > EventHandler>>mouseDown:fromMorph: > ThreePhaseButtonMorph(Morph)>>mouseDown: > ThreePhaseButtonMorph>>mouseDown: > ThreePhaseButtonMorph(Morph)>>handleMouseDown: > MouseButtonEvent>>sentTo: > ThreePhaseButtonMorph(Morph)>>handleEvent: > MorphicEventDispatcher>>dispatchMouseDown:with: > MorphicEventDispatcher>>dispatchEvent:with: > ThreePhaseButtonMorph(Morph)>>processEvent:using: > MorphicEventDispatcher>>dispatchMouseDown:with: > MorphicEventDispatcher>>dispatchEvent:with: > HaloMorph(Morph)>>processEvent:using: > MorphicEventDispatcher>>dispatchMouseDown:with: > MorphicEventDispatcher>>dispatchEvent:with: > PasteUpMorph(Morph)>>processEvent:using: > PasteUpMorph>>processEvent:using: > PasteUpMorph(Morph)>>processEvent: > HandMorph>>sendEvent:focus:clear: > HandMorph>>sendMouseEvent: > HandMorph>>handleEvent: > HandMorph>>processEvents > [] in WorldState>>doOneCycleNowFor: {[:h | ActiveHand := h. h > processEvents. capturingGesture := capturingGest...]} > Array(SequenceableCollection)>>do: > WorldState>>handsDo: > WorldState>>doOneCycleNowFor: > WorldState>>doOneCycleFor: > PasteUpMorph>>doOneCycle > [] in Project class>>spawnNewProcess {[[World doOneCycle. Processor > yield. false] whileFalse. nil]} > [] in BlockContext>>newProcess {[self value. Processor terminateActive]} > > > > Rotating flaps DNU and other mishaps > > ------------------------------------ > > > > Key: SQ-1119 > > URL: http://tracker.squeakland.org/browse/SQ-1119 > > Project: squeakland > > Issue Type: Bug > > Components: etoys > > Reporter: Karl Ramberg > > Fix For: future release > > > > > > Most flaps can be rotated by rotation handle but none of them do this > gracefully. Viewer flaps give DNU when collapsed and opened again. 'About' > flap leaves a green transformation morph on the desktop. > > Should we disable the rotation handle for flaps ? > > I can't really see a use case for rotating a flap, except for a cool > factor ;-) > > -- > This message is automatically generated by JIRA. > - > If you think it was sent incorrectly contact one of the administrators: > http://tracker.squeakland.org/secure/Administrators.jspa > - > For more information on JIRA, see: http://www.atlassian.com/software/jira > > >

1 0

The Inbox: Compiler.quasiquote-eem.248.mcz
by commits＠source.squeak.org 06 Feb '13

06 Feb '13

A new version of Compiler was added to project The Inbox: http://source.squeak.org/inbox/Compiler.quasiquote-eem.248.mcz ==================== Summary ==================== Name: Compiler.quasiquote-eem.248 Author: eem Time: 5 February 2013, 9:54:20.317 pm UUID: ef044906-3339-48cc-856b-9b5172e3e81b Ancestors: Compiler-cwp.247 Add a quasi-quote form that allows convenient embedding of substrings within a format string, and provides a convenient way of embedding literal strings within an alternative literal string whose string delimiter is different. e.g. `hello [#cruel] world!` evaluates to 'hello cruel world'. `S1[B1]...SN[BN]SN+1` is equivalent to { 'S1'. [B1] value. ... 'SN'. [BN] value. 'SN+1' } concatenateQuasiQuote where concatenateQuasiQuote sends asString to each element and answers the concatenation of those elements. however, single-statement blocks are inlined, so e.g. the above `hello [#cruel] world!` is compiled as { 'hello '. #cruel. ' world!' } concatenateQuasiQuote See Tests.quasiquote-eem.188 for tests and examples. =============== Diff against Compiler-cwp.247 =============== Item was added: + ----- Method: Array>>concatenateQuasiQuote (in category '*Compiler-support') ----- + concatenateQuasiQuote + "This method is used in compilation of quasi-quote constructs. + It MUST NOT be deleted or altered." + + | s sz | + sz := self size. + s := WriteStream on: (String new: sz * 16). + 1 to: sz do: + [:i| s nextPutAll: (self at: i) asString]. + ^s contents! Item was removed: - ----- Method: Decompiler>>checkForBlock:selector:arguments: (in category 'control') ----- - checkForBlock: receiver selector: selector arguments: arguments - selector == #blockCopy: ifTrue: - [^self checkForBlockCopy: receiver]. - self assert: selector == #closureCopy:copiedValues:. - ^self checkForClosureCopy: receiver arguments: arguments! Item was added: + ----- Method: Decompiler>>checkForMacroMessage:selector:arguments: (in category 'control') ----- + checkForMacroMessage: rcvr selector: selector arguments: args + ^ (selector == #concatenateQuasiQuote + and: [self checkForQuasiQuote: rcvr selector: selector arguments: args]) + or: [(#closureCopy:copiedValues: == selector + and: [self checkForClosureCopy: rcvr arguments: args]) + or: [#blockCopy: == selector + and: [self checkForBlockCopy: rcvr]]]! Item was added: + ----- Method: Decompiler>>checkForQuasiQuote:selector:arguments: (in category 'control') ----- + checkForQuasiQuote: rcvr "<BraceNode>" selector: selector "<Symbol>" arguments: args "<Array>" + stack addLast: + ((MessageNode new + receiver: rcvr + selector: (SelectorNode new key: #concatenateQuasiQuote code: nil) + arguments: args + precedence: 1) + notePrintingSelector: #printQuasiQuoteOn:indent:; + yourself). + ^true! Item was changed: ----- Method: Decompiler>>send:super:numArgs: (in category 'instruction decoding') ----- send: selector super: superFlag numArgs: numArgs | args rcvr selNode msgNode messages | args := Array new: numArgs. (numArgs to: 1 by: -1) do: [:i | args at: i put: stack removeLast]. rcvr := stack removeLast. superFlag ifTrue: [rcvr := constructor codeSuper]. + (self checkForMacroMessage: rcvr selector: selector arguments: args) ifFalse: - ((#(blockCopy: closureCopy:copiedValues:) includes: selector) - and: [self checkForBlock: rcvr selector: selector arguments: args]) ifFalse: [selNode := constructor codeAnySelector: selector. rcvr == CascadeFlag ifTrue: ["May actually be a cascade or an ifNil: for value." self willJumpIfFalse ifTrue: "= generated by a case macro" [selector == #= ifTrue: [" = signals a case statement..." statements addLast: args first. stack addLast: rcvr. "restore CascadeFlag" ^ self]. selector == #== ifTrue: [" == signals an ifNil: for value..." stack removeLast; removeLast. rcvr := stack removeLast. stack addLast: IfNilFlag; addLast: (constructor codeMessage: rcvr selector: selNode arguments: args). ^ self]] ifFalse: [(self willJumpIfTrue and: [selector == #==]) ifTrue: [" == signals an ifNotNil: for value..." stack removeLast; removeLast. rcvr := stack removeLast. stack addLast: IfNilFlag; addLast: (constructor codeMessage: rcvr selector: selNode arguments: args). ^ self]]. msgNode := constructor codeCascadedMessage: selNode arguments: args. stack last == CascadeFlag ifFalse: ["Last message of a cascade" statements addLast: msgNode. messages := self popTo: stack removeLast. "Depth saved by first dup" msgNode := constructor codeCascade: stack removeLast messages: messages]] ifFalse: [msgNode := constructor codeMessage: rcvr selector: selNode arguments: args]. stack addLast: msgNode]! Item was changed: ----- Method: MessageNode class>>initialize (in category 'class initialization') ----- initialize "MessageNode initialize" MacroSelectors := #( ifTrue: ifFalse: ifTrue:ifFalse: ifFalse:ifTrue: and: or: whileFalse: whileTrue: whileFalse whileTrue to:do: to:by:do: caseOf: caseOf:otherwise: ifNil: ifNotNil: ifNil:ifNotNil: ifNotNil:ifNil: + repeat + nil "space for concatenateQuasiQuote" ). - repeat ). MacroTransformers := #( transformIfTrue: transformIfFalse: transformIfTrueIfFalse: transformIfFalseIfTrue: transformAnd: transformOr: transformWhile: transformWhile: transformWhile: transformWhile: transformToDo: transformToDo: transformCase: transformCase: transformIfNil: transformIfNil: transformIfNilIfNotNil: transformIfNotNilIfNil: + transformRepeat: + nil "space for concatenateQuasiQuote" ). - transformRepeat: ). MacroEmitters := #( emitCodeForIf:encoder:value: emitCodeForIf:encoder:value: emitCodeForIf:encoder:value: emitCodeForIf:encoder:value: emitCodeForIf:encoder:value: emitCodeForIf:encoder:value: emitCodeForWhile:encoder:value: emitCodeForWhile:encoder:value: emitCodeForWhile:encoder:value: emitCodeForWhile:encoder:value: emitCodeForToDo:encoder:value: emitCodeForToDo:encoder:value: emitCodeForCase:encoder:value: emitCodeForCase:encoder:value: emitCodeForIfNil:encoder:value: emitCodeForIfNil:encoder:value: emitCodeForIf:encoder:value: emitCodeForIf:encoder:value: + emitCodeForRepeat:encoder:value: + nil "space for concatenateQuasiQuote"). - emitCodeForRepeat:encoder:value:). MacroSizers := #( sizeCodeForIf:value: sizeCodeForIf:value: sizeCodeForIf:value: sizeCodeForIf:value: sizeCodeForIf:value: sizeCodeForIf:value: sizeCodeForWhile:value: sizeCodeForWhile:value: sizeCodeForWhile:value: sizeCodeForWhile:value: sizeCodeForToDo:value: sizeCodeForToDo:value: sizeCodeForCase:value: sizeCodeForCase:value: sizeCodeForIfNil:value: sizeCodeForIfNil:value: sizeCodeForIf:value: sizeCodeForIf:value: + sizeCodeForRepeat:value: + nil "space for concatenateQuasiQuote"). - sizeCodeForRepeat:value:). MacroPrinters := #( printIfOn:indent: printIfOn:indent: printIfOn:indent: printIfOn:indent: printIfOn:indent: printIfOn:indent: printWhileOn:indent: printWhileOn:indent: printWhileOn:indent: printWhileOn:indent: printToDoOn:indent: printToDoOn:indent: printCaseOn:indent: printCaseOn:indent: printIfNil:indent: printIfNil:indent: printIfNilNotNil:indent: printIfNilNotNil:indent: + printRepeatOn:indent: + printQuasiQuoteOn:indent:)! - printRepeatOn:indent:)! Item was added: + ----- Method: MessageNode>>notePrintingSelector: (in category 'macro transformations') ----- + notePrintingSelector: printingSelectorSymbol + "decompile" + + special := MacroPrinters indexOf: printingSelectorSymbol! Item was added: + ----- Method: MessageNode>>printQuasiQuoteOn:indent: (in category 'printing') ----- + printQuasiQuoteOn: aStream indent: level + aStream nextPut: $`. + receiver elements do: + [:parseNode| + (parseNode isLiteralNode + and: [parseNode key class == 'literal' class]) + ifTrue: + [parseNode key do: + [:char| + ('`[\' includes: char) ifTrue: + [aStream nextPut: $\]. + aStream nextPut: char]] + ifFalse: + [(parseNode isMessageNode + and: [parseNode selector key == #value + and: [parseNode receiver isBlockNode]]) + ifTrue: + [parseNode receiver printOn: aStream indent: 0] + ifFalse: + [aStream nextPut: $[. + parseNode printOn: aStream indent: 0. + aStream nextPut: $]]]]. + aStream nextPut: $`! Item was changed: ----- Method: Parser>>advance (in category 'scanning') ----- advance | this | prevMark := hereMark. prevEnd := hereEnd. this := here. here := token. hereType := tokenType. hereMark := mark. hereEnd := source position - (aheadChar == DoItCharacter ifTrue: [hereChar == DoItCharacter ifTrue: [0] ifFalse: [1]] ifFalse: [2]). + hereType ~~ #backQuote ifTrue: + [self scanToken]. - self scanToken. "Transcript show: 'here: ', here printString, ' mark: ', hereMark printString, ' end: ', hereEnd printString; cr." ^this! Item was changed: ----- Method: Parser>>expression (in category 'expression types') ----- expression + (hereType == #word and: [tokenType == #leftArrow]) ifTrue: + [^self assignment: self variable]. + hereType == #backQuote + ifTrue: [self quasiQuoteExpression] + ifFalse: + [hereType == #leftBrace + ifTrue: [self braceExpression] + ifFalse: + [self primaryExpression ifFalse: + [^false]]]. + (self messagePart: 3 repeat: true) ifTrue: + [hereType == #semicolon ifTrue: + [self cascade]]. + ^true! - (hereType == #word and: [tokenType == #leftArrow]) - ifTrue: [^ self assignment: self variable]. - hereType == #leftBrace - ifTrue: [self braceExpression] - ifFalse: [self primaryExpression ifFalse: [^ false]]. - (self messagePart: 3 repeat: true) - ifTrue: [hereType == #semicolon ifTrue: [self cascade]]. - ^ true! Item was added: + ----- Method: Parser>>nonQuasiQuoteExpression (in category 'expression types') ----- + nonQuasiQuoteExpression + + (hereType == #word and: [tokenType == #leftArrow]) + ifTrue: [^ self assignment: self variable]. + hereType == #leftBrace + ifTrue: [self braceExpression] + ifFalse: [self primaryExpression ifFalse: [^ false]]. + (self messagePart: 3 repeat: true) + ifTrue: [hereType == #semicolon ifTrue: [self cascade]]. + ^ true! Item was added: + ----- Method: Parser>>quasiQuoteExpression (in category 'expression types') ----- + quasiQuoteExpression + "`quasi-quote` + => { elements } concatenateQuasiQuote + => MessageNode receiver: BraceNode selector: #concatenateQuasiQuote. + + The syntax of quasi-quote is + quasi-quote := $` (characters | blockExpression) * $` + characters := (unescapedCharacter | $\ escapedCharacter) * + + The semantics of quasi-quote are that each blockExpression is evaluated + left-to-right in the scope of the enclosing method or block. The sequence + of interspersed character sequences and expressions are concatenated + left-to-right, sending asString to each element immediately prior to concatenation. + The concatenation is then the result of the expression. It is always a new string. + + The implementation inlines single-statement blocks into the brace expression that + comprises the receiver of concatenateQuasiQuote" + + | elements locations stringStream loc | + elements := OrderedCollection new. + locations := OrderedCollection new. + stringStream := WriteStream on: (String new: 16). + [loc := hereMark + requestorOffset. + hereType == #doit ifTrue: + [^self expected: 'back quote']. + hereType == #leftBracket + ifTrue: + [self scanToken; advance. + parseNode := nil. + self blockExpression. + parseNode statements size = 1 + ifTrue: + [elements addLast: parseNode statements first] + ifFalse: + [elements addLast: (MessageNode new + receiver: parseNode + selector: #value + arguments: #() + precedence: 1 + from: encoder)]. + source position: hereMark - 1. + [source peek ~~ $]] whileTrue: + [source position: source position - 1]. + source next. + self step; step. + self setHereTypeForQuasiQuote. + locations addLast: loc] + ifFalse: + [(self scanQuasiQuoteCharactersUsing: stringStream) ifNotNil: + [:lit| + elements addLast: lit. + locations addLast: loc]]. + hereType ~~ #backQuote] whileTrue. + parseNode := MessageNode new + receiver: (BraceNode new elements: elements sourceLocations: locations) + selector: #concatenateQuasiQuote + arguments: #() + precedence: 1 + from: encoder. + self scanToken; advance. + ^true! Item was changed: + ----- Method: Parser>>queriedUnusedTemporaries (in category 'temps') ----- - ----- Method: Parser>>queriedUnusedTemporaries (in category 'accessing') ----- queriedUnusedTemporaries queriedUnusedTemporaries ifNil: [queriedUnusedTemporaries := Dictionary new]. ^queriedUnusedTemporaries! Item was added: + ----- Method: Parser>>scanQuasiQuoteCharactersUsing: (in category 'scanning') ----- + scanQuasiQuoteCharactersUsing: stringStream + "Answer the next non-empty sequence of characters in a quasi-quote string, or nil, if none." + stringStream reset. + [hereChar ~~ $` and: [hereChar ~~ $[ and: [hereChar ~~ DoItCharacter]]] whileTrue: + [hereChar == $\ + ifTrue: + [stringStream nextPut: aheadChar. self step] + ifFalse: + [stringStream nextPut: hereChar]. + self step]. + self setHereTypeForQuasiQuote. + ^stringStream position > 0 ifTrue: + [encoder encodeLiteral: stringStream contents]! Item was added: + ----- Method: Parser>>setHereTypeForQuasiQuote (in category 'scanning') ----- + setHereTypeForQuasiQuote + "Set hereType appropriately based on hereChar. Used only for quasi-quote parsing." + hereChar == $` + ifTrue: + [hereType := #backQuote. + self step] + ifFalse: + [hereChar == $[ + ifTrue: + [hereType := #leftBracket. + self step] + ifFalse: + [hereChar == DoItCharacter ifTrue: + [hereType := #doit]]]! Item was changed: + ----- Method: Parser>>tempsMark (in category 'temps') ----- - ----- Method: Parser>>tempsMark (in category 'accessing') ----- tempsMark ^ tempsMark! Item was changed: + ----- Method: Parser>>tempsMark: (in category 'temps') ----- - ----- Method: Parser>>tempsMark: (in category 'accessing') ----- tempsMark: aNumber tempsMark := aNumber! Item was changed: ----- Method: Scanner class>>initializeTypeTable (in category 'initialization') ----- initializeTypeTable "self initializeTypeTable" | newTable | newTable := Array new: 256 withAll: #xBinary. "default" newTable atAll: #(9 10 12 13 32 ) put: #xDelimiter. "tab lf ff cr space" newTable atAll: ($0 asciiValue to: $9 asciiValue) put: #xDigit. 1 to: 255 do: [:index | (Character value: index) isLetter ifTrue: [newTable at: index put: #xLetter]]. newTable at: $" asciiValue put: #xDoubleQuote. newTable at: $# asciiValue put: #xLitQuote. newTable at: $$ asciiValue put: #xDollar. newTable at: $' asciiValue put: #xSingleQuote. + newTable at: $` asciiValue put: #backQuote. newTable at: $: asciiValue put: #xColon. newTable at: $( asciiValue put: #leftParenthesis. newTable at: $) asciiValue put: #rightParenthesis. newTable at: $. asciiValue put: #period. newTable at: $; asciiValue put: #semicolon. newTable at: $[ asciiValue put: #leftBracket. newTable at: $] asciiValue put: #rightBracket. newTable at: ${ asciiValue put: #leftBrace. newTable at: $} asciiValue put: #rightBrace. newTable at: $^ asciiValue put: #upArrow. newTable at: $_ asciiValue put: #xUnderscore. newTable at: $| asciiValue put: #verticalBar. TypeTable := newTable "bon voyage!!"!

1 0

The Inbox: Tests.quasiquote-eem.188.mcz
by commits＠source.squeak.org 06 Feb '13

06 Feb '13

A new version of Tests was added to project The Inbox: http://source.squeak.org/inbox/Tests.quasiquote-eem.188.mcz ==================== Summary ==================== Name: Tests.quasiquote-eem.188 Author: eem Time: 5 February 2013, 9:54:12.842 pm UUID: c6a111d6-4f3f-4810-9ed3-cb8aa57a0a1c Ancestors: Tests-fbs.187 Tests for the quasi-quote implemented by Compiler.quasiquote-eem.248 =============== Diff against Tests-fbs.187 =============== Item was added: + TestCase subclass: #QuasiQuoteTest + instanceVariableNames: 'foo bar baz' + classVariableNames: '' + poolDictionaries: '' + category: 'Tests-Compiler'! Item was added: + ----- Method: QuasiQuoteTest>>evaluate: (in category 'private') ----- + evaluate: aString + ^self class newCompiler evaluate: aString for: self logged: false ! Item was added: + ----- Method: QuasiQuoteTest>>testDecompilation (in category 'tests') ----- + testDecompilation + self assert: (self evaluate: '`[thisContext method decompile]`') + equals: 'DoIt\ ^ `[thisContext method decompile]`' withCRs. + self assert: (self evaluate: '`hello [thisContext method decompile] world!!`') + equals: 'hello DoIt\ ^ `hello [thisContext method decompile] world!!` world!!' withCRs. + self assert: (self evaluate: '| s | `hello [s := thisContext method decompile asString. ''yo''] world!!`. s') + equals: 'DoIt\ | t1 |\ `hello [t1 := thisContext method decompile asString.\ ''yo''] world!!`.\ ^ t1' withCRs! Item was added: + ----- Method: QuasiQuoteTest>>testErrors (in category 'tests') ----- + testErrors + self should: [self evaluate: '`hello'] + raise: SyntaxErrorNotification, Error + withExceptionDo: [:ex| self assert: ex errorMessage = 'back quote expected']. + self should: [self evaluate: '`[nil][true][false[1][$1][#(one)]`'] + raise: SyntaxErrorNotification, Error + withExceptionDo: [:ex| self assert: ex errorMessage = 'Period or right bracket expected']. + self shouldnt: [self evaluate: '`[nil. true. false]`'] + raise: SyntaxErrorNotification, Error! Item was added: + ----- Method: QuasiQuoteTest>>testLiterals (in category 'tests') ----- + testLiterals + self assert: (self evaluate: '`[nil][true][false][1][$1][#(one)]`') equals: 'niltruefalse11#(#one)'! Item was added: + ----- Method: QuasiQuoteTest>>testMessageExpressions (in category 'tests') ----- + testMessageExpressions + self assert: (self evaluate: '`[self class name]`') equals: self class name. + self assert: (self evaluate: '`hello [1@2]`') equals: 'hello ', (1@2) asString.! Item was added: + ----- Method: QuasiQuoteTest>>testNonLocalReturns (in category 'tests') ----- + testNonLocalReturns + self assert: (self evaluate: '`[^#nlr]`') equals: #nlr! Item was added: + ----- Method: QuasiQuoteTest>>testNullStrings (in category 'tests') ----- + testNullStrings + self assert: (self evaluate: '``') equals: ''. + self assert: (self evaluate: '`[]`') equals: 'nil'. + self assert: (self evaluate: '`[][]`') equals: 'nilnil'! Item was added: + ----- Method: QuasiQuoteTest>>testScopeAccess (in category 'tests') ----- + testScopeAccess + foo := 'Foo'. + bar := 'Bar'. + baz := 'Baz'. + self assert: (self evaluate: '`[foo][bar][baz]`') equals: 'FooBarBaz'. + self assert: (self evaluate: '`foo[foo]bar[bar]baz[baz]`') equals: 'fooFoobarBarbazBaz'. + + self assert: (self evaluate: '[:a :b :c| `[a][b][c]`] value: foo value: bar value: baz') equals: 'FooBarBaz'. + self assert: (self evaluate: '[:a :b :c| `foo[a]bar[b]baz[c]`] value: foo value: bar value: baz') equals: 'fooFoobarBarbazBaz'! Item was added: + ----- Method: QuasiQuoteTest>>testSimpleString (in category 'tests') ----- + testSimpleString + self assert: { 'hello world!!' } concatenateQuasiQuote equals: 'hello world!!'. + self shouldnt: [Parser new parse: '`hello world!!`' readStream class: nil class noPattern: true notifying: nil ifFail: [Error signal]] + raise: SyntaxErrorNotification, Error. + self shouldnt: [self evaluate: '`hello world!!`'] + raise: SyntaxErrorNotification, Error. + self assert: (self evaluate: '`hello world!!`') equals: 'hello world!!'. + + self assert: { 'hello '. #cruel. ' world!!' } concatenateQuasiQuote equals: 'hello cruel world!!'. + self shouldnt: [Parser new parse: '`hello [#cruel] world!!`' readStream class: nil class noPattern: true notifying: nil ifFail: [Error signal]] + raise: SyntaxErrorNotification, Error. + self shouldnt: [self evaluate: '`hello [#cruel] world!!`'] + raise: SyntaxErrorNotification, Error. + self assert: (self evaluate: '`hello [#cruel] world!!`') equals: 'hello cruel world!!'. + + self assert: (self evaluate: '`''hello world!!''`') equals: '''hello world!!'''.!

1 0

The Trunk: SUnit-eem.91.mcz
by commits＠source.squeak.org 06 Feb '13

06 Feb '13

Eliot Miranda uploaded a new version of SUnit to project The Trunk: http://source.squeak.org/trunk/SUnit-eem.91.mcz ==================== Summary ==================== Name: SUnit-eem.91 Author: eem Time: 5 February 2013, 9:45:22.157 pm UUID: 563010a6-5bbc-4312-ae7c-b09410b24fad Ancestors: SUnit-cmm.90 Robust testCase printing. i.e. TestCase new asString should not raise an error. =============== Diff against SUnit-cmm.90 =============== Item was changed: ----- Method: TestCase>>printOn: (in category 'printing') ----- printOn: aStream + testSelector + ifNil: [super printOn: aStream] + ifNotNil: + [aStream + nextPutAll: self class printString; + nextPutAll: '>>#'; + nextPutAll: testSelector] ! - aStream - nextPutAll: self class printString; - nextPutAll: '>>#'; - nextPutAll: testSelector - !

1 0

Daily Commit Log
by commits＠source.squeak.org 06 Feb '13

06 Feb '13

Changes to Trunk (http://source.squeak.org/trunk.html) in the last 24 hours: http://lists.squeakfoundation.org/pipermail/packages/2013-February/005682.h… Name: SUnit-cmm.90 Ancestors: SUnit-ul.89 - Do not wipe out pre-initialized state on TestCases. Tests do not need to be prevented from running more than once if proper setUp/tearDown methods are present. =============================================

1 0

Jump to page: