Squeak-dev May 2015

squeak-dev@lists.squeakfoundation.org

50 participants
615 discussions

The Trunk: EToys-mt.124.mcz
by commits＠source.squeak.org 01 May '15

01 May '15

Marcel Taeumel uploaded a new version of EToys to project The Trunk: http://source.squeak.org/trunk/EToys-mt.124.mcz ==================== Summary ==================== Name: EToys-mt.124 Author: mt Time: 1 May 2015, 2:27:02.944 pm UUID: 883ff941-bc6b-c940-87e9-d6a3c79c8443 Ancestors: EToys-topa.123 Tiles-view check moved from Tools package. =============== Diff against EToys-topa.123 =============== Item was changed: SystemOrganization addCategory: #'Etoys-Buttons'! SystemOrganization addCategory: #'Etoys-CustomEvents'! SystemOrganization addCategory: #'Etoys-Experimental'! SystemOrganization addCategory: #'Etoys-Outliner'! + SystemOrganization addCategory: #'Etoys-PreferenceBrowser'! SystemOrganization addCategory: #'Etoys-Protocols'! SystemOrganization addCategory: #'Etoys-Protocols-Type Vocabularies'! SystemOrganization addCategory: #'Etoys-Scripting'! SystemOrganization addCategory: #'Etoys-Scripting Support'! SystemOrganization addCategory: #'Etoys-Scripting Tiles'! SystemOrganization addCategory: #'Etoys-Stacks'! SystemOrganization addCategory: #'Etoys-StarSqueak'! SystemOrganization addCategory: #'Etoys-Support'! SystemOrganization addCategory: #'Etoys-Tests'! SystemOrganization addCategory: #'Etoys-Tile Scriptors'! SystemOrganization addCategory: #'Etoys-Widgets'! - SystemOrganization addCategory: #'Etoys-PreferenceBrowser'! Item was added: + ----- Method: CodeHolder>>showingTiles (in category '*Etoys-tiles') ----- + showingTiles + "Answer whether the receiver is currently showing tiles" + + ^ contentsSymbol == #tiles + !

1 0

The Trunk: MorphicTests-mt.29.mcz
by commits＠source.squeak.org 01 May '15

01 May '15

Marcel Taeumel uploaded a new version of MorphicTests to project The Trunk: http://source.squeak.org/trunk/MorphicTests-mt.29.mcz ==================== Summary ==================== Name: MorphicTests-mt.29 Author: mt Time: 1 May 2015, 11:52:25.528 am UUID: 79cef7f2-a107-194e-b2c0-88452a5711b5 Ancestors: MorphicTests-mt.28 Tests added for text editor's model callbacks. =============== Diff against MorphicTests-mt.28 =============== Item was added: + ValueHolder subclass: #MorphicTestTextModel + instanceVariableNames: 'flags result' + classVariableNames: '' + poolDictionaries: '' + category: 'MorphicTests-Text Support'! Item was added: + ----- Method: MorphicTestTextModel>>debugExpression: (in category 'do-its general') ----- + debugExpression: anExpression + + self flags add: #expressionDebugged. + self result: (Compiler evaluate: anExpression).! Item was added: + ----- Method: MorphicTestTextModel>>doItContext (in category 'do-its support') ----- + doItContext + + self flags add: #doItContext. + ^ nil! Item was added: + ----- Method: MorphicTestTextModel>>doItReceiver (in category 'do-its support') ----- + doItReceiver + + self flags add: #doItReceiver. + ^ self result! Item was added: + ----- Method: MorphicTestTextModel>>exploreIt:result: (in category 'do-its') ----- + exploreIt: expression result: object + + self flags add: #explored. + self result: object.! Item was added: + ----- Method: MorphicTestTextModel>>expressionEvaluated:result: (in category 'do-its general') ----- + expressionEvaluated: anExpression result: anObject + + self flags add: #expressionEvaluated. + self result: anObject.! Item was added: + ----- Method: MorphicTestTextModel>>flags (in category 'as yet unclassified') ----- + flags + + ^ flags ifNil: [flags := Bag new]! Item was added: + ----- Method: MorphicTestTextModel>>hasFlag: (in category 'as yet unclassified') ----- + hasFlag: aSymbol + + ^ self flags includes: aSymbol! Item was added: + ----- Method: MorphicTestTextModel>>inspectIt:result: (in category 'do-its') ----- + inspectIt: expression result: object + + self flags add: #inspected. + self result: object.! Item was added: + ----- Method: MorphicTestTextModel>>printIt:result: (in category 'do-its') ----- + printIt: expression result: object + + self flags add: #printed. + self result: object printString.! Item was added: + ----- Method: MorphicTestTextModel>>result (in category 'as yet unclassified') ----- + result + + ^ result! Item was added: + ----- Method: MorphicTestTextModel>>result: (in category 'as yet unclassified') ----- + result: anObject + + result := anObject.! Item was added: + MorphicTestTextModel subclass: #MorphicTestTextModelWithEvaluationSupport + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'MorphicTests-Text Support'! Item was added: + ----- Method: MorphicTestTextModelWithEvaluationSupport>>evaluateExpression: (in category 'do-its general') ----- + evaluateExpression: anExpression + + self flags add: #expressionEvaluated. + self result: (Compiler evaluate: anExpression asString). + ^ self result! Item was added: + TestCase subclass: #TextEditorTest + instanceVariableNames: 'model widget' + classVariableNames: '' + poolDictionaries: '' + category: 'MorphicTests-Text Support'! Item was added: + ----- Method: TextEditorTest>>editor (in category 'running') ----- + editor + + ^ widget textMorph editor! Item was added: + ----- Method: TextEditorTest>>setUp (in category 'running') ----- + setUp + + super setUp. + model := MorphicTestTextModel new. + widget := PluggableTextMorph on: model text: #contents accept: #contents:. + + "We don't do real keyboard event handling. To be sure to set the model in the editor." + self editor model: model. + + model contents: ''.! Item was added: + ----- Method: TextEditorTest>>test01Setup (in category 'tests') ----- + test01Setup + + self assert: model dependents size = 1. + self assert: self editor model == model. + self assert: widget text isEmpty. + self assert: model contents isEmpty.! Item was added: + ----- Method: TextEditorTest>>test02EvaluateExpression (in category 'tests') ----- + test02EvaluateExpression + + model := MorphicTestTextModelWithEvaluationSupport new. + widget model: model. + + self text: '3+4'. + self editor doIt. + + self + assert: (model hasFlag: #expressionEvaluated); + assert: 7 equals: model result.! Item was added: + ----- Method: TextEditorTest>>test03DebugExpression (in category 'tests') ----- + test03DebugExpression + + self text: 'Morph new'. + self editor debugIt. + + self + assert: (model hasFlag: #expressionDebugged); + assert: (model result isKindOf: Morph).! Item was added: + ----- Method: TextEditorTest>>test04PrintIt (in category 'tests') ----- + test04PrintIt + + self text: '3+4'. + self editor printIt. + + self + assert: (model hasFlag: #printed); + assert: '7' equals: model result.! Item was added: + ----- Method: TextEditorTest>>test05ExploreIt (in category 'tests') ----- + test05ExploreIt + + self text: '1@1 corner: 20@20'. + self editor exploreIt. + + self + assert: (model hasFlag: #explored); + assert: (model result isKindOf: Rectangle).! Item was added: + ----- Method: TextEditorTest>>test06InspectIt (in category 'tests') ----- + test06InspectIt + + self text: '1@1 corner: 20@20'. + self editor inspectIt. + + self + assert: (model hasFlag: #inspected); + assert: (model result isKindOf: Rectangle).! Item was added: + ----- Method: TextEditorTest>>test07DoItReceiver (in category 'tests') ----- + test07DoItReceiver + + self text: 'self color'. + model result: (Morph new color: Color yellow). + self editor doIt. + + self + assert: (model hasFlag: #expressionEvaluated); + assert: Color yellow equals: model result.! Item was added: + ----- Method: TextEditorTest>>text: (in category 'running') ----- + text: aString + "Text editors have a short lifetime in pluggable text morphs." + + model contents: aString. + + "We don't do real keyboard event handling. To be sure to set the model in the editor." + self editor model: model.!

1 0

The Trunk: Morphic-mt.953.mcz
by commits＠source.squeak.org 01 May '15

01 May '15

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.953.mcz ==================== Summary ==================== Name: Morphic-mt.953 Author: mt Time: 1 May 2015, 11:51:15.58 am UUID: 20ca3687-6855-9d48-aa9a-efbc4a201aa4 Ancestors: Morphic-mt.952 Text editor hooks modified to be more descriptive on model side. And to not confuse Tweak. =============== Diff against Morphic-mt.952 =============== Item was changed: ----- Method: TextEditor>>debugIt (in category 'do-its') ----- debugIt | receiver context | self lineSelectAndEmptyCheck: [^self]. + (model respondsTo: #debugExpression:) + ifTrue: [^ model perform: #debugExpression: with: self selection]. - (model respondsTo: #debugIt:) - ifTrue: [^ model perform: #debugIt: with: self selection]. receiver := (model respondsTo: #doItReceiver) ifTrue: [model doItReceiver] ifFalse: [nil]. context := (model respondsTo: #doItContext) ifTrue: [model doItContext] ifFalse: [nil]. (self compileSelectionFor: receiver in: context) ifNotNil: [:method | self debug: method receiver: receiver in: context].! Item was changed: ----- Method: TextEditor>>evaluateSelectionAndDo: (in category 'do-its') ----- evaluateSelectionAndDo: aBlock "Treat the current selection as an expression; evaluate it and invoke aBlock with the result." | result rcvr ctxt | self lineSelectAndEmptyCheck: [^ nil]. + (model respondsTo: #evaluateExpression:) ifTrue: [ + ^ aBlock value: (model perform: #evaluateExpression: with: self selection)]. - (model respondsTo: #evaluate:) ifTrue: [ - ^ aBlock value: (model perform: #evaluate: with: self selection)]. (model respondsTo: #doItReceiver) ifTrue: [ rcvr := model doItReceiver. ctxt := model doItContext] ifFalse: [rcvr := ctxt := nil]. result := [ rcvr class evaluatorClass new evaluate: self selectionAsStream in: ctxt to: rcvr notifying: self ifFail: [morph flash. ^ nil] logged: true. ] on: OutOfScopeNotification do: [ :ex | ex resume: true]. + (model respondsTo: #expressionEvaluated:result:) ifTrue: [ + model perform: #expressionEvaluated:result: with: self selection with: result]. - (model respondsTo: #evaluated:result:) ifTrue: [ - model perform: #evaluated:result: with: self selection with: result]. ^aBlock value: result!

1 0

The Trunk: Collections-tfel.623.mcz
by commits＠source.squeak.org 01 May '15

01 May '15

Tim Felgentreff uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-tfel.623.mcz ==================== Summary ==================== Name: Collections-tfel.623 Author: tfel Time: 1 May 2015, 11:06:35.625 am UUID: baf2902d-52b9-2442-a513-8a5a6ff0ce30 Ancestors: Collections-nice.622 fix fallback code for ByteString>>findSubstring:in:startingAt:matchTable: when passing a starting index <= 0 =============== Diff against Collections-nice.622 =============== Item was changed: ----- Method: ByteString>>findSubstring:in:startingAt:matchTable: (in category 'comparing') ----- findSubstring: key in: body startingAt: start matchTable: matchTable "Answer the index in the string body at which the substring key first occurs, at or beyond start. The match is determined using matchTable, which can be used to effect, eg, case-insensitive matches. If no match is found, zero will be returned. The algorithm below is not optimum -- it is intended to be translated to C which will go so fast that it wont matter." | index | <primitive: 'primitiveFindSubstring' module: 'MiscPrimitivePlugin'> <var: #key declareC: 'unsigned char *key'> <var: #body declareC: 'unsigned char *body'> <var: #matchTable declareC: 'unsigned char *matchTable'> key size = 0 ifTrue: [^ 0]. + (start max: 1) to: body size - key size + 1 do: - start to: body size - key size + 1 do: [:startIndex | index := 1. [(matchTable at: (body at: startIndex+index-1) asciiValue + 1) = (matchTable at: (key at: index) asciiValue + 1)] whileTrue: [index = key size ifTrue: [^ startIndex]. index := index+1]]. ^ 0 " ' ' findSubstring: 'abc' in: 'abcdefabcd' startingAt: 1 matchTable: CaseSensitiveOrder 1 ' ' findSubstring: 'abc' in: 'abcdefabcd' startingAt: 2 matchTable: CaseSensitiveOrder 7 ' ' findSubstring: 'abc' in: 'abcdefabcd' startingAt: 8 matchTable: CaseSensitiveOrder 0 ' ' findSubstring: 'abc' in: 'abcdefABcd' startingAt: 2 matchTable: CaseSensitiveOrder 0 ' ' findSubstring: 'abc' in: 'abcdefABcd' startingAt: 2 matchTable: CaseInsensitiveOrder 7 "!

1 0

The Trunk: CollectionsTests-tfel.240.mcz
by commits＠source.squeak.org 01 May '15

01 May '15

Tim Felgentreff uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-tfel.240.mcz ==================== Summary ==================== Name: CollectionsTests-tfel.240 Author: tfel Time: 1 May 2015, 11:04:36.037 am UUID: 74204945-fbd6-6c49-9348-caafa98fb628 Ancestors: CollectionsTests-mt.239 Add a test case to check that ByteString>>findSubstring:in:startingAt:matchTable: behaves the same way as the primitive implementation (esp when using a negative index for startingAt:) =============== Diff against CollectionsTests-mt.239 =============== Item was added: + ----- Method: StringTest>>testFindSubstringInStartingAtMatchTable (in category 'tests - finding') ----- + testFindSubstringInStartingAtMatchTable + + | str tbl cm | + str := 'hello '. + tbl := String classPool at: #CaseSensitiveOrder. + self assert: (str findSubstring: ' ' in: str startingAt: 1 matchTable: tbl) = 6. + self assert: (str findSubstring: 'q' in: str startingAt: 1 matchTable: tbl) = 0. + self assert: (str findSubstring: 'q' in: str startingAt: -1 matchTable: tbl) = 0. + self assert: (str findSubstring: ' ' in: str startingAt: -1 matchTable: tbl) = 6. + + "The next test ensures that the fallback code works just as well" + cm := (CompiledMethod newFrom: (ByteString >> #findSubstring:in:startingAt:matchTable:)). + cm objectAt: 1 put: (cm header bitAnd: 16r1FF bitInvert). + self assert: (cm valueWithReceiver: str arguments: {' '. str. 1. tbl}) = 6. + self assert: (cm valueWithReceiver: str arguments: {'q'. str. 1. tbl}) = 0. + self assert: (cm valueWithReceiver: str arguments: {'q'. str. -1. tbl}) = 0. + self assert: (cm valueWithReceiver: str arguments: {' '. str. -1. tbl}) = 6. + !

1 0

Jump to page: