hg/stx-libtool: comparison ChangesBrowser.st

equal deleted inserted replaced

-:e93cd2eb8afa
+:90d8b9febd7a
 lastNr := self numberOfChanges.
 "if we apply multiple changes, and an error occurs,
 ask the user if all operations should be aborted..."
 multipleApply := (lastNr - changeNr) > 1.
+AbortAllOperationRequest handle:[:ex |
-changeNr to:lastNr do:[:changeNr |
+ex return
-changeListView setSelection:changeNr.
+] do:[
-self applyChange:changeNr
+changeNr to:lastNr do:[:changeNr |
-].
+changeListView setSelection:changeNr.
-self autoSelect:self numberOfChanges.
+self applyChange:changeNr
+].
+self autoSelect:self numberOfChanges.
+]
 ]
 "Modified: 21.1.1997 / 22:25:29 / cg"
 !
 ].
 !
 processNonMethodChunk
 |s changeClass sel  cls p rec clsName ownerTree ownerName
-m nameAndClass|
+m nameAndClass args instVarsArg classVarsArg categoryArg|
 (chunkText startsWith:'''---- snap') ifTrue:[
 self processSnapshotChunk.
 ^ self
 ].
 p := browser parseExpression:fullChunkText inNameSpace:Smalltalk.
 (p notNil and:[p ~~ #Error]) ifTrue:[
 p isMessage ifTrue:[
 sel := p selector.
 rec := p receiver.
+args := p args.
 ]
 ] ifFalse:[
 sel := nil.
 (Scanner new scanTokens:fullChunkText) size == 0 ifTrue:[
 "/ a comment only
 ].
 autoCompare value ifTrue:[
 (changeClass isNil or:[changeClass isLoaded not]) ifTrue:[
 changeDelta := '?'
 ] ifFalse:[
-(changeClass comment = (p args at:1) evaluate) ifTrue:[
+(changeClass comment = (args at:1) evaluate) ifTrue:[
 changeDelta := '='.
 ]
 ]
 ].
-sel := nil.
+"/ sel := nil.
+^ self.
 ].
 (sel == #removeSelector:) ifTrue:[
 nameAndClass := self extractClassAndClassNameFromParseTree:rec.
 clsName := nameAndClass key. changeClass := nameAndClass value.
-sel := (p args at:1) evaluate.
+sel := (args at:1) evaluate.
 changeClassNames at:changeClassNames size put:clsName.
 autoCompare value ifTrue:[
 (changeClass isNil or:[changeClass isLoaded not]) ifTrue:[
 changeDelta := '?'
 ]
 ]
 ].
 changeType := '(remove)'.
 changeString := self contractClass:clsName selector:sel to:maxLen.
-sel := nil.
+"/ sel := nil.
+^ self.
 ].
 (p notNil
 and:[p ~~ #Error
 and:[p isMessage
 changeDelta := '='.
 ]
 ]
 ]
 ].
+^ self.
 ].
 (sel == #privacy:) ifTrue:[
 sel := (rec args at:1) evaluate.
 changeType := '(privacy change)'.
 changeString := self contractClass:clsName selector:sel to:maxLen.
 changeDelta := '?'
 ] ifFalse:[
 changeDelta := ' '
 ]
 ].
+^ self.
 ].
 sel := nil.
 ].
 (Class definitionSelectors includes:sel) ifTrue:[
 changeType := '(class definition)'.
-clsName := (p args at:1) evaluate.
+clsName := (args at:1) evaluate.
 changeClassNames at:changeClassNames size put:clsName.
 "/ is it a private-class ?
 ('*privateIn:' match:sel) ifTrue:[
-ownerTree := p args last.
+ownerTree := args last.
 ownerName := ownerTree name asString.
 clsName := ownerName , '::' , clsName
 ].
 changeString := clsName.
 or:[
 cls superclass notNil
 and:[p receiver isConstant not
 and:[cls superclass name = p receiver name]]
 ]) ifTrue:[
-cls instanceVariableString asCollectionOfWords = (p args at:2) evaluate asCollectionOfWords ifTrue:[
+(sel == #'variableByteSubclass:classVariableNames:poolDictionaries:category:')
-cls classVariableString asCollectionOfWords = (p args at:3) evaluate asCollectionOfWords ifTrue:[
+ifTrue:[
-(p args at:4) evaluate isEmpty ifTrue:[
+"/ VSE definition message
-cls definitionSelector = (sel , 'category:')
+instVarsArg := ''.
-ifTrue:[
+classVarsArg := (args at:2) evaluate.
-"/ ST/V, VAge or Dolphin definition
+categoryArg := (args at:4) evaluate.
+] ifFalse:[
+instVarsArg := (args at:2) evaluate.
+classVarsArg := (args at:3) evaluate.
+categoryArg := (args at:5) evaluate.
+].
+cls instanceVariableString asCollectionOfWords = instVarsArg asCollectionOfWords ifTrue:[
+cls classVariableString asCollectionOfWords = classVarsArg asCollectionOfWords ifTrue:[
+cls definitionSelector = (sel , 'category:')
+ifTrue:[
+"/ ST/V, VAge or Dolphin definition
+changeDelta := '='.
+] ifFalse:[
+cls category = categoryArg ifTrue:[
 changeDelta := '='.
 ] ifFalse:[
-cls category = (p args at:5) evaluate ifTrue:[
+changeType := '(class category change)'.
-changeDelta := '='.
-] ifFalse:[
-changeType := '(class category change)'.
-]
 ]
 ]
 ]
 ]
 ]
 ]
 ]
 ].
-sel := nil.
+"/ sel := nil.
-] ifFalse:[
+^ self.
-(#(
+].
-#'primitiveDefinitions:'
-#'primitiveFunctions:'
+(#(
-#'primitiveVariables:'
+#'primitiveDefinitions:'
-) includes:sel) ifTrue:[
+#'primitiveFunctions:'
-changeType := '(class definition)'.
+#'primitiveVariables:'
-clsName := rec name.
+) includes:sel) ifTrue:[
-] ifFalse:[
+changeType := '(class definition)'.
-((sel == #instanceVariableNames:)
+clsName := rec name.
-and:[rec isMessage
+^ self.
-and:[rec selector == #class]]) ifTrue:[
+].
-clsName := rec receiver name.
-changeClass := (self nameSpaceForApply) classNamed:clsName.
+((sel == #instanceVariableNames:)
-changeType := '(class definition)'.
+and:[rec isMessage
-changeClassNames at:changeClassNames size put:clsName.
+and:[rec selector == #class]]) ifTrue:[
+clsName := rec receiver name.
-autoCompare value ifTrue:[
+changeClass := (self nameSpaceForApply) classNamed:clsName.
-changeClass isNil ifTrue:[
+changeType := '(class definition)'.
-changeDelta := '?'.
+changeClassNames at:changeClassNames size put:clsName.
-] ifFalse:[
-s := (p args at:1) evaluate.
+autoCompare value ifTrue:[
-s = changeClass class instanceVariableString ifTrue:[
+changeClass isNil ifTrue:[
-changeDelta := '='.
+changeDelta := '?'.
-]
+] ifFalse:[
-]
+s := (p args at:1) evaluate.
-].
+s = changeClass class instanceVariableString ifTrue:[
+changeDelta := '='.
+]
 ]
-]
+].
+^ self.
 ].
 "Modified: / 14-08-2010 / 12:54:24 / cg"
 !
 ! !
 !ChangesBrowser class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.465 2015-01-04 19:00:04 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.466 2015-01-12 21:17:09 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.465 2015-01-04 19:00:04 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.466 2015-01-12 21:17:09 cg Exp $'
 ! !

changeset 15087	90d8b9febd7a
parent 15082	e188631fbd28
child 15090	27f730f4fd5b