author | Claus Gittinger <cg@exept.de> |
Tue, 09 Jul 2019 15:21:52 +0200 | |
changeset 4455 | af2a675e0f32 |
parent 4444 | 956cc4bf175d |
child 4483 | 7de46789b10d |
permissions | -rw-r--r-- |
4311 | 1 |
"{ Encoding: utf8 }" |
2 |
||
3 | 3 |
" |
4 |
COPYRIGHT (c) 1993 by Claus Gittinger |
|
85 | 5 |
All Rights Reserved |
3 | 6 |
|
7 |
This software is furnished under a license and may be used |
|
8 |
only in accordance with the terms of that license and with the |
|
9 |
inclusion of the above copyright notice. This software may not |
|
10 |
be provided or otherwise made available to, or used by, any |
|
11 |
other person. No title to or ownership of the software is |
|
12 |
hereby transferred. |
|
13 |
" |
|
957 | 14 |
"{ Package: 'stx:libbasic3' }" |
15 |
||
3744 | 16 |
"{ NameSpace: Smalltalk }" |
17 |
||
0 | 18 |
ClassChange subclass:#ClassDefinitionChange |
2316 | 19 |
instanceVariableNames:'objectType superClassName classType indexedType otherParameters |
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
20 |
instanceVariableString classVariableString |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
21 |
classInstanceVariableString poolDictionaries category private |
3446 | 22 |
definitionSelector' |
235 | 23 |
classVariableNames:'' |
24 |
poolDictionaries:'' |
|
25 |
category:'System-Changes' |
|
0 | 26 |
! |
27 |
||
9 | 28 |
!ClassDefinitionChange class methodsFor:'documentation'! |
29 |
||
30 |
copyright |
|
31 |
" |
|
32 |
COPYRIGHT (c) 1993 by Claus Gittinger |
|
38 | 33 |
All Rights Reserved |
9 | 34 |
|
35 |
This software is furnished under a license and may be used |
|
36 |
only in accordance with the terms of that license and with the |
|
37 |
inclusion of the above copyright notice. This software may not |
|
38 |
be provided or otherwise made available to, or used by, any |
|
39 |
other person. No title to or ownership of the software is |
|
40 |
hereby transferred. |
|
41 |
" |
|
42 |
! |
|
43 |
||
44 |
documentation |
|
45 |
" |
|
1162 | 46 |
instances represent class definition-changes. |
47 |
They are typically held in a ChangeSet. |
|
235 | 48 |
|
49 |
[author:] |
|
50 |
Claus Gittinger |
|
9 | 51 |
" |
100 | 52 |
! ! |
53 |
||
911 | 54 |
!ClassDefinitionChange methodsFor:'accessing'! |
55 |
||
1434 | 56 |
basicSuperClassName |
57 |
^ superClassName |
|
58 |
! |
|
59 |
||
1427 | 60 |
category |
1854 | 61 |
category isNil ifTrue:[ |
62 |
self setupFromSource. |
|
63 |
]. |
|
1427 | 64 |
^ category |
1854 | 65 |
|
66 |
"Modified: / 11-10-2006 / 14:12:01 / cg" |
|
1427 | 67 |
! |
68 |
||
4334 | 69 |
category:aStringOrSymbol |
70 |
category := aStringOrSymbol. |
|
71 |
||
72 |
"Modified (format): / 30-06-2018 / 17:49:08 / Claus Gittinger" |
|
1178 | 73 |
! |
74 |
||
1427 | 75 |
classInstanceVariableNames |
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
76 |
^ self classInstanceVariableString asCollectionOfWords |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
77 |
! |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
78 |
|
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
79 |
classInstanceVariableNames:aCollectionOfWords |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
80 |
self classInstanceVariableString:(aCollectionOfWords asStringWith:' '). |
1427 | 81 |
! |
82 |
||
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
83 |
classInstanceVariableString |
3744 | 84 |
^ classInstanceVariableString ? '' |
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
85 |
! |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
86 |
|
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
87 |
classInstanceVariableString:aString |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
88 |
classInstanceVariableString := aString. |
1427 | 89 |
! |
90 |
||
91 |
classVariableNames |
|
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
92 |
^ self classVariableString asCollectionOfWords |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
93 |
! |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
94 |
|
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
95 |
classVariableNames:aCollectionOfWords |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
96 |
self classVariableString:(aCollectionOfWords asStringWith:' '). |
1427 | 97 |
! |
98 |
||
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
99 |
classVariableString |
3875
aaa891f63fc6
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3855
diff
changeset
|
100 |
^ classVariableString ? '' |
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
101 |
! |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
102 |
|
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
103 |
classVariableString:aString |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
104 |
classVariableString := aString. |
1427 | 105 |
! |
106 |
||
2368 | 107 |
delta |
3446 | 108 |
| changeClass changeSource imageSource | |
109 |
||
2368 | 110 |
|
3446 | 111 |
changeClass := self changeClass. |
112 |
changeClass isNil ifTrue:[^#+]. |
|
113 |
changeSource := self definitionString. |
|
114 |
imageSource := self isPrivateClassDefinitionChange |
|
115 |
ifTrue:[changeClass definition] |
|
116 |
ifFalse:[changeClass definitionWithoutPackage]. |
|
3139
c6eb068647cc
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3111
diff
changeset
|
117 |
|
3446 | 118 |
^ (self class isSource: changeSource |
119 |
sameSourceAs: imageSource) ifTrue:[ #= ] ifFalse:[ #~ ]. |
|
120 |
||
121 |
" |
|
122 |
Tools::TextDiff2Tool openOn: changeSource label: 'Change' and: imageSource label: 'Image' |
|
123 |
" |
|
2504 | 124 |
|
125 |
"Modified: / 31-08-2011 / 09:26:48 / cg" |
|
3446 | 126 |
"Modified: / 04-02-2014 / 20:30:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2504 | 127 |
! |
128 |
||
129 |
deltaDetail |
|
130 |
"Returns a delta to the current state as a ChangeDelta object" |
|
131 |
||
2690 | 132 |
| class mySource imageSource myTree imageTree same | |
2504 | 133 |
|
134 |
class := self changeClass. |
|
135 |
class isNil ifTrue:[^ ChangeDeltaInformation added ]. |
|
2753 | 136 |
class isLoaded ifFalse:[^ ChangeDeltaInformation different ]. |
2504 | 137 |
mySource := self source. |
138 |
imageSource := class definitionWithoutPackage "definition". |
|
2690 | 139 |
same := (mySource = imageSource). |
140 |
same ifFalse:[ |
|
141 |
same := (self class isSource: mySource sameSourceAs: imageSource ). |
|
142 |
same ifFalse:[ |
|
143 |
"/ care for formatting (tabs, indentation etc.) |
|
144 |
myTree := RBParser parseExpression:mySource. |
|
145 |
imageTree := RBParser parseExpression:imageSource. |
|
146 |
same := (myTree = imageTree). |
|
147 |
same ifFalse:[ |
|
3275
e525d31c2a9b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3270
diff
changeset
|
148 |
"/ some classDefinition strings may contain whitespace |
2690 | 149 |
"/ instVarName string like 'foo bar ' instead of 'foo bar' (i.e. added a space)... |
150 |
((myTree receiver = imageTree receiver) |
|
151 |
and:[ (myTree selector = imageTree selector) |
|
152 |
and:[ ('*ubclass:instanceVariableNames:classVariableNames:poolDictionaries:category:' match: myTree selector) |
|
153 |
and:[ (myTree arguments at:1) = (imageTree arguments at:1) |
|
154 |
||
155 |
and:[ (2 to:5) conform:[:i | |
|
156 |
((myTree arguments at:i) isLiteral |
|
157 |
and:[ (imageTree arguments at:i) isLiteral |
|
3275
e525d31c2a9b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3270
diff
changeset
|
158 |
and:[ (myTree arguments at:i) value asString asCollectionOfWords |
e525d31c2a9b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3270
diff
changeset
|
159 |
= (imageTree arguments at:i) value asString asCollectionOfWords ]]) ] |
2690 | 160 |
|
161 |
]]]]) |
|
162 |
ifTrue:[ |
|
163 |
same := true |
|
164 |
] |
|
165 |
]. |
|
166 |
] |
|
167 |
]. |
|
168 |
||
169 |
^ same |
|
2504 | 170 |
ifTrue:[ ChangeDeltaInformation identical ] |
171 |
ifFalse:[ ChangeDeltaInformation different ] |
|
172 |
||
173 |
"Created: / 31-08-2011 / 10:26:42 / cg" |
|
2753 | 174 |
"Modified: / 24-01-2012 / 22:13:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2368 | 175 |
! |
176 |
||
3163
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
177 |
imageSource |
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
178 |
"return the source for the in-image version of the method" |
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
179 |
|
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
180 |
| cls | |
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
181 |
|
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
182 |
cls := self changeClass. |
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
183 |
cls isNil ifTrue:[ ^ nil ]. |
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
184 |
^ cls definitionWithoutPackage |
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
185 |
! |
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
186 |
|
3689
4d94248f61ed
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3543
diff
changeset
|
187 |
indexedType |
4d94248f61ed
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3543
diff
changeset
|
188 |
^ indexedType |
4d94248f61ed
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3543
diff
changeset
|
189 |
! |
4d94248f61ed
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3543
diff
changeset
|
190 |
|
1427 | 191 |
instanceVariableNames |
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
192 |
^ self instanceVariableString asCollectionOfWords |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
193 |
! |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
194 |
|
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
195 |
instanceVariableNames:aCollectionOfWords |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
196 |
self instanceVariableString:(aCollectionOfWords asStringWith:' ') |
1427 | 197 |
! |
198 |
||
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
199 |
instanceVariableString |
3875
aaa891f63fc6
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3855
diff
changeset
|
200 |
^ instanceVariableString ? '' |
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
201 |
! |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
202 |
|
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
203 |
instanceVariableString:aString |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
204 |
instanceVariableString := aString. |
1427 | 205 |
! |
206 |
||
3150
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
207 |
localClassName |
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
208 |
"for private classes, this returns the name relative to its owner; |
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
209 |
for non-private ones, this is the regular name. |
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
210 |
Notice that className always returns the full name (incl. any owner prefix)" |
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
211 |
|
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
212 |
self isPrivateClassDefinitionChange ifFalse:[^ self className]. |
3837
30ceae481017
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3810
diff
changeset
|
213 |
owningClassName isNil ifTrue:[^ self className]. |
3220
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
214 |
|
3150
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
215 |
(className startsWith:(owningClassName,'::')) ifTrue:[ |
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
216 |
^ className copyFrom:(owningClassName size + 2 + 1). |
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
217 |
] ifFalse:[ |
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
218 |
"/ should not happen |
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
219 |
^ self className |
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
220 |
] |
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
221 |
! |
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
222 |
|
1046
450ef3136cc3
care for the nameSpace in a class-definition
Claus Gittinger <cg@exept.de>
parents:
962
diff
changeset
|
223 |
nameSpaceName |
3446 | 224 |
| nm | |
3270
b986056e7fe8
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3245
diff
changeset
|
225 |
|
3446 | 226 |
nm := super nameSpaceName. |
227 |
^nm. |
|
228 |
||
229 |
"/ "/ JV: What is the following good for? Please explain..." |
|
230 |
"/ objectType == #variable ifTrue:[ |
|
231 |
"/ ^ nil |
|
232 |
"/ ]. |
|
233 |
"/ ^ self cutNameSpaceOf:(self nameSpaceOverride ? super nameSpaceName) |
|
2280
c93519e114c9
fix for namespace: do not add ns twice.
Claus Gittinger <cg@exept.de>
parents:
2207
diff
changeset
|
234 |
|
2515
39059cf824a8
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2504
diff
changeset
|
235 |
"Modified: / 07-09-2011 / 20:47:14 / cg" |
3446 | 236 |
"Modified: / 11-06-2013 / 17:18:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1046
450ef3136cc3
care for the nameSpace in a class-definition
Claus Gittinger <cg@exept.de>
parents:
962
diff
changeset
|
237 |
! |
450ef3136cc3
care for the nameSpace in a class-definition
Claus Gittinger <cg@exept.de>
parents:
962
diff
changeset
|
238 |
|
1196 | 239 |
nameSpaceName: aNameSpaceName classType: aClassType otherParameters:otherParametersArg |
1854 | 240 |
"this instance setup message is used when reading from a VW-xml change file. |
241 |
Support for this is not yet complete." |
|
242 |
||
3446 | 243 |
| imports | |
1196 | 244 |
|
3446 | 245 |
nameSpaceName := aNameSpaceName. |
911 | 246 |
classType := aClassType. |
1196 | 247 |
otherParameters := Dictionary new addAll:otherParametersArg; yourself. |
3543
ed4000ee3e21
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3491
diff
changeset
|
248 |
private := otherParameters at:#private: ifAbsent:nil. |
ed4000ee3e21
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3491
diff
changeset
|
249 |
category := otherParameters at:#category: ifAbsent:nil. |
1196 | 250 |
|
3543
ed4000ee3e21
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3491
diff
changeset
|
251 |
aClassType == #defineSharedVariable: ifTrue:[ |
ed4000ee3e21
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3491
diff
changeset
|
252 |
] ifFalse:[ |
ed4000ee3e21
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3491
diff
changeset
|
253 |
superClassName := otherParameters at:#superclass: ifAbsent:nil. |
ed4000ee3e21
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3491
diff
changeset
|
254 |
self assert:(superClassName notNil). |
ed4000ee3e21
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3491
diff
changeset
|
255 |
superClassName notNil ifTrue:[ |
ed4000ee3e21
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3491
diff
changeset
|
256 |
superClassName := superClassName pathString. |
ed4000ee3e21
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3491
diff
changeset
|
257 |
]. |
ed4000ee3e21
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3491
diff
changeset
|
258 |
indexedType := otherParameters at:#indexedType: ifAbsent:nil. |
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
259 |
instanceVariableString := otherParameters at:#instanceVariableNames: ifAbsent:nil. |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
260 |
classInstanceVariableString := otherParameters at:#classInstanceVariableNames: ifAbsent:nil. |
3543
ed4000ee3e21
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3491
diff
changeset
|
261 |
imports := otherParameters at:#imports: ifAbsent:nil. |
1196 | 262 |
]. |
1854 | 263 |
|
2280
c93519e114c9
fix for namespace: do not add ns twice.
Claus Gittinger <cg@exept.de>
parents:
2207
diff
changeset
|
264 |
"Modified: / 15-06-2010 / 14:50:35 / cg" |
3446 | 265 |
"Modified: / 12-12-2013 / 12:59:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
911 | 266 |
! |
267 |
||
268 |
objectType |
|
269 |
"return the value of the instance variable 'objectType' (automatically generated)" |
|
270 |
||
1046
450ef3136cc3
care for the nameSpace in a class-definition
Claus Gittinger <cg@exept.de>
parents:
962
diff
changeset
|
271 |
^ objectType |
450ef3136cc3
care for the nameSpace in a class-definition
Claus Gittinger <cg@exept.de>
parents:
962
diff
changeset
|
272 |
! |
911 | 273 |
|
274 |
objectType:something |
|
275 |
"set the value of the instance variable 'objectType' (automatically generated)" |
|
276 |
||
1046
450ef3136cc3
care for the nameSpace in a class-definition
Claus Gittinger <cg@exept.de>
parents:
962
diff
changeset
|
277 |
objectType := something. |
450ef3136cc3
care for the nameSpace in a class-definition
Claus Gittinger <cg@exept.de>
parents:
962
diff
changeset
|
278 |
! |
450ef3136cc3
care for the nameSpace in a class-definition
Claus Gittinger <cg@exept.de>
parents:
962
diff
changeset
|
279 |
|
1427 | 280 |
poolDictionaries |
2832 | 281 |
poolDictionaries isNil ifTrue:[ |
282 |
self setupFromSource. |
|
283 |
]. |
|
1427 | 284 |
^ poolDictionaries |
2832 | 285 |
|
286 |
"Modified: / 13-06-2012 / 12:23:41 / cg" |
|
1427 | 287 |
! |
288 |
||
4334 | 289 |
poolDictionaries:aCollectionOfPools |
290 |
poolDictionaries := aCollectionOfPools. |
|
291 |
||
292 |
"Modified (format): / 30-06-2018 / 17:52:07 / Claus Gittinger" |
|
1427 | 293 |
! |
294 |
||
2289 | 295 |
private:aBoolean |
296 |
private := aBoolean. |
|
297 |
||
298 |
"Created: / 30-08-2010 / 13:56:11 / cg" |
|
299 |
! |
|
300 |
||
1046
450ef3136cc3
care for the nameSpace in a class-definition
Claus Gittinger <cg@exept.de>
parents:
962
diff
changeset
|
301 |
source |
3220
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
302 |
"return the source of the change; |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
303 |
either the original source or a synthesized" |
1046
450ef3136cc3
care for the nameSpace in a class-definition
Claus Gittinger <cg@exept.de>
parents:
962
diff
changeset
|
304 |
|
3220
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
305 |
|src| |
1196 | 306 |
|
1473
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
307 |
(src := source) isNil ifTrue:[ |
1196 | 308 |
src := self definitionString |
309 |
]. |
|
310 |
^ src |
|
2280
c93519e114c9
fix for namespace: do not add ns twice.
Claus Gittinger <cg@exept.de>
parents:
2207
diff
changeset
|
311 |
|
2900
c21c251db4a0
fixed namespaceoverride (for changeSetBrowser)
Claus Gittinger <cg@exept.de>
parents:
2876
diff
changeset
|
312 |
"Modified: / 10-08-2012 / 11:53:54 / cg" |
1196 | 313 |
! |
314 |
||
3855
ea6eae92e1ab
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3837
diff
changeset
|
315 |
superClassName |
4444 | 316 |
"returns nil, if no superclass. |
317 |
Notice, that squeak returns the string 'nil' in this case; |
|
318 |
so this might change in the future; |
|
319 |
in the meantime, senders should be written to accept both nil and 'nil'" |
|
3855
ea6eae92e1ab
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3837
diff
changeset
|
320 |
|
1473
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
321 |
|nm| |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
322 |
|
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
323 |
nm := superClassName. |
3855
ea6eae92e1ab
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3837
diff
changeset
|
324 |
nm isNil ifTrue:[^ nil " 'nil' "]. |
3163
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
325 |
"/ convert VW namespace syntax |
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
326 |
(nm includes:$.) ifTrue:[ |
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
327 |
^ nm copyReplaceAll:$. withAll:'::'. |
1473
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
328 |
]. |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
329 |
^ nm |
4444 | 330 |
|
331 |
"Modified (comment): / 22-06-2019 / 16:05:02 / Claus Gittinger" |
|
1427 | 332 |
! |
333 |
||
3163
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
334 |
superClassName:aString |
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
335 |
superClassName := aString. |
16fdcb5a998b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3150
diff
changeset
|
336 |
self assert:(aString notNil). |
2207 | 337 |
self invalidateSource. |
1473
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
338 |
! |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
339 |
|
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
340 |
superClassNameWithoutMyNamespace |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
341 |
|nm| |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
342 |
|
1956 | 343 |
superClassName isNil ifTrue:[^ 'nil']. |
344 |
||
1473
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
345 |
nm := self cutMyNameSpaceOf:superClassName. |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
346 |
(nm includes:$.) ifTrue:[ |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
347 |
^ nm copyReplaceAll:$. withAll:'::'. |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
348 |
]. |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
349 |
^ nm |
1956 | 350 |
|
351 |
"Modified: / 03-03-2007 / 13:09:07 / cg" |
|
1473
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
352 |
! |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
353 |
|
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
354 |
superClassNameWithoutNamespace |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
355 |
|nm| |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
356 |
|
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
357 |
nm := self cutNameSpaceOf:superClassName. |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
358 |
(nm includes:$.) ifTrue:[ |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
359 |
^ nm copyReplaceAll:$. withAll:'::'. |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
360 |
]. |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
361 |
^ nm |
1046
450ef3136cc3
care for the nameSpace in a class-definition
Claus Gittinger <cg@exept.de>
parents:
962
diff
changeset
|
362 |
! ! |
911 | 363 |
|
1998
06004ad8a6e4
changed #apply - set the packageId
Stefan Vogel <sv@exept.de>
parents:
1956
diff
changeset
|
364 |
!ClassDefinitionChange methodsFor:'applying'! |
06004ad8a6e4
changed #apply - set the packageId
Stefan Vogel <sv@exept.de>
parents:
1956
diff
changeset
|
365 |
|
06004ad8a6e4
changed #apply - set the packageId
Stefan Vogel <sv@exept.de>
parents:
1956
diff
changeset
|
366 |
apply |
3808
c9927a70b702
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3744
diff
changeset
|
367 |
|changeClass sourceWithNamespace ns| |
3111 | 368 |
|
2425 | 369 |
superClassName isNil ifTrue:[ |
3446 | 370 |
self setupFromSource. |
371 |
]. |
|
372 |
"Some classes have nil superclass (such as Object)..." |
|
373 |
superClassName notNil ifTrue:[ |
|
3808
c9927a70b702
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3744
diff
changeset
|
374 |
nameSpaceOverride notEmptyOrNil ifTrue:[ |
c9927a70b702
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3744
diff
changeset
|
375 |
"/ a q&d hack: need to find those which pass in a nameSpace isntead of a string |
c9927a70b702
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3744
diff
changeset
|
376 |
(ns := nameSpaceOverride) isString ifFalse:[ ns := ns name ]. |
c9927a70b702
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3744
diff
changeset
|
377 |
(superClassName startsWith:(ns,'::')) ifFalse:[ |
c9927a70b702
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3744
diff
changeset
|
378 |
superClassName := (ns,'::',superClassName) asSymbol. |
c9927a70b702
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3744
diff
changeset
|
379 |
]. |
c9927a70b702
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3744
diff
changeset
|
380 |
]. |
3446 | 381 |
(Smalltalk classNamed:superClassName) isNil ifTrue:[ |
382 |
Class undeclared:superClassName |
|
3111 | 383 |
]. |
2425 | 384 |
]. |
3220
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
385 |
|
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
386 |
"/ here, using the current namespace as provided by the query or the override, |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
387 |
"/ generate a class definition with full names (i.e. incl. ns prefix). |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
388 |
sourceWithNamespace := self source. |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
389 |
"/ as the namespace is already in the definition string, make sure that the namespace is not |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
390 |
"/ added twice, by anwering Smalltalk now!! |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
391 |
Class nameSpaceQuerySignal |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
392 |
answer:Smalltalk |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
393 |
do:[ |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
394 |
Parser evaluate:sourceWithNamespace. |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
395 |
]. |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
396 |
|
4334 | 397 |
classInstanceVariableString notEmptyOrNil ifTrue:[ |
398 |
changeClass := self changeClass. |
|
399 |
changeClass notNil ifTrue:[ |
|
400 |
changeClass class instanceVariableString:classInstanceVariableString |
|
401 |
]. |
|
402 |
]. |
|
403 |
||
1998
06004ad8a6e4
changed #apply - set the packageId
Stefan Vogel <sv@exept.de>
parents:
1956
diff
changeset
|
404 |
package notNil ifTrue:[ |
3111 | 405 |
changeClass := self changeClass. |
406 |
changeClass notNil ifTrue:[ |
|
407 |
changeClass setPackage:package. |
|
408 |
]. |
|
1998
06004ad8a6e4
changed #apply - set the packageId
Stefan Vogel <sv@exept.de>
parents:
1956
diff
changeset
|
409 |
]. |
2368 | 410 |
|
411 |
" |
|
2425 | 412 |
(ClassDefinitionChange className: #TestB source: 'TestA subclass: #TestB |
413 |
instanceVariableNames:'''' |
|
414 |
classVariableNames:'''' |
|
415 |
poolDictionaries:'''' |
|
416 |
category:''* remove me *''') |
|
417 |
apply |
|
2368 | 418 |
" |
419 |
||
2554 | 420 |
"Modified: / 06-10-2011 / 17:01:58 / cg" |
3446 | 421 |
"Modified: / 10-06-2013 / 17:12:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
4334 | 422 |
"Modified: / 01-07-2018 / 00:46:30 / Claus Gittinger" |
1998
06004ad8a6e4
changed #apply - set the packageId
Stefan Vogel <sv@exept.de>
parents:
1956
diff
changeset
|
423 |
! ! |
06004ad8a6e4
changed #apply - set the packageId
Stefan Vogel <sv@exept.de>
parents:
1956
diff
changeset
|
424 |
|
784
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
425 |
!ClassDefinitionChange methodsFor:'comparing'! |
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
426 |
|
3210
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
427 |
isConflict |
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
428 |
"true if this change is different than what is already in the image |
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
429 |
(i.e. it overwrites some existing code)" |
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
430 |
|
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
431 |
|cls| |
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
432 |
|
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
433 |
(cls := self changeClass) isNil ifTrue:[^ false]. |
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
434 |
cls superclass name ~= superClassName ifTrue:[ ^ true ]. |
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
435 |
cls instanceVariableString ~= instanceVariableString ifTrue:[ ^ true ]. |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
436 |
cls classVariableString ~= classVariableString ifTrue:[ ^ true ]. |
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
437 |
cls class instanceVariableString ~= (classInstanceVariableString ? '') ifTrue:[ ^ true ]. |
3485
d191b20c93a5
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3446
diff
changeset
|
438 |
cls poolDictionaries ~= poolDictionaries ifTrue:[ ^ true ]. |
3210
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
439 |
cls category ~= category ifTrue:[ ^ true ]. |
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
440 |
cls isPrivate ifTrue:[ |
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
441 |
cls owningClass name ~= owningClassName ifTrue:[ ^ true ]. |
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
442 |
]. |
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
443 |
cls definitionSelector ~= self definitionSelector ifTrue:[ ^ true ]. |
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
444 |
^ false |
3485
d191b20c93a5
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3446
diff
changeset
|
445 |
|
d191b20c93a5
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3446
diff
changeset
|
446 |
"Modified: / 12-02-2014 / 20:25:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3210
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
447 |
! |
ab1729c084da
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3205
diff
changeset
|
448 |
|
784
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
449 |
isForSameAs:changeB |
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
450 |
"return true, if the given change represents a change for the same |
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
451 |
thingy as the receiver (i.e. same method, same definition etc.)." |
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
452 |
|
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
453 |
changeB isClassDefinitionChange ifFalse:[^ false]. |
3205 | 454 |
^ self className = changeB className. |
784
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
455 |
! |
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
456 |
|
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
457 |
sameAs:changeB |
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
458 |
"return true, if the given change represents the same change as the receiver." |
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
459 |
|
798 | 460 |
(self isForSameAs:changeB) ifFalse:[^ false]. |
784
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
461 |
^ self sameSourceAs:changeB |
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
462 |
|
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
463 |
|
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
464 |
|
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
465 |
! ! |
1e50cc7fd07d
added compare methods #sameAs: and #isForSameAs:
Claus Gittinger <cg@exept.de>
parents:
772
diff
changeset
|
466 |
|
2410 | 467 |
!ClassDefinitionChange methodsFor:'converting'! |
468 |
||
469 |
asAntiChange |
|
470 |
||
471 |
^ClassRemoveChange className: self className |
|
472 |
||
473 |
"Created: / 02-11-2009 / 11:11:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
474 |
! ! |
|
475 |
||
962 | 476 |
!ClassDefinitionChange methodsFor:'printing & storing'! |
787 | 477 |
|
1196 | 478 |
definitionString |
3446 | 479 |
| ns | |
480 |
||
481 |
||
482 |
ns := self nameSpaceName. |
|
483 |
ns isEmptyOrNil ifTrue:[ |
|
484 |
^ self definitionStringInNamespace: ns. |
|
485 |
]. |
|
486 |
^String streamContents:[:s| |
|
487 |
"/ owningClassName isNil ifTrue:[ |
|
488 |
s nextPutAll: '"{ NameSpace: '; nextPutAll: ns; nextPutAll: ' }"'. |
|
489 |
s cr; cr. |
|
490 |
"/ ]. |
|
491 |
s nextPutAll: (self definitionStringInNamespace: ns). |
|
492 |
] |
|
493 |
||
494 |
"Modified: / 13-11-2013 / 17:40:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3203
2639572248b5
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3163
diff
changeset
|
495 |
! |
2515
39059cf824a8
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2504
diff
changeset
|
496 |
|
3203
2639572248b5
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3163
diff
changeset
|
497 |
definitionStringInNamespace: nsOrNil |
3446 | 498 |
| classNameUsed superClassNameUsed selPart ownerNameUsed classNameSymbolString | |
2515
39059cf824a8
handle namespace overrides (for mc browser)
Claus Gittinger <cg@exept.de>
parents:
2504
diff
changeset
|
499 |
|
1473
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
500 |
objectType == #variable ifTrue:[ |
3220
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
501 |
"/ a visualWorks static variable definition change. |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
502 |
"/ kludge to be here - should be a separate StaticVariableDefinitionChange |
1473
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
503 |
^ String streamContents:[:stream | |
3203
2639572248b5
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3163
diff
changeset
|
504 |
nsOrNil notNil ifTrue:[ |
2639572248b5
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3163
diff
changeset
|
505 |
stream nextPutAll:((nsOrNil asCollectionOfSubstringsSeparatedBy:$.) asStringWith:'::') |
2280
c93519e114c9
fix for namespace: do not add ns twice.
Claus Gittinger <cg@exept.de>
parents:
2207
diff
changeset
|
506 |
] ifFalse:[ |
c93519e114c9
fix for namespace: do not add ns twice.
Claus Gittinger <cg@exept.de>
parents:
2207
diff
changeset
|
507 |
self halt:'can this happen ?'. |
2834 | 508 |
stream nextPutAll:'Smalltalk' |
2280
c93519e114c9
fix for namespace: do not add ns twice.
Claus Gittinger <cg@exept.de>
parents:
2207
diff
changeset
|
509 |
]. |
c93519e114c9
fix for namespace: do not add ns twice.
Claus Gittinger <cg@exept.de>
parents:
2207
diff
changeset
|
510 |
|
1196 | 511 |
stream |
512 |
nextPutAll:' addClassVarName:'; |
|
1318 | 513 |
nextPutAll:className asString storeString |
1473
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
514 |
]. |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
515 |
]. |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
516 |
|
3855
ea6eae92e1ab
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3837
diff
changeset
|
517 |
superClassNameUsed := (self superClassName) ? 'nil'. |
3446 | 518 |
"Strip of namespace" |
519 |
nsOrNil notNil ifTrue:[ |
|
520 |
(superClassNameUsed startsWith: nsOrNil) ifTrue:[ |
|
521 |
superClassNameUsed := superClassNameUsed copyFrom: nsOrNil size + 3 |
|
522 |
]. |
|
523 |
]. |
|
524 |
||
3150
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
525 |
"/ careful with private classes: the definition MUST give the |
3446 | 526 |
"/ local name as argument, not the full name |
3220
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
527 |
self isPrivateClassDefinitionChange ifTrue:[ |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
528 |
classNameUsed := self localClassName. |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
529 |
] ifFalse:[ |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
530 |
classNameUsed := className. |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
531 |
]. |
3150
10fa70a50dfa
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3139
diff
changeset
|
532 |
|
3203
2639572248b5
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3163
diff
changeset
|
533 |
"/ selPart is the subclass:/variableSubclass/variableByteSubclass:/... - part |
2834 | 534 |
selPart := (self definitionSelector ? #'subclass:instanceVariableNames:classVariableNames:poolDictionaries:category:') |
535 |
keywords first. |
|
2554 | 536 |
|
3446 | 537 |
(classNameUsed first isLetter not or:[classNameUsed contains:[:c | c isLetterOrDigit not and:[c ~~ $_]]]) ifTrue:[ |
538 |
classNameSymbolString := classNameUsed asSymbol storeString |
|
539 |
] ifFalse:[ |
|
540 |
classNameSymbolString := '#' , classNameUsed. |
|
541 |
]. |
|
542 |
||
1473
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
543 |
^ String streamContents:[:stream | |
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
544 |
stream |
2554 | 545 |
nextPutAll:superClassNameUsed; |
2834 | 546 |
nextPutAll:' ',selPart; |
3446 | 547 |
nextPutLine: classNameSymbolString; |
3245
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
548 |
tab; |
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
549 |
nextPutAll:'instanceVariableNames:'; |
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
550 |
nextPutLine:(instanceVariableString ? '') storeString; |
3245
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
551 |
tab; |
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
552 |
nextPutAll:'classVariableNames:'; |
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
553 |
nextPutLine:(classVariableString ? '') storeString; |
3245
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
554 |
tab; |
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
555 |
nextPutAll:'poolDictionaries:'; |
3203
2639572248b5
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3163
diff
changeset
|
556 |
nextPutLine:(poolDictionaries ? '') storeString. |
3837
30ceae481017
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3810
diff
changeset
|
557 |
(self isPrivateClassDefinitionChange and:[owningClassName notNil]) ifTrue:[ |
3220
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
558 |
ownerNameUsed := self owningClassName. |
3446 | 559 |
(nsOrNil isNil or:[nsOrNil ~~ nameSpaceName]) ifTrue:[ |
560 |
(nsOrNil ? nameSpaceName) notNil ifTrue:[ |
|
561 |
ownerNameUsed := (nsOrNil ? nameSpaceName),'::',ownerNameUsed. |
|
562 |
]. |
|
3220
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
563 |
]. |
2831 | 564 |
stream |
3245
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
565 |
tab; |
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
566 |
nextPutAll:'privateIn:'; |
3220
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
567 |
nextPutAll:ownerNameUsed |
2831 | 568 |
] ifFalse:[ |
569 |
stream |
|
3245
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
570 |
tab; |
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
571 |
nextPutAll:'category:'; |
3203
2639572248b5
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3163
diff
changeset
|
572 |
nextPutAll:(category ? '') asString storeString |
2831 | 573 |
]. |
3810
542fa7a00a6f
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3808
diff
changeset
|
574 |
|
542fa7a00a6f
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3808
diff
changeset
|
575 |
classInstanceVariableString notEmptyOrNil ifTrue:[ |
542fa7a00a6f
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3808
diff
changeset
|
576 |
stream nextPut:$.; cr; |
542fa7a00a6f
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3808
diff
changeset
|
577 |
nextPutAll:'"'; |
542fa7a00a6f
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3808
diff
changeset
|
578 |
nextPutAll:classNameUsed; |
542fa7a00a6f
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3808
diff
changeset
|
579 |
nextPutAll:' class instanceVariableNames: '; |
542fa7a00a6f
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3808
diff
changeset
|
580 |
nextPutAll:classInstanceVariableString storeString; |
542fa7a00a6f
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3808
diff
changeset
|
581 |
nextPutAll:'"' |
542fa7a00a6f
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3808
diff
changeset
|
582 |
]. |
1473
a8fe22600414
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1434
diff
changeset
|
583 |
] |
2280
c93519e114c9
fix for namespace: do not add ns twice.
Claus Gittinger <cg@exept.de>
parents:
2207
diff
changeset
|
584 |
|
2834 | 585 |
"Modified: / 13-06-2012 / 13:01:58 / cg" |
3446 | 586 |
"Modified: / 13-11-2013 / 17:13:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1196 | 587 |
! |
588 |
||
3203
2639572248b5
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3163
diff
changeset
|
589 |
definitionStringWithoutNamespace |
2639572248b5
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3163
diff
changeset
|
590 |
"cg - huh - who needs that? (the definitionString already does NOT include the classes namespace)" |
2876 | 591 |
|
592 |
|ns classNameUsed superClassNameUsed| |
|
593 |
||
594 |
ns := self nameSpaceOverride. |
|
595 |
||
596 |
objectType == #variable ifTrue:[ |
|
597 |
^ String streamContents:[:stream | |
|
598 |
ns notNil ifTrue:[ |
|
599 |
stream |
|
600 |
nextPutAll:((ns asCollectionOfSubstringsSeparatedBy:$.) asStringWith:'::') |
|
601 |
] ifFalse:[ |
|
602 |
self halt:'can this happen ?'. |
|
603 |
stream |
|
604 |
nextPutAll:'Smalltalk' |
|
605 |
]. |
|
606 |
||
607 |
stream |
|
608 |
nextPutAll:' addClassVarName:'; |
|
609 |
nextPutAll:className asString storeString |
|
610 |
]. |
|
611 |
]. |
|
612 |
||
3855
ea6eae92e1ab
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3837
diff
changeset
|
613 |
superClassNameUsed := self superClassName ? 'nil'. |
2876 | 614 |
classNameUsed := self classNameWithoutNamespace. |
615 |
||
616 |
^ String streamContents:[:stream | |
|
617 |
self isPrivateClassDefinitionChange ifFalse:[ |
|
618 |
stream |
|
619 |
nextPutAll:superClassNameUsed; |
|
620 |
nextPutAll:' subclass:'; |
|
621 |
nextPutAll: classNameUsed asSymbol storeString |
|
622 |
; |
|
623 |
cr; |
|
624 |
tab; |
|
625 |
nextPutAll:'instanceVariableNames:'; |
|
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
626 |
nextPutAll:(instanceVariableString ? '') storeString; |
2876 | 627 |
cr; |
628 |
tab; |
|
629 |
nextPutAll:'classVariableNames:'; |
|
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
630 |
nextPutAll:(classVariableString ? '') storeString; |
2876 | 631 |
cr; |
632 |
tab; |
|
633 |
nextPutAll:'poolDictionaries:'; |
|
634 |
nextPutAll:(poolDictionaries ? '') storeString; |
|
635 |
cr; |
|
636 |
tab; |
|
637 |
nextPutAll:'category:'; |
|
638 |
nextPutAll:(category ? '') storeString; |
|
639 |
cr |
|
640 |
] ifTrue:[ |
|
641 |
stream |
|
642 |
nextPutAll:superClassNameUsed; |
|
643 |
nextPutAll:' subclass:'; |
|
644 |
nextPutAll: (self className copyFrom: owningClassName size + 3) asSymbol storeString |
|
645 |
; |
|
646 |
cr; |
|
647 |
tab; |
|
648 |
nextPutAll:'instanceVariableNames:'; |
|
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
649 |
nextPutAll:(instanceVariableString ? '') storeString; |
2876 | 650 |
cr; |
651 |
tab; |
|
652 |
nextPutAll:'classVariableNames:'; |
|
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
653 |
nextPutAll:(classVariableString ? '') storeString; |
2876 | 654 |
cr; |
655 |
tab; |
|
656 |
nextPutAll:'poolDictionaries:'; |
|
657 |
nextPutAll:(poolDictionaries ? '') storeString; |
|
658 |
cr; |
|
659 |
tab; |
|
660 |
nextPutAll:'privateIn:'; |
|
661 |
nextPutAll: |
|
662 |
((ns := self nameSpaceName) isNil |
|
663 |
ifTrue:[owningClassName] |
|
664 |
ifFalse:[owningClassName copyFrom: ns size + 3]); |
|
665 |
cr |
|
666 |
] |
|
667 |
] |
|
668 |
||
669 |
"Modified: / 06-10-2011 / 17:02:05 / cg" |
|
670 |
"Created: / 20-03-2012 / 16:37:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
671 |
! |
|
672 |
||
1101 | 673 |
printOn:aStream |
1866 | 674 |
aStream |
675 |
nextPutAll:className; nextPutAll:' {definition}' |
|
676 |
||
677 |
"Modified: / 12-10-2006 / 17:48:28 / cg" |
|
1101 | 678 |
! |
679 |
||
896 | 680 |
printWithoutClassNameOn:aStream |
787 | 681 |
aStream nextPutAll:('definition of ' , className) |
682 |
||
683 |
||
684 |
! ! |
|
685 |
||
772 | 686 |
!ClassDefinitionChange methodsFor:'queries'! |
687 |
||
1134
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
688 |
definitionSelector |
1854 | 689 |
definitionSelector isNil ifTrue:[ |
690 |
self setupFromSource. |
|
3485
d191b20c93a5
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3446
diff
changeset
|
691 |
definitionSelector isNil ifTrue:[ |
d191b20c93a5
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3446
diff
changeset
|
692 |
definitionSelector := #'subclass:instanceVariableNames:classVariableNames:poolDictionaries:category:' |
d191b20c93a5
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3446
diff
changeset
|
693 |
]. |
1854 | 694 |
]. |
695 |
^ definitionSelector |
|
1134
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
696 |
|
1854 | 697 |
"Modified: / 11-10-2006 / 14:11:44 / cg" |
3485
d191b20c93a5
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3446
diff
changeset
|
698 |
"Modified: / 12-02-2014 / 20:25:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1134
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
699 |
! |
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
700 |
|
2833 | 701 |
definitionSelector:aSelector |
702 |
definitionSelector := aSelector |
|
703 |
||
704 |
"Created: / 13-06-2012 / 12:45:02 / cg" |
|
705 |
! |
|
706 |
||
1871
3daa5601c86e
+owner access and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1866
diff
changeset
|
707 |
owningClassName |
3220
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
708 |
"the owner's name, excluding the namespace" |
a8e24cc171f6
namespace handling fixed (I hope)
Claus Gittinger <cg@exept.de>
parents:
3210
diff
changeset
|
709 |
|
1871
3daa5601c86e
+owner access and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1866
diff
changeset
|
710 |
self isPrivateClassDefinitionChange ifTrue:[ |
3daa5601c86e
+owner access and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1866
diff
changeset
|
711 |
owningClassName isNil ifTrue:[ |
3daa5601c86e
+owner access and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1866
diff
changeset
|
712 |
self setupFromSource. |
3daa5601c86e
+owner access and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1866
diff
changeset
|
713 |
]. |
3daa5601c86e
+owner access and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1866
diff
changeset
|
714 |
]. |
3daa5601c86e
+owner access and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1866
diff
changeset
|
715 |
^ owningClassName |
3daa5601c86e
+owner access and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1866
diff
changeset
|
716 |
|
3daa5601c86e
+owner access and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1866
diff
changeset
|
717 |
"Created: / 12-10-2006 / 23:07:25 / cg" |
2289 | 718 |
! |
719 |
||
720 |
owningClassName:aStringOrSymbol |
|
721 |
owningClassName := aStringOrSymbol |
|
722 |
||
723 |
"Created: / 30-08-2010 / 13:55:37 / cg" |
|
772 | 724 |
! ! |
725 |
||
1134
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
726 |
!ClassDefinitionChange methodsFor:'special'! |
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
727 |
|
1395
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1318
diff
changeset
|
728 |
installAsAutoloadedClassIfPublicWithFilename:aFilenameString |
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1318
diff
changeset
|
729 |
"install the class defined by this change as autoloaded. |
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1318
diff
changeset
|
730 |
Skip private classes. |
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1318
diff
changeset
|
731 |
Enter class file name as abbreviation" |
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1318
diff
changeset
|
732 |
|
1904 | 733 |
|parseTree sel cat clsName cls catIdx pkg| |
1134
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
734 |
|
2289 | 735 |
private == true ifTrue:[^ self]. |
736 |
||
1134
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
737 |
parseTree := Parser parseExpression:self source. |
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
738 |
parseTree isMessage ifFalse:[ |
1395
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1318
diff
changeset
|
739 |
self error:'bad change source'. |
1134
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
740 |
]. |
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
741 |
|
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
742 |
sel := parseTree selector. |
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
743 |
(sel endsWith:':privateIn:') ifTrue:[^ self]. |
1418 | 744 |
|
3402
d13a0331a314
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3380
diff
changeset
|
745 |
catIdx := sel keywords indexOf:'category:'. |
1134
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
746 |
catIdx ~~ 0 ifTrue:[ |
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
747 |
cat := (parseTree args at:catIdx) evaluate. |
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
748 |
]. |
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
749 |
|
3223
c3c37b9ce3f1
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3220
diff
changeset
|
750 |
clsName := self fullClassName "className" asSymbol. |
1802 | 751 |
cls := Smalltalk at:clsName. |
1904 | 752 |
|
753 |
pkg := package ? Project current package. |
|
754 |
||
1802 | 755 |
(cls isNil |
756 |
or:[cls isBehavior not |
|
757 |
or:[cls isLoaded not]]) ifTrue:[ |
|
1904 | 758 |
|autoloadedClass| |
1395
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1318
diff
changeset
|
759 |
|
1836 | 760 |
autoloadedClass := Smalltalk |
1395
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1318
diff
changeset
|
761 |
installAutoloadedClassNamed:clsName |
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1318
diff
changeset
|
762 |
category:cat |
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1318
diff
changeset
|
763 |
package:pkg |
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1318
diff
changeset
|
764 |
revision:nil. |
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1318
diff
changeset
|
765 |
aFilenameString notNil ifTrue:[ |
1836 | 766 |
autoloadedClass setClassFilename:aFilenameString. |
767 |
"/ Smalltalk setFilename:aFilenameString forClass:clsName package:pkg. |
|
1395
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1318
diff
changeset
|
768 |
] |
1904 | 769 |
] ifFalse:[ |
770 |
cls notNil ifTrue:[ |
|
771 |
cls isBehavior ifTrue:[ |
|
772 |
cls package ~= pkg ifTrue:[ |
|
3380 | 773 |
Transcript showCR:('Autoloaded class: %1 (%4) not installed (package would change from %2 to %3)' |
774 |
bindWith:clsName with:cls package with:pkg with:aFilenameString). |
|
1904 | 775 |
] |
776 |
]. |
|
777 |
]. |
|
778 |
]. |
|
1836 | 779 |
|
2402
f6799fe6acc4
changed: #installAsAutoloadedClassIfPublicWithFilename:
Claus Gittinger <cg@exept.de>
parents:
2368
diff
changeset
|
780 |
"Modified: / 03-07-2011 / 18:34:05 / cg" |
1854 | 781 |
! |
782 |
||
2207 | 783 |
invalidateSource |
784 |
"internal - flush the sourceString if it got invalidated due to a |
|
785 |
className, superclassName, etc... change" |
|
786 |
||
787 |
source := nil. |
|
788 |
! |
|
789 |
||
1854 | 790 |
setupFromSource |
3245
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
791 |
"Extract data from class definition string in source. |
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
792 |
WARNING: This overwrites values in instvars!!" |
1854 | 793 |
|
3245
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
794 |
|parseTree catIdx poolIdx instVarIdx classVarIdx | |
1854 | 795 |
|
796 |
source notNil ifTrue:[ |
|
797 |
parseTree := Parser parseExpression:source. |
|
1878 | 798 |
(parseTree notNil and:[parseTree isMessage]) ifFalse:[ |
1887 | 799 |
self error:'bad change source' mayProceed:true. |
800 |
^ self |
|
1854 | 801 |
]. |
802 |
||
803 |
definitionSelector := parseTree selector. |
|
804 |
||
805 |
private := (definitionSelector endsWith:':privateIn:'). |
|
1871
3daa5601c86e
+owner access and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1866
diff
changeset
|
806 |
private ifTrue:[ |
3daa5601c86e
+owner access and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1866
diff
changeset
|
807 |
owningClassName := parseTree args last name. |
3daa5601c86e
+owner access and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1866
diff
changeset
|
808 |
]. |
1854 | 809 |
|
810 |
catIdx := definitionSelector keywords indexOf:'category:'. |
|
811 |
catIdx ~~ 0 ifTrue:[ |
|
812 |
category := (parseTree args at:catIdx) evaluate. |
|
813 |
]. |
|
2368 | 814 |
|
2832 | 815 |
poolIdx := definitionSelector keywords indexOf:'poolDictionaries:'. |
816 |
poolIdx ~~ 0 ifTrue:[ |
|
817 |
poolDictionaries := (parseTree args at:poolIdx) evaluate. |
|
818 |
]. |
|
819 |
||
3245
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
820 |
instVarIdx := definitionSelector keywords indexOf:'instanceVariableNames:'. |
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
821 |
instVarIdx ~~ 0 ifTrue:[ |
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
822 |
instanceVariableString := (parseTree args at:instVarIdx) value. |
3245
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
823 |
]. |
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
824 |
|
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
825 |
classVarIdx := definitionSelector keywords indexOf:'classVariableNames:'. |
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
826 |
classVarIdx ~~ 0 ifTrue:[ |
3694
401ad8b2ca8b
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3689
diff
changeset
|
827 |
classVariableString := (parseTree args at:classVarIdx) value. |
3245
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
828 |
]. |
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
829 |
|
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
830 |
|
3446 | 831 |
"Care about nil superclasss (that's valid for certain |
832 |
classes like Object, ProtoObject or custom proxies" |
|
833 |
parseTree receiver isVariable ifTrue:[ |
|
834 |
superClassName := parseTree receiver name. |
|
835 |
] ifFalse:[ |
|
4012 | 836 |
parseTree receiver isLiteral ifTrue:[ |
3446 | 837 |
superClassName := parseTree receiver value. |
838 |
superClassName notNil ifTrue:[ |
|
839 |
self error: 'Invalid superclass - can be either a class or nil' |
|
840 |
] |
|
841 |
] |
|
842 |
]. |
|
1854 | 843 |
]. |
844 |
||
845 |
"Created: / 11-10-2006 / 14:10:02 / cg" |
|
2832 | 846 |
"Modified: / 13-06-2012 / 12:25:10 / cg" |
3446 | 847 |
"Modified: / 10-06-2013 / 17:07:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1134
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
848 |
! ! |
915934e8aab8
care for package; added installAsAutoloaded
Claus Gittinger <cg@exept.de>
parents:
1101
diff
changeset
|
849 |
|
3491
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
850 |
!ClassDefinitionChange methodsFor:'testing'! |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
851 |
|
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
852 |
isClassDefinitionChange |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
853 |
^ true |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
854 |
! |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
855 |
|
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
856 |
isOrContainsClassDefinitionChange |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
857 |
^ true |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
858 |
! |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
859 |
|
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
860 |
isPrivateClassDefinitionChange |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
861 |
"compute lazily; remember in private" |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
862 |
|
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
863 |
private isNil ifTrue:[ |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
864 |
(className includes:$:) ifFalse:[ |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
865 |
"/ cannot be private |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
866 |
private := false |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
867 |
] ifTrue:[ |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
868 |
source isNil ifTrue:[^ false ]. |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
869 |
(source includesString:'private') ifFalse:[ |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
870 |
private := false. |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
871 |
] ifTrue:[ |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
872 |
"/ (self changeClass notNil |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
873 |
"/ and:[self changeClass isLoaded not]) ifTrue:[ |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
874 |
"/ "/ cannot be private |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
875 |
"/ private := false |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
876 |
"/ ] ifTrue:[ |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
877 |
self setupFromSource. |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
878 |
"/ ]. |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
879 |
]. |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
880 |
]. |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
881 |
]. |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
882 |
^ private |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
883 |
|
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
884 |
"Created: / 11-10-2006 / 14:19:03 / cg" |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
885 |
"Modified: / 16-11-2006 / 16:34:19 / cg" |
3689
4d94248f61ed
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3543
diff
changeset
|
886 |
! |
4d94248f61ed
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3543
diff
changeset
|
887 |
|
4d94248f61ed
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3543
diff
changeset
|
888 |
isVariable |
4d94248f61ed
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3543
diff
changeset
|
889 |
indexedType notNil ifTrue:[ |
4311 | 890 |
self breakPoint:#cg. |
3689
4d94248f61ed
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3543
diff
changeset
|
891 |
^ true. |
4d94248f61ed
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3543
diff
changeset
|
892 |
]. |
4d94248f61ed
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3543
diff
changeset
|
893 |
^ false. |
3491
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
894 |
! ! |
39ab3f1bc8fa
category change for isXXX testers;
Claus Gittinger <cg@exept.de>
parents:
3485
diff
changeset
|
895 |
|
2614
7d342615bb66
visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents:
2554
diff
changeset
|
896 |
!ClassDefinitionChange methodsFor:'visiting'! |
7d342615bb66
visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents:
2554
diff
changeset
|
897 |
|
7d342615bb66
visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents:
2554
diff
changeset
|
898 |
acceptChangeVisitor:aVisitor |
7d342615bb66
visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents:
2554
diff
changeset
|
899 |
^ aVisitor visitClassDefinitionChange:self. |
7d342615bb66
visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents:
2554
diff
changeset
|
900 |
|
7d342615bb66
visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents:
2554
diff
changeset
|
901 |
"Created: / 25-11-2011 / 17:13:13 / cg" |
7d342615bb66
visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents:
2554
diff
changeset
|
902 |
! ! |
7d342615bb66
visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents:
2554
diff
changeset
|
903 |
|
100 | 904 |
!ClassDefinitionChange class methodsFor:'documentation'! |
905 |
||
2518 | 906 |
version |
4012 | 907 |
^ '$Header$' |
3223
c3c37b9ce3f1
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3220
diff
changeset
|
908 |
! |
c3c37b9ce3f1
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3220
diff
changeset
|
909 |
|
c3c37b9ce3f1
class: ClassDefinitionChange
Claus Gittinger <cg@exept.de>
parents:
3220
diff
changeset
|
910 |
version_CVS |
4012 | 911 |
^ '$Header$' |
3245
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
912 |
! |
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
913 |
|
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
914 |
version_HG |
a0e79ed3aa65
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3223
diff
changeset
|
915 |
|
3270
b986056e7fe8
class: ClassDefinitionChange
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3245
diff
changeset
|
916 |
^ '$Changeset: <not expanded> $' |
2180
c952a3ae234d
changed: #installAsAutoloadedClassIfPublicWithFilename:
Stefan Vogel <sv@exept.de>
parents:
2093
diff
changeset
|
917 |
! |
c952a3ae234d
changed: #installAsAutoloadedClassIfPublicWithFilename:
Stefan Vogel <sv@exept.de>
parents:
2093
diff
changeset
|
918 |
|
2368 | 919 |
version_SVN |
4012 | 920 |
^ '$Id$' |
100 | 921 |
! ! |
3111 | 922 |