|
1
|
1 |
"
|
|
5
|
2 |
COPYRIGHT (c) 1988 by Claus Gittinger
|
|
159
|
3 |
All Rights Reserved
|
|
1
|
4 |
|
|
|
5 |
This software is furnished under a license and may be used
|
|
|
6 |
only in accordance with the terms of that license and with the
|
|
|
7 |
inclusion of the above copyright notice. This software may not
|
|
|
8 |
be provided or otherwise made available to, or used by, any
|
|
|
9 |
other person. No title to or ownership of the software is
|
|
|
10 |
hereby transferred.
|
|
|
11 |
"
|
|
|
12 |
|
|
|
13 |
Class subclass:#Metaclass
|
|
|
14 |
instanceVariableNames:''
|
|
|
15 |
classVariableNames:''
|
|
|
16 |
poolDictionaries:''
|
|
|
17 |
category:'Kernel-Classes'
|
|
|
18 |
!
|
|
|
19 |
|
|
|
20 |
Metaclass comment:'
|
|
88
|
21 |
COPYRIGHT (c) 1988 by Claus Gittinger
|
|
159
|
22 |
All Rights Reserved
|
|
93
|
23 |
|
|
314
|
24 |
$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.22 1995-03-25 01:22:57 claus Exp $
|
|
88
|
25 |
'!
|
|
1
|
26 |
|
|
88
|
27 |
!Metaclass class methodsFor:'documentation'!
|
|
|
28 |
|
|
|
29 |
copyright
|
|
|
30 |
"
|
|
|
31 |
COPYRIGHT (c) 1988 by Claus Gittinger
|
|
159
|
32 |
All Rights Reserved
|
|
1
|
33 |
|
|
88
|
34 |
This software is furnished under a license and may be used
|
|
|
35 |
only in accordance with the terms of that license and with the
|
|
|
36 |
inclusion of the above copyright notice. This software may not
|
|
|
37 |
be provided or otherwise made available to, or used by, any
|
|
|
38 |
other person. No title to or ownership of the software is
|
|
|
39 |
hereby transferred.
|
|
|
40 |
"
|
|
|
41 |
!
|
|
1
|
42 |
|
|
88
|
43 |
version
|
|
|
44 |
"
|
|
314
|
45 |
$Header: /cvs/stx/stx/libbasic/Metaclass.st,v 1.22 1995-03-25 01:22:57 claus Exp $
|
|
88
|
46 |
"
|
|
|
47 |
!
|
|
|
48 |
|
|
|
49 |
documentation
|
|
|
50 |
"
|
|
|
51 |
every classes class is a subclass of Metaclass.
|
|
|
52 |
Metaclass provides support for creating new (sub)classes and/or
|
|
|
53 |
changing the definition of an already existing class.
|
|
|
54 |
"
|
|
|
55 |
! !
|
|
1
|
56 |
|
|
|
57 |
!Metaclass methodsFor:'creating classes'!
|
|
|
58 |
|
|
|
59 |
name:newName inEnvironment:aSystemDictionary
|
|
159
|
60 |
subclassOf:aClass
|
|
|
61 |
instanceVariableNames:stringOfInstVarNames
|
|
|
62 |
variable:variableBoolean
|
|
|
63 |
words:wordsBoolean
|
|
|
64 |
pointers:pointersBoolean
|
|
|
65 |
classVariableNames:stringOfClassVarNames
|
|
|
66 |
poolDictionaries:stringOfPoolNames
|
|
|
67 |
category:categoryString
|
|
|
68 |
comment:commentString
|
|
|
69 |
changed:changed
|
|
1
|
70 |
|
|
13
|
71 |
"this is the main workhorse for installing new classes - special care
|
|
|
72 |
has to be taken, when changing an existing classes definition. In this
|
|
|
73 |
case, some or all of the methods and subclasses methods have to be
|
|
|
74 |
recompiled.
|
|
|
75 |
Also, the old class(es) are still kept (but not accessable as a global),
|
|
|
76 |
to allow existing instances some life.
|
|
|
77 |
This might change in the future.
|
|
|
78 |
"
|
|
|
79 |
|
|
1
|
80 |
|newClass newMetaclass nInstVars nameString classSymbol oldClass
|
|
175
|
81 |
classVarChange instVarChange superClassChange newComment
|
|
308
|
82 |
changeSet1 changeSet2 addedNames
|
|
202
|
83 |
anyChange oldInstVars newInstVars oldClassVars newClassVars superFlags newFlags|
|
|
13
|
84 |
|
|
68
|
85 |
"NOTICE:
|
|
|
86 |
this method is too complex and should be splitted into managable pieces ...
|
|
159
|
87 |
I dont like it anymore :-)
|
|
|
88 |
(However, its a good test for the compilers ability to handle big, complex methods ;-)
|
|
68
|
89 |
"
|
|
13
|
90 |
|
|
|
91 |
newName = aClass name ifTrue:[
|
|
159
|
92 |
self error:'trying to create circular class definition'.
|
|
|
93 |
^ nil
|
|
13
|
94 |
].
|
|
1
|
95 |
|
|
49
|
96 |
"check for invalid subclassing of UndefinedObject and SmallInteger"
|
|
|
97 |
aClass canBeSubclassed ifFalse:[
|
|
159
|
98 |
self error:('it is not possible to subclass ' , aClass name).
|
|
195
|
99 |
^ nil
|
|
49
|
100 |
].
|
|
|
101 |
|
|
1
|
102 |
nInstVars := stringOfInstVarNames countWords.
|
|
|
103 |
nameString := newName asString.
|
|
13
|
104 |
classSymbol := newName asSymbol.
|
|
1
|
105 |
newComment := commentString.
|
|
|
106 |
|
|
13
|
107 |
"look, if it already exists as a class"
|
|
68
|
108 |
oldClass := aSystemDictionary at:classSymbol ifAbsent:[nil].
|
|
|
109 |
oldClass isBehavior ifFalse:[
|
|
159
|
110 |
oldClass := nil.
|
|
68
|
111 |
] ifTrue:[
|
|
159
|
112 |
oldClass superclass notNil ifTrue:[
|
|
|
113 |
oldClass allSuperclasses do:[:cls |
|
|
|
114 |
cls name = nameString ifTrue:[
|
|
|
115 |
self error:'trying to create circular class definition'.
|
|
|
116 |
^ nil
|
|
|
117 |
]
|
|
|
118 |
]
|
|
|
119 |
].
|
|
68
|
120 |
|
|
159
|
121 |
aClass superclass notNil ifTrue:[
|
|
|
122 |
aClass allSuperclasses do:[:cls |
|
|
|
123 |
cls name = nameString ifTrue:[
|
|
|
124 |
self error:'trying to create circular class definition'.
|
|
|
125 |
^ nil
|
|
|
126 |
]
|
|
|
127 |
].
|
|
|
128 |
].
|
|
13
|
129 |
|
|
159
|
130 |
newComment isNil ifTrue:[
|
|
|
131 |
newComment := oldClass comment
|
|
|
132 |
].
|
|
68
|
133 |
|
|
159
|
134 |
"
|
|
|
135 |
warn, if it exists with different category and different instvars,
|
|
|
136 |
and the existing is not an autoload class.
|
|
|
137 |
Usually, this indicates that someone wants to create a new class with
|
|
|
138 |
a name, which already exists (it happened a few times to myself, while
|
|
|
139 |
I wanted to create a new class called ReturnNode ...).
|
|
|
140 |
This will be much less of a problem, once multiple name spaces are
|
|
|
141 |
implemented and classes can be put into separate packages.
|
|
|
142 |
"
|
|
|
143 |
oldClass isLoaded ifTrue:[
|
|
|
144 |
oldClass category ~= categoryString ifTrue:[
|
|
|
145 |
oldClass instanceVariableString asCollectionOfWords
|
|
|
146 |
~= stringOfInstVarNames asCollectionOfWords ifTrue:[
|
|
|
147 |
(self confirm:'a class named ' , oldClass name , ' already exists -
|
|
68
|
148 |
|
|
|
149 |
create (i.e. change) anyway ?' withCRs)
|
|
159
|
150 |
ifFalse:[
|
|
|
151 |
^ nil
|
|
|
152 |
]
|
|
|
153 |
]
|
|
|
154 |
]
|
|
|
155 |
]
|
|
1
|
156 |
].
|
|
|
157 |
|
|
68
|
158 |
"
|
|
|
159 |
Check for some 'considered bad-style' things, like lower case names.
|
|
|
160 |
But only do these checks for new classes -
|
|
|
161 |
- thus, once confirmed, the warnings will not come again and again.
|
|
|
162 |
|
|
|
163 |
NOTICE:
|
|
195
|
164 |
I dont like the confirmers there - we need a notifying: argument, to give
|
|
44
|
165 |
the outer codeview a chance to highlight the error.
|
|
68
|
166 |
(but thats how its defined in the book - maybe I will change anyway).
|
|
|
167 |
"
|
|
44
|
168 |
oldClass isNil ifTrue:[
|
|
195
|
169 |
(self checkConventionsFor:newName
|
|
|
170 |
instVarNames:stringOfInstVarNames
|
|
|
171 |
classVarNames:stringOfClassVarNames) ifFalse:[
|
|
|
172 |
^ nil
|
|
159
|
173 |
]
|
|
44
|
174 |
].
|
|
|
175 |
|
|
1
|
176 |
"create the metaclass first"
|
|
|
177 |
newMetaclass := Metaclass new.
|
|
|
178 |
newMetaclass setSuperclass:(aClass class).
|
|
|
179 |
newMetaclass instSize:(aClass class instSize).
|
|
175
|
180 |
newMetaclass setName:(nameString , 'class') asSymbol.
|
|
1
|
181 |
newMetaclass classVariableString:'' "stringOfClassVarNames".
|
|
226
|
182 |
"/ newMetaclass setComment:newComment category:categoryString.
|
|
|
183 |
Project notNil ifTrue:[
|
|
|
184 |
newMetaclass package:(Project current packageName)
|
|
|
185 |
].
|
|
1
|
186 |
|
|
195
|
187 |
"then let the new meta create the class"
|
|
1
|
188 |
newClass := newMetaclass new.
|
|
|
189 |
newClass setSuperclass:aClass.
|
|
|
190 |
newClass instSize:(aClass instSize + nInstVars).
|
|
175
|
191 |
newClass setName:classSymbol.
|
|
|
192 |
newClass setComment:newComment category:categoryString.
|
|
1
|
193 |
|
|
68
|
194 |
"
|
|
|
195 |
Allowing non-booleans as variableBoolean
|
|
|
196 |
is a hack for backward (ST-80) compatibility:
|
|
|
197 |
|
|
|
198 |
ST-80 code will pass true or false as variableBoolean,
|
|
|
199 |
while ST/X also calls it with symbols such as #float, #double etc.
|
|
|
200 |
"
|
|
1
|
201 |
(variableBoolean == true) ifTrue:[
|
|
159
|
202 |
pointersBoolean ifTrue:[
|
|
|
203 |
newFlags := Behavior flagPointers
|
|
|
204 |
] ifFalse:[
|
|
|
205 |
wordsBoolean ifTrue:[
|
|
|
206 |
newFlags := Behavior flagWords
|
|
|
207 |
] ifFalse:[
|
|
|
208 |
newFlags := Behavior flagBytes
|
|
|
209 |
]
|
|
|
210 |
]
|
|
1
|
211 |
] ifFalse:[
|
|
159
|
212 |
(variableBoolean == #float) ifTrue:[
|
|
|
213 |
newFlags := Behavior flagFloats
|
|
|
214 |
] ifFalse:[
|
|
|
215 |
(variableBoolean == #double) ifTrue:[
|
|
|
216 |
newFlags := Behavior flagDoubles
|
|
|
217 |
] ifFalse:[
|
|
|
218 |
(variableBoolean == #long) ifTrue:[
|
|
|
219 |
newFlags := Behavior flagLongs
|
|
|
220 |
] ifFalse:[
|
|
|
221 |
newFlags := Behavior flagNotIndexed
|
|
|
222 |
]
|
|
|
223 |
]
|
|
|
224 |
].
|
|
1
|
225 |
].
|
|
68
|
226 |
superFlags := aClass flags bitAnd:(Behavior maskIndexType bitInvert). "preserve other bits"
|
|
|
227 |
oldClass notNil ifTrue:[
|
|
159
|
228 |
oldClass isBuiltInClass ifTrue:[
|
|
|
229 |
"
|
|
|
230 |
special care when redefining Method, Block and other built-in classes,
|
|
|
231 |
which might have other flag bits ...
|
|
|
232 |
"
|
|
49
|
233 |
|
|
159
|
234 |
newFlags := newFlags bitOr:(oldClass flags bitAnd:(Behavior maskIndexType bitInvert))
|
|
|
235 |
]
|
|
68
|
236 |
].
|
|
|
237 |
newClass flags:(newFlags bitOr:superFlags). "preserve inherited special bits"
|
|
1
|
238 |
|
|
|
239 |
(nInstVars ~~ 0) ifTrue:[
|
|
202
|
240 |
newClass setInstanceVariableString:stringOfInstVarNames
|
|
1
|
241 |
].
|
|
|
242 |
oldClass notNil ifTrue:[
|
|
159
|
243 |
"setting first will make new class clear obsolete classvars"
|
|
|
244 |
newClass setClassVariableString:(oldClass classVariableString)
|
|
1
|
245 |
].
|
|
|
246 |
newClass classVariableString:stringOfClassVarNames.
|
|
|
247 |
|
|
68
|
248 |
"
|
|
|
249 |
for new classes, we are almost done here
|
|
77
|
250 |
(also for autoloaded classes)
|
|
68
|
251 |
"
|
|
77
|
252 |
(oldClass isNil or:[oldClass isLoaded not]) ifTrue:[
|
|
159
|
253 |
oldClass isNil ifTrue:[
|
|
|
254 |
self addChangeRecordForClass:newClass.
|
|
|
255 |
].
|
|
1
|
256 |
|
|
159
|
257 |
commentString notNil ifTrue:[
|
|
|
258 |
newClass comment:commentString
|
|
|
259 |
].
|
|
68
|
260 |
|
|
159
|
261 |
aSystemDictionary at:classSymbol put:newClass.
|
|
314
|
262 |
|
|
|
263 |
oldClass isNil ifTrue:[
|
|
|
264 |
Project current notNil ifTrue:[
|
|
|
265 |
"
|
|
|
266 |
new classes get the package assigned
|
|
|
267 |
"
|
|
|
268 |
newClass package:(Project current packageName asSymbol)
|
|
|
269 |
].
|
|
|
270 |
].
|
|
|
271 |
|
|
159
|
272 |
aSystemDictionary changed:#newClass with:newClass.
|
|
|
273 |
^ newClass
|
|
2
|
274 |
].
|
|
|
275 |
|
|
10
|
276 |
|
|
68
|
277 |
"
|
|
|
278 |
here comes the hard part - we are actually changing the
|
|
|
279 |
definition of an existing class ....
|
|
|
280 |
Try hard to get away WITHOUT recompiling, since it makes all
|
|
|
281 |
compiled code into interpreted ...
|
|
|
282 |
"
|
|
|
283 |
|
|
10
|
284 |
oldInstVars := oldClass instanceVariableString asCollectionOfWords.
|
|
|
285 |
newInstVars := newClass instanceVariableString asCollectionOfWords.
|
|
|
286 |
oldClassVars := oldClass classVariableString asCollectionOfWords.
|
|
|
287 |
newClassVars := newClass classVariableString asCollectionOfWords.
|
|
|
288 |
|
|
68
|
289 |
"
|
|
|
290 |
we are on the bright side of life, if the instance layout and
|
|
|
291 |
inheritance do not change.
|
|
|
292 |
In this case, we can go ahead and patch the class object.
|
|
|
293 |
"
|
|
2
|
294 |
(oldClass superclass == newClass superclass) ifTrue:[
|
|
|
295 |
(oldClass instSize == newClass instSize) ifTrue:[
|
|
159
|
296 |
(oldClass flags == newClass flags) ifTrue:[
|
|
|
297 |
(oldClass name = newClass name) ifTrue:[
|
|
|
298 |
(oldInstVars = newInstVars) ifTrue:[
|
|
68
|
299 |
|
|
159
|
300 |
(newComment ~= oldClass comment) ifTrue:[
|
|
|
301 |
oldClass setComment:newComment. "writes a change-chunk"
|
|
|
302 |
oldClass changed:#comment with:oldClass comment.
|
|
|
303 |
self addChangeRecordForClassComment:oldClass.
|
|
|
304 |
].
|
|
10
|
305 |
|
|
159
|
306 |
(oldClassVars = newClassVars) ifTrue:[
|
|
|
307 |
"
|
|
|
308 |
really no change (just comment and/or category)
|
|
|
309 |
"
|
|
|
310 |
anyChange := false.
|
|
10
|
311 |
|
|
202
|
312 |
oldClass setInstanceVariableString:(newClass instanceVariableString).
|
|
159
|
313 |
oldClass setClassVariableString:(newClass classVariableString).
|
|
68
|
314 |
|
|
159
|
315 |
oldClass category ~= categoryString ifTrue:[
|
|
|
316 |
oldClass category:categoryString.
|
|
|
317 |
self addChangeRecordForClass:newClass.
|
|
|
318 |
"notify change of organization"
|
|
202
|
319 |
aSystemDictionary changed:#organization
|
|
159
|
320 |
].
|
|
|
321 |
"notify change of class"
|
|
|
322 |
"/ oldClass changed.
|
|
|
323 |
^ oldClass
|
|
|
324 |
].
|
|
33
|
325 |
|
|
159
|
326 |
"
|
|
|
327 |
when we arrive here, class variables have changed
|
|
|
328 |
"
|
|
|
329 |
oldClass category ~= categoryString ifTrue:[
|
|
|
330 |
"notify change of organization"
|
|
|
331 |
oldClass category:categoryString.
|
|
|
332 |
"notify change of organization"
|
|
202
|
333 |
aSystemDictionary changed:#organization
|
|
159
|
334 |
].
|
|
33
|
335 |
|
|
159
|
336 |
"
|
|
|
337 |
set class variable string;
|
|
|
338 |
this also updates the set of class variables
|
|
|
339 |
by creating new / deleting obsolete ones.
|
|
|
340 |
"
|
|
|
341 |
oldClass classVariableString:stringOfClassVarNames.
|
|
33
|
342 |
|
|
159
|
343 |
"
|
|
|
344 |
get the set of changed class variables
|
|
|
345 |
"
|
|
|
346 |
changeSet1 := Set new.
|
|
|
347 |
oldClassVars do:[:nm |
|
|
|
348 |
(newClassVars includes:nm) ifFalse:[
|
|
|
349 |
changeSet1 add:nm
|
|
|
350 |
]
|
|
|
351 |
].
|
|
|
352 |
newClassVars do:[:nm |
|
|
|
353 |
(oldClassVars includes:nm) ifFalse:[
|
|
|
354 |
changeSet1 add:nm
|
|
|
355 |
]
|
|
|
356 |
].
|
|
33
|
357 |
|
|
159
|
358 |
"
|
|
|
359 |
recompile all methods accessing set of changed classvars
|
|
|
360 |
here and also in all subclasses ...
|
|
|
361 |
"
|
|
|
362 |
|
|
|
363 |
"
|
|
|
364 |
dont update change file for the recompilation
|
|
|
365 |
"
|
|
202
|
366 |
Class withoutUpdatingChangesDo:[
|
|
33
|
367 |
" "
|
|
159
|
368 |
Transcript showCr:'recompiling class & inst methods accessing ' , changeSet1 printString.
|
|
|
369 |
Transcript endEntry.
|
|
33
|
370 |
" "
|
|
159
|
371 |
oldClass withAllSubclasses do:[:aClass |
|
|
|
372 |
aClass class recompileMethodsAccessingAny:changeSet1.
|
|
|
373 |
aClass recompileMethodsAccessingAny:changeSet1.
|
|
|
374 |
].
|
|
|
375 |
].
|
|
33
|
376 |
|
|
159
|
377 |
"notify change of class"
|
|
|
378 |
self addChangeRecordForClass:oldClass.
|
|
|
379 |
oldClass changed:#definition.
|
|
33
|
380 |
|
|
159
|
381 |
^ oldClass
|
|
|
382 |
]
|
|
|
383 |
]
|
|
|
384 |
]
|
|
2
|
385 |
]
|
|
|
386 |
].
|
|
|
387 |
|
|
68
|
388 |
"
|
|
|
389 |
here we enter the darkness of mordor ...
|
|
159
|
390 |
since instance variable layout and/or inheritance has changed.
|
|
68
|
391 |
"
|
|
2
|
392 |
(newComment ~= oldClass comment) ifTrue:[
|
|
159
|
393 |
newClass comment:newComment
|
|
2
|
394 |
].
|
|
|
395 |
|
|
|
396 |
superClassChange := oldClass superclass ~~ newClass superclass.
|
|
1
|
397 |
|
|
68
|
398 |
"
|
|
|
399 |
dont allow built-in classes to be modified this way
|
|
|
400 |
"
|
|
3
|
401 |
(oldClass notNil and:[oldClass isBuiltInClass and:[superClassChange]]) ifTrue:[
|
|
159
|
402 |
self error:'the inheritance of this class is fixed - you cannot change it'.
|
|
|
403 |
^ oldClass
|
|
3
|
404 |
].
|
|
|
405 |
|
|
68
|
406 |
"
|
|
|
407 |
catch special case, where superclass changed its layout and thus
|
|
|
408 |
forced redefinition of this class;
|
|
|
409 |
only log if this is not the case.
|
|
|
410 |
"
|
|
2
|
411 |
(superClassChange
|
|
33
|
412 |
and:[(oldClass superclass isNil or:[oldClass superclass name = newClass superclass name])
|
|
|
413 |
and:[(oldClassVars = newClassVars)
|
|
|
414 |
and:[(oldInstVars = newInstVars)
|
|
|
415 |
and:[newComment = oldClass comment]]]]) ifFalse:[
|
|
159
|
416 |
self addChangeRecordForClass:newClass.
|
|
2
|
417 |
].
|
|
|
418 |
|
|
68
|
419 |
"
|
|
|
420 |
care for class methods ...
|
|
|
421 |
"
|
|
2
|
422 |
changeSet1 := Set new.
|
|
1
|
423 |
|
|
2
|
424 |
classVarChange := false.
|
|
|
425 |
|
|
|
426 |
superClassChange ifTrue:[
|
|
159
|
427 |
"
|
|
|
428 |
superclass changed:
|
|
|
429 |
must recompile all class methods accessing ANY classvar
|
|
|
430 |
(
|
|
|
431 |
actually, we could be less strict and handle the case where
|
|
|
432 |
both the old and the new superclass have a common ancestor,
|
|
|
433 |
and both have no new classvariables in between.
|
|
|
434 |
This would speedup the case when a class is inserted into
|
|
|
435 |
the inheritance chain.
|
|
|
436 |
)
|
|
|
437 |
"
|
|
1
|
438 |
|
|
159
|
439 |
oldClass allClassVarNames do:[:nm | changeSet1 add:nm].
|
|
|
440 |
newClass allClassVarNames do:[:nm | changeSet1 add:nm].
|
|
2
|
441 |
|
|
|
442 |
" "
|
|
159
|
443 |
Transcript showCr:'recompiling class methods accessing any classvar'.
|
|
|
444 |
Transcript endEntry.
|
|
2
|
445 |
" "
|
|
159
|
446 |
self copyInvalidatedMethodsFrom:(oldClass class)
|
|
|
447 |
for:newMetaclass
|
|
|
448 |
accessingAny:changeSet1
|
|
|
449 |
orSuper:true.
|
|
|
450 |
newMetaclass recompileInvalidatedMethods:(Metaclass compiledMethodAt:#invalidMethod).
|
|
2
|
451 |
] ifFalse:[
|
|
159
|
452 |
"
|
|
|
453 |
same superclass, find out which classvars have changed
|
|
|
454 |
"
|
|
|
455 |
classVarChange := oldClassVars ~= newClassVars.
|
|
|
456 |
classVarChange ifTrue:[
|
|
|
457 |
oldClassVars do:[:nm |
|
|
|
458 |
(newClassVars includes:nm) ifFalse:[
|
|
|
459 |
changeSet1 add:nm
|
|
|
460 |
]
|
|
|
461 |
].
|
|
|
462 |
newClassVars do:[:nm |
|
|
|
463 |
(oldClassVars includes:nm) ifFalse:[
|
|
|
464 |
changeSet1 add:nm
|
|
|
465 |
]
|
|
|
466 |
].
|
|
|
467 |
].
|
|
1
|
468 |
|
|
159
|
469 |
classVarChange ifTrue:[
|
|
|
470 |
"
|
|
|
471 |
must recompile some class-methods
|
|
|
472 |
"
|
|
2
|
473 |
" "
|
|
159
|
474 |
Transcript showCr:'recompiling class methods accessing ' , changeSet1 printString.
|
|
|
475 |
Transcript endEntry.
|
|
68
|
476 |
" "
|
|
159
|
477 |
self copyInvalidatedMethodsFrom:(oldClass class) for:newMetaclass accessingAny:changeSet1.
|
|
|
478 |
newMetaclass recompileInvalidatedMethods:(Metaclass compiledMethodAt:#invalidMethod).
|
|
|
479 |
] ifFalse:[
|
|
|
480 |
"
|
|
|
481 |
class methods still work
|
|
|
482 |
"
|
|
|
483 |
self copyMethodsFrom:(oldClass class) for:newMetaclass
|
|
|
484 |
].
|
|
2
|
485 |
].
|
|
1
|
486 |
|
|
68
|
487 |
"
|
|
|
488 |
care for instance methods ...
|
|
|
489 |
"
|
|
|
490 |
|
|
2
|
491 |
superClassChange ifTrue:[
|
|
159
|
492 |
"superclass changed,
|
|
|
493 |
must recompile all methods accessing any class or instvar.
|
|
|
494 |
If number of instvars (i.e. the instances instSize) is the same,
|
|
|
495 |
we can limit the set of recompiled instance methods to those methods,
|
|
|
496 |
which refer to an instvar with a different inst-index
|
|
|
497 |
"
|
|
13
|
498 |
|
|
159
|
499 |
"
|
|
|
500 |
the changeset consists of instance variables,
|
|
308
|
501 |
with a different position
|
|
159
|
502 |
"
|
|
308
|
503 |
changeSet2 := self differentInstanceVariableOffsetsIn:oldClass and:newClass.
|
|
13
|
504 |
|
|
159
|
505 |
"
|
|
|
506 |
merge in the changed class variables
|
|
|
507 |
"
|
|
|
508 |
changeSet1 do:[:nm | changeSet2 add:nm].
|
|
68
|
509 |
|
|
13
|
510 |
" "
|
|
159
|
511 |
Transcript showCr:'recompiling instance methods accessing ' , changeSet2 printString , ' ...'.
|
|
|
512 |
Transcript endEntry.
|
|
13
|
513 |
" "
|
|
159
|
514 |
self copyInvalidatedMethodsFrom:oldClass
|
|
|
515 |
for:newClass
|
|
|
516 |
accessingAny:changeSet2
|
|
|
517 |
orSuper:true.
|
|
|
518 |
newClass recompileInvalidatedMethods:(Metaclass compiledMethodAt:#invalidMethod).
|
|
13
|
519 |
|
|
2
|
520 |
] ifFalse:[
|
|
159
|
521 |
"
|
|
|
522 |
same inheritance ...
|
|
|
523 |
"
|
|
|
524 |
instVarChange := oldInstVars ~= newInstVars.
|
|
|
525 |
instVarChange ifFalse:[
|
|
|
526 |
"
|
|
|
527 |
same instance variables ...
|
|
|
528 |
"
|
|
|
529 |
classVarChange ifTrue:[
|
|
|
530 |
"recompile all inst methods accessing changed classvars"
|
|
1
|
531 |
|
|
2
|
532 |
" "
|
|
159
|
533 |
Transcript showCr:'recompiling instance methods accessing ' , changeSet1 printString , ' ...'.
|
|
|
534 |
Transcript endEntry.
|
|
2
|
535 |
" "
|
|
159
|
536 |
self copyInvalidatedMethodsFrom:oldClass for:newClass accessingAny:changeSet1.
|
|
|
537 |
newClass recompileInvalidatedMethods:(Metaclass compiledMethodAt:#invalidMethod).
|
|
|
538 |
]
|
|
|
539 |
] ifTrue:[
|
|
|
540 |
"
|
|
|
541 |
dont allow built-in classes to be modified
|
|
|
542 |
"
|
|
|
543 |
(oldClass notNil and:[oldClass isBuiltInClass and:[instVarChange]]) ifTrue:[
|
|
|
544 |
self error:'the layout of this class is fixed - you cannot change it'.
|
|
|
545 |
^ oldClass
|
|
|
546 |
].
|
|
3
|
547 |
|
|
159
|
548 |
((oldInstVars size == 0)
|
|
|
549 |
or:[newInstVars startsWith:oldInstVars]) ifTrue:[
|
|
|
550 |
"
|
|
|
551 |
only new inst variable(s) has/have been added -
|
|
|
552 |
old methods still work (the existing inst-indices are still valid)
|
|
|
553 |
"
|
|
68
|
554 |
" "
|
|
159
|
555 |
Transcript showCr:'copying methods ...'.
|
|
|
556 |
Transcript endEntry.
|
|
68
|
557 |
" "
|
|
159
|
558 |
self copyMethodsFrom:oldClass for:newClass.
|
|
2
|
559 |
|
|
159
|
560 |
"
|
|
|
561 |
but: we have to recompile all methods accessing new instars
|
|
|
562 |
(it might have been a classVar/global before ...)
|
|
|
563 |
"
|
|
|
564 |
addedNames := newInstVars select:[:nm | (oldInstVars includes:nm) not].
|
|
|
565 |
"merge in class variables"
|
|
|
566 |
changeSet1 do:[:nm | addedNames add:nm].
|
|
1
|
567 |
|
|
2
|
568 |
" "
|
|
159
|
569 |
Transcript showCr:'recompiling instance methods accessing ' , addedNames printString , '...'.
|
|
|
570 |
Transcript endEntry.
|
|
2
|
571 |
" "
|
|
159
|
572 |
newClass recompileMethodsAccessingAny:addedNames.
|
|
|
573 |
] ifFalse:[
|
|
2
|
574 |
|
|
159
|
575 |
"
|
|
|
576 |
the changeset consists of instance variables,
|
|
308
|
577 |
with a different position
|
|
159
|
578 |
"
|
|
308
|
579 |
changeSet2 := self differentInstanceVariableOffsetsIn:oldClass and:newClass.
|
|
1
|
580 |
|
|
308
|
581 |
"merge in the class variables"
|
|
159
|
582 |
changeSet1 do:[:nm | changeSet2 add:nm].
|
|
2
|
583 |
" "
|
|
159
|
584 |
Transcript showCr:'recompiling instance methods accessing ' , changeSet2 printString , ' ...'.
|
|
|
585 |
Transcript endEntry.
|
|
2
|
586 |
" "
|
|
159
|
587 |
self copyInvalidatedMethodsFrom:oldClass for:newClass accessingAny:changeSet2.
|
|
|
588 |
newClass recompileInvalidatedMethods:(Metaclass compiledMethodAt:#invalidMethod).
|
|
|
589 |
].
|
|
|
590 |
].
|
|
2
|
591 |
].
|
|
1
|
592 |
|
|
68
|
593 |
"
|
|
|
594 |
WOW, everything done for this class
|
|
|
595 |
what about subclasses ?
|
|
|
596 |
"
|
|
2
|
597 |
|
|
68
|
598 |
"
|
|
|
599 |
update superclass of immediate subclasses -
|
|
|
600 |
this forces recompilation (recursively) if needed
|
|
|
601 |
(dont update change file for the subclass changes)
|
|
|
602 |
"
|
|
202
|
603 |
Class withoutUpdatingChangesDo:[
|
|
159
|
604 |
oldClass subclassesDo:[:aClass |
|
|
2
|
605 |
" "
|
|
159
|
606 |
Transcript showCr:'changing superclass of:' , aClass name.
|
|
|
607 |
Transcript endEntry.
|
|
2
|
608 |
" "
|
|
159
|
609 |
aClass superclass:newClass
|
|
|
610 |
]
|
|
2
|
611 |
].
|
|
|
612 |
|
|
68
|
613 |
"
|
|
|
614 |
change category in oldClass - so we see immediately what it is ...
|
|
|
615 |
"
|
|
|
616 |
oldClass category:'obsolete'.
|
|
|
617 |
oldClass class category:'obsolete'.
|
|
|
618 |
|
|
|
619 |
"
|
|
|
620 |
and make the new class globally known
|
|
|
621 |
"
|
|
2
|
622 |
aSystemDictionary at:classSymbol put:newClass.
|
|
68
|
623 |
|
|
|
624 |
oldClass category ~= categoryString ifTrue:[
|
|
159
|
625 |
"notify change of organization"
|
|
202
|
626 |
aSystemDictionary changed:#organization
|
|
68
|
627 |
].
|
|
|
628 |
|
|
|
629 |
"
|
|
|
630 |
Not becoming the old class creates some update problems;
|
|
|
631 |
the browsers must check carefully - a simple identity compare is
|
|
159
|
632 |
not enough ...
|
|
68
|
633 |
QUESTION: is this a good idea ?
|
|
|
634 |
"
|
|
|
635 |
|
|
|
636 |
newClass dependents:(oldClass dependents).
|
|
202
|
637 |
newClass changed:#definition.
|
|
68
|
638 |
|
|
159
|
639 |
"just to make certain ... - tell dependents of oldClass, that something changed
|
|
85
|
640 |
(systemBrowsers will react on this, and update their views)"
|
|
159
|
641 |
oldClass changed:#definition with:newClass.
|
|
68
|
642 |
|
|
2
|
643 |
ObjectMemory flushCaches.
|
|
68
|
644 |
|
|
1
|
645 |
^ newClass
|
|
|
646 |
!
|
|
|
647 |
|
|
|
648 |
new
|
|
2
|
649 |
"create & return a new metaclass (a classes class)"
|
|
|
650 |
|
|
1
|
651 |
|newClass|
|
|
|
652 |
|
|
|
653 |
newClass := self basicNew.
|
|
|
654 |
newClass setSuperclass:(Object class)
|
|
159
|
655 |
selectors:(Array new:0)
|
|
|
656 |
methods:(Array new:0)
|
|
|
657 |
instSize:0
|
|
|
658 |
flags:(Behavior flagNotIndexed).
|
|
175
|
659 |
"/ newClass setComment:(self comment) category:(self category).
|
|
1
|
660 |
^ newClass
|
|
|
661 |
! !
|
|
|
662 |
|
|
|
663 |
!Metaclass methodsFor:'class instance variables'!
|
|
|
664 |
|
|
|
665 |
instanceVariableNames:aString
|
|
|
666 |
"changing / adding class-inst vars -
|
|
251
|
667 |
this actually creates a new metaclass and class, leaving the original
|
|
|
668 |
classes around as obsolete classes. This may also be true for all subclasses,
|
|
|
669 |
if class instance variables are added/removed.
|
|
|
670 |
Existing instances continue to be defined by their original classes.
|
|
|
671 |
|
|
|
672 |
Time will show, if this is an acceptable behavior or if we should migrate
|
|
|
673 |
instances to become insts. of the new classes."
|
|
1
|
674 |
|
|
|
675 |
|newClass newMetaclass nClassInstVars oldClass
|
|
2
|
676 |
allSubclasses t oldVars
|
|
|
677 |
oldNames newNames addedNames
|
|
|
678 |
oldOffsets newOffsets offset changeSet delta
|
|
251
|
679 |
oldToNew newSubMeta newSub oldSubMeta oldSuper
|
|
|
680 |
commonClassInstVars|
|
|
1
|
681 |
|
|
68
|
682 |
"
|
|
|
683 |
cleanup needed here: extract common things with name:inEnvironment:...
|
|
|
684 |
and restructure things ... currently way too complex.
|
|
|
685 |
"
|
|
44
|
686 |
|
|
1
|
687 |
oldVars := self instanceVariableString.
|
|
2
|
688 |
aString = oldVars ifTrue:[
|
|
|
689 |
"
|
|
159
|
690 |
Transcript showCr:'no change (', oldVars , ') -> (', aString , ')'.
|
|
2
|
691 |
"
|
|
159
|
692 |
^ self
|
|
2
|
693 |
].
|
|
|
694 |
|
|
|
695 |
oldNames := oldVars asCollectionOfWords.
|
|
|
696 |
newNames := aString asCollectionOfWords.
|
|
1
|
697 |
|
|
2
|
698 |
oldNames = newNames ifTrue:[
|
|
|
699 |
"
|
|
159
|
700 |
Transcript showCr:'no real change'.
|
|
2
|
701 |
"
|
|
159
|
702 |
"no real change (just formatting)"
|
|
202
|
703 |
self setInstanceVariableString:aString.
|
|
159
|
704 |
^ self
|
|
2
|
705 |
].
|
|
|
706 |
|
|
251
|
707 |
"/ "
|
|
|
708 |
"/ let user confirm, if any name is no good (and was good before)
|
|
|
709 |
"/ "
|
|
|
710 |
"/ (oldNames inject:true
|
|
|
711 |
"/ into:[:okSoFar :word |
|
|
|
712 |
"/ okSoFar and:[word first isUppercase]
|
|
|
713 |
"/ ])
|
|
|
714 |
"/ ifTrue:[
|
|
|
715 |
"/ "was ok before"
|
|
|
716 |
"/ (newNames inject:true
|
|
|
717 |
"/ into:[:okSoFar :word |
|
|
|
718 |
"/ okSoFar and:[word first isUppercase]
|
|
|
719 |
"/ ])
|
|
|
720 |
"/ ifFalse:[
|
|
|
721 |
"/ (self confirm:'class instance variable names should start with an uppercase letter
|
|
|
722 |
"/(by convention only)
|
|
|
723 |
"/
|
|
|
724 |
"/install anyway ?' withCRs)
|
|
|
725 |
"/ ifFalse:[
|
|
|
726 |
"/ ^ nil
|
|
|
727 |
"/ ]
|
|
|
728 |
"/ ]
|
|
|
729 |
"/ ].
|
|
44
|
730 |
|
|
2
|
731 |
nClassInstVars := newNames size.
|
|
|
732 |
|
|
|
733 |
"
|
|
|
734 |
Transcript showCr:'create new class/metaclass'.
|
|
|
735 |
"
|
|
1
|
736 |
|
|
251
|
737 |
"
|
|
|
738 |
create the new metaclass
|
|
|
739 |
"
|
|
1
|
740 |
newMetaclass := Metaclass new.
|
|
|
741 |
newMetaclass setSuperclass:superclass.
|
|
|
742 |
newMetaclass instSize:(superclass instSize + nClassInstVars).
|
|
|
743 |
(nClassInstVars ~~ 0) ifTrue:[
|
|
202
|
744 |
newMetaclass setInstanceVariableString:aString
|
|
1
|
745 |
].
|
|
93
|
746 |
newMetaclass flags:(Behavior flagNotIndexed).
|
|
1
|
747 |
newMetaclass setName:name.
|
|
|
748 |
newMetaclass classVariableString:classvars.
|
|
|
749 |
newMetaclass category:category.
|
|
195
|
750 |
newMetaclass setComment:(self comment).
|
|
1
|
751 |
|
|
|
752 |
"find the class which is my sole instance"
|
|
|
753 |
|
|
|
754 |
t := Smalltalk allClasses select:[:element | element class == self].
|
|
|
755 |
(t size ~~ 1) ifTrue:[
|
|
159
|
756 |
self error:'oops - I should have exactly one instance'.
|
|
|
757 |
^ nil
|
|
1
|
758 |
].
|
|
|
759 |
oldClass := t anElement.
|
|
|
760 |
|
|
251
|
761 |
"
|
|
|
762 |
create the new class
|
|
|
763 |
"
|
|
1
|
764 |
newClass := newMetaclass new.
|
|
|
765 |
newClass setSuperclass:(oldClass superclass).
|
|
|
766 |
newClass instSize:(oldClass instSize).
|
|
|
767 |
newClass flags:(oldClass flags).
|
|
|
768 |
newClass setName:(oldClass name).
|
|
202
|
769 |
newClass setInstanceVariableString:(oldClass instanceVariableString).
|
|
1
|
770 |
newClass classVariableString:(oldClass classVariableString).
|
|
2
|
771 |
newClass setComment:(oldClass comment).
|
|
1
|
772 |
newClass category:(oldClass category).
|
|
|
773 |
|
|
2
|
774 |
changeSet := Set new.
|
|
|
775 |
((oldNames size == 0)
|
|
|
776 |
or:[newNames startsWith:oldNames]) ifTrue:[
|
|
159
|
777 |
"new variable(s) has/have been added - old methods still work"
|
|
2
|
778 |
|
|
68
|
779 |
" "
|
|
159
|
780 |
Transcript showCr:'copying methods ...'.
|
|
|
781 |
Transcript endEntry.
|
|
68
|
782 |
" "
|
|
159
|
783 |
self copyMethodsFrom:self for:newMetaclass.
|
|
|
784 |
self copyMethodsFrom:oldClass for:newClass.
|
|
2
|
785 |
|
|
251
|
786 |
"
|
|
|
787 |
but have to recompile methods accessing stuff now defined
|
|
|
788 |
(it might have been a global before ...)
|
|
|
789 |
"
|
|
2
|
790 |
|
|
159
|
791 |
addedNames := newNames select:[:nm | (oldNames includes:nm) not].
|
|
251
|
792 |
" "
|
|
159
|
793 |
Transcript showCr:'recompiling methods accessing ' , addedNames printString , '...'.
|
|
|
794 |
Transcript endEntry.
|
|
251
|
795 |
" "
|
|
159
|
796 |
"recompile class-methods"
|
|
|
797 |
newMetaclass recompileMethodsAccessingAny:addedNames.
|
|
2
|
798 |
] ifFalse:[
|
|
308
|
799 |
"
|
|
|
800 |
create the changeSet; thats the set of class instvar names
|
|
|
801 |
which have changed their position or are new
|
|
|
802 |
"
|
|
|
803 |
offset := 0. oldOffsets := Dictionary new.
|
|
|
804 |
oldNames do:[:nm | offset := offset + 1. oldOffsets at:nm put:offset].
|
|
|
805 |
offset := 0. newOffsets := Dictionary new.
|
|
|
806 |
newNames do:[:nm | offset := offset + 1. newOffsets at:nm put:offset].
|
|
|
807 |
|
|
|
808 |
oldOffsets associationsDo:[:a |
|
|
|
809 |
|k|
|
|
|
810 |
|
|
|
811 |
k := a key.
|
|
|
812 |
(newOffsets includesKey:k) ifFalse:[
|
|
|
813 |
changeSet add:k
|
|
|
814 |
] ifTrue:[
|
|
|
815 |
(a value ~~ (newOffsets at:k)) ifTrue:[
|
|
|
816 |
changeSet add:k
|
|
|
817 |
]
|
|
|
818 |
]
|
|
|
819 |
].
|
|
|
820 |
newOffsets associationsDo:[:a |
|
|
|
821 |
|k|
|
|
|
822 |
|
|
|
823 |
k := a key.
|
|
|
824 |
(oldOffsets includesKey:k) ifFalse:[
|
|
|
825 |
changeSet add:k
|
|
|
826 |
] ifTrue:[
|
|
|
827 |
(a value ~~ (oldOffsets at:k)) ifTrue:[
|
|
|
828 |
changeSet add:k
|
|
|
829 |
]
|
|
|
830 |
]
|
|
|
831 |
].
|
|
|
832 |
|
|
251
|
833 |
" "
|
|
159
|
834 |
Transcript showCr:'recompiling methods accessing ' , changeSet printString , ' ...'.
|
|
|
835 |
Transcript endEntry.
|
|
251
|
836 |
" "
|
|
|
837 |
"
|
|
|
838 |
recompile class-methods
|
|
|
839 |
"
|
|
159
|
840 |
self copyInvalidatedMethodsFrom:self for:newMetaclass accessingAny:changeSet.
|
|
|
841 |
newMetaclass recompileInvalidatedMethods:(Metaclass compiledMethodAt:#invalidMethod).
|
|
1
|
842 |
|
|
159
|
843 |
self copyMethodsFrom:oldClass for:newClass.
|
|
1
|
844 |
].
|
|
|
845 |
|
|
2
|
846 |
delta := newNames size - oldNames size.
|
|
|
847 |
|
|
68
|
848 |
"
|
|
|
849 |
get list of all subclasses - do before superclass is changed
|
|
|
850 |
"
|
|
1
|
851 |
allSubclasses := oldClass allSubclasses.
|
|
2
|
852 |
allSubclasses := allSubclasses asSortedCollection:[:a :b |
|
|
159
|
853 |
b isSubclassOf:a
|
|
|
854 |
].
|
|
1
|
855 |
|
|
2
|
856 |
oldToNew := IdentityDictionary new.
|
|
|
857 |
|
|
251
|
858 |
"
|
|
|
859 |
create a new class tree, based on new version
|
|
|
860 |
"
|
|
2
|
861 |
allSubclasses do:[:aSubclass |
|
|
159
|
862 |
oldSuper := aSubclass superclass.
|
|
|
863 |
oldSubMeta := aSubclass class.
|
|
1
|
864 |
|
|
159
|
865 |
newSubMeta := Metaclass new.
|
|
|
866 |
oldSuper == oldClass ifTrue:[
|
|
|
867 |
newSubMeta setSuperclass:newMetaclass.
|
|
|
868 |
] ifFalse:[
|
|
|
869 |
newSubMeta setSuperclass:(oldToNew at:oldSuper) class.
|
|
|
870 |
].
|
|
|
871 |
newSubMeta instSize:(oldSubMeta instSize + delta).
|
|
|
872 |
newSubMeta flags:(oldSubMeta flags).
|
|
|
873 |
newSubMeta setName:(oldSubMeta name).
|
|
251
|
874 |
newSubMeta setInstanceVariableString:(oldSubMeta instanceVariableString).
|
|
159
|
875 |
newSubMeta classVariableString:(oldSubMeta classVariableString).
|
|
|
876 |
newSubMeta setComment:(oldSubMeta comment).
|
|
|
877 |
newSubMeta category:(oldSubMeta category).
|
|
2
|
878 |
|
|
159
|
879 |
newSub := newSubMeta new.
|
|
|
880 |
oldSuper == oldClass ifTrue:[
|
|
|
881 |
newSub setSuperclass:newClass.
|
|
|
882 |
] ifFalse:[
|
|
|
883 |
newSub setSuperclass:(oldToNew at:oldSuper).
|
|
|
884 |
].
|
|
|
885 |
newSub setSelectorArray:(aSubclass selectorArray).
|
|
|
886 |
newSub setMethodArray:(aSubclass methodArray).
|
|
|
887 |
newSub setName:(aSubclass name).
|
|
|
888 |
newSub classVariableString:(aSubclass classVariableString).
|
|
|
889 |
newSub setComment:(aSubclass comment).
|
|
|
890 |
newSub category:(aSubclass category).
|
|
2
|
891 |
|
|
159
|
892 |
oldToNew at:aSubclass put:newSub.
|
|
2
|
893 |
|
|
159
|
894 |
aSubclass category:'obsolete'.
|
|
|
895 |
aSubclass class category:'obsolete'.
|
|
1
|
896 |
].
|
|
|
897 |
|
|
2
|
898 |
"recompile what needs to be"
|
|
|
899 |
|
|
|
900 |
delta == 0 ifTrue:[
|
|
159
|
901 |
"only have to recompile class methods accessing
|
|
|
902 |
class instvars from changeset
|
|
|
903 |
"
|
|
1
|
904 |
|
|
251
|
905 |
allSubclasses do:[:oldSubclass |
|
|
|
906 |
|newSubclass|
|
|
|
907 |
|
|
|
908 |
newSubclass := oldToNew at:oldSubclass.
|
|
|
909 |
|
|
|
910 |
Transcript showCr:'recompiling class methods of ' , newSubclass class name ,
|
|
|
911 |
' accessing any of ' , changeSet printString.
|
|
|
912 |
|
|
|
913 |
newSubclass class recompileMethodsAccessingAny:changeSet.
|
|
159
|
914 |
]
|
|
2
|
915 |
] ifFalse:[
|
|
159
|
916 |
"
|
|
|
917 |
have to recompile all class methods accessing class instvars
|
|
|
918 |
"
|
|
251
|
919 |
commonClassInstVars := oldClass class allInstVarNames.
|
|
|
920 |
changeSet do:[:v |
|
|
|
921 |
commonClassInstVars remove:v ifAbsent:[]
|
|
|
922 |
].
|
|
2
|
923 |
|
|
251
|
924 |
allSubclasses do:[:oldSubclass |
|
|
|
925 |
|newSubclass classInstVars|
|
|
|
926 |
|
|
|
927 |
newSubclass := oldToNew at:oldSubclass.
|
|
2
|
928 |
|
|
251
|
929 |
classInstVars := newSubclass class allInstVarNames asSet.
|
|
|
930 |
classInstVars removeAll:commonClassInstVars.
|
|
|
931 |
classInstVars addAll:changeSet.
|
|
|
932 |
|
|
|
933 |
Transcript showCr:'recompiling class methods of ' , newSubclass class name ,
|
|
|
934 |
' accessing any of ' , classInstVars printString.
|
|
|
935 |
|
|
|
936 |
newSubclass class recompileMethodsAccessingAny:classInstVars.
|
|
159
|
937 |
]
|
|
1
|
938 |
].
|
|
|
939 |
|
|
2
|
940 |
self addChangeRecordForClassInstvars:newClass.
|
|
|
941 |
|
|
|
942 |
"install all new classes"
|
|
|
943 |
|
|
|
944 |
Smalltalk at:(oldClass name asSymbol) put:newClass.
|
|
|
945 |
ObjectMemory flushCachesFor:oldClass.
|
|
251
|
946 |
|
|
|
947 |
allSubclasses do:[:oldClass |
|
|
|
948 |
|newClass|
|
|
|
949 |
|
|
|
950 |
newClass := oldToNew at:oldClass.
|
|
|
951 |
"
|
|
|
952 |
Transcript showCr:'install ' , newClass name , '(' , newClass category , ')' ,
|
|
|
953 |
' as ' , newClass name.
|
|
|
954 |
"
|
|
|
955 |
Smalltalk at:newClass name asSymbol put:newClass.
|
|
|
956 |
ObjectMemory flushCachesFor:oldClass.
|
|
2
|
957 |
].
|
|
|
958 |
|
|
68
|
959 |
"tell dependents ..."
|
|
10
|
960 |
|
|
202
|
961 |
oldClass changed:#definition.
|
|
|
962 |
self changed:#definition.
|
|
68
|
963 |
|
|
1
|
964 |
^ newMetaclass
|
|
|
965 |
! !
|
|
|
966 |
|
|
|
967 |
!Metaclass methodsFor:'queries'!
|
|
|
968 |
|
|
|
969 |
isMeta
|
|
|
970 |
"return true, if the receiver is some kind of metaclass;
|
|
|
971 |
true is returned here. Redefines isMeta in Object"
|
|
|
972 |
|
|
|
973 |
^ true
|
|
|
974 |
! !
|
|
|
975 |
|
|
|
976 |
!Metaclass methodsFor:'private'!
|
|
|
977 |
|
|
68
|
978 |
invalidMethod
|
|
|
979 |
"When recompiling classes after a definition-change, all
|
|
|
980 |
uncompilable methods will be bound to this method here,
|
|
|
981 |
so that evaluating such an uncompilable method will trigger an error.
|
|
|
982 |
Can also happen when Compiler/runtime system is broken."
|
|
|
983 |
|
|
|
984 |
self error:'invalid method - this method failed to compile when the class was changed'
|
|
|
985 |
!
|
|
|
986 |
|
|
308
|
987 |
differentInstanceVariableOffsetsIn:class1 and:class2
|
|
|
988 |
"return a set of instance variable names which have different
|
|
|
989 |
positions in class1 and class2.
|
|
|
990 |
Also, variables which are only present in one class are returned.
|
|
|
991 |
This is used to find methods which need recompilation after a
|
|
|
992 |
change in the instance variables."
|
|
|
993 |
|
|
|
994 |
|offsets1 offsets2 changeSet|
|
|
|
995 |
|
|
|
996 |
changeSet := Set new.
|
|
|
997 |
|
|
|
998 |
"
|
|
|
999 |
collect the instvar-indices in the old and new class
|
|
|
1000 |
"
|
|
|
1001 |
offsets1 := class1 instanceVariableOffsets.
|
|
|
1002 |
offsets2 := class2 instanceVariableOffsets.
|
|
|
1003 |
|
|
|
1004 |
"
|
|
|
1005 |
the changeset consists of instance variables,
|
|
|
1006 |
with a different position
|
|
|
1007 |
"
|
|
|
1008 |
offsets1 keysAndValuesDo:[:varName :varIndex |
|
|
|
1009 |
(offsets2 includesKey:varName) ifFalse:[
|
|
|
1010 |
changeSet add:varName
|
|
|
1011 |
] ifTrue:[
|
|
|
1012 |
(varIndex ~~ (offsets2 at:varName)) ifTrue:[
|
|
|
1013 |
changeSet add:varName
|
|
|
1014 |
]
|
|
|
1015 |
]
|
|
|
1016 |
].
|
|
|
1017 |
offsets2 keysAndValuesDo:[:varName :varIndex |
|
|
|
1018 |
(offsets1 includesKey:varName) ifFalse:[
|
|
|
1019 |
changeSet add:varName
|
|
|
1020 |
] ifTrue:[
|
|
|
1021 |
(varIndex ~~ (offsets1 at:varName)) ifTrue:[
|
|
|
1022 |
changeSet add:varName
|
|
|
1023 |
]
|
|
|
1024 |
]
|
|
|
1025 |
].
|
|
|
1026 |
^ changeSet
|
|
|
1027 |
|
|
|
1028 |
"
|
|
|
1029 |
View class
|
|
|
1030 |
differentInstanceVariableOffsetsIn:View
|
|
|
1031 |
and:StandardSystemView
|
|
|
1032 |
View class
|
|
|
1033 |
differentInstanceVariableOffsetsIn:Object
|
|
|
1034 |
and:Point
|
|
|
1035 |
"
|
|
|
1036 |
!
|
|
|
1037 |
|
|
1
|
1038 |
copyMethodsFrom:oldClass for:newClass
|
|
159
|
1039 |
"copy all methods from oldClass to newClass.
|
|
|
1040 |
This is used for class-methods when a class has changed, but metaclass is
|
|
|
1041 |
unaffected (i.e. classVars/inheritance have not changed) so there is no need
|
|
|
1042 |
to recompile the class methods."
|
|
1
|
1043 |
|
|
68
|
1044 |
newClass selectors:(oldClass selectorArray copy)
|
|
159
|
1045 |
methods:(oldClass methodArray copy)
|
|
1
|
1046 |
!
|
|
|
1047 |
|
|
|
1048 |
copyInvalidatedMethodsFrom:oldClass for:newClass
|
|
159
|
1049 |
"copy all methods from oldClass to newClass and change their code
|
|
|
1050 |
to a trap method reporting an error.
|
|
|
1051 |
This is used when a class has been changed its layout or inheritance,
|
|
|
1052 |
for all methods; before recompilation is attempted.
|
|
|
1053 |
This allows us to keep the source while trapping uncompilable (due to
|
|
|
1054 |
now undefined instvars) methods. Compilation of these methods will show
|
|
|
1055 |
an error on the transcript and lead to the debugger once called."
|
|
1
|
1056 |
|
|
251
|
1057 |
|trap trapCode trapByteCode oldMethod newMethod oldMethodArray newMethodArray|
|
|
1
|
1058 |
|
|
68
|
1059 |
trap := Metaclass compiledMethodAt:#invalidMethod.
|
|
1
|
1060 |
trapCode := trap code.
|
|
|
1061 |
trapByteCode := trap byteCode.
|
|
|
1062 |
|
|
68
|
1063 |
oldMethodArray := oldClass methodArray.
|
|
2
|
1064 |
newMethodArray := Array new:(oldMethodArray size).
|
|
68
|
1065 |
newClass selectors:(oldClass selectorArray copy)
|
|
159
|
1066 |
methods:newMethodArray.
|
|
2
|
1067 |
1 to:oldMethodArray size do:[:i |
|
|
251
|
1068 |
oldMethod := oldMethodArray at:i.
|
|
|
1069 |
oldMethod isWrapped ifTrue:[
|
|
|
1070 |
oldMethod := oldMethod originalMethod
|
|
|
1071 |
].
|
|
|
1072 |
newMethod := oldMethod copy.
|
|
159
|
1073 |
newMethod code:trapCode.
|
|
|
1074 |
newMethod literals:nil.
|
|
|
1075 |
newMethod byteCode:trapByteCode.
|
|
|
1076 |
newMethodArray at:i put:newMethod
|
|
2
|
1077 |
]
|
|
|
1078 |
!
|
|
|
1079 |
|
|
|
1080 |
copyInvalidatedMethodsFrom:oldClass for:newClass accessingAny:setOfNames
|
|
|
1081 |
"copy all methods from oldClass to newClass. Those methods accessing
|
|
|
1082 |
a variable in setOfNames will be copied as invalid method, leading to
|
|
159
|
1083 |
a trap when its executed. This is used when a class has changed its
|
|
|
1084 |
layout for all methods which are affected by the change."
|
|
|
1085 |
|
|
|
1086 |
self copyInvalidatedMethodsFrom:oldClass
|
|
|
1087 |
for:newClass
|
|
|
1088 |
accessingAny:setOfNames
|
|
|
1089 |
orSuper:false
|
|
|
1090 |
!
|
|
|
1091 |
|
|
|
1092 |
copyInvalidatedMethodsFrom:oldClass for:newClass accessingAny:setOfNames orSuper:superBoolean
|
|
|
1093 |
"copy all methods from oldClass to newClass.
|
|
|
1094 |
Those methods accessing a variable in setOfNames will be copied as invalid method,
|
|
|
1095 |
leading to a trap when its executed. If superBoolean is true, this is also done
|
|
|
1096 |
for methods accessing super. This is used when a class has changed its
|
|
|
1097 |
layout for all methods which are affected by the change."
|
|
2
|
1098 |
|
|
251
|
1099 |
|trap trapCode trapByteCode p source mustInvalidate
|
|
202
|
1100 |
oldMethod newMethod oldMethodArray newMethodArray|
|
|
2
|
1101 |
|
|
68
|
1102 |
trap := Metaclass compiledMethodAt:#invalidMethod.
|
|
2
|
1103 |
trapCode := trap code.
|
|
|
1104 |
trapByteCode := trap byteCode.
|
|
|
1105 |
|
|
68
|
1106 |
oldMethodArray := oldClass methodArray.
|
|
2
|
1107 |
newMethodArray := Array new:(oldMethodArray size).
|
|
68
|
1108 |
newClass selectors:(oldClass selectorArray copy)
|
|
159
|
1109 |
methods:newMethodArray.
|
|
2
|
1110 |
1 to:oldMethodArray size do:[:i |
|
|
159
|
1111 |
oldMethod := oldMethodArray at:i.
|
|
251
|
1112 |
oldMethod isWrapped ifTrue:[
|
|
|
1113 |
oldMethod := oldMethod originalMethod
|
|
|
1114 |
].
|
|
202
|
1115 |
|
|
|
1116 |
"before parsing (which may take some time),
|
|
|
1117 |
do a string search if its only one variable,
|
|
|
1118 |
we are looking for."
|
|
|
1119 |
|
|
251
|
1120 |
source := oldMethod source.
|
|
202
|
1121 |
((setOfNames size == 1) and:[superBoolean not]) ifTrue:[
|
|
251
|
1122 |
mustInvalidate := (source findString:(setOfNames first)) ~~ 0.
|
|
202
|
1123 |
] ifFalse:[
|
|
251
|
1124 |
((setOfNames size == 0) and:[superBoolean]) ifTrue:[
|
|
|
1125 |
mustInvalidate := (source findString:'super') ~~ 0.
|
|
|
1126 |
] ifFalse:[
|
|
|
1127 |
mustInvalidate := true
|
|
|
1128 |
].
|
|
202
|
1129 |
].
|
|
|
1130 |
|
|
|
1131 |
mustInvalidate ifTrue:[
|
|
251
|
1132 |
"we have to parse it ..."
|
|
|
1133 |
p := Parser parseMethod:source in:newClass.
|
|
202
|
1134 |
(p isNil
|
|
|
1135 |
or:[(p usedVars notNil and:[p usedVars includesAny:setOfNames])
|
|
|
1136 |
or:[superBoolean and:[p usesSuper]]]) ifFalse:[
|
|
|
1137 |
mustInvalidate := false
|
|
|
1138 |
]
|
|
|
1139 |
].
|
|
|
1140 |
|
|
|
1141 |
mustInvalidate ifTrue:[
|
|
159
|
1142 |
newMethod := oldMethod copy.
|
|
|
1143 |
newMethod code:trapCode.
|
|
|
1144 |
newMethod literals:nil.
|
|
|
1145 |
newMethod byteCode:trapByteCode
|
|
|
1146 |
] ifFalse:[
|
|
|
1147 |
newMethod := oldMethod.
|
|
|
1148 |
].
|
|
|
1149 |
newMethodArray at:i put:newMethod
|
|
1
|
1150 |
]
|
|
|
1151 |
!
|
|
|
1152 |
|
|
|
1153 |
anyInvalidatedMethodsIn:aClass
|
|
|
1154 |
"return true, if aClass has any invalidated methods in it"
|
|
|
1155 |
|
|
|
1156 |
|trap trapCode trapByteCode|
|
|
|
1157 |
|
|
68
|
1158 |
trap := Metaclass compiledMethodAt:#invalidMethod.
|
|
1
|
1159 |
trapCode := trap code.
|
|
|
1160 |
trapByteCode := trap byteCode.
|
|
|
1161 |
|
|
68
|
1162 |
aClass methodArray do:[:aMethod |
|
|
159
|
1163 |
trapCode notNil ifTrue:[
|
|
|
1164 |
(aMethod code == trapCode) ifTrue:[^ true]
|
|
|
1165 |
].
|
|
|
1166 |
trapByteCode notNil ifTrue:[
|
|
|
1167 |
(aMethod byteCode == trapByteCode) ifTrue:[^ true]
|
|
|
1168 |
]
|
|
1
|
1169 |
].
|
|
|
1170 |
^ false
|
|
195
|
1171 |
!
|
|
|
1172 |
|
|
|
1173 |
checkConventionsFor:className instVarNames:instVarNameString classVarNames:classVarNameString
|
|
|
1174 |
"Check for some 'considered bad-style' things, like lower case names.
|
|
|
1175 |
NOTICE:
|
|
|
1176 |
I dont like the confirmers below - we need a notifying: argument, to give
|
|
|
1177 |
the outer codeview a chance to highlight the error.
|
|
|
1178 |
(but thats how its defined in the book - maybe I will change it anyway).
|
|
|
1179 |
"
|
|
|
1180 |
|
|
|
1181 |
"let user confirm, if the classname is no good"
|
|
|
1182 |
className first isUppercase ifFalse:[
|
|
202
|
1183 |
(self confirm:'classename ''' , className , ''' should start with an uppercase letter
|
|
195
|
1184 |
(by convention only)
|
|
|
1185 |
|
|
|
1186 |
install anyway ?' withCRs)
|
|
|
1187 |
ifFalse:[
|
|
|
1188 |
^ false
|
|
|
1189 |
]
|
|
|
1190 |
].
|
|
|
1191 |
|
|
|
1192 |
"let user confirm, if any instvarname is no good"
|
|
|
1193 |
(instVarNameString asCollectionOfWords
|
|
|
1194 |
findFirst:[:word | word first isUppercase]) ~~ 0 ifTrue:[
|
|
|
1195 |
(self confirm:'instance variable names should start with a lowercase letter
|
|
|
1196 |
(by convention only)
|
|
|
1197 |
|
|
|
1198 |
install anyway ?' withCRs)
|
|
|
1199 |
ifFalse:[
|
|
|
1200 |
^ false
|
|
|
1201 |
]
|
|
|
1202 |
].
|
|
|
1203 |
|
|
|
1204 |
"let user confirm, if any classvarname is no good"
|
|
|
1205 |
(classVarNameString asCollectionOfWords
|
|
|
1206 |
findFirst:[:word | word first isLowercase]) ~~ 0 ifTrue:[
|
|
|
1207 |
(self confirm:'class variable names should start with an uppercase letter
|
|
|
1208 |
(by convention only)
|
|
|
1209 |
|
|
|
1210 |
install anyway ?' withCRs)
|
|
|
1211 |
ifFalse:[
|
|
|
1212 |
^ false
|
|
|
1213 |
].
|
|
|
1214 |
].
|
|
|
1215 |
|
|
|
1216 |
^ true
|
|
1
|
1217 |
! !
|