Squeak-dev September 2019

squeak-dev@lists.squeakfoundation.org

38 participants
356 discussions

The Trunk: TraitsTests-mt.23.mcz
by commits＠source.squeak.org 02 Sep '19

02 Sep '19

Marcel Taeumel uploaded a new version of TraitsTests to project The Trunk: http://source.squeak.org/trunk/TraitsTests-mt.23.mcz ==================== Summary ==================== Name: TraitsTests-mt.23 Author: mt Time: 2 September 2019, 7:36:50.497683 pm UUID: c2a17580-66fa-cd46-b10e-d915399380f3 Ancestors: TraitsTests-mt.22 Speeds up tests. On my machine, they took more than 10 minutes and are now down to roughly 65 seconds. :-) Thanks to source-file caching and notification silence during set-up and tear-down. The mini pattern #*Silently might be useful for other tests, too. =============== Diff against TraitsTests-mt.22 =============== Item was changed: ----- Method: TraitFileOutTest>>categoryName (in category 'running') ----- categoryName + ^'TraitsTestsTemporary-FileOut'! - ^'TraitsTests-FileOut'! Item was removed: - ----- Method: TraitFileOutTest>>setUp (in category 'running') ----- - setUp - - super setUp. - Utilities - useAuthorInitials: self className - during: [ - SystemOrganization addCategory: self categoryName. - - td := self createTraitNamed: #TD uses: {}. - td compile: 'd' classified: #cat1. - tc := self createTraitNamed: #TC uses: td. - tc compile: 'c' classified: #cat1. - tb := self createTraitNamed: #TB uses: td. - tb compile: 'b' classified: #cat1. - ta := self createTraitNamed: #TA uses: tb + ((tc @ {#cc->#c}) - {#c}). - ta compile: 'a' classified: #cat1. - - ca := self createClassNamed: #CA superclass: Object uses: {}. - ca compile: 'ca' classified: #cat1. - cb := self createClassNamed: #CB superclass: ca uses: ta. - cb compile: 'cb' classified: #cat1. - - "make the class of cb also use tc:" - cb class uses: ta classTrait + tc instanceVariableNames: '' ]! Item was added: + ----- Method: TraitFileOutTest>>setUpSilently (in category 'running') ----- + setUpSilently + + super setUpSilently. + + SystemOrganization addCategory: self categoryName. + + td := self createTraitNamed: #TD uses: {}. + td compile: 'd' classified: #cat1. + tc := self createTraitNamed: #TC uses: td. + tc compile: 'c' classified: #cat1. + tb := self createTraitNamed: #TB uses: td. + tb compile: 'b' classified: #cat1. + ta := self createTraitNamed: #TA uses: tb + ((tc @ {#cc->#c}) - {#c}). + ta compile: 'a' classified: #cat1. + + ca := self createClassNamed: #CA superclass: Object uses: {}. + ca compile: 'ca' classified: #cat1. + cb := self createClassNamed: #CB superclass: ca uses: ta. + cb compile: 'cb' classified: #cat1. + + "make the class of cb also use tc:" + cb class uses: ta classTrait + tc instanceVariableNames: ''.! Item was removed: - ----- Method: TraitFileOutTest>>tearDown (in category 'running') ----- - tearDown - | dir | - dir := FileDirectory default. - self createdClassesAndTraits, self resourceClassesAndTraits do: [:each | - dir deleteFileNamed: each asString , '.st' ifAbsent: []]. - dir deleteFileNamed: self categoryName , '.st' ifAbsent: []. - SystemOrganization removeSystemCategory: self categoryName. - ca := cb := ta := tb := tc := td := nil. - super tearDown! Item was added: + ----- Method: TraitFileOutTest>>tearDownSilently (in category 'running') ----- + tearDownSilently + + | dir | + dir := FileDirectory default. + self createdClassesAndTraits, self resourceClassesAndTraits do: [:each | + dir deleteFileNamed: each asString , '.st' ifAbsent: []]. + dir deleteFileNamed: self categoryName , '.st' ifAbsent: []. + SystemOrganization removeSystemCategory: self categoryName. + ca := cb := ta := tb := tc := td := nil. + + super tearDownSilently.! Item was changed: ----- Method: TraitsResource>>tearDown (in category 'running') ----- tearDown SystemChangeNotifier uniqueInstance noMoreNotificationsFor: self. + + SystemChangeNotifier uniqueInstance doSilently: [ + self createdClassesAndTraits do: + [:aClassOrTrait | | behaviorName | + behaviorName := aClassOrTrait name. + Smalltalk at: behaviorName + ifPresent: [:classOrTrait | classOrTrait removeFromSystem]. + ChangeSet current removeClassChanges: behaviorName] ]. + - self createdClassesAndTraits do: - [:aClassOrTrait | | behaviorName | - behaviorName := aClassOrTrait name. - Smalltalk at: behaviorName - ifPresent: [:classOrTrait | classOrTrait removeFromSystem]. - ChangeSet current removeClassChanges: behaviorName]. createdClassesAndTraits := self t1: (self t2: (self t3: (self t4: (self t5: (self t6: (self c1: (self c2: (self c3: (self c4: (self c5: (self c6: (self c7: (self c8: nil)))))))))))))! Item was added: + ----- Method: TraitsTestCase class>>isAbstract (in category 'as yet unclassified') ----- + isAbstract + + ^ self = TraitsTestCase! Item was changed: ----- Method: TraitsTestCase>>performTest (in category 'private') ----- performTest + CurrentReadOnlySourceFiles cacheDuring: [ + Utilities useAuthorInitials: self className during: [ + self performTestSilently]].! - Utilities - useAuthorInitials: self className - during: [ super performTest ]! Item was added: + ----- Method: TraitsTestCase>>performTestSilently (in category 'private') ----- + performTestSilently + "Perform the test without making too much noise." + + super performTest.! Item was changed: ----- Method: TraitsTestCase>>setUp (in category 'running') ----- setUp super setUp. self timeout: 90. "pre: This is necessary to account for the TraitsResrouce setup" + + CurrentReadOnlySourceFiles cacheDuring: [ + SystemChangeNotifier uniqueInstance doSilently: [ + Utilities useAuthorInitials: self className during: [ + self setUpSilently]]].! - ! Item was added: + ----- Method: TraitsTestCase>>setUpSilently (in category 'running') ----- + setUpSilently + "Prepare the system without making too much noise."! Item was changed: ----- Method: TraitsTestCase>>tearDown (in category 'running') ----- tearDown + CurrentReadOnlySourceFiles cacheDuring: [ + SystemChangeNotifier uniqueInstance doSilently: [ + Utilities useAuthorInitials: self className during: [ + self tearDownSilently]]]. + + super tearDown.! - TraitsResource resetIfDirty. - self createdClassesAndTraits do: - [:aClassOrTrait | | behaviorName | - behaviorName := aClassOrTrait name. - Smalltalk at: behaviorName - ifPresent: [:classOrTrait | classOrTrait removeFromSystem]. - ChangeSet current removeClassChanges: behaviorName]. - createdClassesAndTraits := nil! Item was added: + ----- Method: TraitsTestCase>>tearDownSilently (in category 'running') ----- + tearDownSilently + "Clean up the system without making too much noise." + + TraitsResource resetIfDirty. + + self createdClassesAndTraits do: [:aClassOrTrait | | behaviorName | + behaviorName := aClassOrTrait name. + Smalltalk at: behaviorName + ifPresent: [:classOrTrait | classOrTrait removeFromSystem]. + ChangeSet current removeClassChanges: behaviorName]. + + createdClassesAndTraits := nil.!

1 0

The Trunk: TraitsTests-mt.22.mcz
by commits＠source.squeak.org 02 Sep '19

02 Sep '19

Marcel Taeumel uploaded a new version of TraitsTests to project The Trunk: http://source.squeak.org/trunk/TraitsTests-mt.22.mcz ==================== Summary ==================== Name: TraitsTests-mt.22 Author: mt Time: 2 September 2019, 6:30:30.686683 pm UUID: 2fdfe490-2fb1-5c48-a171-9a3ef751aa72 Ancestors: TraitsTests-mt.21 Removes a hard-coded value to let the test pass again. =============== Diff against TraitsTests-mt.21 =============== Item was changed: ----- Method: TraitTest>>testPrinting (in category 'testing') ----- testPrinting self assertPrints: self t6 definition like: 'Trait named: #T6 uses: T1 + (T2 @ {#m22Alias->#m22}) + category: ''', self categoryName, ''''! - category: ''TraitsTests-Kernel'''!

1 0

The Trunk: TraitsTests-mt.21.mcz
by commits＠source.squeak.org 02 Sep '19

02 Sep '19

Marcel Taeumel uploaded a new version of TraitsTests to project The Trunk: http://source.squeak.org/trunk/TraitsTests-mt.21.mcz ==================== Summary ==================== Name: TraitsTests-mt.21 Author: mt Time: 2 September 2019, 6:16:52.04089 pm UUID: 4cf604e6-f6b1-bd4a-a2a7-8cdb84295f3b Ancestors: TraitsTests-mt.20 Uses category name from resources object. Fixes a protocol. Comments a test that gave me the hint for that fix in SUnit-mt.116. =============== Diff against TraitsTests-mt.20 =============== Item was changed: ----- Method: TraitMethodDescriptionTest>>testArgumentNames (in category 'running') ----- testArgumentNames + "T5 combines both T1 and T2. For conflicting messages, T5 cannot know the correct argument names and thus falls back to a generic form 'arg1', 'arg2', etc." + self t1 compile: 'zork1: myArgument zork2: mySecondArgument ^true'. self t2 compile: 'zork1: myArgument zork2: somethingElse ^false'. + self assert: ((self t5 sourceCodeAt: #zork1:zork2:) asString beginsWith: 'zork1: arg1 zork2: arg2'). + self t1 compile: 'zork1: myArgument zork2: mySecondArgument ^true'. self t2 compile: 'zork1: somethingElse zork2: myArgument ^false'. + self assert: ((self t5 sourceCodeAt: #zork1:zork2:) asString beginsWith: 'zork1: arg1 zork2: arg2')! Item was changed: ----- Method: TraitsTestCase>>categoryName (in category 'running') ----- categoryName + + ^ TraitsResource current categoryName! - ^self class category! Item was changed: + ----- Method: TraitsTestCase>>setUp (in category 'running') ----- - ----- Method: TraitsTestCase>>setUp (in category 'accessing') ----- setUp super setUp. self timeout: 90. "pre: This is necessary to account for the TraitsResrouce setup" !

1 0

The Trunk: SUnit-mt.116.mcz
by commits＠source.squeak.org 02 Sep '19

02 Sep '19

Marcel Taeumel uploaded a new version of SUnit to project The Trunk: http://source.squeak.org/trunk/SUnit-mt.116.mcz ==================== Summary ==================== Name: SUnit-mt.116 Author: mt Time: 2 September 2019, 6:14:45.31489 pm UUID: 9009acd3-04d0-304e-8f97-9dd9eca62b27 Ancestors: SUnit-pre.115 Reset all test resources during system-wide clean up. While this *should* happen automatically during regular use of the test runner (see TestCase >> #debug), our trunk image has some outdated TraitsResource stuff, which affects the first run of tests. =============== Diff against SUnit-pre.115 =============== Item was added: + ----- Method: TestResource class>>cleanUp: (in category 'class initialization') ----- + cleanUp: aggressive + + aggressive ifTrue: [ + self withAllSubclassesDo: [:cls | cls reset]].!

1 0

The Trunk: Compiler-TraitTest.409.mcz
by commits＠source.squeak.org 02 Sep '19

02 Sep '19

Marcel Taeumel uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-TraitTest.409.mcz ==================== Summary ==================== Name: Compiler-TraitTest.409 Author: TraitTest Time: 2 September 2019, 5:10:57.854301 pm UUID: b13d5a17-2a64-8048-9e67-c70d875eb5e6 Ancestors: Compiler-ct.408 Fixes #markerOrNilFor: comment (SistaV1) and implementation (V3). returnSelf and returnTop got mixed up. =============== Diff against Compiler-ct.408 =============== Item was changed: ----- Method: EncoderForSistaV1 class>>markerOrNilFor: (in category 'compiled method support') ----- markerOrNilFor: aMethod "If aMethod is a marker method, answer the symbol used to mark it. Otherwise answer nil. What is a marker method? It is method with body like 'self subclassResponsibility' or '^ self subclassResponsibility' used to indicate ('mark') a special property. Marker methods compile to two bytecode forms, this: self send: <literal 1> pop returnSelf or this: self send: <literal 1> returnTop" | expectedHeaderPlusLliteralSize e byte | expectedHeaderPlusLliteralSize := Smalltalk wordSize * 4. ^(((e := aMethod endPC - expectedHeaderPlusLliteralSize) = 3 or: [e = 4]) and: [aMethod numLiterals = 3 + and: [(aMethod at: expectedHeaderPlusLliteralSize + 1) = 16r4C "push self" + and: [(aMethod at: expectedHeaderPlusLliteralSize + 2) = 16r80 "send" + and: [(byte := aMethod at: expectedHeaderPlusLliteralSize + 3) = 16rD8 "pop" or: [byte = 16r5C "returnTop"]]]]]) - and: [(aMethod at: expectedHeaderPlusLliteralSize + 1) = 16r4C "push self" - and: [(aMethod at: expectedHeaderPlusLliteralSize + 2) = 16r80 - and: [(byte := aMethod at: expectedHeaderPlusLliteralSize + 3) = 16rD8 or: [byte = 16r5C]]]]]) "pop or returnSelf" ifTrue: [aMethod literalAt: 1]! Item was changed: ----- Method: EncoderForV3 class>>markerOrNilFor: (in category 'compiled method support') ----- markerOrNilFor: aMethod "If aMethod is a marker method, answer the symbol used to mark it. Otherwise answer nil. What is a marker method? It is method with body like 'self subclassResponsibility' or '^ self subclassResponsibility' used to indicate ('mark') a special property. Marker methods compile to two bytecode forms, this: self send: <literal 1> pop returnSelf or this: self send: <literal 1> returnTop" | expectedHeaderPlusLliteralSize e byte | expectedHeaderPlusLliteralSize := Smalltalk wordSize * 4. ^(((e := aMethod endPC - expectedHeaderPlusLliteralSize) = 3 or: [e = 4]) and: [aMethod numLiterals = 3 + and: [(aMethod at: expectedHeaderPlusLliteralSize + 1) = 16r70 "push self" + and: [(aMethod at: expectedHeaderPlusLliteralSize + 2) = 16rD0 "send" + and: [(byte := aMethod at: expectedHeaderPlusLliteralSize + 3) = 16r87 "pop" or: [byte = 16r7C "returnTop"]]]]]) - and: [(aMethod at: expectedHeaderPlusLliteralSize + 1) = 16r70 "push self" - and: [(aMethod at: expectedHeaderPlusLliteralSize + 2) = 16rD0 - and: [(byte := aMethod at: expectedHeaderPlusLliteralSize + 3) = 16r87 or: [byte = 16r78]]]]]) "pop or returnSelf" ifTrue: [aMethod literalAt: 1]!

2 1

The Trunk: System-mt.1089.mcz
by commits＠source.squeak.org 02 Sep '19

02 Sep '19

Marcel Taeumel uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-mt.1089.mcz ==================== Summary ==================== Name: System-mt.1089 Author: mt Time: 2 September 2019, 4:27:00.273994 pm UUID: c9c311b5-5625-ba44-90eb-ecfdc1216633 Ancestors: System-mt.1088 Adds some support for the empty symbol because some tests rely on it. Hmpf. =============== Diff against System-mt.1088 =============== Item was changed: ----- Method: SystemNavigation>>allSentMessagesWithout: (in category 'query') ----- allSentMessagesWithout: classesAndMessagesPair "Answer the set of selectors which are sent somewhere in the system, computed in the absence of the supplied classes and messages." | sent absentClasses absentSelectors | sent := IdentitySet new: CompiledMethod instanceCount. absentClasses := classesAndMessagesPair first. absentSelectors := classesAndMessagesPair second. "sd 29/04/03" Cursor execute showWhile: [ self environment allClassesAndTraitsDo: [:cls | ((absentClasses includes: cls) ifTrue: [{}] ifFalse: [{cls. cls classSide}]) do: [:each | (absentSelectors isEmpty ifTrue: [each selectors] ifFalse: [each selectors copyWithoutAll: absentSelectors]) do: [:sel | "Include all sels, but not if sent by self" (each compiledMethodAt: sel) allLiteralsDo: [:m | self flag: #dicuss. "mt: How to distinguish a symbol from a selector?" + (m isSymbol and: [m size > 0 and: [m first isLowercase]]) - (m isSymbol and: [m first isLowercase]) ifTrue: ["might be sent" m == sel ifFalse: [sent add: m]]. ]]]]]. "The following may be sent without being in any literal frame" Smalltalk specialSelectorNames do: [:sel | sent add: sel]. Smalltalk presumedSentMessages do: [:sel | sent add: sel]. ^ sent.!

1 0

The Trunk: TraitsTests-mt.20.mcz
by commits＠source.squeak.org 02 Sep '19

02 Sep '19

Marcel Taeumel uploaded a new version of TraitsTests to project The Trunk: http://source.squeak.org/trunk/TraitsTests-mt.20.mcz ==================== Summary ==================== Name: TraitsTests-mt.20 Author: mt Time: 2 September 2019, 4:24:07.828994 pm UUID: 1210eec4-a9ff-8541-96f6-5821c64cecfa Ancestors: TraitsTests-mt.19 Update some traits tests. Put test data in its own category 'TraitsTestsTemporary' to not be committed by accident. =============== Diff against TraitsTests-mt.19 =============== Item was changed: ----- Method: TraitSystemTest>>testAllClassesAndTraits (in category 'testing') ----- testAllClassesAndTraits "self debug: #testAllClassesAndTraits" + | trait previousClassesAndTraits previousClasses | + previousClassesAndTraits := Smalltalk allClassesAndTraits. + previousClasses := Smalltalk allClasses. - | trait | trait := self t1. + + self deny: (previousClassesAndTraits includes: trait). + self deny: (previousClasses includes: trait). + self assert: (Smalltalk allClassesAndTraits includes: trait). self deny: (Smalltalk allClasses includes: trait). ! Item was changed: ----- Method: TraitSystemTest>>testAllImplementedMessagesWithout (in category 'testing') ----- testAllImplementedMessagesWithout "self debug: #testAllImplementedMessagesWithout" + SystemNavigation default allImplementedMessages in: [:msgs | + self deny: (msgs includes: #das2qwdqwd). + self deny: (msgs includes: #qwdqwdqwdc)]. + self t6 compile: 'das2qwdqwd'. + + SystemNavigation default allImplementedMessages in: [:msgs | + self assert: (msgs includes: #das2qwdqwd). + self deny: (msgs includes: #qwdqwdqwdc)].! - self assert: (SystemNavigation default allImplementedMessages includes: #das2qwdqwd). - self deny: (SystemNavigation default allImplementedMessages includes: #qwdqwdqwdc).! Item was changed: ----- Method: TraitSystemTest>>testAllSentMessages (in category 'testing') ----- testAllSentMessages "self debug: #testAllSentMessages" + SystemNavigation default allSentMessages in: [:msgs | + self deny: (msgs includes: 'dasoia' asSymbol). + self deny: (msgs includes: 'nioaosi' asSymbol)]. + self t1 compile: 'foo 1 dasoia'. + + SystemNavigation default allSentMessages in: [:msgs | + self assert: (msgs includes: 'dasoia' asSymbol). + self deny: (msgs includes: 'nioaosi' asSymbol)].! - self assert: (SystemNavigation default allSentMessages includes: 'dasoia' asSymbol). - self deny: (SystemNavigation default allSentMessages includes: 'nioaosi' asSymbol).! Item was changed: ----- Method: TraitsResource>>categoryName (in category 'as yet unclassified') ----- categoryName + + ^ 'TraitsTestsTemporary'! - ^self class category!

1 0

The Trunk: Nebraska-mt.55.mcz
by commits＠source.squeak.org 02 Sep '19

02 Sep '19

Marcel Taeumel uploaded a new version of Nebraska to project The Trunk: http://source.squeak.org/trunk/Nebraska-mt.55.mcz ==================== Summary ==================== Name: Nebraska-mt.55 Author: mt Time: 2 September 2019, 9:26:42.299272 am UUID: d5506310-80f2-3349-aaed-f0e6cee4e679 Ancestors: Nebraska-ul.54 Cleans up duplication in extension categories. Example: "*nebraska-*nebraska-Morphic-Remote" -> "*nebraska-Morphic-Remote" =============== Diff against Nebraska-ul.54 =============== Item was changed: + ----- Method: Color>>encodeForRemoteCanvas (in category '*nebraska-Morphic-Remote') ----- - ----- Method: Color>>encodeForRemoteCanvas (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodeForRemoteCanvas | encoded | CanvasEncoder at: 4 count: 1. (encoded := String new: 12) putInteger32: (rgb bitAnd: 16rFFFF) at: 1; putInteger32: (rgb >> 16) at: 5; putInteger32: self privateAlpha at: 9. ^encoded! Item was changed: + ----- Method: ColorForm>>encodeForRemoteCanvas (in category '*nebraska-Morphic-Remote') ----- - ----- Method: ColorForm>>encodeForRemoteCanvas (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodeForRemoteCanvas "encode into a bitstream for use with RemoteCanvas." | colorsToSend | colorsToSend := self colors. ^String streamContents: [ :str | str nextPut: $C; "indicates color form" nextPutAll: colorsToSend size printString; nextPut: $,. colorsToSend do: [ :each | str nextPutAll: each encodeForRemoteCanvas ]. str nextPutAll: super encodeForRemoteCanvas ]. ! Item was changed: + ----- Method: CompositeTransform>>encodeForRemoteCanvas (in category '*nebraska-Morphic-Remote') ----- - ----- Method: CompositeTransform>>encodeForRemoteCanvas (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodeForRemoteCanvas ^String streamContents: [ :str | str nextPutAll: 'Composite,'; nextPutAll: '('; nextPutAll: globalTransform encodeForRemoteCanvas; nextPutAll: ')('; nextPutAll: localTransform encodeForRemoteCanvas; nextPutAll: ')' ]! Item was changed: + ----- Method: DisplayTransform>>encodeForRemoteCanvas (in category '*nebraska-Morphic-Remote') ----- - ----- Method: DisplayTransform>>encodeForRemoteCanvas (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodeForRemoteCanvas "encode this transform into a string for use by a RemoteCanvas" ^self subclassResponsibility! Item was changed: + ----- Method: GradientFillStyle>>encodeForRemoteCanvas (in category '*nebraska-Morphic-Remote') ----- - ----- Method: GradientFillStyle>>encodeForRemoteCanvas (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodeForRemoteCanvas ^(DataStream streamedRepresentationOf: self) asString ! Item was changed: + ----- Method: InfiniteForm>>encodeForRemoteCanvas (in category '*nebraska-Morphic-Remote') ----- - ----- Method: InfiniteForm>>encodeForRemoteCanvas (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodeForRemoteCanvas ^patternForm encodeForRemoteCanvas ! Item was changed: + ----- Method: KeyboardEvent>>decodeFromStringArray: (in category '*nebraska-Morphic-Remote') ----- - ----- Method: KeyboardEvent>>decodeFromStringArray: (in category '*nebraska-*nebraska-Morphic-Remote') ----- decodeFromStringArray: array "decode the receiver from an array of strings" type := array first asSymbol. position := CanvasDecoder decodePoint: (array second). buttons := CanvasDecoder decodeInteger: (array third). keyValue := CanvasDecoder decodeInteger: array fourth! Item was changed: + ----- Method: KeyboardEvent>>encodedAsStringArray (in category '*nebraska-Morphic-Remote') ----- - ----- Method: KeyboardEvent>>encodedAsStringArray (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodedAsStringArray "encode the receiver into an array of strings, such that it can be retrieved via the fromStringArray: class method" ^{ type. CanvasEncoder encodePoint: position. CanvasEncoder encodeInteger: buttons. CanvasEncoder encodeInteger: keyValue asInteger }! Item was changed: + ----- Method: MatrixTransform2x3>>encodeForRemoteCanvas (in category '*nebraska-Morphic-Remote') ----- - ----- Method: MatrixTransform2x3>>encodeForRemoteCanvas (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodeForRemoteCanvas "encode this transform into a string for use by a RemoteCanvas" ^String streamContents: [ :str | str nextPutAll: 'Matrix,'. 1 to: 6 do: [ :i | str print: (self basicAt: i). str nextPut: $, ]. ]! Item was changed: + ----- Method: MorphicEvent class>>fromStringArray: (in category '*nebraska-Morphic-Remote') ----- - ----- Method: MorphicEvent class>>fromStringArray: (in category '*nebraska-*nebraska-Morphic-Remote') ----- fromStringArray: array "decode an event that was encoded with encodedAsStringArray" | type | type := (array at: 1). (type = 'mouseMove') ifTrue:[^MouseMoveEvent new decodeFromStringArray: array]. (type = 'mouseDown' or:[type = 'mouseUp']) ifTrue:[^MouseButtonEvent new decodeFromStringArray: array]. (type = 'keystroke' or:[type = 'keyDown' or:[type = 'keyUp']]) ifTrue:[^KeyboardEvent new decodeFromStringArray: array]. ^nil! Item was changed: + ----- Method: MorphicTransform>>encodeForRemoteCanvas (in category '*nebraska-Morphic-Remote') ----- - ----- Method: MorphicTransform>>encodeForRemoteCanvas (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodeForRemoteCanvas "encode this transform into a string for use by a RemoteCanvas" ^String streamContents: [ :str | str nextPutAll: 'Morphic,'; print: offset x truncated; nextPut: $,; print: offset y truncated; nextPut: $,; print: scale asFloat; nextPut: $,; print: angle asFloat ]! Item was changed: + ----- Method: MouseButtonEvent>>decodeFromStringArray: (in category '*nebraska-Morphic-Remote') ----- - ----- Method: MouseButtonEvent>>decodeFromStringArray: (in category '*nebraska-*nebraska-Morphic-Remote') ----- decodeFromStringArray: array "decode the receiver from an array of strings" type := array first asSymbol. position := CanvasDecoder decodePoint: (array second). buttons := CanvasDecoder decodeInteger: (array third). whichButton := CanvasDecoder decodeInteger: (array fourth)! Item was changed: + ----- Method: MouseButtonEvent>>encodedAsStringArray (in category '*nebraska-Morphic-Remote') ----- - ----- Method: MouseButtonEvent>>encodedAsStringArray (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodedAsStringArray "encode the receiver into an array of strings, such that it can be retrieved via the fromStringArray: class method" ^{ type. CanvasEncoder encodePoint: position. CanvasEncoder encodeInteger: buttons. CanvasEncoder encodeInteger: whichButton. }! Item was changed: + ----- Method: MouseMoveEvent>>decodeFromStringArray: (in category '*nebraska-Morphic-Remote') ----- - ----- Method: MouseMoveEvent>>decodeFromStringArray: (in category '*nebraska-*nebraska-Morphic-Remote') ----- decodeFromStringArray: array "decode the receiver from an array of strings" type := array first asSymbol. position := CanvasDecoder decodePoint: (array second). buttons := CanvasDecoder decodeInteger: (array third). startPoint := CanvasDecoder decodePoint: (array fourth)! Item was changed: + ----- Method: MouseMoveEvent>>encodedAsStringArray (in category '*nebraska-Morphic-Remote') ----- - ----- Method: MouseMoveEvent>>encodedAsStringArray (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodedAsStringArray "encode the receiver into an array of strings, such that it can be retrieved via the fromStringArray: class method" ^{ type. CanvasEncoder encodePoint: position. CanvasEncoder encodeInteger: buttons. CanvasEncoder encodePoint: startPoint. }! Item was changed: + ----- Method: Point>>encodeForRemoteCanvas (in category '*nebraska-Morphic-Remote') ----- - ----- Method: Point>>encodeForRemoteCanvas (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodeForRemoteCanvas | encoded | CanvasEncoder at: 3 count: 1. encoded := String new: 8. encoded putInteger32: x asInteger at: 1. encoded putInteger32: y asInteger at: 5. ^encoded! Item was changed: + ----- Method: ProjectNavigationMorph>>buttonShare (in category '*nebraska-Morphic-Remote') ----- - ----- Method: ProjectNavigationMorph>>buttonShare (in category '*nebraska-*nebraska-Morphic-Remote') ----- buttonShare ^self makeButton: 'Share' balloonText: 'Share this project so that others can explore it with you.' for: #shareThisWorld ! Item was changed: + ----- Method: ProjectNavigationMorph>>shareThisWorld (in category '*nebraska-Morphic-Remote') ----- - ----- Method: ProjectNavigationMorph>>shareThisWorld (in category '*nebraska-*nebraska-Morphic-Remote') ----- shareThisWorld NebraskaServerMorph serveWorld: self world! Item was changed: + ----- Method: Rectangle>>encodeForRemoteCanvas (in category '*nebraska-Morphic-Remote') ----- - ----- Method: Rectangle>>encodeForRemoteCanvas (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodeForRemoteCanvas | encoded | CanvasEncoder at: 2 count: 1. encoded := String new: 16. encoded putInteger32: origin x asInteger at: 1. encoded putInteger32: origin y asInteger at: 5. encoded putInteger32: corner x asInteger at: 9. encoded putInteger32: corner y asInteger at: 13. ^encoded! Item was changed: + ----- Method: Rectangle>>encodeForRemoteCanvasB (in category '*nebraska-Morphic-Remote') ----- - ----- Method: Rectangle>>encodeForRemoteCanvasB (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodeForRemoteCanvasB | encoded | encoded := Bitmap new: 4. encoded at: 1 put: origin x asInteger. encoded at: 2 put: origin y asInteger. encoded at: 3 put: corner x asInteger. encoded at: 4 put: corner y asInteger. ^encoded! Item was changed: + ----- Method: UserInputEvent>>encodedAsStringArray (in category '*nebraska-Morphic-Remote') ----- - ----- Method: UserInputEvent>>encodedAsStringArray (in category '*nebraska-*nebraska-Morphic-Remote') ----- encodedAsStringArray "encode the receiver into an array of strings, such that it can be retrieved via the fromStringArray: class method" ^{ type. CanvasEncoder encodePoint: position. CanvasEncoder encodeInteger: buttons. }!

1 0

The Trunk: MorphicExtras-mt.259.mcz
by commits＠source.squeak.org 02 Sep '19

02 Sep '19

Marcel Taeumel uploaded a new version of MorphicExtras to project The Trunk: http://source.squeak.org/trunk/MorphicExtras-mt.259.mcz ==================== Summary ==================== Name: MorphicExtras-mt.259 Author: mt Time: 2 September 2019, 9:25:15.169272 am UUID: e38a7506-69f9-d248-9125-5b167b1092fd Ancestors: MorphicExtras-mt.258 Cleans up double-extension categories. We never kept record of move operations between packages for extension categories. Example: "*MorphicExtras-*morphic-Postscript Canvases" -> "*MorphicExtras-Postscript Canvases". =============== Diff against MorphicExtras-mt.258 =============== Item was changed: + ----- Method: Color>>encodePostscriptOn: (in category '*MorphicExtras-Postscript Canvases') ----- - ----- Method: Color>>encodePostscriptOn: (in category '*MorphicExtras-*morphic-Postscript Canvases') ----- encodePostscriptOn: aStream aStream setrgbcolor:self. ! Item was changed: + ----- Method: ColorForm>>encodePostscriptOn: (in category '*MorphicExtras-Postscript Canvases') ----- - ----- Method: ColorForm>>encodePostscriptOn: (in category '*MorphicExtras-*morphic-Postscript Canvases') ----- encodePostscriptOn: aStream self unhibernate. aStream print: '% form contains '; write: (colors select: [:c | c = Color transparent]) size; print: ' transparent colors'; cr. ^ self asFormWithSingleTransparentColors printPostscript: aStream operator: (self depth = 1 ifTrue: ['imagemask'] ifFalse: [(self indexOfColor: Color transparent) printString , ' transparentimage'])! Item was changed: + ----- Method: ColorForm>>printPostscript: (in category '*MorphicExtras-Postscript Canvases') ----- - ----- Method: ColorForm>>printPostscript: (in category '*MorphicExtras-*morphic-Postscript Canvases') ----- printPostscript:aStream aStream nextPutAll:'% form contains '; print:((colors select:[:c| c=Color transparent]) size); nextPutAll:' transparent colors'; cr. ^self asFormWithSingleTransparentColors printPostscript:aStream operator:(self depth=1 ifTrue:['imagemask'] ifFalse:[ (self indexOfColor:Color transparent) printString ,' transparentimage']) . ! Item was changed: + ----- Method: ImageMorph>>drawPostscriptOn: (in category '*MorphicExtras-Postscript Canvases') ----- - ----- Method: ImageMorph>>drawPostscriptOn: (in category '*MorphicExtras-*morphic-Postscript Canvases') ----- drawPostscriptOn: aCanvas | top f2 c2 clrs | clrs := image colorsUsed. (clrs includes: Color transparent) ifFalse: [^super drawPostscriptOn: aCanvas]. "no need for this, then" top := aCanvas topLevelMorph. f2 := Form extent: self extent depth: image depth. c2 := f2 getCanvas. c2 fillColor: Color white. c2 translateBy: bounds origin negated clippingTo: f2 boundingBox during: [ :c | top fullDrawOn: c ]. aCanvas paintImage: f2 at: bounds origin ! Item was changed: + ----- Method: MatrixTransform2x3>>encodePostscriptOn: (in category '*MorphicExtras-Postscript Canvases') ----- - ----- Method: MatrixTransform2x3>>encodePostscriptOn: (in category '*MorphicExtras-*morphic-Postscript Canvases') ----- encodePostscriptOn: aStream aStream writeMatrix:self. ! Item was changed: + ----- Method: Point>>encodePostscriptOn: (in category '*MorphicExtras-Postscript Canvases') ----- - ----- Method: Point>>encodePostscriptOn: (in category '*MorphicExtras-*morphic-Postscript Canvases') ----- encodePostscriptOn:aStream aStream writePoint:self.! Item was changed: + ----- Method: PolygonMorph>>drawPostscriptOn: (in category '*MorphicExtras-Postscript Canvases') ----- - ----- Method: PolygonMorph>>drawPostscriptOn: (in category '*MorphicExtras-*morphic-Postscript Canvases') ----- drawPostscriptOn: aCanvas "Display the receiver, a spline curve, approximated by straight line segments." | array | vertices size < 1 ifTrue: [self error: 'a polygon must have at least one point']. array := self drawArrowsOn: aCanvas. closed ifTrue: [aCanvas drawPolygon: self getVertices color: self color borderWidth: self borderWidth borderColor: self borderColor] ifFalse: [self drawClippedBorderOn: aCanvas usingEnds: array]. ! Item was changed: + ----- Method: ProjectViewMorph>>fullDrawPostscriptOn: (in category '*MorphicExtras-Postscript Canvases') ----- - ----- Method: ProjectViewMorph>>fullDrawPostscriptOn: (in category '*MorphicExtras-*morphic-Postscript Canvases') ----- fullDrawPostscriptOn: aCanvas | f | "handle the fact that we have the squished text within" f := self imageForm. f offset: 0@0. aCanvas paintImage: f at: bounds origin. ! Item was changed: + ----- Method: Rectangle>>encodePostscriptOn: (in category '*MorphicExtras-Postscript Canvases') ----- - ----- Method: Rectangle>>encodePostscriptOn: (in category '*MorphicExtras-*morphic-Postscript Canvases') ----- encodePostscriptOn:aStream aStream write:self origin; print:' '; write:self extent; print:' '.! Item was changed: + ----- Method: String>>asPostscript (in category '*MorphicExtras-Postscript Canvases') ----- - ----- Method: String>>asPostscript (in category '*MorphicExtras-*morphic-Postscript Canvases') ----- asPostscript | temp | temp := self asString copyReplaceAll: '(' with: '$'. temp := temp copyReplaceAll: ')' with: '$'. temp := temp copyReplaceAll: ' ' with: ''. ^ PostscriptEncoder mapMacStringToPS: temp! Item was changed: + ----- Method: TheWorldMenu>>printWorldOnFile (in category '*MorphicExtras-Postscript Canvases') ----- - ----- Method: TheWorldMenu>>printWorldOnFile (in category '*MorphicExtras-*morphic-Postscript Canvases') ----- printWorldOnFile "Ask the user for a filename and print the world as postscript." myWorld printPSToFileNamed: 'SqueakScreen' !

1 0

The Trunk: System-mt.1088.mcz
by commits＠source.squeak.org 02 Sep '19

02 Sep '19

Marcel Taeumel uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-mt.1088.mcz ==================== Summary ==================== Name: System-mt.1088 Author: mt Time: 2 September 2019, 9:12:20.976272 am UUID: 3e565c44-884e-0d47-b919-b0071d31f64c Ancestors: System-mt.1087 Moves utility method from MenuItemMorph. We should think about having more geometry classes such as Triangle. See: http://forum.world.st/Proposal-Geometry-Classes-td5093998.html =============== Diff against System-mt.1087 =============== Item was added: + ----- Method: Utilities class>>triangle:containsPoint: (in category 'geometry testing') ----- + triangle: points containsPoint: p + " Computes if p is in the triangle defined by points. + p should be a Point, and points should be an array with three Points. + I took the algorithm from the bottom of this page: + http://www.blackpawn.com/texts/pointinpoly/default.html " + + | a b c v0 v1 v2 dot00 dot01 dot02 dot11 dot12 denom invDenom u v | + a := points first. + b := points second. + c := points third. + " Compute vectors " + v0 := c - a. + v1 := b - a. + v2 := p - a. + " Compute dot products " + dot00 := v0 dotProduct: v0. + dot01 := v0 dotProduct: v1. + dot02 := v0 dotProduct: v2. + dot11 := v1 dotProduct: v1. + dot12 := v1 dotProduct: v2. + " Compute barycentric coordinates " + denom := dot00 * dot11 - (dot01 * dot01). + denom = 0 ifTrue: [ ^false ]. + invDenom := 1 / denom. + u := (dot11 * dot02 - (dot01 * dot12)) * invDenom. + v := (dot00 * dot12 - (dot01 * dot02)) * invDenom. + " Check if point is in triangle " + ^u >= 0 and: [ v >= 0 and: [ u + v <= 1 ] ]!

1 0

Jump to page: