Squeak-dev March 2011

squeak-dev@lists.squeakfoundation.org

84 participants
416 discussions

The Trunk: Multilingual-nice.139.mcz
by commits＠source.squeak.org 30 Mar '11

30 Mar '11

Nicolas Cellier uploaded a new version of Multilingual to project The Trunk: http://source.squeak.org/trunk/Multilingual-nice.139.mcz ==================== Summary ==================== Name: Multilingual-nice.139 Author: nice Time: 30 March 2011, 10:52:57.838 pm UUID: 113356c1-c621-944f-9e35-c3cc5ed0d195 Ancestors: Multilingual-ul.138 minor ifNil refactoring =============== Diff against Multilingual-ul.138 =============== Item was changed: ----- Method: ByteTextConverter>>nextFromStream: (in category 'conversion') ----- nextFromStream: aStream | character1 | aStream isBinary ifTrue: [^ aStream basicNext]. + character1 := aStream basicNext ifNil: [^ nil]. - character1 := aStream basicNext. - character1 isNil ifTrue: [^ nil]. ^ self toSqueak: character1! Item was changed: ----- Method: MultiByteBinaryOrTextStream>>upTo: (in category 'public') ----- upTo: delim | out ch | out := WriteStream on: (String new: 1000). self atEnd ifTrue: [^ '']. + [(ch := self next) == nil] whileFalse: [ - [(ch := self next) isNil] whileFalse: [ (ch = delim) ifTrue: [ ^ out contents "terminator is not doubled; we're done!!" ]. out nextPut: ch. ]. ^ out contents. ! Item was changed: ----- Method: TTCFont class>>registry (in category 'other') ----- registry + ^ Registry + ifNil: [Registry := IdentityDictionary new] - - ^ Registry isNil - ifTrue: [Registry := IdentityDictionary new] - ifFalse: [Registry]. ! Item was changed: ----- Method: TTCFont>>emphasis: (in category 'accessing') ----- emphasis: code code > 3 ifTrue: [^ self]. code = 0 ifTrue: [^ self]. + derivatives ifNil: [^ self]. - derivatives isNil ifTrue: [^ self]. ^ (derivatives at: code) ifNil: [self]. ! Item was changed: ----- Method: TTCFontSet class>>registry (in category 'as yet unclassified') ----- registry + ^ Registry + ifNil: [Registry := IdentityDictionary new]! - - ^ Registry isNil - ifTrue: [Registry := IdentityDictionary new] - ifFalse: [Registry]. - !

1 0

The Trunk: Compiler-nice.200.mcz
by commits＠source.squeak.org 30 Mar '11

30 Mar '11

Nicolas Cellier uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-nice.200.mcz ==================== Summary ==================== Name: Compiler-nice.200 Author: nice Time: 30 March 2011, 10:47:39.106 pm UUID: e97c15bd-d6b0-b648-9bde-fb0e2ffde315 Ancestors: Compiler-nice.199 minor ifNil refactoring =============== Diff against Compiler-nice.199 =============== Item was changed: ----- Method: BlockLocalTempCounter>>tempCountForBlockAt:in: (in category 'initialize-release') ----- tempCountForBlockAt: pc in: method "Compute the number of local temporaries in a block. If the block begins with a sequence of push: nil bytecodes then some of These could be initializing local temps. We can only reliably disambuguate them from other uses of nil by parsing the stack and seeing what the offset of the stack pointer is at the end of the block. There are short-cuts. The ones we take here are - if there is no sequence of push nils there can be no local temps - we follow forward jumps to shorten the amount of scanning" stackPointer := 0. scanner := InstructionStream new method: method pc: pc. scanner interpretNextInstructionFor: self. + blockEnd ifNil: - blockEnd isNil ifTrue: [self error: 'pc is not that of a block']. scanner nextByte = Encoder pushNilCode ifTrue: [joinOffsets := Dictionary new. [scanner pc < blockEnd] whileTrue: [scanner interpretNextInstructionFor: self]]. ^stackPointer! Item was changed: ----- Method: BlockLocalTempCounter>>testTempCountForBlockAt:in: (in category 'initialize-release') ----- testTempCountForBlockAt: startPc in: method "Compute the number of local temporaries in a block. If the block begins with a sequence of push: nil bytecodes then some of These could be initializing local temps. We can only reliably disambuguate them from other uses of nil by parsing the stack and seeing what the offset of the stack pointer is at the end of the block.There are short-cuts. The only one we take here is - if there is no sequence of push nils there can be no local temps" | symbolicLines line prior thePc | symbolicLines := Dictionary new. method symbolicLinesDo: [:pc :lineForPC| symbolicLines at: pc put: lineForPC]. stackPointer := 0. scanner := InstructionStream new method: method pc: startPc. scanner interpretNextInstructionFor: self. + blockEnd ifNil: - blockEnd isNil ifTrue: [self error: 'pc is not that of a block']. scanner nextByte = Encoder pushNilCode ifTrue: [joinOffsets := Dictionary new. [scanner pc < blockEnd] whileTrue: [line := symbolicLines at: scanner pc. prior := stackPointer. thePc := scanner pc. scanner interpretNextInstructionFor: self. Transcript cr; print: prior; nextPutAll: '->'; print: stackPointer; tab; print: thePc; tab; nextPutAll: line; flush]]. ^stackPointer! Item was changed: ----- Method: Parser>>encoder (in category 'public access') ----- encoder + ^encoder ifNil: + [encoder := EncoderForV3PlusClosures new]! - encoder isNil ifTrue: - [encoder := EncoderForV3PlusClosures new]. - ^encoder! Item was changed: ----- Method: Parser>>encoderClass: (in category 'public access') ----- encoderClass: anEncoderClass + encoder ifNotNil: [ + self error: 'encoder already set']. - encoder notNil ifTrue: - [self error: 'encoder already set']. encoder := anEncoderClass new! Item was changed: ----- Method: RemoteTempVectorNode>>printDefinitionForClosureAnalysisOn: (in category 'printing') ----- printDefinitionForClosureAnalysisOn: aStream | refs | aStream nextPut: ${; nextPutAll: key. definingScope ifNotNil: [definingScope blockExtent ifNotNil: [:be| aStream nextPutAll: ' d@'; print: be first]]. + readingScopes ifNotNil: [ + refs := Set new. - readingScopes notNil ifTrue: - [refs := Set new. readingScopes do: [:elems| refs addAll: elems]. refs asSortedCollection do: [:read| aStream nextPutAll: ' r@'; print: read]]. remoteTemps do: [:rt| rt printDefinitionForClosureAnalysisOn: aStream] separatedBy: [aStream nextPut: $,; space]. aStream nextPut: $}! Item was changed: ----- Method: TempVariableNode>>sizeCodeForLoad: (in category 'code generation') ----- sizeCodeForLoad: encoder + ^remoteNode + ifNil: [0] + ifNotNil: [remoteNode sizeCodeForLoadFor: self encoder: encoder]! - ^remoteNode isNil - ifTrue: [0] - ifFalse: [remoteNode sizeCodeForLoadFor: self encoder: encoder]!

1 0

The Inbox: Tools-fbs.334.mcz
by commits＠source.squeak.org 30 Mar '11

30 Mar '11

A new version of Tools was added to project The Inbox: http://source.squeak.org/inbox/Tools-fbs.334.mcz ==================== Summary ==================== Name: Tools-fbs.334 Author: fbs Time: 30 March 2011, 9:42:09.966 pm UUID: acca9b1d-675e-f846-815e-eac885ca38ca Ancestors: Tools-fbs.333 More "parallel rollout" of selectedMessageCategoryName, and #messageCategoryListIndex and #messageCategoryListIndex: now internally use the name. =============== Diff against Tools-fbs.333 =============== Item was changed: ----- Method: Browser>>buildMessageCategoryBrowserEditString: (in category 'message category functions') ----- buildMessageCategoryBrowserEditString: aString "Create and schedule a message category browser for the currently selected message category. The initial text view contains the characters in aString." "wod 6/24/1998: set newBrowser classListIndex so that it works whether the receiver is a standard or a Hierarchy Browser." | newBrowser | ^ self hasMessageCategorySelected ifFalse: [ nil ] ifTrue: [newBrowser := Browser new. newBrowser selectSystemCategory: self selectedSystemCategory. + newBrowser selectClass: self selectedClass. + newBrowser metaClassIndicated: self metaClassIndicated. + newBrowser selectMessageCategoryNamed: self selectedMessageCategoryName. - newBrowser classListIndex: (newBrowser classList indexOf: self selectedClassName). - newBrowser metaClassIndicated: metaClassIndicated. - newBrowser messageCategoryListIndex: messageCategoryListIndex. newBrowser selectMessageNamed: self selectedMessageName. self class openBrowserView: (newBrowser openMessageCatEditString: aString) label: 'Message Category Browser (' , newBrowser selectedClassOrMetaClassName , ')'. newBrowser.].! Item was changed: ----- Method: Browser>>messageCategoryListIndex (in category 'message category list') ----- messageCategoryListIndex "Answer the index of the selected message category." + ^self messageCategoryList indexOf: selectedMessageCategoryName ifAbsent: [0].! - ^messageCategoryListIndex! Item was changed: ----- Method: Browser>>messageCategoryListIndex: (in category 'message category list') ----- messageCategoryListIndex: anInteger "Set the selected message category to be the one indexed by anInteger." messageCategoryListIndex := anInteger. selectedMessageCategoryName := nil. + self selectMessageCategoryNamed: (self messageCategoryList at: anInteger ifAbsent: [nil]).! - selectedMessageName := nil. - self changed: #messageCategorySelectionChanged. - self changed: #messageCategoryListIndex. "update my selection" - self changed: #messageList. - self editSelection: (anInteger > 0 - ifTrue: [#newMessage] - ifFalse: [self hasClassSelected - ifTrue: [#editClass] - ifFalse: [#newClass]]). - contents := nil. - self contentsChanged.! Item was changed: ----- Method: Browser>>messageList (in category 'message list') ----- messageList "Answer an Array of the message selectors of the currently selected message category, provided that the messageCategoryListIndex is in proper range. Otherwise, answer an empty Array If messageCategoryListIndex is found to be larger than the number of categories (it happens!!), it is reset to zero." | sel | (sel := self messageCategoryListSelection) ifNil: [ ^ self classOrMetaClassOrganizer ifNil: [Array new] ifNotNil: [self classOrMetaClassOrganizer allMethodSelectors] "^ Array new" ]. ^ sel = ClassOrganizer allCategory ifTrue: [self classOrMetaClassOrganizer ifNil: [Array new] ifNotNil: [self classOrMetaClassOrganizer allMethodSelectors]] ifFalse: + [(self classOrMetaClassOrganizer listAtCategoryNamed: self selectedMessageCategoryName ) + ifNil: [messageCategoryListIndex := 0. selectedMessageCategoryName := nil. Array new]]! - [(self classOrMetaClassOrganizer listAtCategoryNumber: messageCategoryListIndex - 1) - ifNil: [messageCategoryListIndex := 0. Array new]]! Item was changed: ----- Method: Browser>>selectClassNamed: (in category 'class list') ----- selectClassNamed: aSymbolOrString | className currentMessageCategoryName currentMessageName | currentMessageCategoryName := [self selectedMessageCategoryName] on: Error do: [:ex| ex return: nil]. currentMessageName := [self selectedMessageName] on: Error do: [:ex| ex return: nil]. selectedClassName := aSymbolOrString ifNotNil: [ aSymbolOrString asSymbol ]. self setClassOrganizer. "Try to reselect the category and/or selector if the new class has them." messageCategoryListIndex := self messageCategoryList indexOf: currentMessageCategoryName ifAbsent: [0]. + selectedMessageCategoryName :=(self messageCategoryList includes: currentMessageCategoryName) + ifTrue: [currentMessageCategoryName] + ifFalse: [nil]. self selectMessageNamed: (self hasMessageCategorySelected ifTrue: [ currentMessageName ] ifFalse: [ nil ]). self hasMessageSelected ifTrue: [self editSelection: #editMessage] ifFalse: [self hasMessageCategorySelected ifTrue: [self editSelection: #newMessage] ifFalse: [self classCommentIndicated ifTrue: [] ifFalse: [self editSelection: (self hasClassSelected not ifTrue: [(metaClassIndicated or: [ self hasSystemCategorySelected not ]) ifTrue: [#none] ifFalse: [#newClass]] ifFalse: [#editClass])]]]. contents := nil. self selectedClass isNil ifFalse: [className := self selectedClass name. (RecentClasses includes: className) ifTrue: [RecentClasses remove: className]. RecentClasses addFirst: className. RecentClasses size > 16 ifTrue: [RecentClasses removeLast]]. self changed: #classSelectionChanged. self changed: #classCommentText. self changed: #classListIndex. "update my selection" self changed: #messageCategoryList. self changed: #messageList. self changed: #relabel. self contentsChanged! Item was changed: ----- Method: Browser>>selectMessageCategoryNamed: (in category 'message category list') ----- selectMessageCategoryNamed: aSymbol "Given aSymbol, select the category with that name. Do nothing if aSymbol doesn't exist." + selectedMessageCategoryName := aSymbol. + messageCategoryListIndex := aSymbol ifNil: [0] ifNotNil: [self messageCategoryList indexOf: aSymbol]. + + selectedMessageName := nil. + self changed: #messageCategorySelectionChanged. + self changed: #messageCategoryListIndex. "update my selection" + self changed: #messageList. + self editSelection: (aSymbol notNil + ifTrue: [#newMessage] + ifFalse: [self hasClassSelected + ifTrue: [#editClass] + ifFalse: [#newClass]]). + contents := nil. + self contentsChanged.! - self messageCategoryListIndex: (self messageCategoryList indexOf: aSymbol ifAbsent: [ 1])! Item was changed: ----- Method: MessageSet>>compileMessage:notifying: (in category 'as yet unclassified') ----- compileMessage: aText notifying: aController "Compile the code that was accepted by the user, placing the compiled method into an appropriate message category. Return true if the compilation succeeded, else false." "Copied from Browser's version of sd 11/20/2005 21:26 because later versions remove messageListIndex." + | fallBackCategoryName fallBackCategoryIndex fallBackMethodIndex originalSelectorName result | - | fallBackCategoryIndex fallBackMethodIndex originalSelectorName result | self selectedMessageCategoryName ifNil: [ self selectOriginalCategoryForCurrentMethod ifFalse:["Select the '--all--' category" self messageCategoryListIndex: 1]]. self selectedMessageCategoryName asSymbol = ClassOrganizer allCategory ifTrue: [ "User tried to save a method while the ALL category was selected" fallBackCategoryIndex := messageCategoryListIndex. + fallBackCategoryName := selectedMessageCategoryName. fallBackMethodIndex := messageListIndex. editSelection == #newMessage ifTrue: [ "Select the 'as yet unclassified' category" messageCategoryListIndex := 0. + selectedMessageCategoryName := nil. (result := self defineMessageFrom: aText notifying: aController) ifNil: ["Compilation failure: reselect the original category & method" messageCategoryListIndex := fallBackCategoryIndex. + selectedMessageCategoryName := fallBackCategoryName. messageListIndex := fallBackMethodIndex] ifNotNil: [self setSelector: result]] ifFalse: [originalSelectorName := self selectedMessageName. self setOriginalCategoryIndexForCurrentMethod. messageListIndex := fallBackMethodIndex := self messageList indexOf: originalSelectorName. (result := self defineMessageFrom: aText notifying: aController) ifNotNil: [self setSelector: result] ifNil: [ "Compilation failure: reselect the original category & method" messageCategoryListIndex := fallBackCategoryIndex. + selectedMessageCategoryName := fallBackCategoryName. messageListIndex := fallBackMethodIndex. ^ result notNil]]. self changed: #messageCategoryList. ^ result notNil] ifFalse: [ "User tried to save a method while the ALL category was NOT selected" ^ (self defineMessageFrom: aText notifying: aController) notNil]!

1 0

The Inbox: ToolsTests-fbs.37.mcz
by commits＠source.squeak.org 30 Mar '11

30 Mar '11

A new version of ToolsTests was added to project The Inbox: http://source.squeak.org/inbox/ToolsTests-fbs.37.mcz ==================== Summary ==================== Name: ToolsTests-fbs.37 Author: fbs Time: 30 March 2011, 9:43:09.786 pm UUID: c55ff548-5659-ea49-863a-6e20c8ccff21 Ancestors: ToolsTests-fbs.36 Still more Browser tests! =============== Diff against ToolsTests-fbs.36 =============== Item was added: + ----- Method: BrowserTest>>testMessageList (in category 'as yet unclassified') ----- + testMessageList + browser selectSystemCategory: browser class category. + browser selectClass: nil. + self assert: browser messageList isEmpty. + + browser selectClass: browser class. + browser messageCategoryListIndex: 0. + self assert: browser messageList = browser classOrMetaClassOrganizer allMethodSelectors. + browser messageCategoryListIndex: 1. "-- all --" + self assert: browser messageList = browser classOrMetaClassOrganizer allMethodSelectors. + + browser messageCategoryListIndex: 2. + self assert: browser messageList = (browser classOrMetaClassOrganizer listAtCategoryNumber: 1). + + browser metaClassIndicated: true. + browser messageCategoryListIndex: 0. + self assert: browser messageList = browser classOrMetaClassOrganizer allMethodSelectors. + + browser messageCategoryListIndex: 1. "-- all --" + self assert: browser messageList = browser classOrMetaClassOrganizer allMethodSelectors. + + browser messageCategoryListIndex: 2. + self assert: browser messageList = (browser classOrMetaClassOrganizer listAtCategoryNumber: 1).! Item was added: + ----- Method: BrowserTest>>testSelectClassNamedPreservesPlace (in category 'as yet unclassified') ----- + testSelectClassNamedPreservesPlace + | commonCategory commonSelector otherClass | + browser selectSystemCategory: browser class category. + otherClass := HierarchyBrowser. "Unlikely to move out of Browser's package!!" + browser selectClassNamed: browser class name. + + commonCategory := (browser class organization categories intersection: otherClass organization categories) first. + commonSelector := (otherClass organization allMethodSelectors intersection: browser class organization allMethodSelectors) first. + browser selectMessageCategoryNamed: commonCategory. + browser selectMessageNamed: commonSelector. + + browser selectClass: otherClass. + + self assert: browser selectedClassName = otherClass name. + self assert: browser selectedMessageCategoryName = commonCategory. + self assert: browser selectedMessageName = commonSelector.!

1 0

The Trunk: System-nice.428.mcz
by commits＠source.squeak.org 30 Mar '11

30 Mar '11

Nicolas Cellier uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-nice.428.mcz ==================== Summary ==================== Name: System-nice.428 Author: nice Time: 30 March 2011, 10:08:55.293 pm UUID: 600c7f8a-fbc8-47eb-b06f-5a9b93a9c677 Ancestors: System-ul.427 Use #newCompiler #newParser =============== Diff against System-ul.427 =============== Item was changed: ----- Method: BreakpointManager class>>breakpointMethodSourceFor:in: (in category 'private') ----- breakpointMethodSourceFor: aSymbol in: aClass "Compose new source containing a break statement (currently it will be the first, later we want to insert it in any place)" | oldSource methodNode breakOnlyMethodNode sendBreakMessageNode | oldSource := aClass sourceCodeAt: aSymbol. + methodNode := aClass newCompiler - methodNode := aClass compilerClass new compile: oldSource in: aClass notifying: nil ifFail: [self error: '[breakpoint] unable to install breakpoint']. + breakOnlyMethodNode := aClass newCompiler - breakOnlyMethodNode := aClass compilerClass new compile: 'temporaryMethodSelectorForBreakpoint self break. ^self' in: aClass notifying: nil ifFail: [self error: '[breakpoint] unable to install breakpoint']. sendBreakMessageNode := breakOnlyMethodNode block statements first. methodNode block statements addFirst: sendBreakMessageNode. ^methodNode printString ! Item was changed: ----- Method: BreakpointManager class>>compilePrototype:in: (in category 'private') ----- compilePrototype: aSymbol in: aClass "Compile and return a new method containing a break statement" | source node method | source := self breakpointMethodSourceFor: aSymbol in: aClass. + node := aClass newCompiler - node := aClass compilerClass new compile: source in: aClass notifying: nil ifFail: [self error: '[breakpoint] unable to install breakpoint']. node isNil ifTrue: [^nil]. "dunno what the arguments mean..." method := node generate. ^method! Item was changed: ----- Method: ChangeRecord>>methodSelector (in category 'access') ----- methodSelector ^type == #method ifTrue: + [(Smalltalk at: class ifAbsent: [Object]) newParser parseSelector: self string]! - [(Smalltalk at: class ifAbsent: [Object]) parserClass new parseSelector: self string]! Item was changed: ----- Method: CodeLoader class>>exportCodeSegment:classes:keepSource: (in category 'utilities') ----- exportCodeSegment: exportName classes: aClassList keepSource: keepSources "Code for writing out a specific category of classes as an external image segment. Perhaps this should be a method." | is oldMethods newMethods classList symbolHolder fileName | keepSources ifTrue: [ self confirm: 'We are going to abandon sources. Quit without saving after this has run.' orCancel: [^self]]. classList := aClassList asArray. "Strong pointers to symbols" symbolHolder := Symbol allSymbols. oldMethods := OrderedCollection new: classList size * 150. newMethods := OrderedCollection new: classList size * 150. keepSources ifTrue: [ classList do: [:cl | cl selectorsAndMethodsDo: [:selector :m | | oldCodeString methodNode | m fileIndex > 0 ifTrue: [oldCodeString := cl sourceCodeAt: selector. + methodNode := cl newCompiler - methodNode := cl compilerClass new parse: oldCodeString in: cl notifying: nil. oldMethods addLast: m. newMethods addLast: (m copyWithTempsFromMethodNode: methodNode)]]]]. oldMethods asArray elementsExchangeIdentityWith: newMethods asArray. oldMethods := newMethods := nil. Smalltalk garbageCollect. is := ImageSegment new copyFromRootsForExport: classList. "Classes and MetaClasses" fileName := FileDirectory fileName: exportName extension: ImageSegment fileExtension. is writeForExport: fileName. self compressFileNamed: fileName ! Item was changed: ----- Method: ImageSegment>>acceptSingleMethodSource: (in category 'fileIn/Out') ----- acceptSingleMethodSource: aDictionary | oldClassInfo oldClassName ismeta newName actualClass selector | oldClassInfo := (aDictionary at: #oldClassName) findTokens: ' '. "'Class' or 'Class class'" oldClassName := oldClassInfo first asSymbol. ismeta := oldClassInfo size > 1. "must use class var since we may not be the same guy who did the initial work" newName := RecentlyRenamedClasses ifNil: [ oldClassName ] ifNotNil: [ RecentlyRenamedClasses at: oldClassName ifAbsent: [oldClassName] ]. actualClass := Smalltalk at: newName. ismeta ifTrue: [actualClass := actualClass class]. + selector := actualClass newParser parseSelector: (aDictionary at: #methodText). - selector := actualClass parserClass new parseSelector: (aDictionary at: #methodText). (actualClass compiledMethodAt: selector ifAbsent: [^self "hosed input"]) putSource: (aDictionary at: #methodText) fromParseNode: nil class: actualClass category: (aDictionary at: #category) withStamp: (aDictionary at: #changeStamp) inFile: 2 priorMethod: nil. ! Item was changed: ----- Method: SmalltalkImage>>abandonSources (in category 'shrinking') ----- abandonSources "Smalltalk abandonSources" "Replaces every method by a copy with the 4-byte source pointer replaced by a string of all arg and temp names, followed by its length. These names can then be used to inform the decompiler." "wod 11/3/1998: zap the organization before rather than after condensing changes." "eem 7/1/2009 13:59 update for the closure schematic temp names regime" | oldMethods newMethods bTotal bCount | (self confirm: 'This method will preserve most temp names (up to about 15k characters of temporaries) while allowing the sources file to be discarded. -- CAUTION -- If you have backed up your system and are prepared to face the consequences of abandoning source code files, choose Yes. If you have any doubts, you may choose No to back out with no harm done.') == true ifFalse: [^ self inform: 'Okay - no harm done']. self forgetDoIts. oldMethods := OrderedCollection new: CompiledMethod instanceCount. newMethods := OrderedCollection new: CompiledMethod instanceCount. bTotal := 0. bCount := 0. self systemNavigation allBehaviorsDo: [:b | bTotal := bTotal + 1]. 'Saving temp names for better decompilation...' displayProgressAt: Sensor cursorPoint from: 0 to: bTotal during: [:bar | self systemNavigation allBehaviorsDo: [:cl | "for test: (Array with: Arc with: Arc class) do:" bar value: (bCount := bCount + 1). cl selectorsAndMethodsDo: [:selector :m | | oldCodeString methodNode | m fileIndex > 0 ifTrue: [oldCodeString := cl sourceCodeAt: selector. + methodNode := cl newCompiler - methodNode := cl compilerClass new parse: oldCodeString in: cl notifying: nil. oldMethods addLast: m. newMethods addLast: (m copyWithTempsFromMethodNode: methodNode)]]]]. oldMethods asArray elementsExchangeIdentityWith: newMethods asArray. self systemNavigation allBehaviorsDo: [:b | b zapOrganization]. self condenseChanges. Preferences disable: #warnIfNoSourcesFile!

1 0

The Trunk: Tests-nice.124.mcz
by commits＠source.squeak.org 30 Mar '11

30 Mar '11

Nicolas Cellier uploaded a new version of Tests to project The Trunk: http://source.squeak.org/trunk/Tests-nice.124.mcz ==================== Summary ==================== Name: Tests-nice.124 Author: nice Time: 30 March 2011, 9:58:44.797 pm UUID: 215347fc-b044-40a0-b4d8-671b12c67baf Ancestors: Tests-ul.123 Use #newCompiler #newParser =============== Diff against Tests-ul.123 =============== Item was changed: ----- Method: ClosureCompilerTest>>testDecompiledDoitMethodTempNames (in category 'tests') ----- testDecompiledDoitMethodTempNames "self new testDecompiledDoitMethodTempNames" "Test that a decompiled doit that has been copied with temps decompiles to the input" | removeComments | removeComments := [:n| n comment: nil]. self closureCases do: [:source| | mns m mps mnps | "Need to compare an ungenerated tree with the generated method's methodNode because generating code alters the tree when it introduces remote temp vectors." mns := #(first last) collect: [:ignored| source first isLetter ifTrue: + [self class newCompiler - [self class compilerClass new compile: source in: self class notifying: nil ifFail: [self error: 'compilation error']] ifFalse: + [self class newCompiler - [self class compilerClass new compileNoPattern: source in: self class context: nil notifying: nil ifFail: [self error: 'compilation error']]]. m := (mns last generateWithTempNames). removeComments value: mns first. mns first nodesDo: removeComments. self assert: (mnps := mns first printString) = (mps := m methodNode printString)]! Item was changed: ----- Method: ClosureCompilerTest>>testMethodAndNodeTempNames (in category 'tests') ----- testMethodAndNodeTempNames "self new testMethodAndNodeTempNames" "Test that BytecodeAgnosticMethodNode>>blockExtentsToTempRefs answers the same structure as CompiledMethod>>blockExtentsToTempRefs when the method has been copied with the appropriate temps. This tests whether doit methods are debuggable since they carry their own temps." self closureCases do: [:source| | mn om m mbe obe | mn := source first isLetter ifTrue: + [self class newCompiler - [self class compilerClass new compile: source in: self class notifying: nil ifFail: [self error: 'compilation error']] ifFalse: + [self class newCompiler - [self class compilerClass new compileNoPattern: source in: self class context: nil notifying: nil ifFail: [self error: 'compilation error']]. m := (om := mn generate) copyWithTempsFromMethodNode: mn. self assert: m holdsTempNames. self assert: m endPC = om endPC. mbe := m blockExtentsToTempsMap. obe := mn blockExtentsToTempsMap. self assert: mbe keys asSet = obe keys asSet. (mbe keys intersection: obe keys) do: [:interval| self assert: (mbe at: interval) = (obe at: interval)]]! Item was changed: ----- Method: DecompilerTests>>checkDecompileMethod: (in category 'utilities') ----- checkDecompileMethod: oldMethod | cls selector oldMethodNode methodNode newMethod oldCodeString newCodeString | cls := oldMethod methodClass. selector := oldMethod selector. oldMethodNode := (cls decompilerClass new withTempNames: oldMethod methodNode schematicTempNamesString) decompile: selector in: cls method: oldMethod. [oldMethodNode properties includesKey: #warning] whileTrue: [oldMethodNode properties removeKey: #warning]. oldCodeString := oldMethodNode decompileString. + methodNode := [cls newCompiler - methodNode := [cls compilerClass new compile: oldCodeString in: cls notifying: nil ifFail: []] on: SyntaxErrorNotification do: [:ex| ex errorMessage = 'Cannot store into' ifTrue: [ex return: #badStore]. ex pass]. "Ignore cannot store into block arg errors; they're not our issue." methodNode ~~ #badStore ifTrue: [newMethod := methodNode generate. newCodeString := ((cls decompilerClass new withTempNames: methodNode schematicTempNamesString) decompile: selector in: cls method: newMethod) decompileString. "(StringHolder new textContents: (TextDiffBuilder buildDisplayPatchFrom: oldCodeString to: newCodeString)) openLabel: 'Decompilation Differences for ', cls name,'>>',selector" "(StringHolder new textContents: (TextDiffBuilder buildDisplayPatchFrom: oldMethod abstractSymbolic to: newMethod abstractSymbolic)) openLabel: 'Bytecode Differences for ', cls name,'>>',selector" self assert: oldCodeString = newCodeString description: cls name asString, ' ', selector asString resumable: true]! Item was changed: ----- Method: MCStWriterTest>>assertChunkIsWellFormed: (in category 'asserting') ----- assertChunkIsWellFormed: chunk + self class newParser - self class parserClass new parse: chunk readStream class: UndefinedObject noPattern: true context: nil notifying: nil ifFail: [self assert: false]! Item was changed: ----- Method: MCStWriterTest>>assertMethodChunkIsWellFormed: (in category 'asserting') ----- assertMethodChunkIsWellFormed: chunk + self class newParser - self class parserClass new parse: chunk readStream class: UndefinedObject noPattern: false context: nil notifying: nil ifFail: [self assert: false]!

1 0

The Trunk: CollectionsTests-nice.184.mcz
by commits＠source.squeak.org 30 Mar '11

30 Mar '11

Nicolas Cellier uploaded a new version of CollectionsTests to project The Trunk: http://source.squeak.org/trunk/CollectionsTests-nice.184.mcz ==================== Summary ==================== Name: CollectionsTests-nice.184 Author: nice Time: 30 March 2011, 9:57:18.627 pm UUID: 88386be6-a998-42c7-87c4-efd261e64f02 Ancestors: CollectionsTests-nice.183 Use #newCompiler #newParser =============== Diff against CollectionsTests-nice.183 =============== Item was changed: ----- Method: CharacterTest>>testPrintStringAll (in category 'testing-printing') ----- testPrintStringAll Character allCharacters do: [ :each | + self assert: (self class newCompiler - self assert: (self class compilerClass evaluate: each printString) = each ].! Item was changed: ----- Method: CharacterTest>>testStoreStringAll (in category 'testing-printing') ----- testStoreStringAll Character allCharacters do: [ :each | + self assert: (self class newCompiler - self assert: (self class compilerClass evaluate: each storeString) = each ].!

1 0

The Trunk: Compiler-nice.199.mcz
by commits＠source.squeak.org 30 Mar '11

30 Mar '11

Nicolas Cellier uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-nice.199.mcz ==================== Summary ==================== Name: Compiler-nice.199 Author: nice Time: 30 March 2011, 9:56:40.201 pm UUID: 40f46685-08e8-4661-95bd-8be4327c963b Ancestors: Compiler-IgorStasenko.198 Use #newCompiler #newParser Move some #evaluate: methods to instance side to enable (self class newCompiler evaluate: 'nil') usage =============== Diff against Compiler-IgorStasenko.198 =============== Item was changed: ----- Method: Compiler class>>new (in category 'accessing') ----- new + ^ super new parser: self newParser! - ^ super new parser: self parserClass new! Item was added: + ----- Method: Compiler>>evaluate: (in category 'public access') ----- + evaluate: textOrString + "See evaluate:for:notifying:logged:. If a compilation error occurs, + a Syntax Error view is created rather than notifying any requestor. + Compilation is carried out with respect to nil, i.e., no object, and the + invocation is not logged." + + ^self evaluate: textOrString for: nil logged: false! Item was added: + ----- Method: Compiler>>evaluate:for:logged: (in category 'public access') ----- + evaluate: textOrString for: anObject logged: logFlag + "See evaluate:for:notifying:logged:. If a compilation error occurs, + a Syntax Error view is created rather than notifying any requestor." + + ^self evaluate: textOrString for: anObject notifying: nil logged: logFlag! Item was added: + ----- Method: Compiler>>evaluate:for:notifying:logged: (in category 'public access') ----- + evaluate: textOrString for: anObject notifying: aController logged: logFlag + "Compile and execute the argument, textOrString with respect to the class + of anObject. If a compilation error occurs, notify aController. If both + compilation and execution are successful then, if logFlag is true, log + (write) the text onto a system changes file so that it can be replayed if + necessary." + + ^ self + evaluate: textOrString + in: nil + to: anObject + notifying: aController + ifFail: [^nil] + logged: logFlag.! Item was changed: ----- Method: Compiler>>evaluate:in:to: (in category 'public access') ----- evaluate: aString in: aContext to: aReceiver "evaluate aString in the given context, and return the result. 2/2/96 sw" + ^self + evaluate: aString + in: aContext + to: aReceiver + notifying: nil + ifFail: [^ #failedDoit]! - | result | - result := self - evaluate: aString - in: aContext - to: aReceiver - notifying: nil - ifFail: [^ #failedDoit]. - ^ result! Item was added: + ----- Method: Compiler>>evaluate:logged: (in category 'public access') ----- + evaluate: textOrString logged: logFlag + "See evaluate:for:notifying:logged:. If a compilation error occurs, + a Syntax Error view is created rather than notifying any requestor. + Compilation is carried out with respect to nil, i.e., no object." + + ^self evaluate: textOrString for: nil logged: logFlag! Item was added: + ----- Method: Compiler>>evaluate:notifying:logged: (in category 'public access') ----- + evaluate: textOrString notifying: aController logged: logFlag + "See evaluate:for:notifying:logged:. Compilation is carried out + with respect to nil, i.e., no object." + + ^self evaluate: textOrString for: nil notifying: aController logged: logFlag! Item was changed: ----- Method: Compiler>>parser (in category 'public access') ----- parser + parser ifNil: [parser := (class ifNil: [self class]) newParser]. - parser ifNil: [parser := self parserClass new]. ^parser! Item was removed: - ----- Method: Compiler>>parserClass (in category 'public access') ----- - parserClass - - ^parser ifNil: [self class parserClass] ifNotNil: [parser class]! Item was changed: ----- Method: MethodNode>>blockExtentsToTempsMap (in category 'debugger support') ----- blockExtentsToTempsMap "Answer a Dictionary of blockExtent to temp locations for the current method. This is used by the debugger to locate temp vars in contexts. A temp map entry is a pair of the temp's name and its index, where an index is either an integer for a normal temp or a pair of the index of the indirect temp vector containing the temp and the index of the temp in its indirect temp vector." ^encoder blockExtentsToTempsMap ifNil: [| methNode | + methNode := encoder classEncoding newParser - methNode := encoder classEncoding parserClass new encoderClass: encoder class; parse: (sourceText ifNil: [self decompileString]) class: self methodClass. "As a side effect generate: creates data needed for the map." methNode generate. methNode encoder blockExtentsToTempsMap]! Item was changed: ----- Method: MethodNode>>rawSourceRangesAndMethodDo: (in category 'source mapping') ----- rawSourceRangesAndMethodDo: aBinaryBlock "Evaluate aBinaryBlock with the rawSourceRanges and method generated from the receiver." | methNode method | + methNode := encoder classEncoding newParser - methNode := encoder classEncoding parserClass new encoderClass: encoder class; parse: (sourceText "If no source, use decompile string as source to map from" ifNil: [self decompileString] ifNotNil: [sourceText]) class: self methodClass. method := methNode generate. "set bytecodes to map to" ^aBinaryBlock value: methNode encoder rawSourceRanges value: method!

1 0

The Trunk: Collections-nice.435.mcz
by commits＠source.squeak.org 30 Mar '11

30 Mar '11

Nicolas Cellier uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-nice.435.mcz ==================== Summary ==================== Name: Collections-nice.435 Author: nice Time: 30 March 2011, 9:50:07.129 pm UUID: f53b9d14-89c3-4105-8e0b-41cd10076918 Ancestors: Collections-nice.434 Use #newCompiler #newParser =============== Diff against Collections-nice.434 =============== Item was changed: ----- Method: Text>>makeSelectorBold (in category 'emphasis') ----- makeSelectorBold "For formatting Smalltalk source code, set the emphasis of that portion of the receiver's string that parses as a message selector to be bold." | parser i | string size = 0 ifTrue: [^ self]. i := 0. [(string at: (i := i + 1)) isSeparator] whileTrue. (string at: i) = $[ ifTrue: [^ self]. "block, no selector" + [(parser := Compiler newParser) parseSelector: string] on: Error do: [^ self]. - [(parser := Compiler parserClass new) parseSelector: string] on: Error do: [^ self]. self makeBoldFrom: 1 to: (parser endOfLastToken min: string size)! Item was changed: ----- Method: Text>>makeSelectorBoldIn: (in category 'emphasis') ----- makeSelectorBoldIn: aClass "For formatting Smalltalk source code, set the emphasis of that portion of the receiver's string that parses as a message selector to be bold." | parser | string size = 0 ifTrue: [^self]. + (parser := aClass newParser) parseSelector: string. - (parser := aClass parserClass new) parseSelector: string. self makeBoldFrom: 1 to: (parser endOfLastToken min: string size)!

1 0

The Trunk: Traits-nice.288.mcz
by commits＠source.squeak.org 30 Mar '11

30 Mar '11

Nicolas Cellier uploaded a new version of Traits to project The Trunk: http://source.squeak.org/trunk/Traits-nice.288.mcz ==================== Summary ==================== Name: Traits-nice.288 Author: nice Time: 30 March 2011, 9:47:27.896 pm UUID: 2c2016d2-acf3-448a-b3b9-836089b17a9e Ancestors: Traits-nice.287 Use #newCompiler #newParser =============== Diff against Traits-nice.287 =============== Item was changed: ----- Method: ClassDescription>>replaceSelector:withAlias:in: (in category '*Traits-NanoKernel') ----- replaceSelector: originalSelector withAlias: aliasSelector in: source "replaces originalSelector with aliasSelector in in given source code" | oldKeywords newKeywords args selectorWithArgs s | oldKeywords := originalSelector keywords. newKeywords := aliasSelector keywords. oldKeywords size = newKeywords size ifFalse:[self error: 'Keyword mismatch']. + args := (self newParser parseArgsAndTemps: source asString notifying: nil) - args := (self parserClass new parseArgsAndTemps: source asString notifying: nil) copyFrom: 1 to: originalSelector numArgs. selectorWithArgs := String streamContents: [:stream | newKeywords keysAndValuesDo: [:index :keyword | stream nextPutAll: keyword. stream space. args size >= index ifTrue: [ stream nextPutAll: (args at: index); space]]]. s := source asString readStream. oldKeywords do: [ :each | s match: each ]. args isEmpty ifFalse: [ s match: args last ]. ^selectorWithArgs withBlanksTrimmed asText , s upToEnd ! Item was changed: ----- Method: ClassDescription>>traitAddSelector:withMethod: (in category '*Traits-NanoKernel') ----- traitAddSelector: selector withMethod: traitMethod "Add a method inherited from a trait. Recompiles to avoid sharing and implement aliasing." | oldMethod source methodNode newMethod originalSelector | oldMethod := self compiledMethodAt: selector ifAbsent:[nil]. oldMethod ifNotNil:[ "The following is an important optimization as it prevents exponential growth in recompilation. If T1 is used by T2 and T2 by T3 then (without this optimization) any change in T1 would cause all methods in T2 to be recompiled and each recompilation of a method in T2 would cause T3 to be fully recompiled. The test eliminates all such situations." (oldMethod sameTraitCodeAs: traitMethod) ifTrue:[^oldMethod]. ]. originalSelector := traitMethod selector. source := traitMethod methodClass sourceCodeAt: originalSelector. originalSelector == selector ifFalse:[ "Replace source selectors for aliases" source := self replaceSelector: originalSelector withAlias: selector in: source. ]. + methodNode := self newCompiler - methodNode := self compilerClass new compile: source in: self classified: nil notifying: nil ifFail:[^nil]. newMethod := methodNode generate: self defaultMethodTrailer. newMethod putSource: source fromParseNode: methodNode inFile: 2 withPreamble: [:f | f cr; nextPut: $!!; nextChunkPut: 'Trait method'; cr]. newMethod originalTraitMethod: traitMethod. ^super addSelectorSilently: selector withMethod: newMethod.!

1 0

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

Jump to page: