--- a/ClassDefinitionChange.st Mon Dec 29 16:14:33 2014 +0100
+++ b/ClassDefinitionChange.st Mon Dec 29 16:59:26 2014 +0100
@@ -13,8 +13,8 @@
ClassChange subclass:#ClassDefinitionChange
instanceVariableNames:'objectType superClassName classType indexedType otherParameters
- instanceVariableNames classVariableNames
- classInstanceVariableNames poolDictionaries category private
+ instanceVariableString classVariableString
+ classInstanceVariableString poolDictionaries category private
definitionSelector'
classVariableNames:''
poolDictionaries:''
@@ -67,19 +67,35 @@
!
classInstanceVariableNames
- ^ classInstanceVariableNames
+ ^ self classInstanceVariableString asCollectionOfWords
+!
+
+classInstanceVariableNames:aCollectionOfWords
+ self classInstanceVariableString:(aCollectionOfWords asStringWith:' ').
!
-classInstanceVariableNames:something
- classInstanceVariableNames := something.
+classInstanceVariableString
+ ^ classInstanceVariableString
+!
+
+classInstanceVariableString:aString
+ classInstanceVariableString := aString.
!
classVariableNames
- ^ classVariableNames
+ ^ self classVariableString asCollectionOfWords
+!
+
+classVariableNames:aCollectionOfWords
+ self classVariableString:(aCollectionOfWords asStringWith:' ').
!
-classVariableNames:something
- classVariableNames := something.
+classVariableString
+ ^ classVariableString
+!
+
+classVariableString:aString
+ classVariableString := aString.
!
delta
@@ -167,11 +183,19 @@
!
instanceVariableNames
- ^ instanceVariableNames
+ ^ self instanceVariableString asCollectionOfWords
+!
+
+instanceVariableNames:aCollectionOfWords
+ self instanceVariableString:(aCollectionOfWords asStringWith:' ')
!
-instanceVariableNames:something
- instanceVariableNames := something.
+instanceVariableString
+ ^ instanceVariableString
+!
+
+instanceVariableString:aString
+ instanceVariableString := aString.
!
localClassName
@@ -225,8 +249,8 @@
superClassName := superClassName pathString.
].
indexedType := otherParameters at:#indexedType: ifAbsent:nil.
- instanceVariableNames := otherParameters at:#instanceVariableNames: ifAbsent:nil.
- classInstanceVariableNames := otherParameters at:#classInstanceVariableNames: ifAbsent:nil.
+ instanceVariableString := otherParameters at:#instanceVariableNames: ifAbsent:nil.
+ classInstanceVariableString := otherParameters at:#classInstanceVariableNames: ifAbsent:nil.
imports := otherParameters at:#imports: ifAbsent:nil.
].
@@ -377,9 +401,9 @@
(cls := self changeClass) isNil ifTrue:[^ false].
cls superclass name ~= superClassName ifTrue:[ ^ true ].
- cls instanceVariableString ~= instanceVariableNames ifTrue:[ ^ true ].
- cls classVariableString ~= classVariableNames ifTrue:[ ^ true ].
- cls class instanceVariableString ~= (classInstanceVariableNames ? '') ifTrue:[ ^ true ].
+ cls instanceVariableString ~= instanceVariableString ifTrue:[ ^ true ].
+ cls classVariableString ~= classVariableString ifTrue:[ ^ true ].
+ cls class instanceVariableString ~= (classInstanceVariableString ? '') ifTrue:[ ^ true ].
cls poolDictionaries ~= poolDictionaries ifTrue:[ ^ true ].
cls category ~= category ifTrue:[ ^ true ].
cls isPrivate ifTrue:[
@@ -492,10 +516,10 @@
nextPutLine: classNameSymbolString;
tab;
nextPutAll:'instanceVariableNames:';
- nextPutLine:(instanceVariableNames ? '') storeString;
+ nextPutLine:(instanceVariableString ? '') storeString;
tab;
nextPutAll:'classVariableNames:';
- nextPutLine:(classVariableNames ? '') storeString;
+ nextPutLine:(classVariableString ? '') storeString;
tab;
nextPutAll:'poolDictionaries:';
nextPutLine:(poolDictionaries ? '') storeString.
@@ -559,11 +583,11 @@
cr;
tab;
nextPutAll:'instanceVariableNames:';
- nextPutAll:(instanceVariableNames ? '') storeString;
+ nextPutAll:(instanceVariableString ? '') storeString;
cr;
tab;
nextPutAll:'classVariableNames:';
- nextPutAll:(classVariableNames ? '') storeString;
+ nextPutAll:(classVariableString ? '') storeString;
cr;
tab;
nextPutAll:'poolDictionaries:';
@@ -582,11 +606,11 @@
cr;
tab;
nextPutAll:'instanceVariableNames:';
- nextPutAll:(instanceVariableNames ? '') storeString;
+ nextPutAll:(instanceVariableString ? '') storeString;
cr;
tab;
nextPutAll:'classVariableNames:';
- nextPutAll:(classVariableNames ? '') storeString;
+ nextPutAll:(classVariableString ? '') storeString;
cr;
tab;
nextPutAll:'poolDictionaries:';
@@ -769,12 +793,12 @@
instVarIdx := definitionSelector keywords indexOf:'instanceVariableNames:'.
instVarIdx ~~ 0 ifTrue:[
- instanceVariableNames := (parseTree args at:instVarIdx) value.
+ instanceVariableString := (parseTree args at:instVarIdx) value.
].
classVarIdx := definitionSelector keywords indexOf:'classVariableNames:'.
classVarIdx ~~ 0 ifTrue:[
- classVariableNames := (parseTree args at:classVarIdx) value.
+ classVariableString := (parseTree args at:classVarIdx) value.
].
@@ -854,11 +878,11 @@
!ClassDefinitionChange class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.91 2014-12-23 22:51:35 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.92 2014-12-29 15:59:26 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.91 2014-12-23 22:51:35 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic3/ClassDefinitionChange.st,v 1.92 2014-12-29 15:59:26 cg Exp $'
!
version_HG
@@ -867,6 +891,6 @@
!
version_SVN
- ^ '$Id: ClassDefinitionChange.st,v 1.91 2014-12-23 22:51:35 cg Exp $'
+ ^ '$Id: ClassDefinitionChange.st,v 1.92 2014-12-29 15:59:26 cg Exp $'
! !