--- a/ChangesBrowser.st Tue Feb 01 20:24:45 2000 +0100
+++ b/ChangesBrowser.st Tue Feb 01 22:53:17 2000 +0100
@@ -1880,7 +1880,7 @@
|aStream chunk sawExcla parseTree thisClass cat oldSource newSource
parser sel oldMethod outcome showDiff d t1 t2 selector isLoaded
- method beep sClass thisClassSym|
+ method beep superClass thisClassSym|
aStream := self streamForChange:changeNr.
aStream isNil ifTrue:[^ self].
@@ -1904,7 +1904,9 @@
parseTree := Parser parseExpression:chunk.
].
(parseTree notNil and:[parseTree isMessage]) ifTrue:[
- ((selector := parseTree selector) == #removeSelector:) ifTrue:[
+ selector := parseTree selector.
+
+ selector == #'removeSelector:' ifTrue:[
thisClass := (parseTree receiver evaluate).
thisClass isBehavior ifTrue:[
(self checkClassIsLoaded:thisClass) ifTrue:[
@@ -1922,7 +1924,7 @@
outcome := 'cannot compare this change (class not present)'
].
].
- selector == #category: ifTrue:[
+ selector == #'category:' ifTrue:[
parseTree receiver isMessage ifTrue:[
parseTree receiver selector == #compiledMethodAt: ifTrue:[
(method := parseTree receiver evaluate) isMethod ifTrue:[
@@ -1938,7 +1940,7 @@
]
]
].
- selector == #comment: ifTrue:[
+ selector == #'comment:' ifTrue:[
thisClass := (parseTree receiver evaluate).
thisClass isBehavior ifTrue:[
(self checkClassIsLoaded:thisClass) ifTrue:[
@@ -1955,10 +1957,10 @@
outcome := 'cannot compare this change (class not present)'
].
].
- selector == #subclass:instanceVariableNames:classVariableNames:poolDictionaries:category: ifTrue:[
- sClass := (parseTree receiver evaluate).
- sClass isBehavior ifTrue:[
- (self checkClassIsLoaded:sClass) ifTrue:[
+ selector == #'subclass:instanceVariableNames:classVariableNames:poolDictionaries:category:' ifTrue:[
+ superClass := (parseTree receiver evaluate).
+ superClass isBehavior ifTrue:[
+ (self checkClassIsLoaded:superClass) ifTrue:[
thisClassSym := (parseTree arguments at:1) evaluate.
thisClass := Smalltalk at:thisClassSym ifAbsent:nil.
thisClass notNil ifTrue:[
@@ -1967,9 +1969,17 @@
((thisClass sharedPools size == 0) and:[(parseTree arguments at:4) evaluate = '']) ifTrue:[
thisClass category = (parseTree arguments at:5) evaluate ifTrue:[
outcome := 'change has no effect\\(same definition)'.
+ ] ifFalse:[
+ outcome := 'category is different'
]
- ]
+ ] ifFalse:[
+ outcome := 'sharedPool definition is different'
+ ].
+ ] ifFalse:[
+ outcome := 'classVariable definition is different'
]
+ ] ifFalse:[
+ outcome := 'instanceVariable definition is different'
]
]
]
@@ -3323,5 +3333,5 @@
!ChangesBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.186 2000-02-01 19:24:45 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ChangesBrowser.st,v 1.187 2000-02-01 21:53:17 cg Exp $'
! !