Squeak-dev September 2009

squeak-dev@lists.squeakfoundation.org

119 participants
370 discussions

The Trunk: ST80-ar.52.mcz
by commits＠source.squeak.org 06 Sep '09

06 Sep '09

Andreas Raab uploaded a new version of ST80 to project The Trunk: http://source.squeak.org/trunk/ST80-ar.52.mcz ==================== Summary ==================== Name: ST80-ar.52 Author: ar Time: 6 September 2009, 11:13:12 am UUID: f5692589-ffaf-bd4a-a248-9f849ea05687 Ancestors: ST80-ar.51 More offList/suspend cleanup. =============== Diff against ST80-ar.51 =============== Item was changed: ----- Method: ControlManager>>interruptName:preemptedProcess: (in category 'scheduling') ----- interruptName: labelString preemptedProcess: theInterruptedProcess "Create a Notifier on the active scheduling process with the given label. Make the Notifier the active controller." + | newActiveController preemptedProcess | - | suspendingList newActiveController preemptedProcess | preemptedProcess := theInterruptedProcess ifNil: [Processor preemptedProcess]. preemptedProcess suspend. + "There is something wrong here. We suspend *two* processes, the interrupted + process and the activeControllerProcess (unless they are the same). How can + that possibly be right? However, it is what the code did before I added the comment + (it was merely hidden underneith another pile of code). Someone with more + understanding about MVC fix this please." + + preemptedProcess == activeControllerProcess + ifFalse:[activeControllerProcess suspend]. - (suspendingList := activeControllerProcess suspendingList) == nil - ifTrue: [activeControllerProcess == Processor activeProcess - ifTrue: [activeControllerProcess suspend]] - ifFalse: [suspendingList remove: activeControllerProcess ifAbsent:[]. - activeControllerProcess offList]. activeController ~~ nil ifTrue: [ "Carefully de-emphasis the current window." activeController view topView deEmphasizeForDebugger]. newActiveController := (Debugger openInterrupt: labelString onProcess: preemptedProcess) controller. newActiveController centerCursorInView. self activeController: newActiveController. !

1 0

The Trunk: Kernel-ar.244.mcz
by commits＠source.squeak.org 06 Sep '09

06 Sep '09

Andreas Raab uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-ar.244.mcz ==================== Summary ==================== Name: Kernel-ar.244 Author: ar Time: 6 September 2009, 11:10:25 am UUID: eb85be7b-6342-3f41-b69f-b28e30372520 Ancestors: Kernel-eem.243 Restore ContextPart>>isBottomContext which for some reason got dropped in latest changes. =============== Diff against Kernel-eem.243 =============== Item was added: + ----- Method: ContextPart>>isBottomContext (in category 'query') ----- + isBottomContext + "Answer if this is the last context (the first context invoked) in my sender chain" + + ^sender isNil!

1 0

Re: [squeak-dev] Clamato
by Jason Rogers 06 Sep '09

06 Sep '09

A (hopefully) simple question. How would you implement #perform:with: ? JS can handle the reflection (either via eval(...) or function pointers). BTW: This looks great! -- Jason Rogers "I am crucified with Christ: nevertheless I live; yet not I, but Christ liveth in me: and the life which I now live in the flesh I live by the faith of the Son of God, who loved me, and gave himself for me." Galatians 2:20

5 11

The Trunk: Morphic-bf.169.mcz
by commits＠source.squeak.org 06 Sep '09

06 Sep '09

Bert Freudenberg uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-bf.169.mcz ==================== Summary ==================== Name: Morphic-bf.169 Author: bf Time: 6 September 2009, 4:20:54 am UUID: ec4af925-e9a0-4eab-934b-f3a6ad22ffc9 Ancestors: Morphic-eem.168 - fix PluggableListMorph>>userString which answered an OrderedCollection instead of a String, making "copy text" on a list fail =============== Diff against Morphic-eem.168 =============== Item was changed: ----- Method: PluggableListMorph>>userString (in category 'debug and other') ----- userString + "Do I have a text string to be searched on?" + + ^ String streamContents: [:strm | + 1 to: self getListSize do: [:i | + strm nextPutAll: (self getListItem: i); cr]]! - ^list!

1 0

[SUGG] About Bug Tracking
by Giuseppe Luigi Punzi Ruiz 06 Sep '09

06 Sep '09

Hi, Not so far, there was a "war" about the use of Mantis and other relating bug tracking software. Instead of using external tools, Could'nt be interesting to get something like Bug Tracking integrated into SqueakSource or Monticello? This could facilities reporting bugs inside the image, read fix, and so on. Gjallar(1) is a bug tracking software written in Squeak AFAIR and probably is easy to integrate with the release image. Why we use Mantis? I think is more easy (not to me, sad) to create a little reporting and fixing framework inside Squeak tools, than using and binding with existings tools in other languajes. Just my 2 cents from my ignorance. (1) http://gjallar.se/ Giuseppe Luigi Punzi Ruiz Blog: http://www.lordzealon.com Twitter & Skype & GoogleTalk accounts: glpunzi

2 2

Re: [squeak-dev] The Trunk: Compiler-ar.80.mcz
by Alexander Lazarević 06 Sep '09

06 Sep '09

Hallo Andreas! Can't wait to see how this stuff works. :) Until then I get an error during update with this package. Alex MessageNotUnderstood: MethodProperties>>method: 6 September 2009 8:18:03.575 am VM: Win32 - a SmalltalkImage Image: Squeak3.10.2 [latest update: #7179] SecurityManager state: Restricted: false FileAccess: true SocketAccess: true Working Dir C:\Dokumente und Einstellungen\laza\Desktop Trusted Dir C:\Dokumente und Einstellungen\laza\Desktop\laza Untrusted Dir C:\Dokumente und Einstellungen\laza\Eigene Dateien\My Squeak MethodProperties(Object)>>doesNotUnderstand: #method: Receiver: a MethodProperties Arguments and temporary variables: <<error during printing> Receiver's instance variables: properties: nil pragmas: #() selector: #checkForSlips DecompilerConstructorForClosures>>codeMethod:block:tempVars:primitive:class: Receiver: {a DecompilerConstructorForClosures} Arguments and temporary variables: <<error during printing> Receiver's instance variables: comment: nil pc: nil method: a CompiledMethod(1254: Preferences class>>checkForSlips) instVars: #('superclass' 'methodDict' 'format' 'instanceVariables' 'organizatio...etc... nArgs: 0 literalValues: an Array(#valueOfFlag:ifAbsent: #checkForSlips a MethodPropertie...etc... tempVars: #() tempNameCounter: nil Decompiler>>decompile:in:method:using: Receiver: a Decompiler Arguments and temporary variables: <<error during printing> Receiver's instance variables: sender: a CompiledMethod(1254: Preferences class>>checkForSlips) pc: 31 constructor: {a DecompilerConstructorForClosures} method: a CompiledMethod(1254: Preferences class>>checkForSlips) instVars: #(nil nil nil nil nil nil nil nil nil nil nil nil nil) tempVars: #() constTable: an Array({self} {true} {false} {nil} {-1} {0} {1} {2}) stack: an OrderedCollection() statements: an OrderedCollection() lastPc: 30 exit: 31 caseExits: an OrderedCollection() lastJumpPc: 30 lastReturnPc: -1 limit: 31 hasValue: false blockStackBase: nil numLocalTemps: 0 blockStartsToTempVars: nil tempVarCount: 0 Decompiler>>decompile:in:method: Receiver: a Decompiler Arguments and temporary variables: <<error during printing> Receiver's instance variables: sender: a CompiledMethod(1254: Preferences class>>checkForSlips) pc: 31 constructor: {a DecompilerConstructorForClosures} method: a CompiledMethod(1254: Preferences class>>checkForSlips) instVars: #(nil nil nil nil nil nil nil nil nil nil nil nil nil) tempVars: #() constTable: an Array({self} {true} {false} {nil} {-1} {0} {1} {2}) stack: an OrderedCollection() statements: an OrderedCollection() lastPc: 30 exit: 31 caseExits: an OrderedCollection() lastJumpPc: 30 lastReturnPc: -1 limit: 31 hasValue: false blockStackBase: nil numLocalTemps: 0 blockStartsToTempVars: nil tempVarCount: 0 --- The full stack --- MethodProperties(Object)>>doesNotUnderstand: #method: DecompilerConstructorForClosures>>codeMethod:block:tempVars:primitive:class: Decompiler>>decompile:in:method:using: Decompiler>>decompile:in:method: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CompiledMethod>>getSourceFor:in: Metaclass(Behavior)>>sourceCodeAt: Metaclass(Behavior)>>recompile:from: Metaclass(Behavior)>>recompile: [] in [] in Compiler class>>initialize [] in [] in Array(SequenceableCollection)>>do:displayingProgress: Array(SequenceableCollection)>>withIndexDo: [] in Array(SequenceableCollection)>>do:displayingProgress: [] in [] in ProgressInitiationException>>defaultMorphicAction BlockClosure>>on:do: [] in ProgressInitiationException>>defaultMorphicAction BlockClosure>>ensure: ProgressInitiationException>>defaultMorphicAction ProgressInitiationException>>defaultAction UndefinedObject>>handleSignal: MethodContext(ContextPart)>>handleSignal: MethodContext(ContextPart)>>handleSignal: MethodContext(ContextPart)>>handleSignal: MethodContext(ContextPart)>>handleSignal: MethodContext(ContextPart)>>handleSignal: ProgressInitiationException(Exception)>>signal ProgressInitiationException>>display:at:from:to:during: ProgressInitiationException class>>display:at:from:to:during: ByteString(String)>>displayProgressAt:from:to:during: Array(SequenceableCollection)>>do:displayingProgress: [] in Compiler class>>initialize Array(SequenceableCollection)>>do: Compiler class>>initialize MCMethodDefinition>>postload MCMethodDefinition(MCDefinition)>>postloadOver: [] in [] in [] in MCPackageLoader>>basicLoad ...etc... On Sun, Sep 6, 2009 at 7:06 AM, <commits(a)source.squeak.org> wrote: > Andreas Raab uploaded a new version of Compiler to project The Trunk: > http://source.squeak.org/trunk/Compiler-ar.80.mcz > > ==================== Summary ==================== > > Name: Compiler-ar.80 > Author: ar > Time: 5 September 2009, 10:06:25 am > UUID: 82001507-c038-784a-a4e2-0c969b53800f > Ancestors: Compiler-eem.79 > > Add an initialize method working around the limitations of MCDs and scripts. > > =============== Diff against Compiler-eem.79 =============== > > Item was added: > + ----- Method: Compiler class>>initialize (in category 'class initialization') ----- > + initialize > + "For the benefit of MC running a required script in the proper order." > + #('Compiler' 'Kernel' 'System') do:[:pkgName| > + Transcript nextPutAll: pkgName; cr; flush. > + (PackageInfo named: pkgName) methods > + do: [:ea | ea actualClass recompile: ea methodSymbol] > + displayingProgress: 'Recompiling ', pkgName,'...'] > + > + ! > > >

2 3

The Trunk: Compiler-ar.81.mcz
by commits＠source.squeak.org 06 Sep '09

06 Sep '09

Andreas Raab uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-ar.81.mcz ==================== Summary ==================== Name: Compiler-ar.81 Author: ar Time: 5 September 2009, 10:24:42 am UUID: 1373ef7e-27c9-964c-bd38-7ce0168b4daf Ancestors: Compiler-ar.80 Another required script for loading the latest batch of closure fixes. =============== Diff against Compiler-ar.80 =============== Item was changed: ----- Method: Compiler class>>initialize (in category 'class initialization') ----- initialize "For the benefit of MC running a required script in the proper order." + self recompileAll.! - #('Compiler' 'Kernel' 'System') do:[:pkgName| - Transcript nextPutAll: pkgName; cr; flush. - (PackageInfo named: pkgName) methods - do: [:ea | ea actualClass recompile: ea methodSymbol] - displayingProgress: 'Recompiling ', pkgName,'...'] - - !

1 0

The Trunk: Tools-eem.122.mcz
by commits＠source.squeak.org 06 Sep '09

06 Sep '09

Andreas Raab uploaded a new version of Tools to project The Trunk: http://source.squeak.org/trunk/Tools-eem.122.mcz ==================== Summary ==================== Name: Tools-eem.122 Author: eem Time: 5 September 2009, 5:20:28 am UUID: 915ae117-3206-46e9-8554-3cf57c998eca Ancestors: Tools-ar.121 Eighth package of eight in closure compiler fixes 9/5/2009. Debugger fixes for method maps. DebuggerMethodMap moves to new factorisation of symbolic temps computation. =============== Diff against Tools-ar.121 =============== Item was changed: ----- Method: Debugger>>pcRange (in category 'code pane') ----- pcRange "Answer the indices in the source code for the method corresponding to the selected context's program counter value." (selectingPC and: [contextStackIndex ~= 0]) ifFalse: [^1 to: 0]. self selectedContext isDead ifTrue: [^1 to: 0]. + ^self selectedContext debuggerMap - debuggerMap ifNil: - [debuggerMap := self selectedContext debuggerMap]. - ^debuggerMap rangeForPC: self selectedContext pc contextIsActiveContext: contextStackIndex = 1! Item was changed: ----- Method: DebuggerMethodMap>>rangeForPC:contextIsActiveContext: (in category 'source mapping') ----- rangeForPC: contextsConcretePC contextIsActiveContext: contextIsActiveContext "Answer the indices in the source code for the supplied pc. If the context is the actve context (is at the hot end of the stack) then its pc is the current pc. But if the context isn't, because it is suspended sending a message, then its current pc is the previous pc." | pc i end | pc := self method abstractPCForConcretePC: (contextIsActiveContext ifTrue: [contextsConcretePC] ifFalse: [(self method pcPreviousTo: contextsConcretePC) + ifNotNil: [:prevpc| prevpc] - ifNotNilDo: [:prevpc| prevpc] ifNil: [contextsConcretePC]]). (self abstractSourceMap includesKey: pc) ifTrue: [^self abstractSourceMap at: pc]. sortedSourceMap ifNil: [sortedSourceMap := self abstractSourceMap. sortedSourceMap := (sortedSourceMap keys collect: [:key| key -> (sortedSourceMap at: key)]) asSortedCollection]. (sortedSourceMap isNil or: [sortedSourceMap isEmpty]) ifTrue: [^1 to: 0]. i := sortedSourceMap indexForInserting: (pc -> nil). i < 1 ifTrue: [^1 to: 0]. i > sortedSourceMap size ifTrue: [end := sortedSourceMap inject: 0 into: [:prev :this | prev max: this value last]. ^end+1 to: end]. ^(sortedSourceMap at: i) value "| method source scanner map | method := DebuggerMethodMap compiledMethodAt: #rangeForPC:contextIsActiveContext:. source := method getSourceFromFile asString. scanner := InstructionStream on: method. map := method debuggerMap. Array streamContents: [:ranges| [scanner atEnd] whileFalse: [| range | range := map rangeForPC: scanner pc contextIsActiveContext: true. ((map abstractSourceMap includesKey: scanner abstractPC) and: [range first ~= 0]) ifTrue: [ranges nextPut: (source copyFrom: range first to: range last)]. scanner interpretNextInstructionFor: InstructionClient new]]"! Item was changed: ----- Method: DebuggerMethodMapForClosureCompiledMethods>>privateTempRefsForContext:startpcsToBlockExtents: (in category 'private') ----- privateTempRefsForContext: aContext startpcsToBlockExtents: theContextsStartpcsToBlockExtents "Answer the sequence of temps in scope in aContext in the natural order, outermost arguments and temporaries first, innermost last. Each temp is a pair of the temp's name followed by a reference. The reference can be integer - index of temp in aContext #( indirectionVectorIndex tempIndex ) - remote temp in indirectionVector at index in aContext #( outer. temp reference ) - a temp reference in an outer context." + blockExtentsToTempRefs ifNil: + [blockExtentsToTempRefs := (aContext method holdsTempNames + ifTrue: [aContext method] + ifFalse: [methodNode]) blockExtentsToTempsMap. + startpcsToTempRefs := Dictionary new]. - self ensureExtentsMapsInitialized. ^startpcsToTempRefs at: aContext startpc ifAbsentPut: [| localRefs | localRefs := blockExtentsToTempRefs at: (theContextsStartpcsToBlockExtents at: aContext startpc). aContext outerContext ifNil: [localRefs] + ifNotNil: - ifNotNilDo: [:outer| | outerTemps | "Present temps in the order outermost to innermost left-to-right, but replace copied outermost temps with their innermost copies" outerTemps := (self privateTempRefsForContext: outer startpcsToBlockExtents: theContextsStartpcsToBlockExtents) collect: [:outerPair| localRefs detect: [:localPair| outerPair first = localPair first] ifNone: [{ outerPair first. { #outer. outerPair last } }]]. outerTemps, (localRefs reject: [:localPair| outerTemps anySatisfy: [:outerPair| localPair first = outerPair first]])]]! Item was changed: ----- Method: Debugger>>selectedMessage (in category 'context stack (message list)') ----- selectedMessage "Answer the source code of the currently selected context." + ^contents := self selectedContext debuggerMap sourceText asText makeSelectorBold! - debuggerMap isNil ifTrue: - [debuggerMap := self selectedContext debuggerMap]. - ^contents := debuggerMap sourceText asText makeSelectorBold! Item was changed: ----- Method: DebuggerMethodMap>>sourceText (in category 'source mapping') ----- sourceText + self method ifNotNil: + [:method| + method holdsTempNames ifTrue: + [^method + getSourceFor: (method selector ifNil: [method defaultSelector]) + in: method methodClass]]. ^methodNode sourceText! Item was changed: ----- Method: Debugger>>contents:notifying: (in category 'accessing') ----- contents: aText notifying: aController "The retrieved information has changed and its source must now be updated. In this case, the retrieved information is the method of the selected context." | result selector classOfMethod category h ctxt newMethod | contextStackIndex = 0 ifTrue: [^false]. self selectedContext isExecutingBlock ifTrue: [h := self selectedContext activeHome. h ifNil: [self inform: 'Method for block not found on stack, can''t edit and continue'. ^false]. (self confirm: 'I will have to revert to the method from\which this block originated. Is that OK?' withCRs) ifFalse: [^false]. self resetContext: h. result := self contents: aText notifying: aController. self contentsChanged. ^result]. classOfMethod := self selectedClass. category := self selectedMessageCategoryName. selector := self selectedClass parserClass new parseSelector: aText. (selector == self selectedMessageName or: [(self selectedMessageName beginsWith: 'DoIt') and: [selector numArgs = self selectedMessageName numArgs]]) ifFalse: [self inform: 'can''t change selector'. ^false]. selector := classOfMethod compile: aText classified: category notifying: aController. selector ifNil: [^false]. "compile cancelled" contents := aText. newMethod := classOfMethod compiledMethodAt: selector. newMethod isQuick ifTrue: [self down. self selectedContext jump: (self selectedContext previousPc - self selectedContext pc)]. ctxt := interruptedProcess popTo: self selectedContext. ctxt == self selectedContext ifFalse: [self inform: 'Method saved, but current context unchanged\because of unwind error. Click OK to see error' withCRs] ifTrue: [newMethod isQuick ifFalse: [interruptedProcess restartTopWith: newMethod; stepToSendOrReturn]. + contextVariablesInspector object: nil]. - contextVariablesInspector object: nil. - debuggerMap := nil]. self resetContext: ctxt. Smalltalk isMorphic ifTrue: [World addAlarm: #changed: withArguments: #(contentsSelection) for: self at: (Time millisecondClockValue + 200)]. ^true! Item was changed: ----- Method: Debugger>>contextStackIndex:oldContextWas: (in category 'private') ----- contextStackIndex: anInteger oldContextWas: oldContext "Change the context stack index to anInteger, perhaps in response to user selection." | isNewMethod selectedContextSlotName index | contextStackIndex := anInteger. anInteger = 0 ifTrue: + [currentCompiledMethod := contents := nil. - [currentCompiledMethod := debuggerMap := contents := nil. self changed: #contextStackIndex. self decorateButtons. self contentsChanged. contextVariablesInspector object: nil. receiverInspector object: self receiver. ^self]. selectedContextSlotName := contextVariablesInspector selectedSlotName. isNewMethod := oldContext == nil or: [oldContext method ~~ (currentCompiledMethod := self selectedContext method)]. isNewMethod ifTrue: + [contents := self selectedMessage. - [debuggerMap := nil. - contents := self selectedMessage. self contentsChanged. self pcRange]. self changed: #contextStackIndex. self decorateButtons. contextVariablesInspector object: self selectedContext. ((index := contextVariablesInspector fieldList indexOf: selectedContextSlotName) ~= 0 and: [index ~= contextVariablesInspector selectionIndex]) ifTrue: [contextVariablesInspector toggleIndex: index]. receiverInspector object: self receiver. isNewMethod ifFalse: [self changed: #contentsSelection]!

1 0

The Trunk: System-eem.142.mcz
by commits＠source.squeak.org 06 Sep '09

06 Sep '09

Andreas Raab uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-eem.142.mcz ==================== Summary ==================== Name: System-eem.142 Author: eem Time: 5 September 2009, 5:14:21 am UUID: ae7696f5-b413-4aa6-8255-f41ed57953f2 Ancestors: System-ar.141 Seventh package of eight in closure compiler fixes 9/5/2009. use new temp names encoding scheme in abandonSources and exportCodeSegment:classes:keepSource: Use correct compiler class when parsing the selectors of ChangeRecords. Move some block-local temps into blocks in Change scanning =============== Diff against System-ar.141 =============== Item was changed: ----- Method: ClassChangeRecord>>compileAll:from: (in category 'method changes') ----- compileAll: newClass from: oldClass "Something about this class has changed. Locally retained methods must be recompiled. NOTE: You might think that if this changeSet is in force, then we can just note the new methods but a lower change set may override and be in force which would mean that only the overriding copies go recompiled. Just do it." - | sel changeType changeRecord newMethod | methodChanges associationsDo: + [:assn | | sel changeType changeRecord newMethod | + sel := assn key. + changeRecord := assn value. - [:assn | sel := assn key. changeRecord := assn value. changeType := changeRecord changeType. (changeType == #add or: [changeType == #change]) ifTrue: [newMethod := newClass recompileNonResidentMethod: changeRecord currentMethod atSelector: sel from: oldClass. changeRecord noteNewMethod: newMethod]]! Item was changed: ----- Method: ChangeRecord>>methodSelector (in category 'access') ----- methodSelector + ^type == #method ifTrue: + [(Smalltalk at: class ifAbsent: [Object]) parserClass new parseSelector: self string]! - type == #method - ifFalse: [^ nil]. - ^ self class 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 | - | is oldMethods newMethods m oldCodeString argsAndTemps 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 allInstances. oldMethods := OrderedCollection new: classList size * 150. newMethods := OrderedCollection new: classList size * 150. keepSources ifTrue: [ classList do: [:cl | cl selectors do: + [:selector | | m oldCodeString methodNode | - [:selector | m := cl compiledMethodAt: selector. m fileIndex > 0 ifTrue: [oldCodeString := cl sourceCodeAt: selector. + methodNode := cl compilerClass new + parse: oldCodeString in: cl notifying: nil. - argsAndTemps := (cl compilerClass new - parse: oldCodeString in: cl notifying: nil) tempNames. oldMethods addLast: m. + newMethods addLast: (m copyWithTempsFromMethodNode: methodNode)]]]]. - newMethods addLast: (m copyWithTempNames: argsAndTemps)]]]]. oldMethods asArray elementsExchangeIdentityWith: newMethods asArray. + oldMethods := newMethods := nil. - oldMethods := newMethods := m := oldCodeString := argsAndTemps := 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: ClassChangeRecord>>methodChangeTypes (in category 'method changes') ----- methodChangeTypes "Return an old-style dictionary of method change types." + | dict | - | dict selector record | dict := IdentityDictionary new. methodChanges associationsDo: + [:assn | | selector record | + selector := assn key. + record := assn value. - [:assn | selector := assn key. record := assn value. dict at: selector put: record changeType]. ^ dict! Item was changed: ----- Method: ClassChangeRecord>>forgetChangesIn: (in category 'removal') ----- forgetChangesIn: otherRecord "See forgetAllChangesFoundIn:. Used in culling changeSets." + | cls otherMethodChanges | - | cls otherMethodChanges selector actionToSubtract | (cls := self realClass) == nil ifTrue: [^ self]. "We can do better now, though..." otherMethodChanges := otherRecord methodChangeTypes. otherMethodChanges associationsDo: + [:assoc | | selector actionToSubtract | + selector := assoc key. actionToSubtract := assoc value. - [:assoc | selector := assoc key. actionToSubtract := assoc value. (cls includesSelector: selector) ifTrue: [(#(add change) includes: actionToSubtract) ifTrue: [methodChanges removeKey: selector ifAbsent: []]] ifFalse: [(#(remove addedThenRemoved) includes: actionToSubtract) ifTrue: [methodChanges removeKey: selector ifAbsent: []]]]. changeTypes isEmpty ifFalse: [changeTypes removeAllFoundIn: otherRecord allChangeTypes. (changeTypes includes: #rename) ifFalse: [changeTypes removeAllSuchThat: [:x | x beginsWith: 'oldName: ']]]! Item was changed: ----- Method: SystemDictionary>>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." - "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. See stats below" "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 | - condensing changes." - | oldCodeString argsAndTemps oldMethods newMethods m 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. - (up to about 400 characters) 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]. - 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 selectors do: + [:selector | | m oldCodeString methodNode | + m := cl compiledMethodAt: selector. + m fileIndex > 0 ifTrue: + [oldCodeString := cl sourceCodeAt: selector. + methodNode := cl compilerClass new + parse: oldCodeString + in: cl + notifying: nil. + oldMethods addLast: m. + newMethods addLast: (m copyWithTempsFromMethodNode: methodNode)]]]]. - during: [:bar | self systemNavigation - allBehaviorsDo: [:cl | - "for test: (Array with: Arc with: Arc class) do:" - bar value: (bCount := bCount + 1). - cl selectors - do: [:selector | - m := cl compiledMethodAt: selector. - m fileIndex > 0 - ifTrue: [oldCodeString := cl sourceCodeAt: selector. - argsAndTemps := (cl compilerClass new - parse: oldCodeString - in: cl - notifying: nil) tempNames. - oldMethods addLast: m. - newMethods - addLast: (m copyWithTempNames: argsAndTemps)]]]]. oldMethods asArray elementsExchangeIdentityWith: newMethods asArray. + self systemNavigation allBehaviorsDo: [:b | b zapOrganization]. - self systemNavigation - allBehaviorsDo: [:b | b zapOrganization]. self condenseChanges. Preferences disable: #warnIfNoSourcesFile! Item was changed: ----- Method: ClassChangeRecord>>invokePhase1 (in category 'isolation layers') ----- invokePhase1 + | elements | - | selector changeRecord type elements | revertable ifFalse: [^ self]. inForce ifTrue: [self error: 'Can invoke only when not in force.']. "Do the first part of the invoke operation -- no particular hurry." "Save the outer method dictionary for quick revert of method changes." priorMD := self realClass methodDict. "Prepare a methodDictionary for switcheroo." thisMD := self realClass methodDict copy. methodChanges associationsDo: + [:assn | | selector changeRecord type | + selector := assn key. + changeRecord := assn value. - [:assn | selector := assn key. changeRecord := assn value. type := changeRecord changeType. type = #remove ifTrue: [thisMD removeKey: selector]. type = #add ifTrue: [thisMD at: selector put: changeRecord currentMethod]. type = #change ifTrue: [thisMD at: selector put: changeRecord currentMethod]. ]. "Replace the original organization (and comment)." priorOrganization := self realClass organization. thisOrganization elementArray copy do: [:sel | (thisMD includesKey: sel) ifFalse: [thisOrganization removeElement: sel]]. #(DoIt DoItIn:) do: [:sel | thisMD removeKey: sel ifAbsent: []]. thisOrganization elementArray size = thisMD size ifFalse: [elements := thisOrganization elementArray asSet. thisMD keysDo: [:sel | (elements includes: sel) ifFalse: [thisOrganization classify: sel under: (priorOrganization categoryOfElement: sel)]]]. self realClass organization: thisOrganization. !

1 0

The Trunk: Morphic-eem.168.mcz
by commits＠source.squeak.org 06 Sep '09

06 Sep '09

Andreas Raab uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-eem.168.mcz ==================== Summary ==================== Name: Morphic-eem.168 Author: eem Time: 5 September 2009, 5:05:03 am UUID: 0761a5a2-9392-4af5-b03c-320a122db616 Ancestors: Morphic-Igor.Stasenko.167 Sixth package of eight in closure compiler fixes 9/5/2009. Use new temp encoding scheme in TextEditor>>compileSelectionFor:in: =============== Diff against Morphic-Igor.Stasenko.167 =============== Item was changed: ----- Method: TextEditor>>compileSelectionFor:in: (in category 'do-its') ----- compileSelectionFor: anObject in: evalContext | methodNode method | + methodNode := [Compiler new - methodNode _ [Compiler new compileNoPattern: self selectionAsStream in: anObject class context: evalContext notifying: self ifFail: [^nil]] on: OutOfScopeNotification do: [:ex | ex resume: true]. + method := methodNode generate: #(0 0 0 0). + ^method copyWithTempsFromMethodNode: methodNode! - method _ methodNode generate: #(0 0 0 0). - ^method copyWithTempNames: methodNode tempNames!

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
37
Older →

Jump to page: