author | Claus Gittinger <cg@exept.de> |
Thu, 12 Oct 2006 21:34:14 +0200 | |
changeset 1865 | 89d9aef483b2 |
parent 1842 | 6ca4e98df305 |
child 1867 | dad9e13fba4c |
permissions | -rw-r--r-- |
3 | 1 |
" |
2 |
COPYRIGHT (c) 1993 by Claus Gittinger |
|
16 | 3 |
All Rights Reserved |
3 | 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 |
" |
|
921
fa4db05c887b
oops - nameSpace prefix handling needed fix due
Claus Gittinger <cg@exept.de>
parents:
916
diff
changeset
|
12 |
"{ Package: 'stx:libbasic3' }" |
fa4db05c887b
oops - nameSpace prefix handling needed fix due
Claus Gittinger <cg@exept.de>
parents:
916
diff
changeset
|
13 |
|
0 | 14 |
OrderedCollection subclass:#ChangeSet |
1476 | 15 |
instanceVariableNames:'changedClasses changeSelectors' |
235 | 16 |
classVariableNames:'' |
17 |
poolDictionaries:'' |
|
18 |
category:'System-Changes' |
|
0 | 19 |
! |
20 |
||
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
21 |
Object subclass:#ChangeFileReader |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
22 |
instanceVariableNames:'inputStream parseTree changeAction changeSet selector receiver |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
23 |
arguments receiverSelector receiverReceiver lineNumber position |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
24 |
className methodSelector' |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
25 |
classVariableNames:'' |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
26 |
poolDictionaries:'' |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
27 |
privateIn:ChangeSet |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
28 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
29 |
|
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
30 |
Object subclass:#DiffSet |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
31 |
instanceVariableNames:'changed onlyInReceiver onlyInArg' |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
32 |
classVariableNames:'' |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
33 |
poolDictionaries:'' |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
34 |
privateIn:ChangeSet |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
35 |
! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
36 |
|
1182 | 37 |
ChangeSet::ChangeFileReader subclass:#DolphinPACFileReader |
38 |
instanceVariableNames:'' |
|
39 |
classVariableNames:'' |
|
40 |
poolDictionaries:'' |
|
41 |
privateIn:ChangeSet |
|
42 |
! |
|
43 |
||
1176 | 44 |
ChangeSet::ChangeFileReader subclass:#SIFChangeFileReader |
45 |
instanceVariableNames:'' |
|
46 |
classVariableNames:'' |
|
47 |
poolDictionaries:'' |
|
48 |
privateIn:ChangeSet |
|
49 |
! |
|
50 |
||
625
06f4ed35832b
added #patches for ST80 compatibility
Claus Gittinger <cg@exept.de>
parents:
378
diff
changeset
|
51 |
!ChangeSet class methodsFor:'documentation'! |
9 | 52 |
|
53 |
copyright |
|
54 |
" |
|
55 |
COPYRIGHT (c) 1993 by Claus Gittinger |
|
16 | 56 |
All Rights Reserved |
9 | 57 |
|
58 |
This software is furnished under a license and may be used |
|
59 |
only in accordance with the terms of that license and with the |
|
60 |
inclusion of the above copyright notice. This software may not |
|
61 |
be provided or otherwise made available to, or used by, any |
|
62 |
other person. No title to or ownership of the software is |
|
63 |
hereby transferred. |
|
64 |
" |
|
65 |
! |
|
66 |
||
67 |
documentation |
|
68 |
" |
|
69 |
used in the changes management to keep track of changes |
|
235 | 70 |
|
71 |
[author:] |
|
879 | 72 |
Claus Gittinger |
9 | 73 |
" |
74 |
! ! |
|
75 |
||
654 | 76 |
!ChangeSet class methodsFor:'instance creation'! |
77 |
||
1176 | 78 |
forExistingClass:aClass |
79 |
"build a changeSet for some given class. |
|
80 |
That does of course not give deltas, but instead reflects the current |
|
81 |
state of the given class. |
|
82 |
It is useful in conjunction with the other utility methods, |
|
83 |
for example, when building patchLists, diffSets etc." |
|
84 |
||
1188 | 85 |
|changeSet s| |
1176 | 86 |
|
1188 | 87 |
s := ReadWriteStream on:''. |
1176 | 88 |
aClass fileOutOn:s. |
1188 | 89 |
s reset. |
90 |
changeSet := self fromStream:s. |
|
1865 | 91 |
|
92 |
changeSet do:[:eachChange | |
|
93 |
eachChange isMethodChange ifTrue:[ |
|
94 |
eachChange package:(eachChange changeMethod package) |
|
95 |
] ifFalse:[ |
|
96 |
eachChange isClassChange ifTrue:[ |
|
97 |
eachChange package:(eachChange changeClass package) |
|
98 |
]. |
|
99 |
]. |
|
100 |
]. |
|
101 |
||
1176 | 102 |
^ changeSet |
103 |
||
1188 | 104 |
"/ |source changeSet chunk sawExcla lastTimeStamp s change nameSpace| |
105 |
||
1176 | 106 |
"/ changeSet := self new. |
107 |
"/ |
|
108 |
"/ "/ first, a classDefinition change ... |
|
109 |
"/ changeSet addClassDefinitionChangeFor:aClass. |
|
110 |
"/ "/ are there any class-instVars ? |
|
111 |
"/ aClass class instVarNames size > 0 ifTrue:[ |
|
112 |
"/ changeSet addInstVarDefinitionChangeFor:aClass class. |
|
113 |
"/ ]. |
|
114 |
"/ "/ a comment ? |
|
115 |
"/ aClass comment size > 0 ifTrue:[ |
|
116 |
"/ changeSet addClassCommentChangeFor:aClass. |
|
117 |
"/ ]. |
|
118 |
"/ |
|
119 |
"/ "/ class methods first ... |
|
120 |
"/ aClass class methodDictionary keysAndValuesDo:[:sel :mthd | |
|
121 |
"/ changeSet addMethodChange:mthd in:aClass class. |
|
122 |
"/ ]. |
|
123 |
"/ |
|
124 |
"/ "/ instance methods ... |
|
125 |
"/ aClass methodDictionary keysAndValuesDo:[:sel :mthd | |
|
126 |
"/ changeSet addMethodChange:mthd in:aClass. |
|
127 |
"/ ]. |
|
128 |
"/ |
|
129 |
"/ ^ changeSet |
|
130 |
||
1865 | 131 |
|
1176 | 132 |
" |
133 |
ChangeSet forExistingClass:ChangeSet |
|
1865 | 134 |
|
135 |
Rectangle hasExtensions |
|
136 |
ChangeSet forExistingClass:Rectangle |
|
1176 | 137 |
" |
138 |
||
1865 | 139 |
"Created: / 16-02-1998 / 12:19:34 / cg" |
140 |
"Modified: / 12-10-2006 / 18:22:49 / cg" |
|
141 |
! |
|
142 |
||
143 |
forExistingClass:aClass withExtensions:withExtensions extensionsOnly:extensionsOnly |
|
144 |
"build a changeSet for some given full, the base-class or the extensions only. |
|
145 |
That does of course not give deltas, but instead reflects the current |
|
146 |
state of the given class. |
|
147 |
It is useful in conjunction with the other utility methods, |
|
148 |
for example, when building patchLists, diffSets etc." |
|
149 |
||
150 |
|changeSet classPackage| |
|
151 |
||
152 |
changeSet := self forExistingClass:aClass. |
|
153 |
classPackage := aClass package. |
|
154 |
||
155 |
extensionsOnly ifTrue:[ |
|
156 |
^ changeSet |
|
157 |
select:[:change | |
|
158 |
change isMethodChange |
|
159 |
and:[ change package ~= classPackage ] |
|
160 |
]. |
|
161 |
]. |
|
162 |
withExtensions ifFalse:[ |
|
163 |
^ changeSet |
|
164 |
reject:[:change | |
|
165 |
change isMethodChange |
|
166 |
and:[ change package ~= classPackage ] |
|
167 |
]. |
|
168 |
]. |
|
169 |
||
170 |
^ changeSet |
|
171 |
||
172 |
" |
|
173 |
ChangeSet forExistingClass:ChangeSet |
|
174 |
||
175 |
Rectangle hasExtensions |
|
176 |
Rectangle extensions |
|
177 |
||
178 |
ChangeSet forExistingClass:Rectangle withExtensions:true extensionsOnly:false |
|
179 |
ChangeSet forExistingClass:Rectangle withExtensions:false extensionsOnly:false |
|
180 |
ChangeSet forExistingClass:Rectangle withExtensions:false extensionsOnly:true |
|
181 |
" |
|
182 |
||
183 |
"Created: / 12-10-2006 / 18:13:02 / cg" |
|
184 |
"Modified: / 12-10-2006 / 20:36:16 / cg" |
|
1176 | 185 |
! |
186 |
||
1292 | 187 |
forExistingMethods:aCollectionOfMethods |
188 |
"build a changeSet for a collection of methods. |
|
189 |
That does of course not give deltas, but instead reflects the current |
|
190 |
state of the given set of methods. |
|
191 |
It is useful in conjunction with the other utility methods, |
|
192 |
for example, when building patchLists, diffSets etc." |
|
193 |
||
194 |
|changeSet stream previousPackage| |
|
195 |
||
196 |
stream := ReadWriteStream on:''. |
|
197 |
aCollectionOfMethods do:[:eachMethod | |
|
198 |
previousPackage ~= eachMethod package ifTrue:[ |
|
199 |
stream nextPutAll:'"{ Package: '''. |
|
200 |
stream nextPutAll:eachMethod package asString. |
|
201 |
stream nextPutAll:''' }"'; cr; cr. |
|
202 |
]. |
|
203 |
eachMethod mclass fileOutMethod:eachMethod on:stream |
|
204 |
]. |
|
205 |
stream reset. |
|
206 |
changeSet := self fromStream:stream. |
|
207 |
^ changeSet |
|
208 |
||
209 |
" |
|
210 |
ChangeSet forExistingMethods:(Array with:(Array compiledMethodAt:#at:) |
|
211 |
with:(Object compiledMethodAt:#at:) |
|
212 |
with:(Behavior compiledMethodAt:#compiledMethodAt:) ) |
|
213 |
" |
|
214 |
! |
|
215 |
||
1182 | 216 |
fromDolphinPACStream:aStream |
217 |
"build a changeSet from a stream, containing dolphin pac file chunks." |
|
218 |
||
219 |
^ self fromDolphinPACStream:aStream while:[:thisChange | true] |
|
220 |
||
221 |
! |
|
222 |
||
223 |
fromDolphinPACStream:aStream while:aConditionBlock |
|
224 |
"build a changeSet from a stream, containing dolphin pac file chunks." |
|
225 |
||
226 |
|changeSet| |
|
227 |
||
228 |
changeSet := self new. |
|
229 |
self |
|
230 |
changesFromStream:aStream |
|
231 |
for:changeSet |
|
232 |
reader:(DolphinPACFileReader new) |
|
233 |
do:[:aChange :lineNumberOrNil :posOrNil | |
|
234 |
changeSet add:aChange. |
|
235 |
(aConditionBlock value:aChange) ifFalse:[^ changeSet]. |
|
236 |
]. |
|
237 |
||
238 |
^ changeSet |
|
239 |
! |
|
240 |
||
1176 | 241 |
fromFile:aFilename |
1182 | 242 |
|mime stream| |
1176 | 243 |
|
244 |
mime := MIMETypes mimeTypeForFilename:aFilename. |
|
245 |
mime isNil ifTrue:[ |
|
246 |
mime := aFilename asFilename mimeTypeOfContents. |
|
247 |
mime isNil ifTrue:[ |
|
1329 | 248 |
self error:'unknown MIME type for file'. |
1176 | 249 |
]. |
250 |
]. |
|
930 | 251 |
|
1176 | 252 |
[ |
1379 | 253 |
|encoding decoder| |
254 |
||
1176 | 255 |
stream := aFilename asFilename readStream. |
256 |
mime = 'text/xml' ifTrue:[ |
|
1184 | 257 |
^ self fromXMLStream:stream. |
1182 | 258 |
]. |
259 |
mime = 'application/x-smalltalk-source-sif' ifTrue:[ |
|
260 |
^ self fromSIFStream:stream. |
|
1176 | 261 |
]. |
1182 | 262 |
mime = 'application/x-smalltalk-dolphin-package' ifTrue:[ |
263 |
^ self fromDolphinPACStream:stream. |
|
264 |
]. |
|
1414
f67d4b166606
guessEncoding now implemented in CharacterEncoder
Claus Gittinger <cg@exept.de>
parents:
1412
diff
changeset
|
265 |
encoding := CharacterEncoder guessEncodingOfStream:stream. |
1379 | 266 |
encoding notNil ifTrue:[ |
267 |
decoder := CharacterEncoder encoderFor:encoding. |
|
268 |
stream := EncodedStream stream:stream encoder:decoder. |
|
1415
44d3d469a528
skipEncodingCHunk now in EncodedStream
Claus Gittinger <cg@exept.de>
parents:
1414
diff
changeset
|
269 |
stream skipEncodingChunk. |
1379 | 270 |
]. |
1182 | 271 |
^ self fromStream:stream. |
1176 | 272 |
] ensure:[ |
273 |
stream notNil ifTrue:[stream close]. |
|
274 |
]. |
|
275 |
||
276 |
" |
|
277 |
ChangeSet fromFile:('changes') |
|
278 |
ChangeSet fromFile:('patches') |
|
279 |
" |
|
280 |
||
281 |
"Created: / 16.2.1998 / 12:19:34 / cg" |
|
282 |
"Modified: / 14.12.1999 / 15:23:16 / cg" |
|
283 |
! |
|
284 |
||
285 |
fromSIFStream:aStream |
|
286 |
"build a changeSet from a SIF stream, containing chunks |
|
287 |
in smalltalk interchange format. |
|
288 |
Return the changeSet." |
|
289 |
||
290 |
^ self fromSIFStream:aStream while:[:thisChange | true] |
|
291 |
! |
|
292 |
||
293 |
fromSIFStream:aStream while:aConditionBlock |
|
294 |
"build a changeSet from a SIF stream, containing chunks |
|
295 |
in smalltalk interchange format. |
|
296 |
Return the changeSet." |
|
297 |
||
298 |
|changeSet| |
|
299 |
||
300 |
changeSet := self new. |
|
301 |
self |
|
302 |
changesFromStream:aStream |
|
303 |
for:changeSet |
|
1182 | 304 |
reader:(SIFChangeFileReader new) |
1176 | 305 |
do:[:aChange :lineNumberOrNil :posOrNil | |
306 |
changeSet add:aChange. |
|
307 |
(aConditionBlock value:aChange) ifFalse:[^ changeSet]. |
|
308 |
]. |
|
309 |
||
310 |
^ changeSet |
|
311 |
! |
|
312 |
||
313 |
fromStream:aStream |
|
314 |
"build a changeSet from a stream, containing chunks. |
|
315 |
(i.e. either a classes sourceFile or a change-file). |
|
316 |
Return the changeSet." |
|
317 |
||
318 |
^ self fromStream:aStream while:[:thisChange | true] |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
319 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
320 |
" |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
321 |
ChangeSet fromStream:('changes' asFilename readStream) |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
322 |
ChangeSet fromStream:('patches' asFilename readStream) |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
323 |
ChangeSet fromStream:(Object source asString readStream) |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
324 |
" |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
325 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
326 |
"Created: / 16.2.1998 / 12:19:34 / cg" |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
327 |
"Modified: / 14.12.1999 / 15:23:16 / cg" |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
328 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
329 |
|
1176 | 330 |
fromStream:aStream while:aConditionBlock |
331 |
"build a changeSet from a stream, containing chunks. |
|
332 |
(i.e. either a classes sourceFile or a change-file). |
|
333 |
Return the changeSet." |
|
334 |
||
335 |
|changeSet| |
|
336 |
||
337 |
changeSet := self new. |
|
338 |
self |
|
339 |
changesFromStream:aStream |
|
340 |
for:changeSet |
|
1182 | 341 |
reader:(ChangeFileReader new) |
1176 | 342 |
do:[:aChange :lineNumberOrNil :posOrNil | |
343 |
changeSet add:aChange. |
|
344 |
(aConditionBlock value:aChange) ifFalse:[^ changeSet]. |
|
345 |
]. |
|
346 |
||
347 |
^ changeSet |
|
348 |
||
349 |
" |
|
350 |
ChangeSet fromStream:('changes' asFilename readStream) |
|
351 |
ChangeSet fromStream:('patches' asFilename readStream) |
|
352 |
ChangeSet fromStream:(Object source asString readStream) |
|
353 |
" |
|
354 |
||
355 |
"Created: / 16.2.1998 / 12:19:34 / cg" |
|
356 |
"Modified: / 14.12.1999 / 15:23:16 / cg" |
|
357 |
! |
|
358 |
||
359 |
fromXMLStream:aStream |
|
360 |
"build a changeSet from an XML stream, containing XML definitions. |
|
361 |
Return the changeSet." |
|
362 |
||
363 |
|changeSet builder nameSpace| |
|
364 |
||
365 |
aStream isNil ifTrue:[^ nil]. |
|
366 |
||
367 |
changeSet := self new. |
|
368 |
nameSpace := Smalltalk. |
|
369 |
||
370 |
builder := XML::SourceScannerNodeBuilder new. |
|
1475
934d20073adb
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1471
diff
changeset
|
371 |
builder scanFile:aStream do:[:change | changeSet add: change. ]. |
1176 | 372 |
^ changeSet |
373 |
||
374 |
" |
|
1247 | 375 |
ChangeSet fromXMLStream:('../../goodies/xml/vw/xmlFileInTests/XMLParser.xml' asFilename readStream) |
1176 | 376 |
ChangeSetBrowser |
1247 | 377 |
openOn:(ChangeSet fromXMLStream:('../../goodies/xml/vw/xmlFileInTests/XMLParser.xml' asFilename readStream)) |
1176 | 378 |
" |
379 |
! ! |
|
380 |
||
1281 | 381 |
!ChangeSet class methodsFor:'Compatibility-ST80'! |
1176 | 382 |
|
383 |
patches |
|
384 |
^ #() |
|
385 |
||
386 |
"Created: / 27.10.1997 / 13:52:54 / cg" |
|
387 |
! ! |
|
388 |
||
1281 | 389 |
!ChangeSet class methodsFor:'Compatibility-VW'! |
1176 | 390 |
|
391 |
component: component definition: anObject change: changeSymbol |
|
392 |
"Include indication that a class/namespace was added or removed |
|
393 |
from a CodeComponent." |
|
394 |
||
395 |
self |
|
396 |
changed:#'component:definition:change:' |
|
397 |
with: |
|
398 |
( Array |
|
399 |
with: component |
|
400 |
with: anObject |
|
401 |
with: changeSymbol |
|
402 |
) |
|
403 |
||
404 |
! ! |
|
405 |
||
406 |
!ChangeSet class methodsFor:'instance creation-private'! |
|
407 |
||
1191 | 408 |
changesFromStream:aStream do:aBlock |
409 |
"enumerate changes from a stream and invoke aBlock on each. |
|
410 |
The block is invoked with the change, a lineNumberOrNil and streamPosition arguments. |
|
411 |
The lineNumber is only valid, if the underlying stream |
|
412 |
provides line-numbers; otherwise, nil is passed." |
|
413 |
||
414 |
^ self |
|
415 |
changesFromStream:aStream |
|
416 |
for:(self new) |
|
417 |
reader:nil |
|
418 |
do:aBlock |
|
419 |
||
420 |
" |
|
421 |
ChangeSet |
|
422 |
changesFromStream:('changes' asFilename readStream) |
|
423 |
do:[:chg | Transcript showCR:chg] |
|
424 |
" |
|
425 |
||
426 |
"Created: / 16.2.1998 / 12:19:34 / cg" |
|
427 |
"Modified: / 14.12.1999 / 15:23:16 / cg" |
|
428 |
! |
|
429 |
||
1182 | 430 |
changesFromStream:aStream for:aChangeSet reader:aReader do:aBlock |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
431 |
"enumerate changes from a stream and invoke aBlock on each. |
1191 | 432 |
The block is invoked with the change, a lineNumberOrNil and streamPosition arguments. |
433 |
The lineNumber is only valid, if the underlying stream |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
434 |
provides line-numbers; otherwise, nil is passed." |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
435 |
|
1188 | 436 |
|chunk lastTimeStamp s change nameSpace package |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
437 |
lineNumber pos reader| |
930 | 438 |
|
439 |
nameSpace := Smalltalk. |
|
1135
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
440 |
package := Class packageQuerySignal query. |
1176 | 441 |
|
1182 | 442 |
(reader := aReader) isNil ifTrue:[ |
1176 | 443 |
reader := ChangeFileReader new. |
444 |
]. |
|
445 |
reader changeSet:aChangeSet. |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
446 |
reader changeAction:aBlock. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
447 |
reader inputStream:aStream. |
930 | 448 |
|
449 |
[aStream atEnd] whileFalse:[ |
|
1182 | 450 |
aStream skipSeparators. |
930 | 451 |
lineNumber := aStream lineNumber. |
1209
f98d5eb855d3
code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents:
1200
diff
changeset
|
452 |
pos := aStream position1Based. |
930 | 453 |
chunk := aStream nextChunk. |
1447
2ac1cf09722b
isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents:
1428
diff
changeset
|
454 |
(chunk notEmptyOrNil) ifTrue:[ |
930 | 455 |
Class nameSpaceQuerySignal answer:nameSpace do:[ |
1135
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
456 |
|parser tree ns pkg| |
930 | 457 |
|
458 |
parser := Parser for:chunk. |
|
459 |
tree := parser |
|
460 |
parseExpressionWithSelf:nil |
|
461 |
notifying:nil |
|
462 |
ignoreErrors:true |
|
463 |
ignoreWarnings:true |
|
464 |
inNameSpace:nameSpace. |
|
465 |
||
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
466 |
tree notNil ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
467 |
tree == #Error ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
468 |
change := DoItChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
469 |
change source:chunk. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
470 |
aBlock value:change value:lineNumber value:pos. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
471 |
] ifFalse:[ |
930 | 472 |
"/ if there is any nameSpace directive in there, extract it. |
473 |
((ns := parser currentNameSpace) notNil |
|
474 |
and:[ns ~~ nameSpace]) ifTrue:[ |
|
475 |
nameSpace := ns |
|
476 |
]. |
|
1135
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
477 |
"/ if there is any package directive in there, extract it. |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
478 |
((pkg := parser currentPackage) notNil |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
479 |
and:[pkg ~~ package]) ifTrue:[ |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
480 |
package := pkg |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
481 |
]. |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
482 |
Class packageQuerySignal answer:package do:[ |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
483 |
Class nameSpaceQuerySignal answer:nameSpace do:[ |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
484 |
"/ |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
485 |
"/ what type of chunk is this ... |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
486 |
"/ |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
487 |
tree isConstant ifTrue:[ |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
488 |
(s := tree evaluate) isString ifTrue:[ |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
489 |
(s startsWith:'---- timestamp ') ifTrue:[ |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
490 |
lastTimeStamp := s. |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
491 |
] |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
492 |
] ifFalse:[ |
1169 | 493 |
self error:'unexpected change-chunk' mayProceed:true |
930 | 494 |
] |
495 |
] ifFalse:[ |
|
1135
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
496 |
tree isMessage ifTrue:[ |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
497 |
(reader |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
498 |
changesFromParseTree:tree |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
499 |
lineNumber:lineNumber |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
500 |
position:pos |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
501 |
) ifFalse:[ |
1135
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
502 |
change := DoItChange new. |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
503 |
change source:chunk. |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
504 |
aBlock value:change value:lineNumber value:pos. |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
505 |
] |
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
506 |
] ifFalse:[ |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
507 |
self error:'unexpected change-chunk' mayProceed:true. |
930 | 508 |
] |
509 |
] |
|
510 |
] |
|
511 |
] |
|
512 |
] |
|
513 |
] |
|
514 |
] |
|
515 |
] |
|
516 |
]. |
|
517 |
||
518 |
" |
|
519 |
ChangeSet fromStream:('changes' asFilename readStream) |
|
520 |
ChangeSet fromStream:('patches' asFilename readStream) |
|
521 |
ChangeSet fromStream:(Object source asString readStream) |
|
522 |
" |
|
523 |
||
524 |
"Created: / 16.2.1998 / 12:19:34 / cg" |
|
525 |
"Modified: / 14.12.1999 / 15:23:16 / cg" |
|
1380 | 526 |
! |
527 |
||
528 |
skipEncodingChunkOn:stream |
|
1415
44d3d469a528
skipEncodingCHunk now in EncodedStream
Claus Gittinger <cg@exept.de>
parents:
1414
diff
changeset
|
529 |
self obsoleteMethodWarning:'use stream>>skipENcodingChunk'. |
44d3d469a528
skipEncodingCHunk now in EncodedStream
Claus Gittinger <cg@exept.de>
parents:
1414
diff
changeset
|
530 |
stream skipEncodingChunk |
1083 | 531 |
! ! |
532 |
||
625
06f4ed35832b
added #patches for ST80 compatibility
Claus Gittinger <cg@exept.de>
parents:
378
diff
changeset
|
533 |
!ChangeSet class methodsFor:'queries'! |
27 | 534 |
|
535 |
current |
|
536 |
"ST-80 compatibility: return the current changeSet" |
|
537 |
||
538 |
|p| |
|
539 |
||
540 |
(Project notNil and:[(p := Project current) notNil]) ifTrue:[ |
|
959
ca4fff926135
ChangeSet current: return empty collection if there is no changeSet
Claus Gittinger <cg@exept.de>
parents:
956
diff
changeset
|
541 |
^ p changeSet |
ca4fff926135
ChangeSet current: return empty collection if there is no changeSet
Claus Gittinger <cg@exept.de>
parents:
956
diff
changeset
|
542 |
]. |
ca4fff926135
ChangeSet current: return empty collection if there is no changeSet
Claus Gittinger <cg@exept.de>
parents:
956
diff
changeset
|
543 |
^ #() |
27 | 544 |
|
545 |
" |
|
546 |
ChangeSet current |
|
547 |
" |
|
548 |
! ! |
|
549 |
||
1264 | 550 |
!ChangeSet methodsFor:'Compatibility-ST80'! |
378 | 551 |
|
899 | 552 |
changeClass:aClass |
553 |
"dummy here" |
|
100 | 554 |
|
899 | 555 |
"Created: / 4.2.2000 / 18:30:59 / cg" |
901 | 556 |
! |
557 |
||
1476 | 558 |
changeSelectors |
559 |
"return a collection of all selectors for which changes are in this changeSet" |
|
560 |
||
561 |
|selectors| |
|
562 |
||
563 |
changeSelectors isNil ifTrue:[ |
|
564 |
selectors := IdentitySet new. |
|
565 |
self do:[:chg | |
|
566 |
|cls| |
|
567 |
||
568 |
chg notNil ifTrue:[ |
|
569 |
chg isMethodChange ifTrue:[ |
|
570 |
selectors add:chg selector |
|
571 |
] |
|
572 |
] |
|
573 |
]. |
|
574 |
changeSelectors := selectors. |
|
575 |
]. |
|
576 |
^ changeSelectors. |
|
577 |
||
578 |
" |
|
579 |
ChangeSet current changeSelectors |
|
580 |
" |
|
581 |
! |
|
582 |
||
1102 | 583 |
changedClasses |
584 |
"return a collection of all classes for which changes are in this changeSet" |
|
585 |
||
586 |
|classes| |
|
587 |
||
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
588 |
changedClasses isNil ifTrue:[ |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
589 |
classes := IdentitySet new. |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
590 |
self do:[:chg | |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
591 |
|cls| |
1102 | 592 |
|
1315 | 593 |
chg notNil ifTrue:[ |
594 |
cls := chg changeClass. |
|
595 |
cls notNil ifTrue:[ |
|
596 |
cls isNameSpace ifFalse:[ |
|
597 |
classes add:cls |
|
598 |
] |
|
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
599 |
] |
1102 | 600 |
] |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
601 |
]. |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
602 |
changedClasses := classes. |
1102 | 603 |
]. |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
604 |
^ changedClasses. |
1102 | 605 |
|
606 |
" |
|
607 |
ChangeSet current changedClasses |
|
1791 | 608 |
ChangeSet current flushChangedClassesCache |
1102 | 609 |
" |
1791 | 610 |
|
611 |
"Modified: / 14-09-2006 / 16:04:18 / cg" |
|
1102 | 612 |
! |
613 |
||
1096 | 614 |
component:component definition:anObject change:changeSymbol |
1083 | 615 |
"Include indication that a class/namespace was added or removed |
616 |
from a CodeComponent." |
|
617 |
||
618 |
self |
|
619 |
changed:#'component:definition:change:' |
|
620 |
with: |
|
621 |
( Array |
|
622 |
with: component |
|
623 |
with: anObject |
|
624 |
with: changeSymbol |
|
625 |
) |
|
626 |
! |
|
627 |
||
901 | 628 |
reorganizeSystem |
629 |
"dummy here" |
|
630 |
||
631 |
"Created: / 6.2.2000 / 20:45:10 / cg" |
|
889
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
632 |
! ! |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
633 |
|
985 | 634 |
!ChangeSet methodsFor:'change & update'! |
635 |
||
1096 | 636 |
changed:anAspectSymbol with:aParameter |
637 |
"Allow objects to depend on the ChangeSet class instead of a particular instance |
|
1099 | 638 |
of ChangeSet (which may be switched using projects)." |
985 | 639 |
|
1475
934d20073adb
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1471
diff
changeset
|
640 |
self == ChangeSet current ifTrue:[ |
934d20073adb
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1471
diff
changeset
|
641 |
ChangeSet changed:anAspectSymbol with:aParameter. |
934d20073adb
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1471
diff
changeset
|
642 |
]. |
1096 | 643 |
super changed:anAspectSymbol with:aParameter |
985 | 644 |
! ! |
645 |
||
901 | 646 |
!ChangeSet methodsFor:'changes management'! |
889
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
647 |
|
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
648 |
addClassCommentChangeFor:aClass |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
649 |
"add a classComment change to the receiver" |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
650 |
|
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
651 |
|newChange| |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
652 |
|
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
653 |
newChange := ClassCommentChange class:aClass. |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
654 |
newChange comment:aClass comment. |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
655 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
656 |
self addChange:newChange |
889
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
657 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
658 |
"Modified: / 14.11.2001 / 13:35:34 / cg" |
100 | 659 |
! |
660 |
||
661 |
addClassDefinitionChangeFor:aClass |
|
378 | 662 |
"add a classDefinition change to the receiver" |
663 |
||
100 | 664 |
|newChange| |
665 |
||
1096 | 666 |
newChange := ClassDefinitionChange class:aClass source:(aClass definition). |
1865 | 667 |
newChange package:aClass package. |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
668 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
669 |
self addChange:newChange |
1096 | 670 |
|
1865 | 671 |
" |
672 |
(ChangeSet new addClassDefinitionChangeFor:ChangeSet) inspect |
|
673 |
" |
|
674 |
||
675 |
"Modified: / 12-10-2006 / 18:17:02 / cg" |
|
1096 | 676 |
! |
677 |
||
1232 | 678 |
addClassRemoveChange:oldClass |
1096 | 679 |
"add a classRemove change to the receiver" |
680 |
||
681 |
|newChange| |
|
682 |
||
1232 | 683 |
newChange := ClassRemoveChange new className:oldClass name. |
1281 | 684 |
self rememberChangedClass:oldClass. |
1421 | 685 |
oldClass isPrivate ifTrue:[ |
686 |
self rememberChangedClass:oldClass topOwningClass. |
|
687 |
]. |
|
1232 | 688 |
ClassRemoveChange::ClassBeingRemovedQuery |
689 |
answer:oldClass |
|
690 |
do:[ |
|
691 |
self addChange:newChange |
|
692 |
] |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
693 |
"Modified: / 14.11.2001 / 13:35:39 / cg" |
1096 | 694 |
! |
695 |
||
696 |
addClassRenameChangeFrom:oldName to:newName |
|
697 |
"add a classRename change to the receiver" |
|
698 |
||
699 |
|newChange| |
|
700 |
||
701 |
newChange := ClassRenameChange new oldName:oldName newName:newName. |
|
1281 | 702 |
self rememberChangedClass:(Smalltalk at:newName). |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
703 |
self addChange:newChange |
100 | 704 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
705 |
"Modified: / 14.11.2001 / 13:35:41 / cg" |
100 | 706 |
! |
707 |
||
1081 | 708 |
addDoIt:aString |
709 |
"add a doIt to the receiver" |
|
710 |
||
711 |
|newChange| |
|
712 |
||
1096 | 713 |
newChange := DoItChange new source:aString. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
714 |
self addChange:newChange. |
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
715 |
|
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
716 |
"Modified: / 14.11.2001 / 13:35:44 / cg" |
1081 | 717 |
! |
718 |
||
889
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
719 |
addInstVarDefinitionChangeFor:aClass |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
720 |
"add an instVarDefinition change to the receiver" |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
721 |
|
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
722 |
|newChange| |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
723 |
|
1096 | 724 |
newChange := ClassInstVarDefinitionChange |
725 |
class:aClass |
|
726 |
source:(aClass name , ' instanceVariableNames:' , aClass instanceVariableString storeString). |
|
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
727 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
728 |
self addChange:newChange |
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
729 |
|
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
730 |
"Modified: / 14.11.2001 / 13:35:45 / cg" |
889
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
731 |
! |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
732 |
|
16 | 733 |
addMethodCategoryChange:aMethod category:newCategory in:aClass |
378 | 734 |
"add a methodCategory change to the receiver" |
735 |
||
16 | 736 |
|newChange| |
737 |
||
1096 | 738 |
newChange := MethodCategoryChange |
739 |
class:aClass |
|
740 |
selector:(aClass selectorAtMethod:aMethod) |
|
741 |
category:newCategory. |
|
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
742 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
743 |
self addChange:newChange |
16 | 744 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
745 |
"Modified: / 14.11.2001 / 13:35:48 / cg" |
44 | 746 |
! |
747 |
||
956
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
748 |
addMethodChange:aMethod fromOld:oldMethod in:aClass |
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
749 |
"add a method change to the receiver" |
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
750 |
|
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
751 |
|newChange| |
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
752 |
|
1096 | 753 |
newChange := MethodChange |
754 |
class:aClass |
|
755 |
selector:aMethod selector |
|
756 |
source:aMethod source |
|
757 |
category:aMethod category. |
|
956
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
758 |
oldMethod notNil ifTrue:[ |
1232 | 759 |
newChange previousVersion:oldMethod. |
956
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
760 |
]. |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
761 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
762 |
self addChange:newChange. |
956
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
763 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
764 |
"Modified: / 14.11.2001 / 13:35:50 / cg" |
956
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
765 |
! |
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
766 |
|
85 | 767 |
addMethodChange:aMethod in:aClass |
378 | 768 |
"add a method change to the receiver" |
769 |
||
85 | 770 |
|newChange| |
771 |
||
1096 | 772 |
newChange := MethodChange |
773 |
class:aClass |
|
774 |
selector:aMethod selector |
|
775 |
source:aMethod source |
|
776 |
category:aMethod category. |
|
1865 | 777 |
newChange package:(aMethod package). |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
778 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
779 |
self addChange:newChange |
378 | 780 |
|
1865 | 781 |
"Modified: / 12-10-2006 / 18:15:28 / cg" |
85 | 782 |
! |
783 |
||
1842
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
784 |
addMethodPackageChange:aMethod package:newPackage in:aClass |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
785 |
"add a methodPackage change to the receiver" |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
786 |
|
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
787 |
|newChange| |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
788 |
|
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
789 |
newChange := MethodPackageChange |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
790 |
class:aClass |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
791 |
selector:(aClass selectorAtMethod:aMethod) |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
792 |
package:newPackage. |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
793 |
self rememberChangedClass:aClass. |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
794 |
self addChange:newChange |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
795 |
|
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
796 |
"Created: / 09-10-2006 / 14:02:33 / cg" |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
797 |
! |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
798 |
|
44 | 799 |
addMethodPrivacyChange:aMethod in:aClass |
378 | 800 |
"add a methodPrivacy change to the receiver" |
801 |
||
44 | 802 |
|newChange| |
803 |
||
1096 | 804 |
newChange := MethodPrivacyChange |
805 |
class:aClass |
|
806 |
selector:(aClass selectorAtMethod:aMethod) |
|
807 |
privacy:aMethod privacy. |
|
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
808 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
809 |
self addChange:newChange |
44 | 810 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
811 |
"Modified: / 27.8.1995 / 22:55:22 / claus" |
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
812 |
"Modified: / 14.11.2001 / 13:35:55 / cg" |
235 | 813 |
! |
814 |
||
815 |
addPrimitiveDefinitionsChangeFor:aClass |
|
378 | 816 |
"add a primitiveDefinitions change to the receiver" |
817 |
||
235 | 818 |
|newChange| |
819 |
||
783 | 820 |
newChange := ClassPrimitiveDefinitionsChange new |
1287 | 821 |
class:aClass source:(aClass primitiveDefinitionsString). |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
822 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
823 |
self addChange:newChange |
378 | 824 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
825 |
"Modified: / 14.11.2001 / 13:35:57 / cg" |
235 | 826 |
! |
827 |
||
828 |
addPrimitiveFunctionsChangeFor:aClass |
|
378 | 829 |
"add a primitiveFunctions change to the receiver" |
830 |
||
235 | 831 |
|newChange| |
832 |
||
783 | 833 |
newChange := ClassPrimitiveFunctionsChange new |
1287 | 834 |
class:aClass source:(aClass primitiveFunctionsString). |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
835 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
836 |
self addChange:newChange |
378 | 837 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
838 |
"Modified: / 14.11.2001 / 13:35:59 / cg" |
235 | 839 |
! |
840 |
||
841 |
addPrimitiveVariablesChangeFor:aClass |
|
378 | 842 |
"add a primitiveVariables change to the receiver" |
843 |
||
235 | 844 |
|newChange| |
845 |
||
783 | 846 |
newChange := ClassPrimitiveVariablesChange new |
1287 | 847 |
class:aClass source:(aClass primitiveVariablesString). |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
848 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
849 |
self addChange:newChange |
378 | 850 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
851 |
"Modified: / 14.11.2001 / 13:36:01 / cg" |
654 | 852 |
! |
853 |
||
1164
cecaa2229cab
removeSelector change: remember methods previous version
Claus Gittinger <cg@exept.de>
parents:
1156
diff
changeset
|
854 |
addRemoveSelectorChange:aSelector fromOld:oldMethod in:aClass |
654 | 855 |
"add a method-remove change to the receiver" |
856 |
||
857 |
|newChange| |
|
858 |
||
1081 | 859 |
newChange := MethodRemoveChange class:aClass selector:aSelector. |
1164
cecaa2229cab
removeSelector change: remember methods previous version
Claus Gittinger <cg@exept.de>
parents:
1156
diff
changeset
|
860 |
oldMethod notNil ifTrue:[ |
1232 | 861 |
newChange previousVersion:oldMethod. |
1164
cecaa2229cab
removeSelector change: remember methods previous version
Claus Gittinger <cg@exept.de>
parents:
1156
diff
changeset
|
862 |
]. |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
863 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
864 |
self addChange:newChange |
654 | 865 |
|
866 |
"Modified: / 27.8.1995 / 22:55:22 / claus" |
|
867 |
"Created: / 16.2.1998 / 12:47:07 / cg" |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
868 |
"Modified: / 14.11.2001 / 13:36:04 / cg" |
901 | 869 |
! |
870 |
||
871 |
addRenameCategoryChangeIn:aClass from:oldCategory to:newCategory |
|
872 |
"add a category rename change to the receiver" |
|
873 |
||
874 |
|newChange| |
|
875 |
||
876 |
newChange := MethodCategoryRenameChange class:aClass. |
|
877 |
newChange oldCategoryName:oldCategory newCategoryName:newCategory. |
|
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
878 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
879 |
self addChange:newChange |
1105
b27c0d72d7d0
avoid useless change notifications from #collect:, #select: etc.
Claus Gittinger <cg@exept.de>
parents:
1102
diff
changeset
|
880 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
881 |
"Modified: / 14.11.2001 / 13:36:06 / cg" |
1105
b27c0d72d7d0
avoid useless change notifications from #collect:, #select: etc.
Claus Gittinger <cg@exept.de>
parents:
1102
diff
changeset
|
882 |
! ! |
b27c0d72d7d0
avoid useless change notifications from #collect:, #select: etc.
Claus Gittinger <cg@exept.de>
parents:
1102
diff
changeset
|
883 |
|
85 | 884 |
!ChangeSet methodsFor:'misc'! |
885 |
||
886 |
addPatch:nameOfPatch |
|
887 |
"ignored for now - allows fileIn of ST-80 patch stuff .." |
|
888 |
||
889 |
^ self |
|
890 |
! ! |
|
891 |
||
1263 | 892 |
!ChangeSet methodsFor:'private-accessing'! |
1098 | 893 |
|
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
894 |
addChange:aChange |
1389
c77b539fc824
Use Timestamp/#asTimestamp instead of AbsoluteTime/#asAbsoluteTime
Stefan Vogel <sv@exept.de>
parents:
1380
diff
changeset
|
895 |
aChange timeStamp:(Timestamp now). |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
896 |
self add:aChange. |
1471 | 897 |
changedClasses notNil ifTrue:[ |
898 |
changedClasses add:aChange changeClass. |
|
899 |
]. |
|
1476 | 900 |
changeSelectors notNil ifTrue:[ |
901 |
aChange isMethodChange ifTrue:[ |
|
902 |
changeSelectors add:aChange selector. |
|
903 |
]. |
|
904 |
]. |
|
1232 | 905 |
|
906 |
"/ aChange sendChangeNotificationThroughSmalltalk. |
|
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
907 |
self changed:#addChange: with:aChange. |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
908 |
|
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
909 |
"Created: / 14.11.2001 / 13:35:11 / cg" |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
910 |
"Modified: / 14.11.2001 / 13:36:58 / cg" |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
911 |
! |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
912 |
|
1479 | 913 |
flushChangedClassesCache |
914 |
changedClasses := changeSelectors := nil |
|
915 |
||
916 |
" |
|
917 |
ChangeSet current flushChangedClassesCache |
|
918 |
" |
|
919 |
! |
|
920 |
||
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
921 |
rememberChangedClass:aClass |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
922 |
changedClasses notNil ifTrue:[ |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
923 |
changedClasses add:aClass |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
924 |
]. |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
925 |
! |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
926 |
|
1098 | 927 |
removeAll:aCollection |
1301 | 928 |
aCollection notEmpty ifTrue:[ |
929 |
super removeAll:aCollection. |
|
1476 | 930 |
changedClasses := changeSelectors := nil. |
1301 | 931 |
self changed:#removeAll: with:aCollection. |
932 |
] |
|
1421 | 933 |
! |
934 |
||
935 |
unrememberChangedClasses |
|
936 |
changedClasses := nil |
|
1098 | 937 |
! ! |
938 |
||
1034
cdc9ddc19155
added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents:
985
diff
changeset
|
939 |
!ChangeSet methodsFor:'queries'! |
cdc9ddc19155
added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents:
985
diff
changeset
|
940 |
|
1820 | 941 |
changedPackages |
942 |
"return a collection of all packages for which changes are in this changeSet" |
|
943 |
||
944 |
|classes changedPackages| |
|
945 |
||
946 |
changedPackages := Set new. |
|
947 |
||
948 |
self changedClasses do:[:cls | |
|
1826 | 949 |
|p| |
950 |
||
951 |
(p := cls package) notNil ifTrue:[ |
|
952 |
changedPackages add:p. |
|
953 |
] |
|
1820 | 954 |
]. |
955 |
^ changedPackages. |
|
956 |
||
957 |
" |
|
958 |
ChangeSet current changedPackages |
|
959 |
" |
|
960 |
||
961 |
"Created: / 22-09-2006 / 16:37:40 / cg" |
|
1827 | 962 |
"Modified: / 25-09-2006 / 21:09:42 / cg" |
1820 | 963 |
! |
964 |
||
1034
cdc9ddc19155
added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents:
985
diff
changeset
|
965 |
includesChangeForClass:aClass |
1096 | 966 |
|nameOfClass| |
1085 | 967 |
|
1842
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
968 |
(self changedClasses includes:aClass) ifFalse:[^ false]. |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
969 |
|
1085 | 970 |
nameOfClass := aClass theNonMetaclass name. |
1340 | 971 |
^ self contains:[:aChange | aChange className = nameOfClass] |
1085 | 972 |
|
973 |
" |
|
974 |
ChangeSet current includesChangeForClass:ChangeSet |
|
1096 | 975 |
ChangeSet current includesChangeForClass:ChangeSet class |
1686 | 976 |
ChangeSet current includesChangeForClass:SourceCodeManagerUtilities |
1085 | 977 |
" |
978 |
||
1842
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
979 |
"Modified: / 09-10-2006 / 13:39:22 / cg" |
1085 | 980 |
! |
981 |
||
982 |
includesChangeForClass:aClass selector:selector |
|
1096 | 983 |
|nameOfClass| |
1085 | 984 |
|
1476 | 985 |
(self changedClasses includes:aClass) ifFalse:[^ false]. |
1478 | 986 |
(self changeSelectors includes:selector) ifFalse:[^ false]. |
1476 | 987 |
|
1096 | 988 |
nameOfClass := aClass name. |
1085 | 989 |
|
1096 | 990 |
^ self contains:[:aChange | |
1232 | 991 |
selector = aChange selector |
1096 | 992 |
ifFalse:[ |
993 |
false |
|
994 |
] ifTrue:[ |
|
1232 | 995 |
nameOfClass = aChange className |
1096 | 996 |
] |
1085 | 997 |
] |
998 |
||
999 |
" |
|
1000 |
ChangeSet current includesChangeForClass:ChangeSet selector:#includesChangeForClass: |
|
1001 |
" |
|
1002 |
||
1003 |
"Created: / 31.10.2001 / 10:26:31 / cg" |
|
1004 |
"Modified: / 31.10.2001 / 10:59:49 / cg" |
|
1096 | 1005 |
! |
1006 |
||
1007 |
includesChangeForClassOrMetaclass:aClass |
|
1008 |
|nameOfClass nameOfMetaclass| |
|
1009 |
||
1842
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
1010 |
(self changedClasses includes:aClass theNonMetaclass) ifFalse:[ |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
1011 |
(self changedClasses includes:aClass theMetaclass) ifFalse:[^ false]. |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
1012 |
]. |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
1013 |
|
1096 | 1014 |
nameOfClass := aClass theNonMetaclass name. |
1015 |
nameOfMetaclass := aClass theMetaclass name. |
|
1016 |
||
1017 |
^ self contains:[:aChange | |
|
1018 |
|changeClassName| |
|
1019 |
||
1020 |
changeClassName := aChange className. |
|
1021 |
changeClassName = nameOfClass or:[changeClassName = nameOfMetaclass] |
|
1022 |
] |
|
1842
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
1023 |
|
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
1024 |
"Modified: / 09-10-2006 / 13:40:29 / cg" |
1127
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1025 |
! |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1026 |
|
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1027 |
includesChangeForClassOrMetaclassOrPrivateClassOf:aClass |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1028 |
|nameOfClass nameOfMetaclass| |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1029 |
|
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1030 |
nameOfClass := aClass theNonMetaclass name. |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1031 |
nameOfMetaclass := aClass theMetaclass name. |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1032 |
|
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1033 |
self do:[:aChange | |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1034 |
|changeClassName changeClass| |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1035 |
|
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1036 |
changeClassName := aChange className. |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1037 |
(changeClassName = nameOfClass) ifTrue:[^ true]. |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1038 |
(changeClassName = nameOfMetaclass) ifTrue:[^ true]. |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1039 |
changeClass := aChange changeClass. |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1040 |
(changeClass notNil |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1041 |
and:[changeClass isPrivate |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1042 |
and:[changeClass owningClass == aClass]]) ifTrue:[ |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1043 |
^ true |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1044 |
] |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1045 |
]. |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1046 |
^ false |
1034
cdc9ddc19155
added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents:
985
diff
changeset
|
1047 |
! ! |
cdc9ddc19155
added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents:
985
diff
changeset
|
1048 |
|
857 | 1049 |
!ChangeSet methodsFor:'utilities'! |
1050 |
||
878 | 1051 |
apply |
1052 |
"apply all changes in the receivers changeSet" |
|
1053 |
||
1054 |
self do:[:aChange | |
|
879 | 1055 |
aChange apply |
878 | 1056 |
] |
1057 |
! |
|
1058 |
||
1865 | 1059 |
condenseChanges:changesToRemove |
1060 |
"remove the given changes - a helper for the rest of the condense protocol" |
|
1061 |
||
1062 |
changesToRemove notEmpty ifTrue:[ |
|
1063 |
changedClasses := changeSelectors := nil. |
|
1064 |
self removeAll:changesToRemove. |
|
1065 |
self changed. |
|
1066 |
Smalltalk changed:#currentChangeSet with:self. |
|
1067 |
]. |
|
1068 |
||
1069 |
"Created: / 12-10-2006 / 16:51:11 / cg" |
|
1070 |
! |
|
1071 |
||
1096 | 1072 |
condenseChangesForClass:aClass |
1073 |
"remove all changes for aClass |
|
1074 |
(i.e. leave changes for other classes)." |
|
1075 |
||
1076 |
self condenseChangesForClass:aClass package:nil |
|
1077 |
! |
|
1078 |
||
878 | 1079 |
condenseChangesForClass:aClass package:aPackageSymbol |
1080 |
"remove all changes for aClass and aPackageSymbol |
|
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1081 |
(i.e. leave methodChanges for other packages). |
956
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
1082 |
This is invoked when a class is checked into the repository." |
878 | 1083 |
|
1186
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1084 |
self condenseChangesForClass:aClass selector:nil package:aPackageSymbol |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1085 |
|
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1086 |
"Modified: / 5.11.2001 / 14:29:22 / cg" |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1087 |
! |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1088 |
|
1830 | 1089 |
condenseChangesForClass:aClass selector:aSelector |
1090 |
"remove all changes for aClass >> selector." |
|
1091 |
||
1092 |
self condenseChangesForClass:aClass selector:aSelector package:nil |
|
1093 |
||
1094 |
"Created: / 26-09-2006 / 17:22:59 / cg" |
|
1095 |
! |
|
1096 |
||
1186
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1097 |
condenseChangesForClass:aClass selector:selectorOrNil package:aPackageSymbol |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1098 |
"remove all changes for aClass/selector and aPackageSymbol |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1099 |
(i.e. leave methodChanges for other packages). |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1100 |
If selectorOrNil is nil, all changes for that class are removed; |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1101 |
otherwise, only changes for the given selector. |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1102 |
This is invoked when a class is checked into the repository." |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1103 |
|
945
f9e349d38d49
care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents:
944
diff
changeset
|
1104 |
|changesToRemove className metaClassName chgCls| |
878 | 1105 |
|
945
f9e349d38d49
care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents:
944
diff
changeset
|
1106 |
className := aClass theNonMetaclass name. |
f9e349d38d49
care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents:
944
diff
changeset
|
1107 |
metaClassName := aClass theMetaclass name. |
1865 | 1108 |
|
1109 |
changesToRemove := self select:[:aChange | |
|
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1110 |
|chgClassName chgClass removeThis mClass mthd| |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1111 |
|
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1112 |
removeThis := false. |
945
f9e349d38d49
care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents:
944
diff
changeset
|
1113 |
chgClassName := aChange className. |
1168 | 1114 |
(chgClassName = className or:[chgClassName = metaClassName]) ifTrue:[ |
1187
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1115 |
removeThis := true |
944
f4cb7e9b034b
when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents:
939
diff
changeset
|
1116 |
] ifFalse:[ |
f4cb7e9b034b
when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents:
939
diff
changeset
|
1117 |
chgCls := aChange changeClass. |
1718 | 1118 |
chgCls isNil ifTrue:[ |
1119 |
(chgClassName startsWith:(aClass name,':')) ifTrue:[ |
|
1120 |
"a change for a private class of a no-longer present one..." |
|
1121 |
removeThis := true |
|
1122 |
]. |
|
1123 |
]. |
|
1124 |
||
944
f4cb7e9b034b
when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents:
939
diff
changeset
|
1125 |
(chgCls notNil |
f4cb7e9b034b
when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents:
939
diff
changeset
|
1126 |
and:[chgCls isPrivate |
1190
02e2436893b6
condense after checkin: also condense sub-sub-private classes
Claus Gittinger <cg@exept.de>
parents:
1188
diff
changeset
|
1127 |
and:[chgCls topOwningClass == aClass]]) ifTrue:[ |
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1128 |
removeThis := true |
944
f4cb7e9b034b
when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents:
939
diff
changeset
|
1129 |
] |
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1130 |
]. |
1186
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1131 |
selectorOrNil notNil ifTrue:[ |
1187
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1132 |
(aChange isMethodChange or:[aChange isMethodRemoveChange]) ifFalse:[ |
1186
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1133 |
removeThis := false. |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1134 |
] ifTrue:[ |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1135 |
aChange selector = selectorOrNil ifFalse:[ |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1136 |
removeThis := false. |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1137 |
]. |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1138 |
] |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1139 |
]. |
1187
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1140 |
|
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1141 |
removeThis ifTrue:[ |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1142 |
aChange isMethodChange ifTrue:[ |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1143 |
mClass := aChange changeClass. |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1144 |
mClass notNil ifTrue:[ |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1145 |
mthd := mClass compiledMethodAt:(aChange selector). |
1096 | 1146 |
mthd isNil ifTrue:[ |
1147 |
"/ mthd does no longer exist |
|
1168 | 1148 |
"/ I no longer understand what this was meant for .. (sigh) |
1149 |
"/ aPackageSymbol notNil ifTrue:[ |
|
1150 |
"/ removeThis := false |
|
1151 |
"/ ] |
|
1096 | 1152 |
] ifFalse:[ |
1153 |
(aPackageSymbol notNil and:[mthd package ~= aPackageSymbol]) ifTrue:[ |
|
1154 |
removeThis := false |
|
1155 |
] |
|
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1156 |
] |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1157 |
] |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1158 |
]. |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1159 |
]. |
1865 | 1160 |
removeThis |
1301 | 1161 |
]. |
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1162 |
|
1865 | 1163 |
self condenseChanges:changesToRemove |
1164 |
||
1165 |
"Modified: / 12-10-2006 / 16:51:38 / cg" |
|
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1166 |
! |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1167 |
|
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1168 |
condenseChangesForExtensionsInPackage:aPackageSymbol |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1169 |
"remove all changes for aClass and aPackageSymbol |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1170 |
(i.e. leave methodChanges for other packages). |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1171 |
This is invoked when a class is checked into the repository." |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1172 |
|
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1173 |
|changesToRemove| |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1174 |
|
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1175 |
changesToRemove := OrderedCollection new. |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1176 |
|
1865 | 1177 |
changesToRemove := self select:[:aChange | |
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1178 |
|removeThis mClass mthd| |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1179 |
|
1187
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1180 |
(aChange isMethodChange or:[aChange isMethodRemoveChange]) ifTrue:[ |
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1181 |
removeThis := false. |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1182 |
mClass := aChange changeClass. |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1183 |
mClass notNil ifTrue:[ |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1184 |
mthd := mClass compiledMethodAt:(aChange selector). |
1187
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1185 |
mthd isNil ifTrue:[ |
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1186 |
aChange isMethodRemoveChange ifTrue:[ |
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1187 |
removeThis := true |
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1188 |
]. |
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1189 |
] ifFalse:[ |
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1190 |
mthd package = aPackageSymbol ifTrue:[ |
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1191 |
removeThis := true |
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1192 |
] |
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1193 |
] |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1194 |
]. |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1195 |
]. |
1865 | 1196 |
removeThis |
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1197 |
]. |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1198 |
|
1865 | 1199 |
self condenseChanges:changesToRemove |
1200 |
||
1201 |
"Created: / 05-11-2001 / 14:21:17 / cg" |
|
1202 |
"Modified: / 12-10-2006 / 16:51:32 / cg" |
|
1203 |
! |
|
1204 |
||
1205 |
condenseChangesForPackage:aPackageSymbol |
|
1206 |
"remove all changes for aPackageSymbol |
|
1207 |
This is invoked when a project is checked into the repository." |
|
1208 |
||
1209 |
|changesToRemove| |
|
1210 |
||
1211 |
changesToRemove := self select:[:aChange | |
|
1212 |
|removeThis mClass mthd| |
|
1213 |
||
1214 |
removeThis := false. |
|
1215 |
(aChange isMethodChange or:[aChange isMethodRemoveChange]) ifTrue:[ |
|
1216 |
mClass := aChange changeClass. |
|
1217 |
mClass notNil ifTrue:[ |
|
1218 |
mthd := mClass compiledMethodAt:(aChange selector). |
|
1219 |
mthd isNil ifTrue:[ |
|
1220 |
aChange isMethodRemoveChange ifTrue:[ |
|
1221 |
removeThis := (mClass package = aPackageSymbol) |
|
1222 |
]. |
|
1223 |
] ifFalse:[ |
|
1224 |
removeThis := (mthd package = aPackageSymbol) |
|
1225 |
] |
|
1226 |
]. |
|
1227 |
] ifFalse:[ |
|
1228 |
(aChange isClassChange) ifTrue:[ |
|
1229 |
removeThis := (aChange changeClass package = aPackageSymbol) |
|
1230 |
]. |
|
1231 |
]. |
|
1232 |
removeThis |
|
1521
ea6cb41e4523
send out a change notification, when I condensed
Claus Gittinger <cg@exept.de>
parents:
1479
diff
changeset
|
1233 |
]. |
ea6cb41e4523
send out a change notification, when I condensed
Claus Gittinger <cg@exept.de>
parents:
1479
diff
changeset
|
1234 |
|
1865 | 1235 |
self condenseChanges:changesToRemove |
1236 |
||
1521
ea6cb41e4523
send out a change notification, when I condensed
Claus Gittinger <cg@exept.de>
parents:
1479
diff
changeset
|
1237 |
"Created: / 05-11-2001 / 14:21:17 / cg" |
1865 | 1238 |
"Modified: / 12-10-2006 / 16:51:27 / cg" |
878 | 1239 |
! |
1240 |
||
857 | 1241 |
diffSetsAgainst:anotherChangeSet |
1242 |
"walk over the receiver and anotherChangeSet, |
|
1243 |
add all changes to one of the tree lists: |
|
946 | 1244 |
onlyInReceiver, onlyInArg or changed, |
1245 |
each being a changeSet containing corresponding changes. |
|
1246 |
WARNING: destructive; could modify both the receiver and the argument" |
|
857 | 1247 |
|
1200
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1248 |
|otherChangeIndicesBySelector otherNonMethodChangeIndices changeIndicesBySelector nonMethodChangeIndices |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1249 |
onlyInReceiver onlyInArg changedMethods |
857 | 1250 |
indexFromChangedMethodsToA indexFromChangedMethodsToB |
864 | 1251 |
"info" ret| |
857 | 1252 |
|
1253 |
onlyInReceiver := ChangeSet new. |
|
1254 |
onlyInArg := ChangeSet new. |
|
1255 |
changedMethods := ChangeSet new. |
|
1256 |
||
1257 |
indexFromChangedMethodsToA := OrderedCollection new. |
|
1258 |
indexFromChangedMethodsToB := OrderedCollection new. |
|
1259 |
||
1200
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1260 |
otherChangeIndicesBySelector := Dictionary new. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1261 |
otherNonMethodChangeIndices := OrderedCollection new. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1262 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1263 |
"/ these caches reduces square runtime to almost linear... |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1264 |
anotherChangeSet keysAndValuesDo:[:idxB :aChangeInB | |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1265 |
|setOfOtherChangeIndicesForThisSelector| |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1266 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1267 |
aChangeInB isMethodChange ifTrue:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1268 |
setOfOtherChangeIndicesForThisSelector := otherChangeIndicesBySelector at:(aChangeInB selector) ifAbsentPut:[OrderedCollection new]. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1269 |
setOfOtherChangeIndicesForThisSelector add:idxB. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1270 |
] ifFalse:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1271 |
otherNonMethodChangeIndices add:idxB |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1272 |
]. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1273 |
]. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1274 |
|
857 | 1275 |
self keysAndValuesDo:[:idxA :aChangeInA | |
1200
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1276 |
|indicesOfChangesToExplore anyFound ch| |
857 | 1277 |
|
946 | 1278 |
anyFound := false. |
857 | 1279 |
|
1200
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1280 |
aChangeInA isMethodChange ifTrue:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1281 |
indicesOfChangesToExplore := otherChangeIndicesBySelector at:(aChangeInA selector) ifAbsent:#() |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1282 |
] ifFalse:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1283 |
indicesOfChangesToExplore := otherNonMethodChangeIndices. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1284 |
]. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1285 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1286 |
indicesOfChangesToExplore do:[:idxB | |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1287 |
|aChangeInB| |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1288 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1289 |
aChangeInB := anotherChangeSet at:idxB. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1290 |
|
946 | 1291 |
(aChangeInA isForSameAs:aChangeInB) ifTrue:[ |
1292 |
anyFound := true. |
|
857 | 1293 |
|
946 | 1294 |
"/ also in B - is it different ? |
1295 |
(aChangeInA sameAs:aChangeInB) ifFalse:[ |
|
1296 |
changedMethods add:aChangeInA. |
|
1297 |
indexFromChangedMethodsToA add:idxA. |
|
1298 |
indexFromChangedMethodsToB add:idxB. |
|
1299 |
] ifTrue:[ |
|
1300 |
aChangeInA isMethodChange ifTrue:[ |
|
1301 |
aChangeInA methodCategory ~= aChangeInB methodCategory ifTrue:[ |
|
1302 |
"/ only the category is different; |
|
1303 |
"/ make it a MethodCategory changes. |
|
857 | 1304 |
|
946 | 1305 |
ch := MethodCategoryChange new |
1306 |
className:aChangeInA className |
|
1307 |
selector:aChangeInA selector |
|
1308 |
category:aChangeInA methodCategory. |
|
1309 |
self at:idxA put:ch. |
|
857 | 1310 |
|
946 | 1311 |
ch := MethodCategoryChange new |
1312 |
className:aChangeInB className |
|
1313 |
selector:aChangeInB selector |
|
1314 |
category:aChangeInB methodCategory. |
|
1315 |
anotherChangeSet at:idxB put:ch. |
|
857 | 1316 |
|
946 | 1317 |
changedMethods add:aChangeInA. |
1318 |
indexFromChangedMethodsToA add:idxA. |
|
1319 |
indexFromChangedMethodsToB add:idxB. |
|
1320 |
] |
|
1321 |
]. |
|
1322 |
] |
|
1323 |
] ifFalse:[ |
|
1324 |
(aChangeInA sameAs:aChangeInB) ifTrue:[ |
|
1325 |
anyFound := true. |
|
1326 |
] ifFalse:[ |
|
1327 |
] |
|
1328 |
] |
|
1329 |
]. |
|
857 | 1330 |
|
946 | 1331 |
anyFound ifFalse:[ |
1332 |
onlyInReceiver add:aChangeInA. |
|
1333 |
] |
|
857 | 1334 |
]. |
1335 |
||
1200
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1336 |
"/ these caches reduces square runtime to almost linear... |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1337 |
changeIndicesBySelector := Dictionary new. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1338 |
nonMethodChangeIndices := OrderedCollection new. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1339 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1340 |
self keysAndValuesDo:[:idxA :aChangeInA | |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1341 |
|setOfChangeIndicesForThisSelector| |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1342 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1343 |
aChangeInA isMethodChange ifTrue:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1344 |
setOfChangeIndicesForThisSelector := changeIndicesBySelector at:(aChangeInA selector) ifAbsentPut:[OrderedCollection new]. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1345 |
setOfChangeIndicesForThisSelector add:idxA. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1346 |
] ifFalse:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1347 |
nonMethodChangeIndices add:idxA |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1348 |
]. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1349 |
]. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1350 |
|
857 | 1351 |
anotherChangeSet keysAndValuesDo:[:idxB :aChangeInB | |
1200
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1352 |
|anyFound indicesOfChangesToExplore| |
857 | 1353 |
|
946 | 1354 |
anyFound := false. |
857 | 1355 |
|
1200
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1356 |
aChangeInB isMethodChange ifTrue:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1357 |
indicesOfChangesToExplore := changeIndicesBySelector at:(aChangeInB selector) ifAbsent:#() |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1358 |
] ifFalse:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1359 |
indicesOfChangesToExplore := nonMethodChangeIndices. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1360 |
]. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1361 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1362 |
indicesOfChangesToExplore do:[:idxA | |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1363 |
|aChangeInA idxM| |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1364 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1365 |
aChangeInA := self at:idxA. |
857 | 1366 |
|
946 | 1367 |
(aChangeInA isForSameAs:aChangeInB) ifTrue:[ |
1368 |
anyFound := true. |
|
857 | 1369 |
|
946 | 1370 |
"/ also in B - is it different ? |
1371 |
(aChangeInA sameAs:aChangeInB) ifFalse:[ |
|
1372 |
"/ already there ? |
|
1373 |
idxM := changedMethods findFirst:[:c | c isForSameAs:aChangeInB]. |
|
1374 |
idxM == 0 ifTrue:[ |
|
1375 |
changedMethods add:aChangeInB. |
|
1376 |
indexFromChangedMethodsToB add:idxB. |
|
1377 |
] ifFalse:[ |
|
1378 |
indexFromChangedMethodsToB at:idxM put:idxB |
|
1379 |
] |
|
1380 |
] |
|
1381 |
] ifFalse:[ |
|
1382 |
(aChangeInA sameAs:aChangeInB) ifTrue:[ |
|
1383 |
anyFound := true. |
|
1384 |
] ifFalse:[ |
|
1385 |
] |
|
1386 |
] |
|
1387 |
]. |
|
1388 |
anyFound ifFalse:[ |
|
1389 |
onlyInArg add:aChangeInB. |
|
1390 |
] |
|
857 | 1391 |
]. |
1392 |
||
864 | 1393 |
"/ info := OrderedCollection new:(changedMethods size). |
1394 |
"/ changedMethods keysAndValuesDo:[:idx :changedMethod | |
|
1395 |
"/ info add:(Array |
|
1396 |
"/ with:(indexFromChangedMethodsToA at:idx) |
|
1397 |
"/ with:(indexFromChangedMethodsToB at:idx) |
|
1398 |
"/ ) |
|
1399 |
"/ ]. |
|
1450 | 1400 |
changedMethods := (1 to:changedMethods size) asOrderedCollection collect:[:idx | |
946 | 1401 |
|cA cB| |
857 | 1402 |
|
946 | 1403 |
cA := self at:(indexFromChangedMethodsToA at:idx). |
1404 |
cB := anotherChangeSet at:(indexFromChangedMethodsToB at:idx). |
|
1405 |
Array with:cA with:cB |
|
1406 |
]. |
|
857 | 1407 |
|
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1408 |
ret := DiffSet new |
1450 | 1409 |
changed:changedMethods |
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1410 |
onlyInReceiver:onlyInReceiver |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1411 |
onlyInArg:onlyInArg. |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1412 |
"/ ret info:info. |
864 | 1413 |
^ret |
857 | 1414 |
! ! |
1415 |
||
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1416 |
!ChangeSet::ChangeFileReader methodsFor:'accessing'! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1417 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1418 |
changeAction:aBlock |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1419 |
changeAction := aBlock. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1420 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1421 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1422 |
changeSet:something |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1423 |
"set the value of the instance variable 'changeSet' (automatically generated)" |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1424 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1425 |
changeSet := something. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1426 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1427 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1428 |
inputStream:aStream |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1429 |
inputStream := aStream. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1430 |
! ! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1431 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1432 |
!ChangeSet::ChangeFileReader methodsFor:'helpers'! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1433 |
|
1176 | 1434 |
addChange:change |
1435 |
changeAction value:change value:lineNumber value:position. |
|
1436 |
! |
|
1437 |
||
1438 |
checkReceiverIsGlobalNamed:expectedName |
|
1439 |
^ self variableNameOfReceiver = expectedName |
|
1440 |
! |
|
1441 |
||
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1442 |
classNameOf:aReceiver |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1443 |
(aReceiver isUnaryMessage |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1444 |
and:[aReceiver selector == #class]) ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1445 |
^ (aReceiver receiver name) , ' class'. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1446 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1447 |
^ aReceiver name |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1448 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1449 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1450 |
receiversClassName |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1451 |
^ self classNameOf:receiver |
1176 | 1452 |
! |
1453 |
||
1454 |
variableNameOfReceiver |
|
1455 |
||
1456 |
receiver isVariable ifFalse:[ ^ nil ]. |
|
1457 |
^ receiver name |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1458 |
! ! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1459 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1460 |
!ChangeSet::ChangeFileReader methodsFor:'reading'! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1461 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1462 |
changesFromParseTree:aTree lineNumber:initialLineNumberOrNil position:initialPositionOrNil |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1463 |
"given a parse-tree (from parsing some changes source/chunk), |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1464 |
create changes and evaluate changeAction on each. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1465 |
The chnageAction-block is invoked with the change and a lineNumberOrNil as |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1466 |
arg; the lineNumber is only valid, if the underlying inputStream |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1467 |
provides line-numbers; otherwise, nil is passed." |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1468 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1469 |
lineNumber := initialLineNumberOrNil. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1470 |
position := initialPositionOrNil. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1471 |
parseTree := aTree. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1472 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1473 |
selector := aTree selector. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1474 |
receiver := aTree receiver. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1475 |
arguments := aTree arguments. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1476 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1477 |
receiver isMessage ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1478 |
receiverSelector := receiver selector. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1479 |
receiverReceiver := receiver receiver. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1480 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1481 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1482 |
^ self processChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1483 |
! ! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1484 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1485 |
!ChangeSet::ChangeFileReader methodsFor:'reading-private'! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1486 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1487 |
handleClassCommentChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1488 |
|change| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1489 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1490 |
className := self receiversClassName. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1491 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1492 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1493 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1494 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1495 |
change := ClassCommentChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1496 |
change className:className comment:(arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1497 |
change source:(parseTree printString). |
1176 | 1498 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1499 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1500 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1501 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1502 |
handleClassDefinitionChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1503 |
|nameSpace change| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1504 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1505 |
className := (arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1506 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1507 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1508 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1509 |
nameSpace := Class nameSpaceQuerySignal query. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1510 |
nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1511 |
className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1512 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1513 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1514 |
change := ClassDefinitionChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1515 |
change className:className; source:(parseTree printString). |
1453 | 1516 |
receiver isVariable ifTrue:[ |
1517 |
change superClassName:receiver name. |
|
1518 |
]. |
|
1428
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
1519 |
selector keywords with:arguments do:[:kw :arg | |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
1520 |
kw = #'instanceVariableNames:' ifTrue:[ |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
1521 |
change instanceVariableNames:arg evaluate. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
1522 |
]. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
1523 |
kw = #'classVariableNames:' ifTrue:[ |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
1524 |
change classVariableNames:arg evaluate. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
1525 |
]. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
1526 |
kw = #'poolDictionaries:' ifTrue:[ |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
1527 |
change poolDictionaries:arg evaluate. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
1528 |
]. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
1529 |
kw = #'category:' ifTrue:[ |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
1530 |
change category:arg evaluate. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
1531 |
]. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
1532 |
]. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1533 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1534 |
change package:(Class packageQuerySignal query). |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1535 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1536 |
"/ change nameSpaceName:(nameSpace name). |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1537 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1538 |
"/ |
1176 | 1539 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1540 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1541 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1542 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1543 |
handleClassInstanceVariableDefinitionChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1544 |
|change| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1545 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1546 |
className := self receiversClassName. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1547 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1548 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1549 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1550 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1551 |
change := ClassInstVarDefinitionChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1552 |
change className:className. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1553 |
change source:(parseTree printString). |
1176 | 1554 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1555 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1556 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1557 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1558 |
handleMethodCategoryChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1559 |
|change| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1560 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1561 |
(receiver isMessage |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1562 |
and:[receiverSelector == #'compiledMethodAt:']) ifFalse:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1563 |
self error:'unexpected change' mayProceed:true. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1564 |
^ false. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1565 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1566 |
className := self classNameOf:receiverReceiver. |
1358 | 1567 |
className isNil ifTrue:[self halt:'should not happen']. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1568 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1569 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1570 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1571 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1572 |
methodSelector := (receiver arguments at:1) evaluate. |
1358 | 1573 |
methodSelector isNil ifTrue:[self halt:'should not happen']. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1574 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1575 |
change := MethodCategoryChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1576 |
change |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1577 |
className:className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1578 |
selector:methodSelector |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1579 |
category:(arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1580 |
|
1176 | 1581 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1582 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1583 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1584 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1585 |
handleMethodCategoryRenameChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1586 |
|change| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1587 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1588 |
className := self receiversClassName. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1589 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1590 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1591 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1592 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1593 |
change := MethodCategoryRenameChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1594 |
change |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1595 |
className:className; |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1596 |
oldCategoryName:(arguments at:1) evaluate |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1597 |
newCategoryName:(arguments at:2) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1598 |
|
1176 | 1599 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1600 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1601 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1602 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1603 |
handleMethodChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1604 |
|priv categoryName methodSource changes change parser | |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1605 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1606 |
(selector == #'ignoredMethodsFor:') ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1607 |
priv := #ignored. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1608 |
] ifFalse:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1609 |
priv := nil |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1610 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1611 |
className := self receiversClassName. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1612 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1613 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1614 |
"/ ]. |
1182 | 1615 |
((selector == #'methods') or:[(selector == #'methodsFor')]) ifTrue:[ |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1616 |
categoryName := 'uncategorized' |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1617 |
] ifFalse:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1618 |
categoryName := (arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1619 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1620 |
inputStream skipSeparators. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1621 |
lineNumber := inputStream lineNumber. |
1209
f98d5eb855d3
code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents:
1200
diff
changeset
|
1622 |
position := inputStream position1Based. |
1176 | 1623 |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1624 |
methodSource := inputStream nextChunk. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1625 |
changes := OrderedCollection new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1626 |
|
1395
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1389
diff
changeset
|
1627 |
[methodSource notEmptyOrNil] whileTrue:[ |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1628 |
parser := Parser |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1629 |
parseMethodArgAndVarSpecification:methodSource |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1630 |
in:nil |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1631 |
ignoreErrors:true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1632 |
ignoreWarnings:true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1633 |
parseBody:false. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1634 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1635 |
parser isNil ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1636 |
"/ something wierd ... |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1637 |
methodSelector := '????'. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1638 |
] ifFalse:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1639 |
methodSelector := parser selector. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1640 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1641 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1642 |
change := MethodChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1643 |
change |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1644 |
className:className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1645 |
selector:methodSelector |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1646 |
source:methodSource |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1647 |
category:categoryName |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1648 |
privacy:priv. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1649 |
|
1176 | 1650 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1651 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1652 |
inputStream skipSeparators. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1653 |
lineNumber := inputStream lineNumber. |
1209
f98d5eb855d3
code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents:
1200
diff
changeset
|
1654 |
position := inputStream position1Based. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1655 |
methodSource := inputStream nextChunk. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1656 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1657 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1658 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1659 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1660 |
handleMethodPrivacyChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1661 |
|change| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1662 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1663 |
(receiver isMessage |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1664 |
and:[receiverSelector == #'compiledMethodAt:']) ifFalse:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1665 |
self error:'unexpected change' mayProceed:true. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1666 |
^ false. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1667 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1668 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1669 |
className := self classNameOf:receiverReceiver. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1670 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1671 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1672 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1673 |
methodSelector := (receiver arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1674 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1675 |
change := MethodPrivacyChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1676 |
change |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1677 |
className:className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1678 |
selector:methodSelector |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1679 |
privacy:(arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1680 |
|
1176 | 1681 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1682 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1683 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1684 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1685 |
handleNameSpaceCreationChange |
1176 | 1686 |
|change| |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1687 |
|
1176 | 1688 |
(self checkReceiverIsGlobalNamed:#Namespace) ifFalse:[ |
1689 |
(self checkReceiverIsGlobalNamed:#NameSpace) ifFalse:[ |
|
1690 |
self error:'unexpected receiver in nameSpace message' mayProceed:true. |
|
1691 |
^ false |
|
1692 |
]. |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1693 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1694 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1695 |
className := (arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1696 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1697 |
change := NameSpaceCreationChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1698 |
change name:className. |
1176 | 1699 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1700 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1701 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1702 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1703 |
handlePrimitiveChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1704 |
|change primSource| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1705 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1706 |
className := self receiversClassName. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1707 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1708 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1709 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1710 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1711 |
inputStream skipSeparators. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1712 |
primSource := inputStream nextChunk. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1713 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1714 |
selector == #'primitiveDefinitions' ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1715 |
change := ClassPrimitiveDefinitionsChange new |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1716 |
] ifFalse:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1717 |
selector == #'primitiveFunctions' ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1718 |
change := ClassPrimitiveFunctionsChange new |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1719 |
] ifFalse:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1720 |
change := ClassPrimitiveVariablesChange new |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1721 |
] |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1722 |
]. |
1287 | 1723 |
change className:className source:primSource. |
1176 | 1724 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1725 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1726 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1727 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1728 |
handleRemoveClassChange |
1176 | 1729 |
|change| |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1730 |
|
1176 | 1731 |
(self checkReceiverIsGlobalNamed:#Smalltalk) ifFalse:[ |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1732 |
self error:'unexpected receiver in remove-class message' mayProceed:true. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1733 |
^ false |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1734 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1735 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1736 |
className := (arguments at:1) name. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1737 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1738 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1739 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1740 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1741 |
change := ClassRemoveChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1742 |
change className:className. |
1176 | 1743 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1744 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1745 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1746 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1747 |
handleRemoveMethodChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1748 |
|change| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1749 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1750 |
className := self receiversClassName. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1751 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1752 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1753 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1754 |
methodSelector := (arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1755 |
change := MethodRemoveChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1756 |
change className:className selector:methodSelector. |
1176 | 1757 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1758 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1759 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1760 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1761 |
handleRenameClassChange |
1176 | 1762 |
|oldName newName change| |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1763 |
|
1176 | 1764 |
(self checkReceiverIsGlobalNamed:#Smalltalk) ifFalse:[ |
1765 |
self error:'unexpected receiver in rename-class message' mayProceed:true. |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1766 |
^ false. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1767 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1768 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1769 |
oldName := (arguments at:1) name. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1770 |
newName := (arguments at:2) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1771 |
|
1176 | 1772 |
change := ClassRenameChange new oldName:oldName newName:newName. |
1773 |
self addChange:change. |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1774 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1775 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1776 |
|
1181
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1777 |
handleSqueakCommentStamp |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1778 |
|comment change| |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1779 |
|
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1780 |
inputStream skipSeparators. |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1781 |
|
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1782 |
comment := inputStream nextChunk. |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1783 |
|
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1784 |
className := self receiversClassName. |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1785 |
change := ClassCommentChange new. |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1786 |
change className:className comment:comment. |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1787 |
change source:(parseTree printString). |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1788 |
self addChange:change. |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1789 |
^ true |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1790 |
! |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1791 |
|
1183 | 1792 |
handleVW7ClassDefinitionChange |
1793 |
|nameSpace change| |
|
1794 |
||
1795 |
nameSpace := receiver. |
|
1796 |
className := (arguments at:1) evaluate. |
|
1797 |
||
1798 |
"/ nameSpace := Class nameSpaceQuerySignal query. |
|
1799 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
|
1800 |
"/ className := nameSpace name , '::' , className |
|
1801 |
"/ ]. |
|
1802 |
||
1803 |
change := ClassDefinitionChange new. |
|
1804 |
change className:className; source:(parseTree printString). |
|
1805 |
||
1806 |
change package:(Class packageQuerySignal query). |
|
1807 |
self addChange:change. |
|
1808 |
^ true |
|
1809 |
! |
|
1810 |
||
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1811 |
processChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1812 |
"given a parse-tree (from parsing some changes source/chunk), |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1813 |
create changes and evaluate changeAction on each. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1814 |
The block is invoked with the change and a lineNumberOrNil as |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1815 |
arg; the lineNumber is only valid, if the underlying stream |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1816 |
provides line-numbers; otherwise, nil is passed." |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1817 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1818 |
(selector == #'methods' |
1182 | 1819 |
or:[(selector == #'methodsFor') |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1820 |
or:[(selector == #'methodsFor:') |
1176 | 1821 |
or:[(selector == #'methodsForUndefined:') |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1822 |
or:[(selector == #'publicMethodsFor:') |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1823 |
or:[(selector == #'privateMethodsFor:') |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1824 |
or:[(selector == #'methodsFor:stamp:') |
1182 | 1825 |
or:[(selector == #'ignoredMethodsFor:')]]]]]]]) ifTrue:[ |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1826 |
^ self handleMethodChange. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1827 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1828 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1829 |
selector == #'removeSelector:' ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1830 |
^ self handleRemoveMethodChange. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1831 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1832 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1833 |
"/ any subclass definiton selector ? |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1834 |
(Behavior definitionSelectors includes:selector) |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1835 |
ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1836 |
^ self handleClassDefinitionChange. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1837 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1838 |
|
1183 | 1839 |
(selector == #'defineClass:superclass:indexedType:private:instanceVariableNames:classInstanceVariableNames:imports:category:') |
1840 |
ifTrue:[ |
|
1841 |
^ self handleVW7ClassDefinitionChange. |
|
1842 |
]. |
|
1843 |
||
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1844 |
selector == #'renameCategory:to:' ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1845 |
^ self handleMethodCategoryRenameChange. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1846 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1847 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1848 |
(selector == #'category:') ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1849 |
^ self handleMethodCategoryChange. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1850 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1851 |
(selector == #'privacy:') ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1852 |
^ self handleMethodPrivacyChange. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1853 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1854 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1855 |
selector == #'comment:' ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1856 |
^ self handleClassCommentChange. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1857 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1858 |
|
1181
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1859 |
selector == #'commentStamp:prior:' ifTrue:[ |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1860 |
^ self handleSqueakCommentStamp. |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1861 |
]. |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
1862 |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1863 |
selector == #'instanceVariableNames:' ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1864 |
^ self handleClassInstanceVariableDefinitionChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1865 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1866 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1867 |
selector == #'removeClass:' ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1868 |
^ self handleRemoveClassChange. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1869 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1870 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1871 |
selector == #'renameClass:to:' ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1872 |
^ self handleRenameClassChange. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1873 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1874 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1875 |
selector == #'name:' ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1876 |
^ self handleNameSpaceCreationChange. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1877 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1878 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1879 |
(selector == #'primitiveDefinitions' |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1880 |
or:[selector == #'primitiveFunctions' |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1881 |
or:[selector == #'primitiveVariables']]) ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1882 |
^ self handlePrimitiveChange. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1883 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1884 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1885 |
^ false |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1886 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1887 |
"Created: / 16.2.1998 / 13:42:40 / cg" |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1888 |
"Modified: / 15.12.1999 / 00:29:06 / cg" |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1889 |
! ! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1890 |
|
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1891 |
!ChangeSet::DiffSet methodsFor:'accessing'! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1892 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1893 |
changed |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1894 |
"return the value of the instance variable 'changed' (automatically generated)" |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1895 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1896 |
^ changed |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1897 |
! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1898 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1899 |
changed:something |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1900 |
"set the value of the instance variable 'changed' (automatically generated)" |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1901 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1902 |
changed := something. |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1903 |
! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1904 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1905 |
changed:changedArg onlyInReceiver:onlyInReceiverArg onlyInArg:onlyInArgArg |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1906 |
"set instance variables (automatically generated)" |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1907 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1908 |
changed := changedArg. |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1909 |
changed isNil ifTrue:[changed := OrderedCollection new]. |
1450 | 1910 |
|
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1911 |
onlyInReceiver := onlyInReceiverArg. |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1912 |
onlyInReceiver isNil ifTrue:[onlyInReceiver := ChangeSet new]. |
1450 | 1913 |
|
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1914 |
onlyInArg := onlyInArgArg. |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1915 |
onlyInArg isNil ifTrue:[onlyInArg := ChangeSet new]. |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1916 |
! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1917 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1918 |
onlyInArg |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1919 |
^ onlyInArg |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1920 |
! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1921 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1922 |
onlyInArg:something |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1923 |
onlyInArg := something. |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1924 |
! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1925 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1926 |
onlyInReceiver |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1927 |
^ onlyInReceiver |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1928 |
! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1929 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1930 |
onlyInReceiver:something |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1931 |
onlyInReceiver := something. |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1932 |
! ! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1933 |
|
1292 | 1934 |
!ChangeSet::DiffSet methodsFor:'queries'! |
1935 |
||
1936 |
isEmpty |
|
1937 |
^ changed isEmpty |
|
1938 |
and:[ onlyInReceiver isEmpty |
|
1939 |
and:[ onlyInArg isEmpty ] ] |
|
1940 |
! ! |
|
1941 |
||
1182 | 1942 |
!ChangeSet::DolphinPACFileReader methodsFor:'reading-private'! |
1943 |
||
1944 |
handleCategoriesForClass |
|
1945 |
|category change| |
|
1946 |
||
1947 |
inputStream skipSeparators. |
|
1948 |
category := inputStream nextChunk. |
|
1949 |
||
1950 |
change := ClassCategoryChange new. |
|
1951 |
change |
|
1952 |
className:className |
|
1953 |
category:category. |
|
1954 |
||
1955 |
self addChange:change. |
|
1956 |
^ true |
|
1957 |
! |
|
1958 |
||
1959 |
handleCategoriesForMethod |
|
1960 |
|methodSelector categories category change isPrivate isPublic| |
|
1961 |
||
1962 |
methodSelector := (arguments at:1) evaluate. |
|
1963 |
inputStream skipSeparators. |
|
1964 |
isPrivate := false. |
|
1965 |
||
1966 |
categories := OrderedCollection new. |
|
1967 |
[ |
|
1968 |
category := inputStream nextChunk withoutSeparators. |
|
1969 |
category notEmpty ifTrue:[ |
|
1970 |
categories add:category |
|
1971 |
]. |
|
1972 |
category notEmpty |
|
1973 |
] whileTrue. |
|
1974 |
||
1975 |
categories size > 1 ifTrue:[ |
|
1976 |
isPrivate := categories includes:'private'. |
|
1977 |
categories remove:'private' ifAbsent:nil. |
|
1978 |
]. |
|
1979 |
categories size > 1 ifTrue:[ |
|
1980 |
isPublic := categories includes:'public'. |
|
1981 |
categories remove:'public' ifAbsent:nil. |
|
1982 |
]. |
|
1983 |
"/ categories size > 1 ifTrue:[ |
|
1984 |
"/ self halt. |
|
1985 |
"/ ]. |
|
1986 |
||
1987 |
category := categories first. |
|
1988 |
isPrivate ifTrue:[ |
|
1989 |
category := category , '-private'. |
|
1990 |
]. |
|
1991 |
||
1992 |
change := MethodCategoryChange new. |
|
1993 |
change |
|
1994 |
className:className |
|
1995 |
selector:methodSelector |
|
1996 |
category:category. |
|
1997 |
||
1998 |
self addChange:change. |
|
1999 |
^ true |
|
2000 |
! |
|
2001 |
||
2002 |
processChange |
|
2003 |
"given a parse-tree (from parsing some changes source/chunk), |
|
2004 |
create changes and evaluate changeAction on each. |
|
2005 |
The block is invoked with the change and a lineNumberOrNil as |
|
2006 |
arg; the lineNumber is only valid, if the underlying stream |
|
2007 |
provides line-numbers; otherwise, nil is passed." |
|
2008 |
||
2009 |
(selector == #'categoriesForClass') ifTrue:[ |
|
2010 |
^ self handleCategoriesForClass. |
|
2011 |
]. |
|
2012 |
(selector == #'categoriesFor:') ifTrue:[ |
|
2013 |
^ self handleCategoriesForMethod. |
|
2014 |
]. |
|
2015 |
selector == #'subclass:instanceVariableNames:classVariableNames:poolDictionaries:classInstanceVariableNames:' ifTrue:[ |
|
2016 |
^ self handleClassDefinitionChange. |
|
2017 |
]. |
|
2018 |
^ super processChange |
|
2019 |
||
2020 |
||
2021 |
"/ selector == #named:superclass:indexedInstanceVariables:instanceVariableNames:classVariableNames:sharedPools:classInstanceVariableNames: ifTrue:[ |
|
2022 |
"/ ^ self handleClassDefinitionChange. |
|
2023 |
"/ ]. |
|
2024 |
"/ (selector == #'key:value:') ifTrue:[ |
|
2025 |
"/ (self checkReceiverIsGlobalNamed:'Annotation') ifTrue:[ |
|
2026 |
"/ ^ self handleAnnotation. |
|
2027 |
"/ ] |
|
2028 |
"/ ]. |
|
2029 |
"/ selector == #'method' ifTrue:[ |
|
2030 |
"/ ^ self handleMethodChange:false. |
|
2031 |
"/ ]. |
|
2032 |
"/ selector == #'classMethod' ifTrue:[ |
|
2033 |
"/ ^ self handleMethodChange:true. |
|
2034 |
"/ ]. |
|
2035 |
"/ |
|
2036 |
"/ selector == #'initializer' ifTrue:[ |
|
2037 |
"/ ^ true |
|
2038 |
"/ ]. |
|
2039 |
"/ selector == #'initialize' ifTrue:[ |
|
2040 |
"/ ^ true |
|
2041 |
"/ ]. |
|
2042 |
"/self halt. |
|
2043 |
"/ |
|
2044 |
"/ ^ false |
|
2045 |
||
2046 |
"Created: / 16.2.1998 / 13:42:40 / cg" |
|
2047 |
"Modified: / 15.12.1999 / 00:29:06 / cg" |
|
2048 |
! ! |
|
2049 |
||
1176 | 2050 |
!ChangeSet::SIFChangeFileReader methodsFor:'reading-private'! |
2051 |
||
2052 |
handleAnnotation |
|
2053 |
|key value lastChange change| |
|
2054 |
||
2055 |
key := (arguments at:1) evaluate. |
|
2056 |
value := (arguments at:2) evaluate. |
|
2057 |
||
1422 | 2058 |
key = 'Prerequisite' ifTrue:[ |
2059 |
"/ change := SIFPrerequisiteChange new prerequisiteFileName:value. |
|
2060 |
"/ self addChange:change. |
|
2061 |
^ true |
|
2062 |
]. |
|
2063 |
||
1176 | 2064 |
lastChange := changeSet last. |
2065 |
||
2066 |
key = 'package' ifTrue:[ |
|
2067 |
change := ClassCategoryChange new className:(lastChange className) category:value. |
|
2068 |
self addChange:change. |
|
2069 |
^ true |
|
2070 |
]. |
|
2071 |
key = 'category' ifTrue:[ |
|
2072 |
"/ change := MethodCategoryChange new className:(lastChange className) selector:(lastChange selector) category:value. |
|
2073 |
"/ self addChange:change. |
|
2074 |
lastChange category:value. |
|
2075 |
^ true |
|
2076 |
]. |
|
2077 |
key = 'stamp' ifTrue:[ |
|
2078 |
"/ lastChange timeStamp:value. |
|
2079 |
^ true |
|
2080 |
]. |
|
2081 |
^ false |
|
2082 |
! |
|
2083 |
||
2084 |
handleClassDefinitionChange |
|
2085 |
|nameSpace change| |
|
2086 |
||
2087 |
(self checkReceiverIsGlobalNamed:#Class) ifFalse:[ |
|
2088 |
self error:'unexpected receiver in classDefinition message' mayProceed:true. |
|
2089 |
^ false. |
|
1313 | 2090 |
]. |
1176 | 2091 |
className := (arguments at:1) evaluate. |
2092 |
||
2093 |
nameSpace := Class nameSpaceQuerySignal query. |
|
2094 |
nameSpace ~~ Smalltalk ifTrue:[ |
|
2095 |
className := nameSpace name , '::' , className |
|
2096 |
]. |
|
2097 |
||
2098 |
change := ClassDefinitionChange new. |
|
2099 |
change className:className; source:(parseTree printString). |
|
2100 |
||
2101 |
change package:(Class packageQuerySignal query). |
|
2102 |
self addChange:change. |
|
2103 |
^ true |
|
2104 |
! |
|
2105 |
||
2106 |
handleMethodChange:isMeta |
|
1188 | 2107 |
|categoryName methodSource change parser | |
1176 | 2108 |
|
2109 |
className := self receiversClassName. |
|
2110 |
isMeta ifTrue:[ |
|
2111 |
className := className , ' class' |
|
2112 |
]. |
|
2113 |
||
2114 |
categoryName := 'uncategorized'. |
|
2115 |
||
2116 |
inputStream skipSeparators. |
|
2117 |
lineNumber := inputStream lineNumber. |
|
1209
f98d5eb855d3
code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents:
1200
diff
changeset
|
2118 |
position := inputStream position1Based. |
1176 | 2119 |
|
2120 |
methodSource := inputStream nextChunk. |
|
2121 |
||
2122 |
parser := Parser |
|
2123 |
parseMethodArgAndVarSpecification:methodSource |
|
2124 |
in:nil |
|
2125 |
ignoreErrors:true |
|
2126 |
ignoreWarnings:true |
|
2127 |
parseBody:false. |
|
2128 |
||
2129 |
parser isNil ifTrue:[ |
|
2130 |
"/ something wierd ... |
|
2131 |
methodSelector := '????'. |
|
2132 |
] ifFalse:[ |
|
2133 |
methodSelector := parser selector. |
|
2134 |
]. |
|
2135 |
||
2136 |
change := MethodChange new. |
|
2137 |
change |
|
2138 |
className:className |
|
2139 |
selector:methodSelector |
|
2140 |
source:methodSource |
|
2141 |
category:categoryName |
|
1188 | 2142 |
privacy:nil. |
1176 | 2143 |
|
2144 |
self addChange:change. |
|
2145 |
^ true |
|
2146 |
! |
|
2147 |
||
2148 |
processChange |
|
2149 |
"given a parse-tree (from parsing some changes source/chunk), |
|
2150 |
create changes and evaluate changeAction on each. |
|
2151 |
The block is invoked with the change and a lineNumberOrNil as |
|
2152 |
arg; the lineNumber is only valid, if the underlying stream |
|
2153 |
provides line-numbers; otherwise, nil is passed." |
|
2154 |
||
2155 |
(selector == #'interchangeVersion:') ifTrue:[ |
|
2156 |
^ true |
|
2157 |
]. |
|
2158 |
selector == #named:superclass:indexedInstanceVariables:instanceVariableNames:classVariableNames:sharedPools:classInstanceVariableNames: ifTrue:[ |
|
2159 |
^ self handleClassDefinitionChange. |
|
2160 |
]. |
|
2161 |
(selector == #'key:value:') ifTrue:[ |
|
2162 |
(self checkReceiverIsGlobalNamed:'Annotation') ifTrue:[ |
|
2163 |
^ self handleAnnotation. |
|
2164 |
] |
|
2165 |
]. |
|
2166 |
selector == #'method' ifTrue:[ |
|
2167 |
^ self handleMethodChange:false. |
|
2168 |
]. |
|
2169 |
selector == #'classMethod' ifTrue:[ |
|
2170 |
^ self handleMethodChange:true. |
|
2171 |
]. |
|
2172 |
||
2173 |
selector == #'initializer' ifTrue:[ |
|
2174 |
^ true |
|
2175 |
]. |
|
2176 |
selector == #'initialize' ifTrue:[ |
|
2177 |
^ true |
|
2178 |
]. |
|
2179 |
||
2180 |
^ false |
|
2181 |
||
2182 |
"Created: / 16.2.1998 / 13:42:40 / cg" |
|
2183 |
"Modified: / 15.12.1999 / 00:29:06 / cg" |
|
2184 |
! ! |
|
2185 |
||
625
06f4ed35832b
added #patches for ST80 compatibility
Claus Gittinger <cg@exept.de>
parents:
378
diff
changeset
|
2186 |
!ChangeSet class methodsFor:'documentation'! |
100 | 2187 |
|
2188 |
version |
|
1865 | 2189 |
^ '$Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.139 2006-10-12 19:34:14 cg Exp $' |
100 | 2190 |
! ! |