author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Wed, 21 Mar 2012 01:53:44 +0000 | |
branch | jv |
changeset 3034 | c892671f3e2a |
parent 3033 | 8964521a2c1b |
child 3036 | 7be02f89af2b |
permissions | -rw-r--r-- |
3 | 1 |
" |
2 |
COPYRIGHT (c) 1993 by Claus Gittinger |
|
2376 | 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 |
2412 | 15 |
instanceVariableNames:'changedClasses changeSelectors name' |
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 |
2412 | 22 |
instanceVariableNames:'inputStream parseTree changeAction changeSet selector receiver |
23 |
arguments receiverSelector receiverReceiver lineNumber position |
|
2745
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
24 |
className methodSelector chunk' |
2412 | 25 |
classVariableNames:'' |
26 |
poolDictionaries:'' |
|
27 |
privateIn:ChangeSet |
|
1174
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 |
|
2256
b98137d2aa30
changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents:
2247
diff
changeset
|
30 |
Error subclass:#ChangeProcessingError |
2412 | 31 |
instanceVariableNames:'' |
32 |
classVariableNames:'' |
|
33 |
poolDictionaries:'' |
|
34 |
privateIn:ChangeSet |
|
2256
b98137d2aa30
changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents:
2247
diff
changeset
|
35 |
! |
b98137d2aa30
changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents:
2247
diff
changeset
|
36 |
|
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
37 |
SmalltalkChunkFileSourceWriter subclass:#ClassSourceWriter |
3033 | 38 |
instanceVariableNames:'changeSetBeingSaved namespaceName topClassName classInfos |
39 |
metaInfos' |
|
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
40 |
classVariableNames:'' |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
41 |
poolDictionaries:'' |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
42 |
privateIn:ChangeSet |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
43 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
44 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
45 |
Object subclass:#ClassInfo |
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
46 |
instanceVariableNames:'name superclass definition methods methodDictionary namespace' |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
47 |
classVariableNames:'' |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
48 |
poolDictionaries:'' |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
49 |
privateIn:ChangeSet::ClassSourceWriter |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
50 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
51 |
|
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
52 |
Object subclass:#DiffSet |
3032
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
53 |
instanceVariableNames:'changed onlyInReceiver onlyInArg same' |
2412 | 54 |
classVariableNames:'' |
55 |
poolDictionaries:'' |
|
56 |
privateIn:ChangeSet |
|
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
57 |
! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
58 |
|
1182 | 59 |
ChangeSet::ChangeFileReader subclass:#DolphinPACFileReader |
2412 | 60 |
instanceVariableNames:'' |
61 |
classVariableNames:'' |
|
62 |
poolDictionaries:'' |
|
63 |
privateIn:ChangeSet |
|
1182 | 64 |
! |
65 |
||
2256
b98137d2aa30
changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents:
2247
diff
changeset
|
66 |
ChangeSet::ChangeProcessingError subclass:#InvalidChangeChunkError |
2412 | 67 |
instanceVariableNames:'' |
68 |
classVariableNames:'' |
|
69 |
poolDictionaries:'' |
|
70 |
privateIn:ChangeSet |
|
2256
b98137d2aa30
changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents:
2247
diff
changeset
|
71 |
! |
b98137d2aa30
changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents:
2247
diff
changeset
|
72 |
|
1176 | 73 |
ChangeSet::ChangeFileReader subclass:#SIFChangeFileReader |
2412 | 74 |
instanceVariableNames:'' |
75 |
classVariableNames:'' |
|
76 |
poolDictionaries:'' |
|
77 |
privateIn:ChangeSet |
|
1176 | 78 |
! |
79 |
||
625
06f4ed35832b
added #patches for ST80 compatibility
Claus Gittinger <cg@exept.de>
parents:
378
diff
changeset
|
80 |
!ChangeSet class methodsFor:'documentation'! |
9 | 81 |
|
82 |
copyright |
|
83 |
" |
|
84 |
COPYRIGHT (c) 1993 by Claus Gittinger |
|
2376 | 85 |
All Rights Reserved |
9 | 86 |
|
87 |
This software is furnished under a license and may be used |
|
88 |
only in accordance with the terms of that license and with the |
|
89 |
inclusion of the above copyright notice. This software may not |
|
90 |
be provided or otherwise made available to, or used by, any |
|
91 |
other person. No title to or ownership of the software is |
|
92 |
hereby transferred. |
|
93 |
" |
|
94 |
! |
|
95 |
||
96 |
documentation |
|
97 |
" |
|
98 |
used in the changes management to keep track of changes |
|
235 | 99 |
|
100 |
[author:] |
|
2376 | 101 |
Claus Gittinger |
9 | 102 |
" |
103 |
! ! |
|
104 |
||
654 | 105 |
!ChangeSet class methodsFor:'instance creation'! |
106 |
||
1176 | 107 |
forExistingClass:aClass |
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
108 |
"build a changeSet for some given class, all of its private classes |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
109 |
and all extensions if any. |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
110 |
I.e. a changeSet which represents the existing class in the image. |
1176 | 111 |
That does of course not give deltas, but instead reflects the current |
112 |
state of the given class. |
|
113 |
It is useful in conjunction with the other utility methods, |
|
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
114 |
for example, when building patchLists, diffSets, comparing etc." |
1176 | 115 |
|
1954
521fa986be30
Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents:
1920
diff
changeset
|
116 |
|changeSet s changeObject| |
1176 | 117 |
|
2633 | 118 |
"/ kludge: could do this much faster... |
1188 | 119 |
s := ReadWriteStream on:''. |
1176 | 120 |
aClass fileOutOn:s. |
1188 | 121 |
s reset. |
122 |
changeSet := self fromStream:s. |
|
1865 | 123 |
|
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
124 |
"/ fetch the real package info... |
1865 | 125 |
changeSet do:[:eachChange | |
126 |
eachChange isMethodChange ifTrue:[ |
|
1954
521fa986be30
Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents:
1920
diff
changeset
|
127 |
changeObject := eachChange changeMethod. |
521fa986be30
Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents:
1920
diff
changeset
|
128 |
changeObject notNil ifTrue:[ |
521fa986be30
Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents:
1920
diff
changeset
|
129 |
eachChange package:changeObject package |
521fa986be30
Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents:
1920
diff
changeset
|
130 |
]. |
1865 | 131 |
] ifFalse:[ |
132 |
eachChange isClassChange ifTrue:[ |
|
1954
521fa986be30
Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents:
1920
diff
changeset
|
133 |
changeObject := eachChange changeClass. |
521fa986be30
Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents:
1920
diff
changeset
|
134 |
changeObject notNil ifTrue:[ |
521fa986be30
Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents:
1920
diff
changeset
|
135 |
eachChange package:changeObject package |
521fa986be30
Fix if method does not exist in change
Stefan Vogel <sv@exept.de>
parents:
1920
diff
changeset
|
136 |
]. |
1865 | 137 |
]. |
138 |
]. |
|
139 |
]. |
|
140 |
||
1176 | 141 |
^ changeSet |
142 |
||
1188 | 143 |
"/ |source changeSet chunk sawExcla lastTimeStamp s change nameSpace| |
144 |
||
1176 | 145 |
"/ changeSet := self new. |
146 |
"/ |
|
147 |
"/ "/ first, a classDefinition change ... |
|
148 |
"/ changeSet addClassDefinitionChangeFor:aClass. |
|
149 |
"/ "/ are there any class-instVars ? |
|
150 |
"/ aClass class instVarNames size > 0 ifTrue:[ |
|
151 |
"/ changeSet addInstVarDefinitionChangeFor:aClass class. |
|
152 |
"/ ]. |
|
153 |
"/ "/ a comment ? |
|
154 |
"/ aClass comment size > 0 ifTrue:[ |
|
155 |
"/ changeSet addClassCommentChangeFor:aClass. |
|
156 |
"/ ]. |
|
157 |
"/ |
|
158 |
"/ "/ class methods first ... |
|
159 |
"/ aClass class methodDictionary keysAndValuesDo:[:sel :mthd | |
|
160 |
"/ changeSet addMethodChange:mthd in:aClass class. |
|
161 |
"/ ]. |
|
162 |
"/ |
|
163 |
"/ "/ instance methods ... |
|
164 |
"/ aClass methodDictionary keysAndValuesDo:[:sel :mthd | |
|
165 |
"/ changeSet addMethodChange:mthd in:aClass. |
|
166 |
"/ ]. |
|
167 |
"/ |
|
168 |
"/ ^ changeSet |
|
169 |
||
1865 | 170 |
|
1176 | 171 |
" |
172 |
ChangeSet forExistingClass:ChangeSet |
|
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
173 |
ChangeSet forExistingClass:A |
1865 | 174 |
|
175 |
Rectangle hasExtensions |
|
176 |
ChangeSet forExistingClass:Rectangle |
|
1176 | 177 |
" |
178 |
||
1865 | 179 |
"Created: / 16-02-1998 / 12:19:34 / cg" |
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
180 |
"Modified: / 12-10-2006 / 23:45:14 / cg" |
2633 | 181 |
"Modified (format): / 01-12-2011 / 19:10:22 / cg" |
1865 | 182 |
! |
183 |
||
184 |
forExistingClass:aClass withExtensions:withExtensions extensionsOnly:extensionsOnly |
|
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
185 |
"build a changeSet for some given full class, the base-class or the extensions only, |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
186 |
as specified by the with-arguments. |
1865 | 187 |
That does of course not give deltas, but instead reflects the current |
188 |
state of the given class. |
|
189 |
It is useful in conjunction with the other utility methods, |
|
190 |
for example, when building patchLists, diffSets etc." |
|
191 |
||
192 |
|changeSet classPackage| |
|
193 |
||
194 |
changeSet := self forExistingClass:aClass. |
|
195 |
classPackage := aClass package. |
|
196 |
||
197 |
extensionsOnly ifTrue:[ |
|
198 |
^ changeSet |
|
199 |
select:[:change | |
|
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
200 |
change isMethodChange and:[ change package ~= classPackage ] |
1865 | 201 |
]. |
202 |
]. |
|
203 |
withExtensions ifFalse:[ |
|
204 |
^ changeSet |
|
205 |
reject:[:change | |
|
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
206 |
change isMethodChange and:[ change package ~= classPackage ] |
1865 | 207 |
]. |
208 |
]. |
|
209 |
||
210 |
^ changeSet |
|
211 |
||
212 |
" |
|
213 |
ChangeSet forExistingClass:ChangeSet |
|
214 |
||
215 |
Rectangle hasExtensions |
|
216 |
Rectangle extensions |
|
217 |
||
218 |
ChangeSet forExistingClass:Rectangle withExtensions:true extensionsOnly:false |
|
219 |
ChangeSet forExistingClass:Rectangle withExtensions:false extensionsOnly:false |
|
220 |
ChangeSet forExistingClass:Rectangle withExtensions:false extensionsOnly:true |
|
221 |
" |
|
222 |
||
223 |
"Created: / 12-10-2006 / 18:13:02 / cg" |
|
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
224 |
"Modified: / 12-10-2006 / 23:46:05 / cg" |
1176 | 225 |
! |
226 |
||
1292 | 227 |
forExistingMethods:aCollectionOfMethods |
228 |
"build a changeSet for a collection of methods. |
|
229 |
That does of course not give deltas, but instead reflects the current |
|
230 |
state of the given set of methods. |
|
231 |
It is useful in conjunction with the other utility methods, |
|
232 |
for example, when building patchLists, diffSets etc." |
|
233 |
||
234 |
|changeSet stream previousPackage| |
|
235 |
||
2244
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
236 |
changeSet := self new. |
1292 | 237 |
aCollectionOfMethods do:[:eachMethod | |
2524
309a3ec3f7d1
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2519
diff
changeset
|
238 |
|change source| |
309a3ec3f7d1
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2519
diff
changeset
|
239 |
|
309a3ec3f7d1
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2519
diff
changeset
|
240 |
source := eachMethod source. |
309a3ec3f7d1
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2519
diff
changeset
|
241 |
source isNil ifTrue:[ |
309a3ec3f7d1
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2519
diff
changeset
|
242 |
Transcript showCR:'oops - no source for ',eachMethod whoString. |
309a3ec3f7d1
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2519
diff
changeset
|
243 |
]. |
2244
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
244 |
change := MethodDefinitionChange new. |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
245 |
eachMethod mclass notNil ifTrue:[ change className:eachMethod mclass name ]. |
2524
309a3ec3f7d1
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2519
diff
changeset
|
246 |
source notNil ifTrue:[ change source:source ]. |
2244
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
247 |
change selector:eachMethod selector. |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
248 |
change package:(eachMethod package). |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
249 |
change category:(eachMethod category). |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
250 |
changeSet add:change. |
1292 | 251 |
]. |
2244
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
252 |
|
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
253 |
"/ stream := ReadWriteStream on:''. |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
254 |
"/ aCollectionOfMethods do:[:eachMethod | |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
255 |
"/ previousPackage ~= eachMethod package ifTrue:[ |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
256 |
"/ stream nextPutAll:'"{ Package: '''. |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
257 |
"/ stream nextPutAll:eachMethod package asString. |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
258 |
"/ stream nextPutAll:''' }"'; cr; cr. |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
259 |
"/ ]. |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
260 |
"/ eachMethod mclass fileOutMethod:eachMethod on:stream |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
261 |
"/ ]. |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
262 |
"/ stream reset. |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
263 |
"/ changeSet := self fromStream:stream. |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
264 |
"/ changeSet do:[:eachChange | |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
265 |
"/ eachChange package:(eachChange changeMethod package). |
83dade66e325
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2235
diff
changeset
|
266 |
"/ ]. |
1292 | 267 |
^ changeSet |
268 |
||
269 |
" |
|
270 |
ChangeSet forExistingMethods:(Array with:(Array compiledMethodAt:#at:) |
|
271 |
with:(Object compiledMethodAt:#at:) |
|
272 |
with:(Behavior compiledMethodAt:#compiledMethodAt:) ) |
|
273 |
" |
|
1872
7a1f2a26bf90
changes for compare-project functionality
Claus Gittinger <cg@exept.de>
parents:
1869
diff
changeset
|
274 |
|
2524
309a3ec3f7d1
changed: #forExistingMethods:
Claus Gittinger <cg@exept.de>
parents:
2519
diff
changeset
|
275 |
"Modified: / 17-09-2011 / 10:26:03 / cg" |
1292 | 276 |
! |
277 |
||
2412 | 278 |
forPackage: package |
279 |
||
280 |
^self forPackage: package ignoreAutoloaded: false. |
|
281 |
||
282 |
"Created: / 20-05-2008 / 17:56:18 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
283 |
"Modified: / 12-08-2009 / 14:23:15 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
284 |
! |
|
285 |
||
286 |
forPackage: package ignoreAutoloaded: ignoreAutoloaded |
|
287 |
"build a changeSet for a given package" |
|
288 |
||
289 |
|changeSet packageClasses packageExtensions| |
|
290 |
||
291 |
packageClasses := ProjectDefinition searchForClassesWithProject: package. |
|
292 |
packageExtensions := ProjectDefinition searchForExtensionsWithProject: package. |
|
293 |
changeSet := self forExistingMethods: packageExtensions. |
|
294 |
packageClasses do: |
|
3029
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
295 |
[:cls| |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
296 |
(ignoreAutoloaded not and:[cls isLoaded not]) |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
297 |
ifTrue:[cls autoload]. |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
298 |
cls isLoaded |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
299 |
ifTrue: |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
300 |
[changeSet addAll: |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
301 |
(self |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
302 |
forExistingClass:cls |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
303 |
withExtensions:false |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
304 |
extensionsOnly:false)]]. |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
305 |
changeSet name: 'Package ' , package. |
2412 | 306 |
^changeSet |
307 |
||
308 |
"Created: / 12-08-2009 / 14:22:44 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
3029
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
309 |
"Modified: / 16-03-2012 / 15:37:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2412 | 310 |
! |
311 |
||
2321 | 312 |
fromDiffSet:aDiffSet |
2322
c5ebd3b56e54
comment/format in: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents:
2321
diff
changeset
|
313 |
"build a changeSet from a given diffSet. This can be used as a patchSet, |
c5ebd3b56e54
comment/format in: #fromDiffSet:
Claus Gittinger <cg@exept.de>
parents:
2321
diff
changeset
|
314 |
to update the first-version in the diffSet to the second-version" |
2321 | 315 |
|
316 |
|changeSet| |
|
317 |
||
318 |
changeSet := self new. |
|
2323 | 319 |
"/ class definitions first... |
320 |
changeSet addAll:((aDiffSet changed collect:[:eachPair | eachPair second]) select:[:ch | ch isClassDefinitionChange]). |
|
321 |
changeSet addAll:((aDiffSet onlyInArg) select:[:ch | ch isClassDefinitionChange]). |
|
322 |
||
2321 | 323 |
"/ first add new methods... |
2323 | 324 |
changeSet addAll:((aDiffSet onlyInArg) reject:[:ch | ch isClassDefinitionChange]). |
2321 | 325 |
"/ then, changed methods... |
2323 | 326 |
changeSet addAll:((aDiffSet changed collect:[:eachPair | eachPair second]) reject:[:ch | ch isClassDefinitionChange]). |
2321 | 327 |
"/ then, removed methods... |
328 |
aDiffSet onlyInReceiver do:[:each | |
|
329 |
|ch| |
|
330 |
||
331 |
ch := MethodRemoveChange className:(each className) selector:(each selector). |
|
332 |
changeSet add:ch. |
|
333 |
]. |
|
334 |
^ changeSet |
|
335 |
||
336 |
"Created: / 08-02-2011 / 10:48:36 / cg" |
|
337 |
! |
|
338 |
||
2412 | 339 |
fromDirectory: aStringOfFilename |
340 |
||
341 |
| d cs | |
|
342 |
d := aStringOfFilename asFilename. |
|
343 |
cs := self new. |
|
344 |
d directoryContentsAsFilenames do: |
|
345 |
[:each| |
|
346 |
each suffix = 'st' ifTrue: |
|
347 |
[cs addAll: (self fromFileOrDirectory: each)]]. |
|
3029
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
348 |
cs name: aStringOfFilename asFilename asAbsoluteFilename pathName. |
2412 | 349 |
^cs |
350 |
||
351 |
||
352 |
" |
|
353 |
ChangeSet fromDirectory: (Smalltalk getPackageDirectoryForPackage:'stx:libbasic') |
|
354 |
" |
|
355 |
||
356 |
"Created: / 02-04-2011 / 00:54:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
357 |
! |
|
358 |
||
1182 | 359 |
fromDolphinPACStream:aStream |
360 |
"build a changeSet from a stream, containing dolphin pac file chunks." |
|
361 |
||
362 |
^ self fromDolphinPACStream:aStream while:[:thisChange | true] |
|
363 |
||
364 |
! |
|
365 |
||
366 |
fromDolphinPACStream:aStream while:aConditionBlock |
|
367 |
"build a changeSet from a stream, containing dolphin pac file chunks." |
|
368 |
||
369 |
|changeSet| |
|
370 |
||
371 |
changeSet := self new. |
|
372 |
self |
|
373 |
changesFromStream:aStream |
|
374 |
for:changeSet |
|
375 |
reader:(DolphinPACFileReader new) |
|
376 |
do:[:aChange :lineNumberOrNil :posOrNil | |
|
377 |
changeSet add:aChange. |
|
378 |
(aConditionBlock value:aChange) ifFalse:[^ changeSet]. |
|
379 |
]. |
|
380 |
||
381 |
^ changeSet |
|
382 |
! |
|
383 |
||
1176 | 384 |
fromFile:aFilename |
3029
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
385 |
|mime stream nm| |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
386 |
|
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
387 |
nm := aFilename asFilename asAbsoluteFilename pathName. |
1176 | 388 |
mime := MIMETypes mimeTypeForFilename:aFilename. |
389 |
mime isNil ifTrue:[ |
|
390 |
mime := aFilename asFilename mimeTypeOfContents. |
|
391 |
mime isNil ifTrue:[ |
|
1329 | 392 |
self error:'unknown MIME type for file'. |
1176 | 393 |
]. |
394 |
]. |
|
930 | 395 |
|
1176 | 396 |
[ |
397 |
stream := aFilename asFilename readStream. |
|
398 |
mime = 'text/xml' ifTrue:[ |
|
3029
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
399 |
^ (self fromXMLStream:stream) name: nm; yourself. |
1182 | 400 |
]. |
401 |
mime = 'application/x-smalltalk-source-sif' ifTrue:[ |
|
3029
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
402 |
^ (self fromSIFStream:stream) name: nm; yourself |
1176 | 403 |
]. |
1182 | 404 |
mime = 'application/x-smalltalk-dolphin-package' ifTrue:[ |
3029
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
405 |
^ (self fromDolphinPACStream:stream) name: nm; yourself |
1182 | 406 |
]. |
2247 | 407 |
stream := EncodedStream decodedStreamFor:stream. |
3029
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
408 |
^ (self fromStream:stream) name: nm; yourself |
1176 | 409 |
] ensure:[ |
410 |
stream notNil ifTrue:[stream close]. |
|
411 |
]. |
|
412 |
||
413 |
" |
|
414 |
ChangeSet fromFile:('changes') |
|
415 |
ChangeSet fromFile:('patches') |
|
416 |
" |
|
417 |
||
3029
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
418 |
"Created: / 16-02-1998 / 12:19:34 / cg" |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
419 |
"Modified: / 14-12-1999 / 15:23:16 / cg" |
c7be0be50898
- ChangeSet>>#fromFile: sets the name of the CS to tje filename.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3028
diff
changeset
|
420 |
"Modified: / 16-03-2012 / 15:46:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1176 | 421 |
! |
422 |
||
2412 | 423 |
fromFileOrDirectory: fileOrDirectory |
424 |
||
425 |
| f | |
|
426 |
f := fileOrDirectory asFilename. |
|
427 |
^(f isDirectory |
|
428 |
ifTrue:[self fromDirectory: f] |
|
429 |
ifFalse:[self fromFile: f]) |
|
430 |
name: f pathName; |
|
431 |
yourself. |
|
432 |
||
433 |
" |
|
434 |
ChangeSet fromFileOrDirectory: (Smalltalk getPackageDirectoryForPackage:'stx:libbasic') |
|
435 |
" |
|
436 |
||
437 |
"Created: / 02-04-2011 / 00:50:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
438 |
! |
|
439 |
||
1176 | 440 |
fromSIFStream:aStream |
441 |
"build a changeSet from a SIF stream, containing chunks |
|
442 |
in smalltalk interchange format. |
|
443 |
Return the changeSet." |
|
444 |
||
445 |
^ self fromSIFStream:aStream while:[:thisChange | true] |
|
446 |
! |
|
447 |
||
448 |
fromSIFStream:aStream while:aConditionBlock |
|
449 |
"build a changeSet from a SIF stream, containing chunks |
|
450 |
in smalltalk interchange format. |
|
451 |
Return the changeSet." |
|
452 |
||
453 |
|changeSet| |
|
454 |
||
455 |
changeSet := self new. |
|
456 |
self |
|
457 |
changesFromStream:aStream |
|
458 |
for:changeSet |
|
1182 | 459 |
reader:(SIFChangeFileReader new) |
1176 | 460 |
do:[:aChange :lineNumberOrNil :posOrNil | |
461 |
changeSet add:aChange. |
|
462 |
(aConditionBlock value:aChange) ifFalse:[^ changeSet]. |
|
463 |
]. |
|
464 |
||
465 |
^ changeSet |
|
466 |
! |
|
467 |
||
468 |
fromStream:aStream |
|
469 |
"build a changeSet from a stream, containing chunks. |
|
470 |
(i.e. either a classes sourceFile or a change-file). |
|
471 |
Return the changeSet." |
|
472 |
||
473 |
^ self fromStream:aStream while:[:thisChange | true] |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
474 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
475 |
" |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
476 |
ChangeSet fromStream:('changes' asFilename readStream) |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
477 |
ChangeSet fromStream:('patches' asFilename readStream) |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
478 |
ChangeSet fromStream:(Object source asString readStream) |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
479 |
" |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
480 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
481 |
"Created: / 16.2.1998 / 12:19:34 / cg" |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
482 |
"Modified: / 14.12.1999 / 15:23:16 / cg" |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
483 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
484 |
|
1176 | 485 |
fromStream:aStream while:aConditionBlock |
486 |
"build a changeSet from a stream, containing chunks. |
|
487 |
(i.e. either a classes sourceFile or a change-file). |
|
488 |
Return the changeSet." |
|
489 |
||
490 |
|changeSet| |
|
491 |
||
492 |
changeSet := self new. |
|
493 |
self |
|
494 |
changesFromStream:aStream |
|
495 |
for:changeSet |
|
1182 | 496 |
reader:(ChangeFileReader new) |
1176 | 497 |
do:[:aChange :lineNumberOrNil :posOrNil | |
498 |
changeSet add:aChange. |
|
499 |
(aConditionBlock value:aChange) ifFalse:[^ changeSet]. |
|
500 |
]. |
|
501 |
||
502 |
^ changeSet |
|
503 |
||
504 |
" |
|
505 |
ChangeSet fromStream:('changes' asFilename readStream) |
|
506 |
ChangeSet fromStream:('patches' asFilename readStream) |
|
507 |
ChangeSet fromStream:(Object source asString readStream) |
|
508 |
" |
|
509 |
||
510 |
"Created: / 16.2.1998 / 12:19:34 / cg" |
|
511 |
"Modified: / 14.12.1999 / 15:23:16 / cg" |
|
512 |
! |
|
513 |
||
514 |
fromXMLStream:aStream |
|
515 |
"build a changeSet from an XML stream, containing XML definitions. |
|
516 |
Return the changeSet." |
|
517 |
||
518 |
|changeSet builder nameSpace| |
|
519 |
||
520 |
aStream isNil ifTrue:[^ nil]. |
|
521 |
||
522 |
changeSet := self new. |
|
523 |
nameSpace := Smalltalk. |
|
524 |
||
525 |
builder := XML::SourceScannerNodeBuilder new. |
|
1475
934d20073adb
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1471
diff
changeset
|
526 |
builder scanFile:aStream do:[:change | changeSet add: change. ]. |
1176 | 527 |
^ changeSet |
528 |
||
529 |
" |
|
1247 | 530 |
ChangeSet fromXMLStream:('../../goodies/xml/vw/xmlFileInTests/XMLParser.xml' asFilename readStream) |
1176 | 531 |
ChangeSetBrowser |
1247 | 532 |
openOn:(ChangeSet fromXMLStream:('../../goodies/xml/vw/xmlFileInTests/XMLParser.xml' asFilename readStream)) |
1176 | 533 |
" |
534 |
! ! |
|
535 |
||
1281 | 536 |
!ChangeSet class methodsFor:'Compatibility-ST80'! |
1176 | 537 |
|
538 |
patches |
|
539 |
^ #() |
|
540 |
||
541 |
"Created: / 27.10.1997 / 13:52:54 / cg" |
|
542 |
! ! |
|
543 |
||
2376 | 544 |
|
1281 | 545 |
!ChangeSet class methodsFor:'Compatibility-VW'! |
1176 | 546 |
|
547 |
component: component definition: anObject change: changeSymbol |
|
548 |
"Include indication that a class/namespace was added or removed |
|
549 |
from a CodeComponent." |
|
550 |
||
551 |
self |
|
552 |
changed:#'component:definition:change:' |
|
553 |
with: |
|
554 |
( Array |
|
555 |
with: component |
|
556 |
with: anObject |
|
557 |
with: changeSymbol |
|
558 |
) |
|
559 |
||
560 |
! ! |
|
561 |
||
562 |
!ChangeSet class methodsFor:'instance creation-private'! |
|
563 |
||
1191 | 564 |
changesFromStream:aStream do:aBlock |
565 |
"enumerate changes from a stream and invoke aBlock on each. |
|
566 |
The block is invoked with the change, a lineNumberOrNil and streamPosition arguments. |
|
567 |
The lineNumber is only valid, if the underlying stream |
|
568 |
provides line-numbers; otherwise, nil is passed." |
|
569 |
||
570 |
^ self |
|
571 |
changesFromStream:aStream |
|
572 |
for:(self new) |
|
573 |
reader:nil |
|
574 |
do:aBlock |
|
575 |
||
576 |
" |
|
577 |
ChangeSet |
|
578 |
changesFromStream:('changes' asFilename readStream) |
|
579 |
do:[:chg | Transcript showCR:chg] |
|
580 |
" |
|
581 |
||
582 |
"Created: / 16.2.1998 / 12:19:34 / cg" |
|
583 |
"Modified: / 14.12.1999 / 15:23:16 / cg" |
|
584 |
! |
|
585 |
||
1182 | 586 |
changesFromStream:aStream for:aChangeSet reader:aReader do:aBlock |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
587 |
"enumerate changes from a stream and invoke aBlock on each. |
1191 | 588 |
The block is invoked with the change, a lineNumberOrNil and streamPosition arguments. |
589 |
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
|
590 |
provides line-numbers; otherwise, nil is passed." |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
591 |
|
1188 | 592 |
|chunk lastTimeStamp s change nameSpace package |
3017
114676d42a88
Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
593 |
lineNumber pos reader size | |
930 | 594 |
|
595 |
nameSpace := Smalltalk. |
|
1135
08323691c543
care for package directive (remember)
Claus Gittinger <cg@exept.de>
parents:
1128
diff
changeset
|
596 |
package := Class packageQuerySignal query. |
1176 | 597 |
|
1182 | 598 |
(reader := aReader) isNil ifTrue:[ |
1176 | 599 |
reader := ChangeFileReader new. |
600 |
]. |
|
3017
114676d42a88
Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
601 |
size := aStream size. |
114676d42a88
Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
602 |
|
1176 | 603 |
reader changeSet:aChangeSet. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
604 |
reader changeAction:aBlock. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
605 |
reader inputStream:aStream. |
930 | 606 |
|
607 |
[aStream atEnd] whileFalse:[ |
|
1182 | 608 |
aStream skipSeparators. |
930 | 609 |
lineNumber := aStream lineNumber. |
1209
f98d5eb855d3
code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents:
1200
diff
changeset
|
610 |
pos := aStream position1Based. |
3017
114676d42a88
Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
611 |
|
114676d42a88
Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
612 |
ProgressNotification notify: nil progress:(100 / size) * pos. |
114676d42a88
Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
613 |
|
930 | 614 |
chunk := aStream nextChunk. |
2056 | 615 |
|
1447
2ac1cf09722b
isEmptyOrNil / notEmptyOrNil refactoring
Claus Gittinger <cg@exept.de>
parents:
1428
diff
changeset
|
616 |
(chunk notEmptyOrNil) ifTrue:[ |
2279
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
617 |
Class nameSpaceQuerySignal handle:[:ex| ex proceedWith:nameSpace] do:[ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
618 |
Class packageQuerySignal handle:[:ex| ex proceedWith:package] do:[ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
619 |
|parser tree ns pkg| |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
620 |
|
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
621 |
parser := Parser for:chunk. |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
622 |
tree := parser |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
623 |
parseExpressionWithSelf:nil |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
624 |
notifying:nil |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
625 |
ignoreErrors:true |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
626 |
ignoreWarnings:true |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
627 |
inNameSpace:nameSpace. |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
628 |
|
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
629 |
tree notNil ifTrue:[ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
630 |
tree == #Error ifTrue:[ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
631 |
change := DoItChange new. |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
632 |
change source:chunk. |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
633 |
aBlock valueWithOptionalArgument:change and:lineNumber and:pos. |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
634 |
] ifFalse:[ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
635 |
"/ if there is any nameSpace directive in there, extract it. |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
636 |
((ns := parser currentNameSpace) notNil |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
637 |
and:[ns ~~ nameSpace]) ifTrue:[ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
638 |
nameSpace := ns |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
639 |
]. |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
640 |
"/ if there is any package directive in there, extract it. |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
641 |
((pkg := parser currentPackage) notNil |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
642 |
and:[pkg ~~ package]) ifTrue:[ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
643 |
package := pkg |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
644 |
]. |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
645 |
"/ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
646 |
"/ what type of chunk is this ... |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
647 |
"/ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
648 |
tree isConstant ifTrue:[ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
649 |
(s := tree evaluate) isString ifTrue:[ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
650 |
(s startsWith:'---- timestamp ') ifTrue:[ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
651 |
lastTimeStamp := s. |
930 | 652 |
] |
653 |
] ifFalse:[ |
|
2279
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
654 |
self error:'unexpected change-chunk' mayProceed:true |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
655 |
] |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
656 |
] ifFalse:[ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
657 |
tree isMessage ifTrue:[ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
658 |
(reader |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
659 |
changesFromParseTree:tree |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
660 |
lineNumber:lineNumber |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
661 |
position:pos |
2745
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
662 |
chunk: chunk |
2279
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
663 |
) ifFalse:[ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
664 |
change := DoItChange new. |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
665 |
change source:chunk. |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
666 |
aBlock valueWithOptionalArgument:change and:lineNumber and:pos. |
930 | 667 |
] |
2279
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
668 |
] ifFalse:[ |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
669 |
InvalidChangeChunkError |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
670 |
raiseRequestErrorString:'unexpected change-chunk' |
a85d31a33e57
changed: #changesFromStream:for:reader:do:
Stefan Vogel <sv@exept.de>
parents:
2256
diff
changeset
|
671 |
"/ mayProceed:true. |
930 | 672 |
] |
673 |
] |
|
674 |
] |
|
675 |
] |
|
676 |
] |
|
677 |
] |
|
678 |
] |
|
679 |
]. |
|
680 |
||
681 |
" |
|
682 |
ChangeSet fromStream:('changes' asFilename readStream) |
|
683 |
ChangeSet fromStream:('patches' asFilename readStream) |
|
684 |
ChangeSet fromStream:(Object source asString readStream) |
|
685 |
" |
|
686 |
||
2745
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
687 |
"Created: / 16-02-1998 / 12:19:34 / cg" |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
688 |
"Modified: / 14-12-1999 / 15:23:16 / cg" |
3017
114676d42a88
Added progress notifications during while reading changes from stream
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3012
diff
changeset
|
689 |
"Modified: / 11-02-2012 / 20:09:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1380 | 690 |
! |
691 |
||
692 |
skipEncodingChunkOn:stream |
|
2080 | 693 |
<resource: #obsolete> |
1415
44d3d469a528
skipEncodingCHunk now in EncodedStream
Claus Gittinger <cg@exept.de>
parents:
1414
diff
changeset
|
694 |
self obsoleteMethodWarning:'use stream>>skipENcodingChunk'. |
44d3d469a528
skipEncodingCHunk now in EncodedStream
Claus Gittinger <cg@exept.de>
parents:
1414
diff
changeset
|
695 |
stream skipEncodingChunk |
1083 | 696 |
! ! |
697 |
||
625
06f4ed35832b
added #patches for ST80 compatibility
Claus Gittinger <cg@exept.de>
parents:
378
diff
changeset
|
698 |
!ChangeSet class methodsFor:'queries'! |
27 | 699 |
|
700 |
current |
|
701 |
"ST-80 compatibility: return the current changeSet" |
|
702 |
||
703 |
|p| |
|
704 |
||
705 |
(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
|
706 |
^ p changeSet |
ca4fff926135
ChangeSet current: return empty collection if there is no changeSet
Claus Gittinger <cg@exept.de>
parents:
956
diff
changeset
|
707 |
]. |
ca4fff926135
ChangeSet current: return empty collection if there is no changeSet
Claus Gittinger <cg@exept.de>
parents:
956
diff
changeset
|
708 |
^ #() |
27 | 709 |
|
710 |
" |
|
711 |
ChangeSet current |
|
712 |
" |
|
713 |
! ! |
|
714 |
||
2246 | 715 |
!ChangeSet class methodsFor:'utilities'! |
716 |
||
717 |
decodedStreamFor:aStream |
|
2247 | 718 |
<resource: #obsolete> |
719 |
^ EncodedStream decodedStreamFor:aStream |
|
2246 | 720 |
! ! |
721 |
||
1264 | 722 |
!ChangeSet methodsFor:'Compatibility-ST80'! |
378 | 723 |
|
899 | 724 |
changeClass:aClass |
725 |
"dummy here" |
|
100 | 726 |
|
899 | 727 |
"Created: / 4.2.2000 / 18:30:59 / cg" |
901 | 728 |
! |
729 |
||
1476 | 730 |
changeSelectors |
731 |
"return a collection of all selectors for which changes are in this changeSet" |
|
732 |
||
733 |
|selectors| |
|
734 |
||
735 |
changeSelectors isNil ifTrue:[ |
|
736 |
selectors := IdentitySet new. |
|
737 |
self do:[:chg | |
|
1967 | 738 |
|sel| |
1476 | 739 |
|
740 |
chg notNil ifTrue:[ |
|
741 |
chg isMethodChange ifTrue:[ |
|
1967 | 742 |
sel := chg selector. |
743 |
sel notNil ifTrue:[ |
|
744 |
selectors add:sel |
|
745 |
] |
|
1476 | 746 |
] |
747 |
] |
|
748 |
]. |
|
749 |
changeSelectors := selectors. |
|
750 |
]. |
|
751 |
^ changeSelectors. |
|
752 |
||
753 |
" |
|
754 |
ChangeSet current changeSelectors |
|
755 |
" |
|
1967 | 756 |
|
757 |
"Modified: / 30-05-2007 / 12:12:32 / cg" |
|
1476 | 758 |
! |
759 |
||
1102 | 760 |
changedClasses |
761 |
"return a collection of all classes for which changes are in this changeSet" |
|
762 |
||
763 |
|classes| |
|
764 |
||
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
765 |
changedClasses isNil ifTrue:[ |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
766 |
classes := IdentitySet new. |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
767 |
self do:[:chg | |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
768 |
|cls| |
1102 | 769 |
|
1315 | 770 |
chg notNil ifTrue:[ |
771 |
cls := chg changeClass. |
|
772 |
cls notNil ifTrue:[ |
|
1898 | 773 |
cls isRealNameSpace ifFalse:[ |
1315 | 774 |
classes add:cls |
775 |
] |
|
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
776 |
] |
1102 | 777 |
] |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
778 |
]. |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
779 |
changedClasses := classes. |
1102 | 780 |
]. |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
781 |
^ changedClasses. |
1102 | 782 |
|
783 |
" |
|
784 |
ChangeSet current changedClasses |
|
1791 | 785 |
ChangeSet current flushChangedClassesCache |
1102 | 786 |
" |
1791 | 787 |
|
1898 | 788 |
"Modified: / 10-11-2006 / 17:17:26 / cg" |
1102 | 789 |
! |
790 |
||
1096 | 791 |
component:component definition:anObject change:changeSymbol |
1083 | 792 |
"Include indication that a class/namespace was added or removed |
793 |
from a CodeComponent." |
|
794 |
||
795 |
self |
|
796 |
changed:#'component:definition:change:' |
|
797 |
with: |
|
798 |
( Array |
|
799 |
with: component |
|
800 |
with: anObject |
|
801 |
with: changeSymbol |
|
802 |
) |
|
803 |
! |
|
804 |
||
901 | 805 |
reorganizeSystem |
806 |
"dummy here" |
|
807 |
||
808 |
"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
|
809 |
! ! |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
810 |
|
2235 | 811 |
!ChangeSet methodsFor:'accessing'! |
812 |
||
813 |
name |
|
814 |
^ name |
|
815 |
! |
|
816 |
||
817 |
name:something |
|
818 |
name := something. |
|
819 |
! ! |
|
2234 | 820 |
|
985 | 821 |
!ChangeSet methodsFor:'change & update'! |
822 |
||
1096 | 823 |
changed:anAspectSymbol with:aParameter |
824 |
"Allow objects to depend on the ChangeSet class instead of a particular instance |
|
1099 | 825 |
of ChangeSet (which may be switched using projects)." |
985 | 826 |
|
1475
934d20073adb
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1471
diff
changeset
|
827 |
self == ChangeSet current ifTrue:[ |
934d20073adb
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1471
diff
changeset
|
828 |
ChangeSet changed:anAspectSymbol with:aParameter. |
934d20073adb
more support for alien namespaces (VW7)
Claus Gittinger <cg@exept.de>
parents:
1471
diff
changeset
|
829 |
]. |
1096 | 830 |
super changed:anAspectSymbol with:aParameter |
985 | 831 |
! ! |
832 |
||
901 | 833 |
!ChangeSet methodsFor:'changes management'! |
889
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
834 |
|
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
835 |
addClassCommentChangeFor:aClass |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
836 |
"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
|
837 |
|
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
838 |
|newChange| |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
839 |
|
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
840 |
newChange := ClassCommentChange class:aClass. |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
841 |
newChange comment:aClass comment. |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
842 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
843 |
self addChange:newChange |
889
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
844 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
845 |
"Modified: / 14.11.2001 / 13:35:34 / cg" |
100 | 846 |
! |
847 |
||
848 |
addClassDefinitionChangeFor:aClass |
|
378 | 849 |
"add a classDefinition change to the receiver" |
850 |
||
100 | 851 |
|newChange| |
852 |
||
1096 | 853 |
newChange := ClassDefinitionChange class:aClass source:(aClass definition). |
1865 | 854 |
newChange package:aClass package. |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
855 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
856 |
self addChange:newChange |
1096 | 857 |
|
1865 | 858 |
" |
859 |
(ChangeSet new addClassDefinitionChangeFor:ChangeSet) inspect |
|
860 |
" |
|
861 |
||
862 |
"Modified: / 12-10-2006 / 18:17:02 / cg" |
|
1096 | 863 |
! |
864 |
||
1232 | 865 |
addClassRemoveChange:oldClass |
1096 | 866 |
"add a classRemove change to the receiver" |
867 |
||
868 |
|newChange| |
|
869 |
||
1232 | 870 |
newChange := ClassRemoveChange new className:oldClass name. |
1281 | 871 |
self rememberChangedClass:oldClass. |
1421 | 872 |
oldClass isPrivate ifTrue:[ |
873 |
self rememberChangedClass:oldClass topOwningClass. |
|
874 |
]. |
|
1232 | 875 |
ClassRemoveChange::ClassBeingRemovedQuery |
876 |
answer:oldClass |
|
877 |
do:[ |
|
878 |
self addChange:newChange |
|
879 |
] |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
880 |
"Modified: / 14.11.2001 / 13:35:39 / cg" |
1096 | 881 |
! |
882 |
||
883 |
addClassRenameChangeFrom:oldName to:newName |
|
884 |
"add a classRename change to the receiver" |
|
885 |
||
886 |
|newChange| |
|
887 |
||
888 |
newChange := ClassRenameChange new oldName:oldName newName:newName. |
|
1281 | 889 |
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
|
890 |
self addChange:newChange |
100 | 891 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
892 |
"Modified: / 14.11.2001 / 13:35:41 / cg" |
100 | 893 |
! |
894 |
||
1081 | 895 |
addDoIt:aString |
896 |
"add a doIt to the receiver" |
|
897 |
||
898 |
|newChange| |
|
899 |
||
1096 | 900 |
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
|
901 |
self addChange:newChange. |
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
902 |
|
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
903 |
"Modified: / 14.11.2001 / 13:35:44 / cg" |
1081 | 904 |
! |
905 |
||
889
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
906 |
addInstVarDefinitionChangeFor:aClass |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
907 |
"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
|
908 |
|
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
909 |
|newChange| |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
910 |
|
1096 | 911 |
newChange := ClassInstVarDefinitionChange |
912 |
class:aClass |
|
913 |
source:(aClass name , ' instanceVariableNames:' , aClass instanceVariableString storeString). |
|
2617
a9e632776c57
visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents:
2524
diff
changeset
|
914 |
newChange classInstVarNames:aClass instanceVariableString asCollectionOfWords. |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
915 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
916 |
self addChange:newChange |
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
917 |
|
2617
a9e632776c57
visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents:
2524
diff
changeset
|
918 |
"Modified: / 25-11-2011 / 17:38:42 / cg" |
889
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
919 |
! |
6b05401d7184
more changes (comments, class-instVars) in the changeSet;
Claus Gittinger <cg@exept.de>
parents:
887
diff
changeset
|
920 |
|
16 | 921 |
addMethodCategoryChange:aMethod category:newCategory in:aClass |
378 | 922 |
"add a methodCategory change to the receiver" |
923 |
||
16 | 924 |
|newChange| |
925 |
||
1096 | 926 |
newChange := MethodCategoryChange |
927 |
class:aClass |
|
928 |
selector:(aClass selectorAtMethod:aMethod) |
|
929 |
category:newCategory. |
|
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
930 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
931 |
self addChange:newChange |
16 | 932 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
933 |
"Modified: / 14.11.2001 / 13:35:48 / cg" |
44 | 934 |
! |
935 |
||
956
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
936 |
addMethodChange:aMethod fromOld:oldMethod in:aClass |
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
937 |
"add a method change to the receiver" |
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
938 |
|
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
939 |
|newChange| |
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
940 |
|
1096 | 941 |
newChange := MethodChange |
942 |
class:aClass |
|
943 |
selector:aMethod selector |
|
944 |
source:aMethod source |
|
945 |
category:aMethod category. |
|
956
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
946 |
oldMethod notNil ifTrue:[ |
1232 | 947 |
newChange previousVersion:oldMethod. |
956
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
948 |
]. |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
949 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
950 |
self addChange:newChange. |
956
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
951 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
952 |
"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
|
953 |
! |
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
954 |
|
85 | 955 |
addMethodChange:aMethod in:aClass |
378 | 956 |
"add a method change to the receiver" |
957 |
||
85 | 958 |
|newChange| |
959 |
||
1096 | 960 |
newChange := MethodChange |
961 |
class:aClass |
|
962 |
selector:aMethod selector |
|
963 |
source:aMethod source |
|
964 |
category:aMethod category. |
|
1865 | 965 |
newChange package:(aMethod package). |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
966 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
967 |
self addChange:newChange |
378 | 968 |
|
1865 | 969 |
"Modified: / 12-10-2006 / 18:15:28 / cg" |
85 | 970 |
! |
971 |
||
1842
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
972 |
addMethodPackageChange:aMethod package:newPackage in:aClass |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
973 |
"add a methodPackage change to the receiver" |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
974 |
|
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
975 |
|newChange| |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
976 |
|
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
977 |
newChange := MethodPackageChange |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
978 |
class:aClass |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
979 |
selector:(aClass selectorAtMethod:aMethod) |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
980 |
package:newPackage. |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
981 |
self rememberChangedClass:aClass. |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
982 |
self addChange:newChange |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
983 |
|
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
984 |
"Created: / 09-10-2006 / 14:02:33 / cg" |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
985 |
! |
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
986 |
|
44 | 987 |
addMethodPrivacyChange:aMethod in:aClass |
378 | 988 |
"add a methodPrivacy change to the receiver" |
989 |
||
44 | 990 |
|newChange| |
991 |
||
1096 | 992 |
newChange := MethodPrivacyChange |
993 |
class:aClass |
|
994 |
selector:(aClass selectorAtMethod:aMethod) |
|
995 |
privacy:aMethod privacy. |
|
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
996 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
997 |
self addChange:newChange |
44 | 998 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
999 |
"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
|
1000 |
"Modified: / 14.11.2001 / 13:35:55 / cg" |
235 | 1001 |
! |
1002 |
||
1003 |
addPrimitiveDefinitionsChangeFor:aClass |
|
378 | 1004 |
"add a primitiveDefinitions change to the receiver" |
1005 |
||
235 | 1006 |
|newChange| |
1007 |
||
783 | 1008 |
newChange := ClassPrimitiveDefinitionsChange new |
1287 | 1009 |
class:aClass source:(aClass primitiveDefinitionsString). |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1010 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
1011 |
self addChange:newChange |
378 | 1012 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
1013 |
"Modified: / 14.11.2001 / 13:35:57 / cg" |
235 | 1014 |
! |
1015 |
||
1016 |
addPrimitiveFunctionsChangeFor:aClass |
|
378 | 1017 |
"add a primitiveFunctions change to the receiver" |
1018 |
||
235 | 1019 |
|newChange| |
1020 |
||
783 | 1021 |
newChange := ClassPrimitiveFunctionsChange new |
1287 | 1022 |
class:aClass source:(aClass primitiveFunctionsString). |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1023 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
1024 |
self addChange:newChange |
378 | 1025 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
1026 |
"Modified: / 14.11.2001 / 13:35:59 / cg" |
235 | 1027 |
! |
1028 |
||
1029 |
addPrimitiveVariablesChangeFor:aClass |
|
378 | 1030 |
"add a primitiveVariables change to the receiver" |
1031 |
||
235 | 1032 |
|newChange| |
1033 |
||
783 | 1034 |
newChange := ClassPrimitiveVariablesChange new |
1287 | 1035 |
class:aClass source:(aClass primitiveVariablesString). |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1036 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
1037 |
self addChange:newChange |
378 | 1038 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
1039 |
"Modified: / 14.11.2001 / 13:36:01 / cg" |
654 | 1040 |
! |
1041 |
||
1164
cecaa2229cab
removeSelector change: remember methods previous version
Claus Gittinger <cg@exept.de>
parents:
1156
diff
changeset
|
1042 |
addRemoveSelectorChange:aSelector fromOld:oldMethod in:aClass |
654 | 1043 |
"add a method-remove change to the receiver" |
1044 |
||
1045 |
|newChange| |
|
1046 |
||
1081 | 1047 |
newChange := MethodRemoveChange class:aClass selector:aSelector. |
1164
cecaa2229cab
removeSelector change: remember methods previous version
Claus Gittinger <cg@exept.de>
parents:
1156
diff
changeset
|
1048 |
oldMethod notNil ifTrue:[ |
1232 | 1049 |
newChange previousVersion:oldMethod. |
1164
cecaa2229cab
removeSelector change: remember methods previous version
Claus Gittinger <cg@exept.de>
parents:
1156
diff
changeset
|
1050 |
]. |
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1051 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
1052 |
self addChange:newChange |
654 | 1053 |
|
1054 |
"Modified: / 27.8.1995 / 22:55:22 / claus" |
|
1055 |
"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
|
1056 |
"Modified: / 14.11.2001 / 13:36:04 / cg" |
901 | 1057 |
! |
1058 |
||
1059 |
addRenameCategoryChangeIn:aClass from:oldCategory to:newCategory |
|
1060 |
"add a category rename change to the receiver" |
|
1061 |
||
1062 |
|newChange| |
|
1063 |
||
1064 |
newChange := MethodCategoryRenameChange class:aClass. |
|
1065 |
newChange oldCategoryName:oldCategory newCategoryName:newCategory. |
|
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1066 |
self rememberChangedClass:aClass. |
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
1067 |
self addChange:newChange |
1105
b27c0d72d7d0
avoid useless change notifications from #collect:, #select: etc.
Claus Gittinger <cg@exept.de>
parents:
1102
diff
changeset
|
1068 |
|
1111
d4f353ffaa53
oops - species must be ChangeSet; add: should not send notifications.
Claus Gittinger <cg@exept.de>
parents:
1105
diff
changeset
|
1069 |
"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
|
1070 |
! ! |
b27c0d72d7d0
avoid useless change notifications from #collect:, #select: etc.
Claus Gittinger <cg@exept.de>
parents:
1102
diff
changeset
|
1071 |
|
2376 | 1072 |
!ChangeSet methodsFor:'fileOut'! |
1073 |
||
1074 |
fileOutAs: aStringOrFilename |
|
1075 |
||
1076 |
| stream | |
|
1077 |
stream := aStringOrFilename asFilename writeStream. |
|
1078 |
[ self fileOutOn: stream ] |
|
1079 |
ensure: [stream close] |
|
1080 |
||
1081 |
"Created: / 05-12-2009 / 12:33:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1082 |
! |
|
1083 |
||
1084 |
fileOutOn: stream |
|
1085 |
||
1086 |
self do:[:chg|chg fileOutOn: stream] |
|
1087 |
||
1088 |
"Created: / 05-12-2009 / 12:32:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1089 |
! ! |
|
1090 |
||
2469
4a02caf1782d
changed: #saveToStream:format:
Claus Gittinger <cg@exept.de>
parents:
2412
diff
changeset
|
1091 |
|
85 | 1092 |
!ChangeSet methodsFor:'misc'! |
1093 |
||
1094 |
addPatch:nameOfPatch |
|
1095 |
"ignored for now - allows fileIn of ST-80 patch stuff .." |
|
1096 |
||
1097 |
^ self |
|
1098 |
! ! |
|
1099 |
||
2376 | 1100 |
|
1263 | 1101 |
!ChangeSet methodsFor:'private-accessing'! |
1098 | 1102 |
|
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1103 |
addChange:aChange |
2053 | 1104 |
|changeClass| |
1105 |
||
1898 | 1106 |
aChange timeOfChangeIfKnown isNil ifTrue:[ |
1107 |
aChange timeStamp:(Timestamp now). |
|
1108 |
]. |
|
1109 |
||
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1110 |
self add:aChange. |
1471 | 1111 |
changedClasses notNil ifTrue:[ |
2053 | 1112 |
(changeClass := aChange changeClass) notNil ifTrue:[ |
1113 |
changedClasses add:changeClass. |
|
1114 |
]. |
|
1471 | 1115 |
]. |
1476 | 1116 |
changeSelectors notNil ifTrue:[ |
1117 |
aChange isMethodChange ifTrue:[ |
|
1118 |
changeSelectors add:aChange selector. |
|
1119 |
]. |
|
1120 |
]. |
|
1232 | 1121 |
|
1122 |
"/ aChange sendChangeNotificationThroughSmalltalk. |
|
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1123 |
self changed:#addChange: with:aChange. |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1124 |
|
1898 | 1125 |
"Created: / 14-11-2001 / 13:35:11 / cg" |
1126 |
"Modified: / 10-11-2006 / 16:47:13 / cg" |
|
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1127 |
! |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1128 |
|
1479 | 1129 |
flushChangedClassesCache |
1130 |
changedClasses := changeSelectors := nil |
|
1131 |
||
1132 |
" |
|
1133 |
ChangeSet current flushChangedClassesCache |
|
1134 |
" |
|
1135 |
! |
|
1136 |
||
1128
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1137 |
rememberChangedClass:aClass |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1138 |
changedClasses notNil ifTrue:[ |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1139 |
changedClasses add:aClass |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1140 |
]. |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1141 |
! |
9e213e86c212
cache changed classes (speedup browser)
Claus Gittinger <cg@exept.de>
parents:
1127
diff
changeset
|
1142 |
|
1098 | 1143 |
removeAll:aCollection |
1301 | 1144 |
aCollection notEmpty ifTrue:[ |
1145 |
super removeAll:aCollection. |
|
1476 | 1146 |
changedClasses := changeSelectors := nil. |
1301 | 1147 |
self changed:#removeAll: with:aCollection. |
1148 |
] |
|
1421 | 1149 |
! |
1150 |
||
1151 |
unrememberChangedClasses |
|
1152 |
changedClasses := nil |
|
1098 | 1153 |
! ! |
1154 |
||
1034
cdc9ddc19155
added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents:
985
diff
changeset
|
1155 |
!ChangeSet methodsFor:'queries'! |
cdc9ddc19155
added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents:
985
diff
changeset
|
1156 |
|
2160
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1157 |
changedPackages |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1158 |
"return a collection of all packages for which changes are in this changeSet" |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1159 |
|
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1160 |
|classes changedPackages| |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1161 |
|
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1162 |
changedPackages := Set new. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1163 |
|
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1164 |
self do:[:chg | |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1165 |
|p mthd cls| |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1166 |
|
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1167 |
p := chg package. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1168 |
p isNil ifTrue:[ |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1169 |
chg isMethodChange ifTrue:[ |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1170 |
mthd := chg changeMethod. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1171 |
mthd notNil ifTrue:[ |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1172 |
p := mthd package. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1173 |
] ifFalse:[ |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1174 |
cls := chg changeClass. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1175 |
cls notNil ifTrue:[ |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1176 |
p := cls package. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1177 |
] |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1178 |
] |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1179 |
] ifFalse:[ |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1180 |
chg isClassChange ifTrue:[ |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1181 |
cls := chg changeClass. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1182 |
cls notNil ifTrue:[ |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1183 |
p := cls package. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1184 |
] |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1185 |
] |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1186 |
]. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1187 |
]. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1188 |
p notNil ifTrue:[ |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1189 |
changedPackages add:p. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1190 |
] |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1191 |
]. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1192 |
|
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1193 |
"/ self changedClasses do:[:cls | |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1194 |
"/ |p| |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1195 |
"/ |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1196 |
"/ (p := cls package) notNil ifTrue:[ |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1197 |
"/ changedPackages add:p. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1198 |
"/ ] |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1199 |
"/ ]. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1200 |
^ changedPackages. |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1201 |
|
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1202 |
" |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1203 |
ChangeSet current changedPackages |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1204 |
" |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1205 |
|
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1206 |
"Created: / 22-09-2006 / 16:37:40 / cg" |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1207 |
"Modified: / 13-10-2006 / 01:20:48 / cg" |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1208 |
! |
831832c4c164
oops: fm lost #changedPackages
Claus Gittinger <cg@exept.de>
parents:
2138
diff
changeset
|
1209 |
|
2412 | 1210 |
changesForPackage:aPackageSymbol |
1211 |
||
1212 |
" |
|
1213 |
ChangeSet current changesForPackage:#'stx:goodies/libsvn'. |
|
1214 |
||
1215 |
" |
|
1216 |
||
1217 |
^(self select:[:aChange | |
|
1218 |
|removeThis mClass mthd| |
|
1219 |
||
1220 |
removeThis := false. |
|
1221 |
(aChange isMethodChange or:[aChange isMethodRemoveChange]) ifTrue:[ |
|
1222 |
mClass := aChange changeClass. |
|
1223 |
mClass notNil ifTrue:[ |
|
1224 |
mthd := mClass compiledMethodAt:(aChange selector). |
|
1225 |
mthd isNil ifTrue:[ |
|
1226 |
aChange isMethodRemoveChange ifTrue:[ |
|
1227 |
removeThis := (mClass package = aPackageSymbol) |
|
1228 |
]. |
|
1229 |
] ifFalse:[ |
|
1230 |
removeThis := (mthd package = aPackageSymbol) |
|
1231 |
] |
|
1232 |
]. |
|
1233 |
] ifFalse:[ |
|
1234 |
(aChange isClassChange) ifTrue:[ |
|
1235 |
(aChange changeClass notNil) ifTrue:[ |
|
1236 |
removeThis := (aChange changeClass package = aPackageSymbol) |
|
1237 |
]. |
|
1238 |
]. |
|
1239 |
]. |
|
1240 |
removeThis |
|
1241 |
]) |
|
1242 |
||
1243 |
"Created: / 05-11-2001 / 14:21:17 / cg" |
|
1244 |
"Modified: / 12-10-2006 / 16:51:27 / cg" |
|
1245 |
"Modified: / 22-10-2008 / 13:25:02 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1246 |
! |
|
1247 |
||
1034
cdc9ddc19155
added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents:
985
diff
changeset
|
1248 |
includesChangeForClass:aClass |
1096 | 1249 |
|nameOfClass| |
1085 | 1250 |
|
1251 |
nameOfClass := aClass theNonMetaclass name. |
|
1918
1f3fcb411307
do not check for identical class being in changeSet -
boris
parents:
1898
diff
changeset
|
1252 |
|
1f3fcb411307
do not check for identical class being in changeSet -
boris
parents:
1898
diff
changeset
|
1253 |
(self changedClasses contains:[:aClass | aClass theNonMetaclass name = nameOfClass]) ifFalse:[^ false]. |
1340 | 1254 |
^ self contains:[:aChange | aChange className = nameOfClass] |
1085 | 1255 |
|
1256 |
" |
|
1257 |
ChangeSet current includesChangeForClass:ChangeSet |
|
1096 | 1258 |
ChangeSet current includesChangeForClass:ChangeSet class |
1686 | 1259 |
ChangeSet current includesChangeForClass:SourceCodeManagerUtilities |
1918
1f3fcb411307
do not check for identical class being in changeSet -
boris
parents:
1898
diff
changeset
|
1260 |
ChangeSet current includesChangeForClass:(Expecco::ExpeccoXMLDecoder::ObjectCreator) |
1085 | 1261 |
" |
1262 |
||
1842
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
1263 |
"Modified: / 09-10-2006 / 13:39:22 / cg" |
1085 | 1264 |
! |
1265 |
||
1266 |
includesChangeForClass:aClass selector:selector |
|
1918
1f3fcb411307
do not check for identical class being in changeSet -
boris
parents:
1898
diff
changeset
|
1267 |
|nameOfNonMetaClass nameOfClass| |
1f3fcb411307
do not check for identical class being in changeSet -
boris
parents:
1898
diff
changeset
|
1268 |
|
1478 | 1269 |
(self changeSelectors includes:selector) ifFalse:[^ false]. |
1476 | 1270 |
|
1918
1f3fcb411307
do not check for identical class being in changeSet -
boris
parents:
1898
diff
changeset
|
1271 |
nameOfNonMetaClass := aClass theNonMetaclass name. |
1f3fcb411307
do not check for identical class being in changeSet -
boris
parents:
1898
diff
changeset
|
1272 |
(self changedClasses contains:[:aClass | aClass theNonMetaclass name = nameOfNonMetaClass]) ifFalse:[^ false]. |
1f3fcb411307
do not check for identical class being in changeSet -
boris
parents:
1898
diff
changeset
|
1273 |
|
1096 | 1274 |
nameOfClass := aClass name. |
1085 | 1275 |
|
1096 | 1276 |
^ self contains:[:aChange | |
1232 | 1277 |
selector = aChange selector |
1096 | 1278 |
ifFalse:[ |
1279 |
false |
|
1280 |
] ifTrue:[ |
|
1232 | 1281 |
nameOfClass = aChange className |
1096 | 1282 |
] |
1085 | 1283 |
] |
1284 |
||
1285 |
" |
|
1286 |
ChangeSet current includesChangeForClass:ChangeSet selector:#includesChangeForClass: |
|
1287 |
" |
|
1288 |
||
1289 |
"Created: / 31.10.2001 / 10:26:31 / cg" |
|
1290 |
"Modified: / 31.10.2001 / 10:59:49 / cg" |
|
1096 | 1291 |
! |
1292 |
||
1293 |
includesChangeForClassOrMetaclass:aClass |
|
1294 |
|nameOfClass nameOfMetaclass| |
|
1295 |
||
1296 |
nameOfClass := aClass theNonMetaclass name. |
|
1297 |
nameOfMetaclass := aClass theMetaclass name. |
|
1298 |
||
1920 | 1299 |
(self changedClasses contains:[:eachClass | eachClass theNonMetaclass name = nameOfClass]) ifFalse:[ |
1918
1f3fcb411307
do not check for identical class being in changeSet -
boris
parents:
1898
diff
changeset
|
1300 |
^ false. |
1f3fcb411307
do not check for identical class being in changeSet -
boris
parents:
1898
diff
changeset
|
1301 |
]. |
1f3fcb411307
do not check for identical class being in changeSet -
boris
parents:
1898
diff
changeset
|
1302 |
|
1f3fcb411307
do not check for identical class being in changeSet -
boris
parents:
1898
diff
changeset
|
1303 |
|
1920 | 1304 |
^ self contains:[:eachChange | |
1096 | 1305 |
|changeClassName| |
1306 |
||
1920 | 1307 |
changeClassName := eachChange className. |
1096 | 1308 |
changeClassName = nameOfClass or:[changeClassName = nameOfMetaclass] |
1309 |
] |
|
1842
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
1310 |
|
6ca4e98df305
method-package change record added
Claus Gittinger <cg@exept.de>
parents:
1830
diff
changeset
|
1311 |
"Modified: / 09-10-2006 / 13:40:29 / cg" |
1127
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1312 |
! |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1313 |
|
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1314 |
includesChangeForClassOrMetaclassOrPrivateClassOf:aClass |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1315 |
|nameOfClass nameOfMetaclass| |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1316 |
|
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1317 |
nameOfClass := aClass theNonMetaclass name. |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1318 |
nameOfMetaclass := aClass theMetaclass name. |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1319 |
|
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1320 |
self do:[:aChange | |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1321 |
|changeClassName changeClass| |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1322 |
|
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1323 |
changeClassName := aChange className. |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1324 |
(changeClassName = nameOfClass) ifTrue:[^ true]. |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1325 |
(changeClassName = nameOfMetaclass) ifTrue:[^ true]. |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1326 |
changeClass := aChange changeClass. |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1327 |
(changeClass notNil |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1328 |
and:[changeClass isPrivate |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1329 |
and:[changeClass owningClass == aClass]]) ifTrue:[ |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1330 |
^ true |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1331 |
] |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1332 |
]. |
b009373b0feb
+includesChangeForClassOrMetaclassOrPrivateClassOf
Claus Gittinger <cg@exept.de>
parents:
1115
diff
changeset
|
1333 |
^ false |
1885 | 1334 |
! |
1335 |
||
2519 | 1336 |
includesChangeForClassOrMetaclassOrPrivateClassOfAny:aCollectionOfClasses |
1337 |
|namesOfClasses namesOfMetaclasses| |
|
1338 |
||
1339 |
namesOfClasses := aCollectionOfClasses collect:[:eachClass | eachClass theNonMetaclass name] as:Array. |
|
1340 |
namesOfMetaclasses := aCollectionOfClasses collect:[:eachClass | eachClass theMetaclass name] as:Array. |
|
1341 |
||
1342 |
self do:[:aChange | |
|
1343 |
|changeClassName changeClass| |
|
1344 |
||
1345 |
changeClassName := aChange className. |
|
1346 |
(namesOfClasses includes:changeClassName) ifTrue:[^ true]. |
|
1347 |
(namesOfMetaclasses includes:changeClassName) ifTrue:[^ true]. |
|
1348 |
||
1349 |
changeClass := aChange changeClass. |
|
1350 |
(changeClass notNil and:[changeClass isPrivate]) ifTrue:[ |
|
1351 |
(aCollectionOfClasses includes:changeClass owningClass) ifTrue:[ |
|
1352 |
^ true |
|
1353 |
]. |
|
1354 |
] |
|
1355 |
]. |
|
1356 |
^ false |
|
1357 |
||
1358 |
"Created: / 08-09-2011 / 04:24:26 / cg" |
|
1359 |
! |
|
1360 |
||
1885 | 1361 |
includesChangeForPackage:aPackageID |
1362 |
^ self changedPackages includes:aPackageID |
|
1363 |
||
1364 |
"/ ^ self contains:[:aChange | aChange package = aPackageID] |
|
1365 |
||
1366 |
" |
|
1367 |
ChangeSet current includesChangeForPackage:'stx:libbasic' |
|
1368 |
" |
|
1369 |
||
1370 |
"Created: / 25-10-2006 / 18:06:55 / cg" |
|
2519 | 1371 |
! |
1372 |
||
1373 |
selectForWhichIncludesChangeForClassOrMetaclassOrPrivateClassFrom:aCollectionOfClasses |
|
1374 |
|namesOfClasses namesOfMetaclasses| |
|
1375 |
||
1376 |
namesOfClasses := aCollectionOfClasses collect:[:eachClass | eachClass theNonMetaclass name] as:Array. |
|
1377 |
namesOfMetaclasses := aCollectionOfClasses collect:[:eachClass | eachClass theMetaclass name] as:Array. |
|
1378 |
||
1379 |
^ aCollectionOfClasses |
|
1380 |
select:[:aChange | |
|
1381 |
|changeClassName changeClass| |
|
1382 |
||
1383 |
changeClassName := aChange className. |
|
1384 |
(namesOfClasses includes:changeClassName) |
|
1385 |
or:[ (namesOfMetaclasses includes:changeClassName) |
|
1386 |
or:[ |
|
1387 |
changeClass := aChange changeClass. |
|
1388 |
(changeClass notNil |
|
1389 |
and:[ changeClass isPrivate |
|
1390 |
and:[ (aCollectionOfClasses includes:changeClass owningClass) ]]) |
|
1391 |
]] |
|
1392 |
]. |
|
1393 |
||
1394 |
"Created: / 08-09-2011 / 04:38:32 / cg" |
|
1034
cdc9ddc19155
added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents:
985
diff
changeset
|
1395 |
! ! |
cdc9ddc19155
added query for a class being in a changeSet
Claus Gittinger <cg@exept.de>
parents:
985
diff
changeset
|
1396 |
|
857 | 1397 |
!ChangeSet methodsFor:'utilities'! |
1398 |
||
878 | 1399 |
apply |
1400 |
"apply all changes in the receivers changeSet" |
|
1401 |
||
1402 |
self do:[:aChange | |
|
2376 | 1403 |
aChange apply |
878 | 1404 |
] |
1405 |
! |
|
1406 |
||
2412 | 1407 |
condenseChanges |
1408 |
||
1409 |
| changesToRemove changesToKeep | |
|
1410 |
changesToKeep := self class new. |
|
1411 |
changesToRemove := self class new. |
|
1412 |
self reverseDo: |
|
1413 |
[:change| |
|
1414 |
(changesToKeep anySatisfy:[:each|each isForSameAs: change]) |
|
1415 |
ifTrue:[changesToRemove add: change] |
|
1416 |
ifFalse:[changesToKeep add: change] |
|
1417 |
]. |
|
1418 |
self condenseChanges: changesToRemove. |
|
1419 |
||
1420 |
"Created: / 22-10-2008 / 13:05:13 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1421 |
! |
|
1422 |
||
1865 | 1423 |
condenseChanges:changesToRemove |
1424 |
"remove the given changes - a helper for the rest of the condense protocol" |
|
1425 |
||
1426 |
changesToRemove notEmpty ifTrue:[ |
|
1427 |
changedClasses := changeSelectors := nil. |
|
1428 |
self removeAll:changesToRemove. |
|
1429 |
self changed. |
|
1430 |
Smalltalk changed:#currentChangeSet with:self. |
|
1431 |
]. |
|
1432 |
||
1433 |
"Created: / 12-10-2006 / 16:51:11 / cg" |
|
1434 |
! |
|
1435 |
||
1096 | 1436 |
condenseChangesForClass:aClass |
1437 |
"remove all changes for aClass |
|
1438 |
(i.e. leave changes for other classes)." |
|
1439 |
||
1440 |
self condenseChangesForClass:aClass package:nil |
|
1441 |
! |
|
1442 |
||
878 | 1443 |
condenseChangesForClass:aClass package:aPackageSymbol |
1444 |
"remove all changes for aClass and aPackageSymbol |
|
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1445 |
(i.e. leave methodChanges for other packages). |
956
0c6c209df4e9
keep previousVersion of method in changeSet
Claus Gittinger <cg@exept.de>
parents:
946
diff
changeset
|
1446 |
This is invoked when a class is checked into the repository." |
878 | 1447 |
|
1186
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1448 |
self condenseChangesForClass:aClass selector:nil package:aPackageSymbol |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1449 |
|
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1450 |
"Modified: / 5.11.2001 / 14:29:22 / cg" |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1451 |
! |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1452 |
|
1830 | 1453 |
condenseChangesForClass:aClass selector:aSelector |
1454 |
"remove all changes for aClass >> selector." |
|
1455 |
||
1456 |
self condenseChangesForClass:aClass selector:aSelector package:nil |
|
1457 |
||
1458 |
"Created: / 26-09-2006 / 17:22:59 / cg" |
|
1459 |
! |
|
1460 |
||
1186
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1461 |
condenseChangesForClass:aClass selector:selectorOrNil package:aPackageSymbol |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1462 |
"remove all changes for aClass/selector and aPackageSymbol |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1463 |
(i.e. leave methodChanges for other packages). |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1464 |
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
|
1465 |
otherwise, only changes for the given selector. |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1466 |
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
|
1467 |
|
945
f9e349d38d49
care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents:
944
diff
changeset
|
1468 |
|changesToRemove className metaClassName chgCls| |
878 | 1469 |
|
945
f9e349d38d49
care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents:
944
diff
changeset
|
1470 |
className := aClass theNonMetaclass name. |
f9e349d38d49
care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents:
944
diff
changeset
|
1471 |
metaClassName := aClass theMetaclass name. |
1865 | 1472 |
|
1473 |
changesToRemove := self select:[:aChange | |
|
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1474 |
|chgClassName chgClass removeThis mClass mthd| |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1475 |
|
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1476 |
removeThis := false. |
945
f9e349d38d49
care for metaclasses when condensing changeSet
Claus Gittinger <cg@exept.de>
parents:
944
diff
changeset
|
1477 |
chgClassName := aChange className. |
1168 | 1478 |
(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
|
1479 |
removeThis := true |
944
f4cb7e9b034b
when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents:
939
diff
changeset
|
1480 |
] ifFalse:[ |
f4cb7e9b034b
when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents:
939
diff
changeset
|
1481 |
chgCls := aChange changeClass. |
1718 | 1482 |
chgCls isNil ifTrue:[ |
1483 |
(chgClassName startsWith:(aClass name,':')) ifTrue:[ |
|
1484 |
"a change for a private class of a no-longer present one..." |
|
1485 |
removeThis := true |
|
1486 |
]. |
|
1487 |
]. |
|
1488 |
||
944
f4cb7e9b034b
when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents:
939
diff
changeset
|
1489 |
(chgCls notNil |
f4cb7e9b034b
when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents:
939
diff
changeset
|
1490 |
and:[chgCls isPrivate |
1190
02e2436893b6
condense after checkin: also condense sub-sub-private classes
Claus Gittinger <cg@exept.de>
parents:
1188
diff
changeset
|
1491 |
and:[chgCls topOwningClass == aClass]]) ifTrue:[ |
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1492 |
removeThis := true |
944
f4cb7e9b034b
when condensing, also care for private classes
Claus Gittinger <cg@exept.de>
parents:
939
diff
changeset
|
1493 |
] |
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1494 |
]. |
1186
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1495 |
selectorOrNil notNil ifTrue:[ |
1187
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1496 |
(aChange isMethodChange or:[aChange isMethodRemoveChange]) ifFalse:[ |
1186
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1497 |
removeThis := false. |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1498 |
] ifTrue:[ |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1499 |
aChange selector = selectorOrNil ifFalse:[ |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1500 |
removeThis := false. |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1501 |
]. |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1502 |
] |
a47e1a5770c2
condensing after an extensions-checkin fixed
Claus Gittinger <cg@exept.de>
parents:
1184
diff
changeset
|
1503 |
]. |
1187
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1504 |
|
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1505 |
removeThis ifTrue:[ |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1506 |
aChange isMethodChange ifTrue:[ |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1507 |
mClass := aChange changeClass. |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1508 |
mClass notNil ifTrue:[ |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1509 |
mthd := mClass compiledMethodAt:(aChange selector). |
1096 | 1510 |
mthd isNil ifTrue:[ |
1511 |
"/ mthd does no longer exist |
|
1168 | 1512 |
"/ I no longer understand what this was meant for .. (sigh) |
1513 |
"/ aPackageSymbol notNil ifTrue:[ |
|
1514 |
"/ removeThis := false |
|
1515 |
"/ ] |
|
1096 | 1516 |
] ifFalse:[ |
1517 |
(aPackageSymbol notNil and:[mthd package ~= aPackageSymbol]) ifTrue:[ |
|
1518 |
removeThis := false |
|
1519 |
] |
|
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1520 |
] |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1521 |
] |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1522 |
]. |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1523 |
]. |
1865 | 1524 |
removeThis |
1301 | 1525 |
]. |
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1526 |
|
1865 | 1527 |
self condenseChanges:changesToRemove |
1528 |
||
1529 |
"Modified: / 12-10-2006 / 16:51:38 / cg" |
|
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1530 |
! |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1531 |
|
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1532 |
condenseChangesForExtensionsInPackage:aPackageSymbol |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1533 |
"remove all changes for aClass and aPackageSymbol |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1534 |
(i.e. leave methodChanges for other packages). |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1535 |
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
|
1536 |
|
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1537 |
|changesToRemove| |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1538 |
|
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1539 |
changesToRemove := OrderedCollection new. |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1540 |
|
1865 | 1541 |
changesToRemove := self select:[:aChange | |
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1542 |
|removeThis mClass mthd| |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1543 |
|
1187
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1544 |
(aChange isMethodChange or:[aChange isMethodRemoveChange]) ifTrue:[ |
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1545 |
removeThis := false. |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1546 |
mClass := aChange changeClass. |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1547 |
mClass notNil ifTrue:[ |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1548 |
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
|
1549 |
mthd isNil ifTrue:[ |
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1550 |
aChange isMethodRemoveChange ifTrue:[ |
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1551 |
removeThis := true |
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1552 |
]. |
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1553 |
] ifFalse:[ |
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1554 |
mthd package = aPackageSymbol ifTrue:[ |
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1555 |
removeThis := true |
f63ecc7dbaff
condenseChange fixes (if baseClass or extensions are checked in)
Claus Gittinger <cg@exept.de>
parents:
1186
diff
changeset
|
1556 |
] |
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1557 |
] |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1558 |
]. |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1559 |
]. |
1865 | 1560 |
removeThis |
1087
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1561 |
]. |
5aaf7da2882d
condense changes for extensions
Claus Gittinger <cg@exept.de>
parents:
1085
diff
changeset
|
1562 |
|
1865 | 1563 |
self condenseChanges:changesToRemove |
1564 |
||
1565 |
"Created: / 05-11-2001 / 14:21:17 / cg" |
|
1566 |
"Modified: / 12-10-2006 / 16:51:32 / cg" |
|
1567 |
! |
|
1568 |
||
1569 |
condenseChangesForPackage:aPackageSymbol |
|
1570 |
"remove all changes for aPackageSymbol |
|
1571 |
This is invoked when a project is checked into the repository." |
|
1572 |
||
1573 |
|changesToRemove| |
|
1574 |
||
1575 |
changesToRemove := self select:[:aChange | |
|
1576 |
|removeThis mClass mthd| |
|
1577 |
||
1578 |
removeThis := false. |
|
1579 |
(aChange isMethodChange or:[aChange isMethodRemoveChange]) ifTrue:[ |
|
1580 |
mClass := aChange changeClass. |
|
1581 |
mClass notNil ifTrue:[ |
|
1582 |
mthd := mClass compiledMethodAt:(aChange selector). |
|
1583 |
mthd isNil ifTrue:[ |
|
1584 |
aChange isMethodRemoveChange ifTrue:[ |
|
1585 |
removeThis := (mClass package = aPackageSymbol) |
|
1586 |
]. |
|
1587 |
] ifFalse:[ |
|
1588 |
removeThis := (mthd package = aPackageSymbol) |
|
1589 |
] |
|
1590 |
]. |
|
1591 |
] ifFalse:[ |
|
1592 |
(aChange isClassChange) ifTrue:[ |
|
1883 | 1593 |
(aChange changeClass notNil) ifTrue:[ |
1594 |
removeThis := (aChange changeClass package = aPackageSymbol) |
|
1595 |
]. |
|
1865 | 1596 |
]. |
1597 |
]. |
|
1598 |
removeThis |
|
1521
ea6cb41e4523
send out a change notification, when I condensed
Claus Gittinger <cg@exept.de>
parents:
1479
diff
changeset
|
1599 |
]. |
ea6cb41e4523
send out a change notification, when I condensed
Claus Gittinger <cg@exept.de>
parents:
1479
diff
changeset
|
1600 |
|
1865 | 1601 |
self condenseChanges:changesToRemove |
1602 |
||
1521
ea6cb41e4523
send out a change notification, when I condensed
Claus Gittinger <cg@exept.de>
parents:
1479
diff
changeset
|
1603 |
"Created: / 05-11-2001 / 14:21:17 / cg" |
1865 | 1604 |
"Modified: / 12-10-2006 / 16:51:27 / cg" |
878 | 1605 |
! |
1606 |
||
857 | 1607 |
diffSetsAgainst:anotherChangeSet |
1608 |
"walk over the receiver and anotherChangeSet, |
|
1609 |
add all changes to one of the tree lists: |
|
946 | 1610 |
onlyInReceiver, onlyInArg or changed, |
1611 |
each being a changeSet containing corresponding changes. |
|
1867 | 1612 |
WARNING: |
1613 |
destructive; could modify both the receiver and the argument by possibly |
|
2633 | 1614 |
changing methodChanges into categoryChanges" |
857 | 1615 |
|
1200
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1616 |
|otherChangeIndicesBySelector otherNonMethodChangeIndices changeIndicesBySelector nonMethodChangeIndices |
3032
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
1617 |
onlyInReceiver onlyInArg changedMethods same |
857 | 1618 |
indexFromChangedMethodsToA indexFromChangedMethodsToB |
864 | 1619 |
"info" ret| |
857 | 1620 |
|
1621 |
onlyInReceiver := ChangeSet new. |
|
1622 |
onlyInArg := ChangeSet new. |
|
1623 |
changedMethods := ChangeSet new. |
|
3032
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
1624 |
same := ChangeSet new. |
857 | 1625 |
|
1626 |
indexFromChangedMethodsToA := OrderedCollection new. |
|
1627 |
indexFromChangedMethodsToB := OrderedCollection new. |
|
1628 |
||
1200
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1629 |
otherChangeIndicesBySelector := Dictionary new. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1630 |
otherNonMethodChangeIndices := OrderedCollection new. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1631 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1632 |
"/ 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
|
1633 |
anotherChangeSet keysAndValuesDo:[:idxB :aChangeInB | |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1634 |
|setOfOtherChangeIndicesForThisSelector| |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1635 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1636 |
aChangeInB isMethodChange ifTrue:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1637 |
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
|
1638 |
setOfOtherChangeIndicesForThisSelector add:idxB. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1639 |
] ifFalse:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1640 |
otherNonMethodChangeIndices add:idxB |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1641 |
]. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1642 |
]. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1643 |
|
857 | 1644 |
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
|
1645 |
|indicesOfChangesToExplore anyFound ch| |
857 | 1646 |
|
946 | 1647 |
anyFound := false. |
857 | 1648 |
|
1200
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1649 |
aChangeInA isMethodChange ifTrue:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1650 |
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
|
1651 |
] ifFalse:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1652 |
indicesOfChangesToExplore := otherNonMethodChangeIndices. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1653 |
]. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1654 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1655 |
indicesOfChangesToExplore do:[:idxB | |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1656 |
|aChangeInB| |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1657 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1658 |
aChangeInB := anotherChangeSet at:idxB. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1659 |
|
946 | 1660 |
(aChangeInA isForSameAs:aChangeInB) ifTrue:[ |
1661 |
anyFound := true. |
|
857 | 1662 |
|
946 | 1663 |
"/ also in B - is it different ? |
1664 |
(aChangeInA sameAs:aChangeInB) ifFalse:[ |
|
1665 |
changedMethods add:aChangeInA. |
|
1666 |
indexFromChangedMethodsToA add:idxA. |
|
1667 |
indexFromChangedMethodsToB add:idxB. |
|
1668 |
] ifTrue:[ |
|
1669 |
aChangeInA isMethodChange ifTrue:[ |
|
1670 |
aChangeInA methodCategory ~= aChangeInB methodCategory ifTrue:[ |
|
1671 |
"/ only the category is different; |
|
1672 |
"/ make it a MethodCategory changes. |
|
857 | 1673 |
|
946 | 1674 |
ch := MethodCategoryChange new |
1675 |
className:aChangeInA className |
|
1676 |
selector:aChangeInA selector |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
1677 |
category:aChangeInA methodCategory; |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
1678 |
"JV@2012-03-20: Also keeps origin, required by merge tool" |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
1679 |
origin: aChangeInA. |
946 | 1680 |
self at:idxA put:ch. |
857 | 1681 |
|
946 | 1682 |
ch := MethodCategoryChange new |
1683 |
className:aChangeInB className |
|
1684 |
selector:aChangeInB selector |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
1685 |
category:aChangeInB methodCategory; |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
1686 |
"JV@2012-03-20: Also keeps origin, required by merge tool" |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
1687 |
origin: aChangeInB. |
946 | 1688 |
anotherChangeSet at:idxB put:ch. |
857 | 1689 |
|
946 | 1690 |
changedMethods add:aChangeInA. |
1691 |
indexFromChangedMethodsToA add:idxA. |
|
1692 |
indexFromChangedMethodsToB add:idxB. |
|
1693 |
] |
|
1694 |
]. |
|
1695 |
] |
|
1696 |
] ifFalse:[ |
|
1697 |
(aChangeInA sameAs:aChangeInB) ifTrue:[ |
|
1698 |
anyFound := true. |
|
1699 |
] ifFalse:[ |
|
1700 |
] |
|
1701 |
] |
|
1702 |
]. |
|
857 | 1703 |
|
946 | 1704 |
anyFound ifFalse:[ |
1705 |
onlyInReceiver add:aChangeInA. |
|
1706 |
] |
|
857 | 1707 |
]. |
1708 |
||
1200
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1709 |
"/ 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
|
1710 |
changeIndicesBySelector := Dictionary new. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1711 |
nonMethodChangeIndices := OrderedCollection new. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1712 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1713 |
self keysAndValuesDo:[:idxA :aChangeInA | |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1714 |
|setOfChangeIndicesForThisSelector| |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1715 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1716 |
aChangeInA isMethodChange ifTrue:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1717 |
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
|
1718 |
setOfChangeIndicesForThisSelector add:idxA. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1719 |
] ifFalse:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1720 |
nonMethodChangeIndices add:idxA |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1721 |
]. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1722 |
]. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1723 |
|
857 | 1724 |
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
|
1725 |
|anyFound indicesOfChangesToExplore| |
857 | 1726 |
|
946 | 1727 |
anyFound := false. |
857 | 1728 |
|
1200
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1729 |
aChangeInB isMethodChange ifTrue:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1730 |
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
|
1731 |
] ifFalse:[ |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1732 |
indicesOfChangesToExplore := nonMethodChangeIndices. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1733 |
]. |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1734 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1735 |
indicesOfChangesToExplore do:[:idxA | |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1736 |
|aChangeInA idxM| |
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1737 |
|
2da3e026f94d
much faster diffSet generation - watch out - report bugs to cg
Claus Gittinger <cg@exept.de>
parents:
1191
diff
changeset
|
1738 |
aChangeInA := self at:idxA. |
857 | 1739 |
|
946 | 1740 |
(aChangeInA isForSameAs:aChangeInB) ifTrue:[ |
1741 |
anyFound := true. |
|
857 | 1742 |
|
946 | 1743 |
"/ also in B - is it different ? |
1744 |
(aChangeInA sameAs:aChangeInB) ifFalse:[ |
|
1745 |
"/ already there ? |
|
1746 |
idxM := changedMethods findFirst:[:c | c isForSameAs:aChangeInB]. |
|
1747 |
idxM == 0 ifTrue:[ |
|
1748 |
changedMethods add:aChangeInB. |
|
1749 |
indexFromChangedMethodsToB add:idxB. |
|
1750 |
] ifFalse:[ |
|
1751 |
indexFromChangedMethodsToB at:idxM put:idxB |
|
1752 |
] |
|
1753 |
] |
|
1754 |
] ifFalse:[ |
|
1755 |
(aChangeInA sameAs:aChangeInB) ifTrue:[ |
|
1756 |
anyFound := true. |
|
1757 |
] ifFalse:[ |
|
1758 |
] |
|
1759 |
] |
|
1760 |
]. |
|
1761 |
anyFound ifFalse:[ |
|
1762 |
onlyInArg add:aChangeInB. |
|
1763 |
] |
|
857 | 1764 |
]. |
1765 |
||
864 | 1766 |
"/ info := OrderedCollection new:(changedMethods size). |
1767 |
"/ changedMethods keysAndValuesDo:[:idx :changedMethod | |
|
1768 |
"/ info add:(Array |
|
1769 |
"/ with:(indexFromChangedMethodsToA at:idx) |
|
1770 |
"/ with:(indexFromChangedMethodsToB at:idx) |
|
1771 |
"/ ) |
|
1772 |
"/ ]. |
|
1450 | 1773 |
changedMethods := (1 to:changedMethods size) asOrderedCollection collect:[:idx | |
946 | 1774 |
|cA cB| |
857 | 1775 |
|
946 | 1776 |
cA := self at:(indexFromChangedMethodsToA at:idx). |
1777 |
cB := anotherChangeSet at:(indexFromChangedMethodsToB at:idx). |
|
1778 |
Array with:cA with:cB |
|
1779 |
]. |
|
857 | 1780 |
|
3033 | 1781 |
same := self reject:[:chg|(changedMethods contains:[:pair|pair first == chg]) or:[onlyInReceiver includes: chg]]. |
1782 |
||
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1783 |
ret := DiffSet new |
1450 | 1784 |
changed:changedMethods |
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1785 |
onlyInReceiver:onlyInReceiver |
3032
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
1786 |
onlyInArg:onlyInArg |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
1787 |
same: same. |
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
1788 |
"/ ret info:info. |
864 | 1789 |
^ret |
1867 | 1790 |
|
1791 |
"Modified: / 12-10-2006 / 22:22:39 / cg" |
|
2633 | 1792 |
"Modified (comment): / 01-12-2011 / 19:12:55 / cg" |
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
1793 |
"Modified: / 20-03-2012 / 22:05:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2323 | 1794 |
! |
1795 |
||
2412 | 1796 |
diffSetsAgainstImage |
1797 |
||
1798 |
|imageChangeSet| |
|
1799 |
||
1800 |
imageChangeSet := self class new. |
|
1801 |
self changedClasses do: |
|
1802 |
[:class| |
|
1803 |
(class isMetaclass or:[class isPrivate]) ifFalse: |
|
1804 |
[imageChangeSet addAll: |
|
1805 |
(self class fromStream: class source asString readStream)]]. |
|
1806 |
^self diffSetsAgainst: imageChangeSet |
|
1807 |
||
1808 |
"Created: / 04-12-2007 / 16:03:28 / janfrog" |
|
1809 |
! |
|
1810 |
||
2376 | 1811 |
flatten |
1812 |
||
1813 |
| flatten | |
|
1814 |
flatten := self class new: self size. |
|
1815 |
self do:[:ea|ea do:[:ea2|flatten add: ea2]]. |
|
1816 |
^flatten |
|
1817 |
||
1818 |
"Created: / 29-10-2010 / 14:40:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1819 |
! |
|
1820 |
||
1821 |
groupBy: groupBlock labelAs: labelBlock |
|
1822 |
||
1823 |
" |
|
1824 |
returns a new changeset consisting of CompositeChanges. |
|
1825 |
Changes are grouped together by value (tag) of groupBlock. |
|
1826 |
Each composite change is then labeled using label |
|
1827 |
returned by labelBlock (called with the tag returned |
|
1828 |
by groupBlock as arg) |
|
1829 |
" |
|
1830 |
||
2491
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1831 |
^ self groupBy: groupBlock labelAs: labelBlock sort: false |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1832 |
|
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1833 |
"Created: / 24-07-2009 / 23:17:38 / Jan Vrany <vranyj1@fel.cvut.cz>" |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1834 |
"Modified: / 25-07-2009 / 19:40:16 / Jan Vrany <vranyj1@fel.cvut.cz>" |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1835 |
"Modified: / 29-10-2010 / 12:45:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1836 |
"Modified: / 30-08-2011 / 16:07:30 / cg" |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1837 |
! |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1838 |
|
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1839 |
groupBy: groupBlock labelAs: labelBlock sort: doSort |
2626
0ac000060c44
changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2617
diff
changeset
|
1840 |
"returns a new changeset consisting of CompositeChanges. |
0ac000060c44
changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2617
diff
changeset
|
1841 |
Changes are grouped together by value (tag) of groupBlock. |
0ac000060c44
changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2617
diff
changeset
|
1842 |
Each composite change is then labeled using label |
0ac000060c44
changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2617
diff
changeset
|
1843 |
returned by labelBlock (called with the tag returned |
0ac000060c44
changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2617
diff
changeset
|
1844 |
by groupBlock as arg)" |
2491
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1845 |
|
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1846 |
| buckets newChangeset keys | |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1847 |
|
2376 | 1848 |
buckets := OrderedDictionary new. |
1849 |
self do: |
|
1850 |
[:change| | tag | |
|
1851 |
tag := groupBlock value: change. |
|
1852 |
(buckets at: tag ifAbsentPut: [ChangeSet new:4]) |
|
1853 |
add: change]. |
|
1854 |
newChangeset := ChangeSet new: buckets size. |
|
2491
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1855 |
|
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1856 |
keys := buckets keys select:[:k | k notNil]. |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1857 |
doSort ifTrue:[ |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1858 |
keys sort. |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1859 |
]. |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1860 |
keys do:[:tag | |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1861 |
|changes classDefs| |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1862 |
|
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1863 |
changes := buckets at:tag. |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1864 |
|
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1865 |
"/ buckets keysAndValuesDo: |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1866 |
"/ [:tag :changes| | classDefs | |
2376 | 1867 |
"Move class definition to the front" |
1868 |
classDefs := changes select:[:chg|chg isClassDefinitionChange]. |
|
1869 |
changes removeAll: classDefs. |
|
1870 |
changes addAllFirst: classDefs. |
|
1871 |
||
2626
0ac000060c44
changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2617
diff
changeset
|
1872 |
tag notNil ifTrue:[ |
0ac000060c44
changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2617
diff
changeset
|
1873 |
newChangeset add: |
2376 | 1874 |
(CompositeChange |
1875 |
name: (labelBlock value: tag) |
|
2626
0ac000060c44
changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2617
diff
changeset
|
1876 |
changes: changes)] |
0ac000060c44
changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2617
diff
changeset
|
1877 |
]. |
0ac000060c44
changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2617
diff
changeset
|
1878 |
(buckets includesKey: nil) ifTrue:[ |
0ac000060c44
changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2617
diff
changeset
|
1879 |
newChangeset addAll: (buckets at: nil) |
0ac000060c44
changed: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2617
diff
changeset
|
1880 |
]. |
2376 | 1881 |
^newChangeset |
1882 |
||
1883 |
"Created: / 24-07-2009 / 23:17:38 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1884 |
"Modified: / 25-07-2009 / 19:40:16 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1885 |
"Modified: / 29-10-2010 / 12:45:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2491
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1886 |
"Created: / 30-08-2011 / 16:07:01 / cg" |
2376 | 1887 |
! |
1888 |
||
1889 |
groupByClass |
|
2491
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1890 |
|nm| |
2376 | 1891 |
|
1892 |
^self |
|
2491
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1893 |
groupBy: [:change| |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1894 |
change isClassChange ifTrue: [ |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1895 |
nm := change className. |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1896 |
(nm endsWith:' class') ifTrue:[nm := nm copyTo: nm size - 6]. |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1897 |
nm |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1898 |
] ifFalse: [ |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1899 |
nil |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1900 |
] |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1901 |
] |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1902 |
labelAs: [:className| |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1903 |
className |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1904 |
] |
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1905 |
sort: true |
2376 | 1906 |
|
1907 |
"Created: / 25-07-2009 / 19:43:14 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1908 |
"Modified: / 24-10-2009 / 18:49:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2491
882e07ee86bd
added: #groupBy:labelAs:sort:
Claus Gittinger <cg@exept.de>
parents:
2469
diff
changeset
|
1909 |
"Modified: / 30-08-2011 / 16:08:38 / cg" |
2376 | 1910 |
! |
1911 |
||
2323 | 1912 |
saveSignedToFile:aFilename |
1913 |
"write the changeSet to a signed file in chunk format" |
|
1914 |
||
1915 |
self saveSignedToFile:aFilename format:nil |
|
1916 |
||
1917 |
"Created: / 08-02-2011 / 11:18:54 / cg" |
|
1918 |
! |
|
1919 |
||
1920 |
saveSignedToFile:aFilename format:formatSymbolOrNil |
|
1921 |
"write the changeSet to a signed file in some format. |
|
1922 |
Sign with the exept key (which you do not have outside of exept!!). |
|
1923 |
Nil fomat is chunk" |
|
1924 |
||
1925 |
|s pkcs7SignedData| |
|
1926 |
||
1927 |
s := WriteStream on:(String new:2000). |
|
1928 |
self saveToStream:s format:formatSymbolOrNil. |
|
1929 |
||
1930 |
pkcs7SignedData := Expecco::KeyFileGenerator new signExpeccoCode:s contents. |
|
1931 |
aFilename asFilename contents:pkcs7SignedData. |
|
1932 |
||
1933 |
"Modified: / 08-02-2011 / 11:48:01 / cg" |
|
1934 |
! |
|
1935 |
||
1936 |
saveToFile:aFilename |
|
1937 |
"write the changeSet to a regular file in chunk format" |
|
1938 |
||
1939 |
self saveToFile:aFilename format:nil |
|
1940 |
||
1941 |
"Created: / 08-02-2011 / 11:18:46 / cg" |
|
1942 |
! |
|
1943 |
||
1944 |
saveToFile:aFilename format:formatSymbolOrNil |
|
1945 |
"write the changeSet to a regular file in some format. |
|
1946 |
Nil fomat is chunk" |
|
1947 |
||
1948 |
|s| |
|
1949 |
||
1950 |
s := aFilename asFilename writeStream. |
|
1951 |
self saveToStream:s format:formatSymbolOrNil. |
|
1952 |
s close. |
|
1953 |
||
1954 |
"Created: / 08-02-2011 / 11:20:06 / cg" |
|
1955 |
! |
|
1956 |
||
1957 |
saveToStream:aStream format:formatSymbolOrNil |
|
1958 |
"write the changeSet to a stream in some format. |
|
1959 |
Nil fomat is chunk" |
|
1960 |
||
1961 |
formatSymbolOrNil isNil ifTrue:[ |
|
1962 |
self do:[:eachChange | |
|
1963 |
eachChange isMethodCodeChange ifTrue:[ |
|
1964 |
aStream nextPutAll:'!!',(eachChange className),' methodsFor: '. |
|
1965 |
aStream nextPutAll:(eachChange methodCategory storeString). |
|
1966 |
aStream nextPutLine:'!!'. |
|
1967 |
aStream cr. |
|
1968 |
aStream nextPutAll:(eachChange source). |
|
1969 |
aStream nextPutLine:'!! !!'. |
|
1970 |
] ifFalse:[ |
|
1971 |
aStream nextPutAll:(eachChange source). |
|
1972 |
aStream nextPutLine:'!!'. |
|
1973 |
]. |
|
2469
4a02caf1782d
changed: #saveToStream:format:
Claus Gittinger <cg@exept.de>
parents:
2412
diff
changeset
|
1974 |
aStream cr. |
2323 | 1975 |
]. |
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
1976 |
^self. |
2323 | 1977 |
]. |
1978 |
||
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
1979 |
formatSymbolOrNil == #classSource ifTrue:[ |
3033 | 1980 |
ClassSourceWriter new |
1981 |
fileOut:self |
|
1982 |
on:aStream |
|
1983 |
withTimeStamp:false |
|
1984 |
withInitialize:true |
|
1985 |
withDefinition:true |
|
1986 |
methodFilter:nil encoder:nil. |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
1987 |
^self. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
1988 |
]. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
1989 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
1990 |
self error:'Unknown format, possible formats are { nil, #classSource }' |
2323 | 1991 |
|
1992 |
"Created: / 08-02-2011 / 11:25:16 / cg" |
|
3033 | 1993 |
"Modified: / 20-03-2012 / 14:06:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
857 | 1994 |
! ! |
1995 |
||
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1996 |
!ChangeSet::ChangeFileReader methodsFor:'accessing'! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1997 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1998 |
changeAction:aBlock |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
1999 |
changeAction := aBlock. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2000 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2001 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2002 |
changeSet:something |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2003 |
"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
|
2004 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2005 |
changeSet := something. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2006 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2007 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2008 |
inputStream:aStream |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2009 |
inputStream := aStream. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2010 |
! ! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2011 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2012 |
!ChangeSet::ChangeFileReader methodsFor:'helpers'! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2013 |
|
1176 | 2014 |
addChange:change |
2008 | 2015 |
changeAction |
2016 |
valueWithOptionalArgument:change |
|
2017 |
and:lineNumber |
|
2018 |
and:position. |
|
2019 |
||
1176 | 2020 |
! |
2021 |
||
2022 |
checkReceiverIsGlobalNamed:expectedName |
|
2023 |
^ self variableNameOfReceiver = expectedName |
|
2024 |
! |
|
2025 |
||
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2026 |
classNameOf:aReceiver |
2376 | 2027 |
|
2028 |
| nameSpace clsName | |
|
2029 |
nameSpace := Class nameSpaceQuerySignal query. |
|
2030 |
||
2031 |
(aReceiver isUnaryMessage and:[aReceiver selector == #class]) |
|
2032 |
ifTrue:[clsName := (aReceiver receiver name) , ' class'] |
|
2033 |
ifFalse:[clsName := aReceiver name]. |
|
2034 |
||
2035 |
^(nameSpace ~~ Smalltalk and:[(clsName startsWith: nameSpace name) not]) |
|
2036 |
ifTrue:[nameSpace name , '::' , clsName] |
|
2037 |
ifFalse:[clsName]. |
|
2745
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2038 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2039 |
"Modified: / 24-01-2012 / 17:07:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2040 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2041 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2042 |
receiversClassName |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2043 |
^ self classNameOf:receiver |
1176 | 2044 |
! |
2045 |
||
2046 |
variableNameOfReceiver |
|
2047 |
||
2048 |
receiver isVariable ifFalse:[ ^ nil ]. |
|
2049 |
^ receiver name |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2050 |
! ! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2051 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2052 |
!ChangeSet::ChangeFileReader methodsFor:'reading'! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2053 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2054 |
changesFromParseTree:aTree lineNumber:initialLineNumberOrNil position:initialPositionOrNil |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2055 |
"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
|
2056 |
create changes and evaluate changeAction on each. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2057 |
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
|
2058 |
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
|
2059 |
provides line-numbers; otherwise, nil is passed." |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2060 |
|
2745
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2061 |
^self changesFromParseTree:aTree lineNumber:initialLineNumberOrNil position:initialPositionOrNil chunk: nil |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2062 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2063 |
"Modified: / 24-01-2012 / 17:29:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2064 |
! |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2065 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2066 |
changesFromParseTree:aTree lineNumber:initialLineNumberOrNil position:initialPositionOrNil chunk: initialChunkOrNil |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2067 |
"given a parse-tree (from parsing some changes source/chunk), |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2068 |
create changes and evaluate changeAction on each. |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2069 |
The chnageAction-block is invoked with the change and a lineNumberOrNil as |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2070 |
arg; the lineNumber is only valid, if the underlying inputStream |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2071 |
provides line-numbers; otherwise, nil is passed." |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2072 |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2073 |
lineNumber := initialLineNumberOrNil. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2074 |
position := initialPositionOrNil. |
2745
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2075 |
chunk := initialChunkOrNil. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2076 |
parseTree := aTree. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2077 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2078 |
selector := aTree selector. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2079 |
receiver := aTree receiver. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2080 |
arguments := aTree arguments. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2081 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2082 |
receiver isMessage ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2083 |
receiverSelector := receiver selector. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2084 |
receiverReceiver := receiver receiver. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2085 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2086 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2087 |
^ self processChange |
2745
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2088 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2089 |
"Created: / 24-01-2012 / 17:28:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2090 |
! ! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2091 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2092 |
!ChangeSet::ChangeFileReader methodsFor:'reading-private'! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2093 |
|
2117
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2094 |
handleCategoriesForChange |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2095 |
|selector category categories attributes change| |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2096 |
|
2256
b98137d2aa30
changed: #changesFromStream:for:reader:do:
Claus Gittinger <cg@exept.de>
parents:
2247
diff
changeset
|
2097 |
selector := arguments first value. |
2117
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2098 |
className := self receiversClassName. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2099 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2100 |
categories := OrderedCollection new. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2101 |
attributes := OrderedCollection new. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2102 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2103 |
[ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2104 |
inputStream skipSeparators. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2105 |
category := inputStream nextChunk. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2106 |
category notEmptyOrNil |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2107 |
] whileTrue:[ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2108 |
( #( 'public' 'private' ) includes: category) ifTrue:[ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2109 |
attributes add:category |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2110 |
] ifFalse:[ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2111 |
categories add:category |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2112 |
]. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2113 |
]. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2114 |
categories size == 1 ifTrue:[ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2115 |
"/ easy |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2116 |
change := MethodCategoryChange |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2117 |
className:className |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2118 |
selector:selector |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2119 |
source:(parseTree printString) |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2120 |
category:(categories first). |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2121 |
self addChange:change. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2122 |
] ifFalse:[ |
2298 | 2123 |
self halt:'multiple/missing categories not supported'. |
2117
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2124 |
]. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2125 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2126 |
attributes size == 1 ifTrue:[ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2127 |
"/ easy |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2128 |
(attributes first = 'public') ifTrue:[ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2129 |
"/ default anyway - ignore |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2130 |
] ifFalse:[ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2131 |
change := MethodPrivacyChange |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2132 |
className:className |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2133 |
selector:selector |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2134 |
privacy:(attributes first asSymbol). |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2135 |
change source:(parseTree printString). |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2136 |
self addChange:change. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2137 |
]. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2138 |
] ifFalse:[ |
2298 | 2139 |
self halt:'multiple/missing attributes not supported'. |
2117
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2140 |
]. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2141 |
^ true |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2142 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2143 |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2144 |
handleClassCommentChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2145 |
|change| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2146 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2147 |
className := self receiversClassName. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2148 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2149 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2150 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2151 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2152 |
change := ClassCommentChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2153 |
change className:className comment:(arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2154 |
change source:(parseTree printString). |
1176 | 2155 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2156 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2157 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2158 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2159 |
handleClassDefinitionChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2160 |
|nameSpace change| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2161 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2162 |
className := (arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2163 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2164 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2165 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2166 |
nameSpace := Class nameSpaceQuerySignal query. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2167 |
nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2168 |
className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2169 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2170 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2171 |
change := ClassDefinitionChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2172 |
change className:className; source:(parseTree printString). |
1453 | 2173 |
receiver isVariable ifTrue:[ |
2174 |
change superClassName:receiver name. |
|
2175 |
]. |
|
1428
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
2176 |
selector keywords with:arguments do:[:kw :arg | |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
2177 |
kw = #'instanceVariableNames:' ifTrue:[ |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
2178 |
change instanceVariableNames:arg evaluate. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
2179 |
]. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
2180 |
kw = #'classVariableNames:' ifTrue:[ |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
2181 |
change classVariableNames:arg evaluate. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
2182 |
]. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
2183 |
kw = #'poolDictionaries:' ifTrue:[ |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
2184 |
change poolDictionaries:arg evaluate. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
2185 |
]. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
2186 |
kw = #'category:' ifTrue:[ |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
2187 |
change category:arg evaluate. |
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
2188 |
]. |
2125 | 2189 |
kw = #'privateIn:' ifTrue:[ |
2290 | 2190 |
change className:(arg name ,'::',change classNameWithoutNamespace). |
2191 |
change owningClassName:(arg name). |
|
2192 |
change private:true. |
|
2125 | 2193 |
]. |
1428
807f0bc05504
more state in classdefinition change
Claus Gittinger <cg@exept.de>
parents:
1422
diff
changeset
|
2194 |
]. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2195 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2196 |
change package:(Class packageQuerySignal query). |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2197 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2198 |
"/ change nameSpaceName:(nameSpace name). |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2199 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2200 |
"/ |
1176 | 2201 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2202 |
^ true |
2290 | 2203 |
|
2204 |
"Modified: / 30-08-2010 / 13:56:32 / cg" |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2205 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2206 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2207 |
handleClassInstanceVariableDefinitionChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2208 |
|change| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2209 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2210 |
className := self receiversClassName. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2211 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2212 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2213 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2214 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2215 |
change := ClassInstVarDefinitionChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2216 |
change className:className. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2217 |
change source:(parseTree printString). |
2617
a9e632776c57
visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents:
2524
diff
changeset
|
2218 |
change classInstVarNames:(parseTree arguments first value asCollectionOfWords asArray). |
1176 | 2219 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2220 |
^ true |
2617
a9e632776c57
visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents:
2524
diff
changeset
|
2221 |
|
a9e632776c57
visitor support (for monticello);
Claus Gittinger <cg@exept.de>
parents:
2524
diff
changeset
|
2222 |
"Modified: / 25-11-2011 / 17:40:49 / cg" |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2223 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2224 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2225 |
handleMethodCategoryChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2226 |
|change| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2227 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2228 |
(receiver isMessage |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2229 |
and:[receiverSelector == #'compiledMethodAt:']) ifFalse:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2230 |
self error:'unexpected change' mayProceed:true. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2231 |
^ false. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2232 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2233 |
className := self classNameOf:receiverReceiver. |
2046
6d7bc535ea69
Change #halt: to #shouldImplement or #assert:
Stefan Vogel <sv@exept.de>
parents:
2008
diff
changeset
|
2234 |
self assert:className notNil. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2235 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2236 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2237 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2238 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2239 |
methodSelector := (receiver arguments at:1) evaluate. |
2046
6d7bc535ea69
Change #halt: to #shouldImplement or #assert:
Stefan Vogel <sv@exept.de>
parents:
2008
diff
changeset
|
2240 |
self assert:methodSelector notNil. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2241 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2242 |
change := MethodCategoryChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2243 |
change |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2244 |
className:className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2245 |
selector:methodSelector |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2246 |
category:(arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2247 |
|
1176 | 2248 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2249 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2250 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2251 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2252 |
handleMethodCategoryRenameChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2253 |
|change| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2254 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2255 |
className := self receiversClassName. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2256 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2257 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2258 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2259 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2260 |
change := MethodCategoryRenameChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2261 |
change |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2262 |
className:className; |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2263 |
oldCategoryName:(arguments at:1) evaluate |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2264 |
newCategoryName:(arguments at:2) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2265 |
|
1176 | 2266 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2267 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2268 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2269 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2270 |
handleMethodChange |
2745
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2271 |
[ |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2272 |
^ self handleMethodChangeUnsafe |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2273 |
] on: Error do:[:ex| |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2274 |
| change | |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2275 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2276 |
change := InvalidChange new source: chunk. |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2277 |
self addChange: change. |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2278 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2279 |
"Read methods that may follow" |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2280 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2281 |
[ (chunk := inputStream nextChunk) notEmptyOrNil ] whileTrue:[ |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2282 |
change := InvalidChange new source: chunk. |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2283 |
self addChange: change. |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2284 |
] |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2285 |
]. |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2286 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2287 |
^ true |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2288 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2289 |
"Modified (comment): / 24-01-2012 / 17:32:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2290 |
! |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2291 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2292 |
handleMethodChangeUnsafe |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2293 |
|priv categoryName methodSource changes change parser | |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2294 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2295 |
(selector == #'ignoredMethodsFor:') ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2296 |
priv := #ignored. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2297 |
] ifFalse:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2298 |
priv := nil |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2299 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2300 |
className := self receiversClassName. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2301 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2302 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2303 |
"/ ]. |
1977 | 2304 |
((selector == #'methods') |
2305 |
or:[(selector == #'publicMethods') |
|
2306 |
or:[(selector == #'methodsFor')]]) ifTrue:[ |
|
2307 |
categoryName := 'uncategorized public' |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2308 |
] ifFalse:[ |
1977 | 2309 |
(selector == #'privateMethods') ifTrue:[ |
2310 |
categoryName := 'uncategorized private' |
|
2311 |
] ifFalse:[ |
|
2312 |
categoryName := (arguments at:1) evaluate. |
|
2313 |
] |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2314 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2315 |
inputStream skipSeparators. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2316 |
lineNumber := inputStream lineNumber. |
1209
f98d5eb855d3
code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents:
1200
diff
changeset
|
2317 |
position := inputStream position1Based. |
1176 | 2318 |
|
2745
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2319 |
methodSource := chunk := inputStream nextChunk. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2320 |
changes := OrderedCollection new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2321 |
|
1395
6ea99b157f6b
Use #setFilename:forClass:package: to define an abbreviation
Stefan Vogel <sv@exept.de>
parents:
1389
diff
changeset
|
2322 |
[methodSource notEmptyOrNil] whileTrue:[ |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2323 |
parser := Parser |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2324 |
parseMethodArgAndVarSpecification:methodSource |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2325 |
in:nil |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2326 |
ignoreErrors:true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2327 |
ignoreWarnings:true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2328 |
parseBody:false. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2329 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2330 |
parser isNil ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2331 |
"/ something wierd ... |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2332 |
methodSelector := '????'. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2333 |
] ifFalse:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2334 |
methodSelector := parser selector. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2335 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2336 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2337 |
change := MethodChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2338 |
change |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2339 |
className:className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2340 |
selector:methodSelector |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2341 |
source:methodSource |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2342 |
category:categoryName |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2343 |
privacy:priv. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2344 |
|
1176 | 2345 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2346 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2347 |
inputStream skipSeparators. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2348 |
lineNumber := inputStream lineNumber. |
1209
f98d5eb855d3
code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents:
1200
diff
changeset
|
2349 |
position := inputStream position1Based. |
2745
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2350 |
methodSource := chunk := inputStream nextChunk. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2351 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2352 |
^ true |
2745
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2353 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2354 |
"Created: / 24-01-2012 / 16:52:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2355 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2356 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2357 |
handleMethodPrivacyChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2358 |
|change| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2359 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2360 |
(receiver isMessage |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2361 |
and:[receiverSelector == #'compiledMethodAt:']) ifFalse:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2362 |
self error:'unexpected change' mayProceed:true. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2363 |
^ false. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2364 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2365 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2366 |
className := self classNameOf:receiverReceiver. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2367 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2368 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2369 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2370 |
methodSelector := (receiver arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2371 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2372 |
change := MethodPrivacyChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2373 |
change |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2374 |
className:className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2375 |
selector:methodSelector |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2376 |
privacy:(arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2377 |
|
1176 | 2378 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2379 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2380 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2381 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2382 |
handleNameSpaceCreationChange |
1176 | 2383 |
|change| |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2384 |
|
1176 | 2385 |
(self checkReceiverIsGlobalNamed:#Namespace) ifFalse:[ |
2386 |
(self checkReceiverIsGlobalNamed:#NameSpace) ifFalse:[ |
|
2387 |
self error:'unexpected receiver in nameSpace message' mayProceed:true. |
|
2388 |
^ false |
|
2389 |
]. |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2390 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2391 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2392 |
className := (arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2393 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2394 |
change := NameSpaceCreationChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2395 |
change name:className. |
1176 | 2396 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2397 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2398 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2399 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2400 |
handlePrimitiveChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2401 |
|change primSource| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2402 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2403 |
className := self receiversClassName. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2404 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2405 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2406 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2407 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2408 |
inputStream skipSeparators. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2409 |
primSource := inputStream nextChunk. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2410 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2411 |
selector == #'primitiveDefinitions' ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2412 |
change := ClassPrimitiveDefinitionsChange new |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2413 |
] ifFalse:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2414 |
selector == #'primitiveFunctions' ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2415 |
change := ClassPrimitiveFunctionsChange new |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2416 |
] ifFalse:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2417 |
change := ClassPrimitiveVariablesChange new |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2418 |
] |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2419 |
]. |
1287 | 2420 |
change className:className source:primSource. |
1176 | 2421 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2422 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2423 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2424 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2425 |
handleRemoveClassChange |
1176 | 2426 |
|change| |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2427 |
|
1176 | 2428 |
(self checkReceiverIsGlobalNamed:#Smalltalk) ifFalse:[ |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2429 |
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
|
2430 |
^ false |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2431 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2432 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2433 |
className := (arguments at:1) name. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2434 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2435 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2436 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2437 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2438 |
change := ClassRemoveChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2439 |
change className:className. |
1176 | 2440 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2441 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2442 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2443 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2444 |
handleRemoveMethodChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2445 |
|change| |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2446 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2447 |
className := self receiversClassName. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2448 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2449 |
"/ className := nameSpace name , '::' , className |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2450 |
"/ ]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2451 |
methodSelector := (arguments at:1) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2452 |
change := MethodRemoveChange new. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2453 |
change className:className selector:methodSelector. |
1176 | 2454 |
self addChange:change. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2455 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2456 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2457 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2458 |
handleRenameClassChange |
1176 | 2459 |
|oldName newName change| |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2460 |
|
1176 | 2461 |
(self checkReceiverIsGlobalNamed:#Smalltalk) ifFalse:[ |
2462 |
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
|
2463 |
^ false. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2464 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2465 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2466 |
oldName := (arguments at:1) name. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2467 |
newName := (arguments at:2) evaluate. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2468 |
|
1176 | 2469 |
change := ClassRenameChange new oldName:oldName newName:newName. |
2470 |
self addChange:change. |
|
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2471 |
^ true |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2472 |
! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2473 |
|
1181
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2474 |
handleSqueakCommentStamp |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2475 |
|comment change| |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2476 |
|
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2477 |
inputStream skipSeparators. |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2478 |
|
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2479 |
comment := inputStream nextChunk. |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2480 |
|
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2481 |
className := self receiversClassName. |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2482 |
change := ClassCommentChange new. |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2483 |
change className:className comment:comment. |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2484 |
change source:(parseTree printString). |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2485 |
self addChange:change. |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2486 |
^ true |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2487 |
! |
e13c86138164
more to read squeak change sets
Claus Gittinger <cg@exept.de>
parents:
1176
diff
changeset
|
2488 |
|
1183 | 2489 |
handleVW7ClassDefinitionChange |
2490 |
|nameSpace change| |
|
2491 |
||
2492 |
nameSpace := receiver. |
|
2493 |
className := (arguments at:1) evaluate. |
|
2494 |
||
2495 |
"/ nameSpace := Class nameSpaceQuerySignal query. |
|
2496 |
"/ nameSpace ~~ Smalltalk ifTrue:[ |
|
2497 |
"/ className := nameSpace name , '::' , className |
|
2498 |
"/ ]. |
|
2499 |
||
2500 |
change := ClassDefinitionChange new. |
|
2501 |
change className:className; source:(parseTree printString). |
|
2502 |
||
2503 |
change package:(Class packageQuerySignal query). |
|
2504 |
self addChange:change. |
|
2505 |
^ true |
|
2506 |
! |
|
2507 |
||
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2508 |
processChange |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2509 |
"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
|
2510 |
create changes and evaluate changeAction on each. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2511 |
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
|
2512 |
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
|
2513 |
provides line-numbers; otherwise, nil is passed." |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2514 |
|
2745
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2515 |
[ |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2516 |
^ self processChangeUnsafe |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2517 |
] on: Error do:[:ex| |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2518 |
| change | |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2519 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2520 |
change := InvalidChange new source: chunk. |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2521 |
self addChange: change. |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2522 |
]. |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2523 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2524 |
^true |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2525 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2526 |
"Modified: / 24-01-2012 / 17:34:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2527 |
! |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2528 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2529 |
processChangeUnsafe |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2530 |
"given a parse-tree (from parsing some changes source/chunk), |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2531 |
create changes and evaluate changeAction on each. |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2532 |
The block is invoked with the change and a lineNumberOrNil as |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2533 |
arg; the lineNumber is only valid, if the underlying stream |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2534 |
provides line-numbers; otherwise, nil is passed." |
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2535 |
|
2117
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2536 |
|dispatchSelector| |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2537 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2538 |
dispatchSelector := ('process_',(selector copyReplaceAll:$: with:$_)) asSymbol. |
2122 | 2539 |
"/ Transcript showCR:dispatchSelector. |
2179 | 2540 |
(self respondsTo:dispatchSelector) ifTrue:[ |
2117
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2541 |
^ self perform:dispatchSelector. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2542 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2543 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2544 |
"/ any subclass definiton selector ? |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2545 |
(Behavior definitionSelectors includes:selector) |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2546 |
ifTrue:[ |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2547 |
^ self handleClassDefinitionChange. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2548 |
]. |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2549 |
|
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2550 |
^ false |
2745
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2551 |
|
c2f7200248e7
More robust changeset reading - creates InvalidChange when an error
vrany
parents:
2633
diff
changeset
|
2552 |
"Created: / 24-01-2012 / 17:33:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2117
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2553 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2554 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2555 |
process_categoriesFor_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2556 |
"'categoriesFor:' chunk (Dolphin)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2557 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2558 |
^ self handleCategoriesForChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2559 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2560 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2561 |
process_category_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2562 |
"'category:' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2563 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2564 |
^ self handleMethodCategoryChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2565 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2566 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2567 |
process_commentStamp_prior_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2568 |
"'commentStamp:prior::' chunk (Squeak)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2569 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2570 |
^ self handleSqueakCommentStamp. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2571 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2572 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2573 |
process_comment_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2574 |
"'comment:' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2575 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2576 |
^ self handleClassCommentChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2577 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2578 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2579 |
process_ignoredMethodsFor_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2580 |
"'ignoredMethodsFor:' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2581 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2582 |
^ self handleMethodChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2583 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2584 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2585 |
process_instanceVariableNames_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2586 |
"'instanceVariableNames:' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2587 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2588 |
^ self handleClassInstanceVariableDefinitionChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2589 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2590 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2591 |
process_methods |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2592 |
"'methods' chunk (ST/V and dolphin)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2593 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2594 |
^ self handleMethodChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2595 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2596 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2597 |
process_methodsFor |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2598 |
"'methodsFor' chunk (ST/V and dolphin)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2599 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2600 |
^ self handleMethodChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2601 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2602 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2603 |
process_methodsForUndefined_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2604 |
"'methodsForUndefined:' chunk (?)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2605 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2606 |
^ self handleMethodChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2607 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2608 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2609 |
process_methodsFor_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2610 |
"'methodsFor:' chunk (ST/80, Squeak, ST/X, VW, ...)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2611 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2612 |
^ self handleMethodChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2613 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2614 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2615 |
process_methodsFor_stamp_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2616 |
"'methodsFor:stamp:' chunk (Squeak)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2617 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2618 |
^ self handleMethodChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2619 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2620 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2621 |
process_name_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2622 |
"'name:' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2623 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2624 |
^ self handleNameSpaceCreationChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2625 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2626 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2627 |
process_primitiveDefinitions |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2628 |
"'primitiveDefinitions' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2629 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2630 |
^ self handlePrimitiveChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2631 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2632 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2633 |
process_primitiveFunctions |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2634 |
"'primitiveFunctions' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2635 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2636 |
^ self handlePrimitiveChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2637 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2638 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2639 |
process_primitiveVariables |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2640 |
"'primitiveVariables' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2641 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2642 |
^ self handlePrimitiveChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2643 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2644 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2645 |
process_privacy_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2646 |
"'privacy:' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2647 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2648 |
^ self handleMethodPrivacyChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2649 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2650 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2651 |
process_privateMethods |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2652 |
"'privateMethods' chunk (ST/V and dolphin)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2653 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2654 |
^ self handleMethodChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2655 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2656 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2657 |
process_privateMethodsFor_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2658 |
"'privateMethodsFor:' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2659 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2660 |
^ self handleMethodChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2661 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2662 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2663 |
process_protectedMethodsFor_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2664 |
"'protectedMethodsFor:' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2665 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2666 |
^ self handleMethodChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2667 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2668 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2669 |
process_publicMethods |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2670 |
"'publicMethods' chunk (ST/V and dolphin)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2671 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2672 |
^ self handleMethodChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2673 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2674 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2675 |
process_publicMethodsFor_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2676 |
"'publicMethodsFor:' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2677 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2678 |
^ self handleMethodChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2679 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2680 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2681 |
process_removeClass_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2682 |
"'removeClass:' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2683 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2684 |
^ self handleRemoveClassChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2685 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2686 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2687 |
process_removeSelector_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2688 |
"'removeSelector:' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2689 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2690 |
^ self handleRemoveMethodChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2691 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2692 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2693 |
process_renameCategory_to_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2694 |
"'renameCategory:to:' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2695 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2696 |
^ self handleMethodCategoryRenameChange. |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2697 |
! |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2698 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2699 |
process_renameClass_to_ |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2700 |
"'renameClass:to:' chunk (ST/X)" |
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2701 |
|
4ff77bbf9f89
refactored for more flexible changeChunk handling
Claus Gittinger <cg@exept.de>
parents:
2080
diff
changeset
|
2702 |
^ self handleRenameClassChange. |
1174
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2703 |
! ! |
f4794940b620
new changeSet reading mechanism (extensible);
Claus Gittinger <cg@exept.de>
parents:
1169
diff
changeset
|
2704 |
|
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2705 |
!ChangeSet::ClassSourceWriter methodsFor:'private'! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2706 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2707 |
analyze |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2708 |
"Analyzes changeset an build some index" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2709 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2710 |
classInfos := Dictionary new. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2711 |
metaInfos := Dictionary new. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2712 |
topClassName := nil. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2713 |
"Pass 1 - collect classes" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2714 |
changeSetBeingSaved do:[:change| |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2715 |
change isClassDefinitionChange ifTrue:[ |
3033 | 2716 |
| nm ns | |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2717 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2718 |
nm := change className. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2719 |
(nm endsWith:' class') ifFalse:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2720 |
(classInfos includesKey: nm) ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2721 |
self error:'Multiple definitions of class ', nm. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2722 |
^self. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2723 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2724 |
classInfos at: nm put: (ClassInfo new name: nm). |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2725 |
metaInfos at: nm put: (ClassInfo new name: nm , ' class'). |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2726 |
change isPrivateClassDefinitionChange ifFalse:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2727 |
topClassName notNil ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2728 |
self error: ('Multiple top class definitions (%1 vs %2)' bindWith: topClassName with: nm). |
3033 | 2729 |
^self. |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2730 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2731 |
topClassName := nm. |
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2732 |
namespaceName := change nameSpaceName. |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2733 |
] |
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2734 |
] . |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2735 |
] |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2736 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2737 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2738 |
"Pass 2: fill in infos" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2739 |
changeSetBeingSaved do:[:change| |
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2740 |
change isClassChange ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2741 |
| nm info | |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2742 |
|
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2743 |
nm := change className. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2744 |
(nm endsWith: ' class') ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2745 |
info := metaInfos at: (nm copyTo:(nm size - 6)). |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2746 |
] ifFalse:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2747 |
info := classInfos at: nm. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2748 |
"Fill superclass info..." |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2749 |
change isClassDefinitionChange ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2750 |
| superNm | |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2751 |
superNm := change superClassName. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2752 |
(classInfos includesKey: superNm) ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2753 |
info superclass: (classInfos at: superNm). |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2754 |
(metaInfos at: nm) superclass: (classInfos at: superNm). |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2755 |
]. |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2756 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2757 |
]. |
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2758 |
info addChange: change. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2759 |
] |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2760 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2761 |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2762 |
classInfos do:[:info|info namespace: namespaceName]. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2763 |
metaInfos do:[:info|info namespace: namespaceName]. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
2764 |
|
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2765 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2766 |
" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2767 |
ChangeSet::ClassSourceWriter new |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2768 |
changeSetBeingSaved: (ChangeSet forExistingClass: ChangeSet); |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2769 |
analyze; |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2770 |
yourself |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2771 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2772 |
" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2773 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2774 |
"Created: / 15-03-2012 / 17:51:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2775 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2776 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2777 |
changeSetBeingSaved:something |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2778 |
changeSetBeingSaved := something. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2779 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2780 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2781 |
privateClassesOf: classInfo |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2782 |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2783 |
| classInfoNameSz | |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2784 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2785 |
classInfoNameSz := classInfo name size. |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2786 |
^classInfos values select:[:info| |
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2787 |
info name size > classInfoNameSz and:[ |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2788 |
(info name startsWith: classInfo name) |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2789 |
and:[(info name at:classInfoNameSz + 1) == $: |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2790 |
and:[(info name at:classInfoNameSz + 2) == $: |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2791 |
and:[(info name indexOf: $: startingAt: classInfo name size + 3) == 0]]]] |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2792 |
] |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2793 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2794 |
"Created: / 15-03-2012 / 19:31:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2795 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2796 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2797 |
privateClassesSortedOf: classInfo |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2798 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2799 |
|classes| |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2800 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2801 |
classes := self privateClassesOf: classInfo. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2802 |
(classes size > 0) ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2803 |
classes := classes asOrderedCollection. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2804 |
classes sort:[:a :b | a name < b name]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2805 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2806 |
classes topologicalSort:[:a :b | |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2807 |
"/ a must come before b iff: |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2808 |
"/ b is a subclass of a |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2809 |
"/ b has a private class which is a subclass of a |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2810 |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2811 |
|mustComeBefore privateClassesOfB| |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2812 |
mustComeBefore := (b isSubclassOf:a) or:[b isPrivateClassOf: a]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2813 |
mustComeBefore |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2814 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2815 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2816 |
^ classes. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2817 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2818 |
" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2819 |
Object privateClassesSorted |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2820 |
NewSystemBrowser privateClassesSorted |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2821 |
NewSystemBrowser privateClasses |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2822 |
" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2823 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2824 |
"Created: / 15-03-2012 / 19:45:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2825 |
! ! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2826 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2827 |
!ChangeSet::ClassSourceWriter methodsFor:'source writing'! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2828 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2829 |
fileOut:aChangeSet on:outStreamArg withTimeStamp:stampIt withInitialize:initIt withDefinition:withDefinition methodFilter:methodFilter encoder:encoderOrNil |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2830 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2831 |
|collectionOfCategories versionMethods |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2832 |
nonMeta meta classesImplementingInitialize outStream| |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2833 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2834 |
changeSetBeingSaved := aChangeSet. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2835 |
self analyze. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2836 |
nonMeta := classInfos at: topClassName. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2837 |
meta := metaInfos at: topClassName. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2838 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2839 |
methodsAlreadySaved := Set new. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2840 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2841 |
encoderOrNil isNil ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2842 |
outStream := outStreamArg. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2843 |
] ifFalse:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2844 |
outStream := EncodedStream stream:outStreamArg encoder:encoderOrNil. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2845 |
outStream nextPutAll:'"{ Encoding: ' , encoderOrNil nameOfEncoding , ' }"'; cr; cr. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2846 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2847 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2848 |
" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2849 |
if there is a copyright method, add a copyright comment |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2850 |
at the beginning, taking the string from the copyright method. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2851 |
We cannot do this unconditionally - that would lead to my copyrights |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2852 |
being put on your code ;-). |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2853 |
On the other hand: I want every file created by myself to have the |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2854 |
copyright string at the beginning be preserved .... even if the |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2855 |
code was edited in the browser and filedOut. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2856 |
" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2857 |
self generateHeaderWithCopyrightOn:outStream. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2858 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2859 |
stampIt ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2860 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2861 |
"/ first, a timestamp |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2862 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2863 |
outStream nextPutAll:(Smalltalk timeStamp). |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2864 |
outStream nextPutChunkSeparator. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2865 |
outStream cr; cr. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2866 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2867 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2868 |
withDefinition ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2869 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2870 |
"/ then the definition(s) |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2871 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2872 |
self fileOutAllDefinitionsOf:nonMeta on:outStream. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2873 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2874 |
"/ a comment - if any |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2875 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2876 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2877 |
"/ (comment := nonMeta comment) notNil ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2878 |
"/ nonMeta fileOutCommentOn:outStream. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2879 |
"/ outStream cr. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2880 |
"/ ]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2881 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2882 |
"/ ST/X primitive definitions - if any |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2883 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2884 |
self fileOutPrimitiveSpecsOf: nonMeta on:outStream. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2885 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2886 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2887 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2888 |
"/ methods from all categories in metaclass (i.e. class methods) |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2889 |
"/ EXCEPT: the version method is placed at the very end, to |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2890 |
"/ avoid sourcePosition-shifts when checked out later. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2891 |
"/ (RCS expands this string, so its size is not constant) |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2892 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2893 |
collectionOfCategories := meta categories asSortedCollection. |
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2894 |
versionMethods := meta methods select:[:change |AbstractSourceCodeManager isVersionMethodSelector:change selector]. |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2895 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2896 |
collectionOfCategories notNil ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2897 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2898 |
"/ documentation first (if any), but not the version method |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2899 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2900 |
(collectionOfCategories includes:'documentation') ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2901 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2902 |
"/ versionMethods do:[:versionMethod | |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2903 |
"/ |source| |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2904 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2905 |
"/ source := versionMethod source. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2906 |
"/ (source isEmptyOrNil or:[(source startsWith:nonMeta nameOfOldVersionMethod) not]) ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2907 |
"/ "something bad happend to the classes code" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2908 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2909 |
"/ Class fileOutErrorSignal |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2910 |
"/ raiseRequestWith:aClass |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2911 |
"/ errorString:' - bad source for version method (uncompiled class file?): ', (versionMethod displayString) |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2912 |
"/ ]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2913 |
"/ ]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2914 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2915 |
self fileOutCategory:'documentation' of:meta except:versionMethods only:nil methodFilter:methodFilter on:outStream. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2916 |
outStream cr. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2917 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2918 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2919 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2920 |
"/ initialization next (if any) |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2921 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2922 |
(collectionOfCategories includes:'initialization') ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2923 |
self fileOutCategory:'initialization' of:meta methodFilter:methodFilter on:outStream. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2924 |
outStream cr. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2925 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2926 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2927 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2928 |
"/ instance creation next (if any) |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2929 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2930 |
(collectionOfCategories includes:'instance creation') ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2931 |
self fileOutCategory:'instance creation' of:meta methodFilter:methodFilter on:outStream. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2932 |
outStream cr. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2933 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2934 |
collectionOfCategories do:[:aCategory | |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2935 |
((aCategory ~= 'documentation') |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2936 |
and:[(aCategory ~= 'initialization') |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2937 |
and:[aCategory ~= 'instance creation']]) ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2938 |
self fileOutCategory:aCategory of:meta methodFilter:methodFilter on:outStream. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2939 |
outStream cr |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2940 |
] |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2941 |
] |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2942 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2943 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2944 |
"/ if there are any primitive definitions (vw-like ffi-primitives), |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2945 |
"/ file them out first in the order: defines, types. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2946 |
"/ Otherwise, we might have trouble when filing in later, because the types are needed |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2947 |
"/ for the primitive calls. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2948 |
nonMeta methodDictionary keysAndValuesDo:[:sel :m | |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2949 |
m isVisualWorksTypedef ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2950 |
self fileOutCategory:m category of:nonMeta except:nil only:(Array with:m) methodFilter:methodFilter on:outStream. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2951 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2952 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2953 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2954 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2955 |
"/ methods from all categories |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2956 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2957 |
collectionOfCategories := nonMeta categories asSortedCollection. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2958 |
collectionOfCategories notNil ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2959 |
collectionOfCategories do:[:aCategory | |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2960 |
self fileOutCategory:aCategory of:nonMeta methodFilter:methodFilter on:outStream. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2961 |
outStream cr |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2962 |
] |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2963 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2964 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2965 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2966 |
"/ any private classes' methods |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2967 |
"/ |
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2968 |
(self privateClassesSortedOf: nonMeta) do:[:aClass | |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2969 |
self fileOutAllMethodsOf:aClass on:outStream methodFilter:methodFilter |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2970 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2971 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2972 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2973 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2974 |
"/ finally, the previously skipped version method |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2975 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2976 |
versionMethods notEmpty ifTrue: [ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2977 |
self fileOutCategory:'documentation' of:meta except:nil only:versionMethods methodFilter:methodFilter on:outStream. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2978 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2979 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2980 |
initIt ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2981 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2982 |
"/ optionally an initialize message |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2983 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2984 |
classesImplementingInitialize := OrderedCollection new. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2985 |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2986 |
classInfos values with: metaInfos values do:[:class :meta| |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2987 |
(meta includesSelector: #initialize) ifTrue:[ |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2988 |
classesImplementingInitialize add: class. |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2989 |
] |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2990 |
]. |
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
2991 |
|
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2992 |
classesImplementingInitialize size ~~ 0 ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2993 |
classesImplementingInitialize topologicalSort:[:a :b | b isSubclassOf:a]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2994 |
outStream cr. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2995 |
classesImplementingInitialize do:[:eachClass | |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2996 |
eachClass printClassNameOn:outStream. outStream nextPutAll:' initialize'. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2997 |
outStream nextPutChunkSeparator. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2998 |
outStream cr. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
2999 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3000 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3001 |
] |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3002 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3003 |
"Created: / 15-11-1995 / 12:53:06 / cg" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3004 |
"Modified: / 01-04-1997 / 16:01:05 / stefan" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3005 |
"Modified: / 29-09-2011 / 14:53:49 / cg" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3006 |
"Created: / 15-03-2012 / 17:39:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3007 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3008 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3009 |
fileOutAllDefinitionsOf:nonMetaInfo on:aStream |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3010 |
"append expressions on aStream, which defines myself and all of my private classes." |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3011 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3012 |
| metaInfo | |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3013 |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3014 |
nonMetaInfo definition isPrivateClassDefinitionChange ifFalse:[ |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3015 |
nonMetaInfo definition package notNil ifTrue:[ |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3016 |
aStream nextPutAll: ('"{ Package: ''%1'' }"' bindWith: nonMetaInfo definition package). |
3033 | 3017 |
aStream cr; cr. |
3018 |
]. |
|
3019 |
namespaceName notNil ifTrue:[ |
|
3020 |
aStream nextPutAll: ('"{ NameSpace: %1 }"' bindWith: namespaceName). |
|
3021 |
aStream cr; cr. |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3022 |
]. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3023 |
]. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3024 |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3025 |
aStream nextPutAll: (nonMetaInfo definition definitionStringInNamespace: namespaceName). |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3026 |
aStream nextPutChunkSeparator. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3027 |
aStream cr; cr. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3028 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3029 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3030 |
"/ optional classInstanceVariables |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3031 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3032 |
metaInfo := metaInfos at: nonMetaInfo name. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3033 |
metaInfo definition notNil ifTrue:[ |
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3034 |
| anySuperClassInstVar myClass | |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3035 |
aStream |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3036 |
nextPutAll: metaInfo definition className; |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3037 |
nextPutAll:' instanceVariableNames:'; |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3038 |
nextPutAll: (metaInfo definition classInstVarNames asStringWith:' ') storeString. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3039 |
"mhmh - good idea; saw this in SmallDraw sourcecode ..." |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3040 |
|
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3041 |
anySuperClassInstVar := false. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3042 |
myClass := metaInfo definition changeClass. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3043 |
myClass notNil ifTrue:[myClass := myClass theNonMetaclass]. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3044 |
myClass notNil ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3045 |
myClass allSuperclassesDo:[:aSuperClass | |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3046 |
aSuperClass class instVarNames do:[:ignored | anySuperClassInstVar := true]. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3047 |
]. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3048 |
|
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3049 |
aStream cr; cr; nextPut:(Character doubleQuote); cr; space. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3050 |
anySuperClassInstVar ifFalse:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3051 |
aStream |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3052 |
nextPutLine:'No other class instance variables are inherited by this class.'. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3053 |
] ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3054 |
aStream |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3055 |
nextPutLine:'The following class instance variables are inherited by this class:'. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3056 |
aStream cr. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3057 |
myClass allSuperclassesDo:[:aSuperClass | |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3058 |
aStream tab; nextPutAll:aSuperClass name; nextPutAll:' - '. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3059 |
aStream nextPutLine:(aSuperClass class instanceVariableString). |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3060 |
]. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3061 |
|
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3062 |
]. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3063 |
]. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3064 |
aStream nextPut:(Character doubleQuote); cr. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3065 |
aStream nextPut:$!!; cr; cr |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3066 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3067 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3068 |
"/ here, the full nameSpace prefixes are output, |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3069 |
"/ to avoid confusing stc |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3070 |
"/ (which otherwise could not find the correct superclass) |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3071 |
"/ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3072 |
Class fileOutNameSpaceQuerySignal answer:false do:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3073 |
Class forceNoNameSpaceQuerySignal answer:true do:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3074 |
(self privateClassesSortedOf: nonMetaInfo) do:[:i | |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3075 |
self fileOutAllDefinitionsOf:i on:aStream |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3076 |
] |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3077 |
] |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3078 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3079 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3080 |
"Created: / 15-10-1996 / 11:15:19 / cg" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3081 |
"Modified: / 22-03-1997 / 16:11:56 / cg" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3082 |
"Created: / 15-03-2012 / 19:18:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3083 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3084 |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3085 |
fileOutAllMethodsOf:aClass on:aStream methodFilter:methodFilter |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3086 |
| collectionOfCategories meta | |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3087 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3088 |
meta := metaInfos at: aClass name. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3089 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3090 |
collectionOfCategories := meta categories asSortedCollection. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3091 |
collectionOfCategories notNil ifTrue:[ |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3092 |
collectionOfCategories do:[:aCategory | |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3093 |
self fileOutCategory:aCategory of:meta methodFilter:methodFilter on:aStream. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3094 |
aStream cr |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3095 |
] |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3096 |
]. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3097 |
collectionOfCategories := aClass categories asSortedCollection. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3098 |
collectionOfCategories notNil ifTrue:[ |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3099 |
collectionOfCategories do:[:aCategory | |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3100 |
self fileOutCategory:aCategory of:aClass methodFilter:methodFilter on:aStream. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3101 |
aStream cr |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3102 |
] |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3103 |
]. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3104 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3105 |
(self privateClassesSortedOf: aClass) do:[:privateClass | |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3106 |
self fileOutAllMethodsOf:privateClass on:aStream methodFilter:methodFilter |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3107 |
]. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3108 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3109 |
"Created: / 15-10-1996 / 11:13:00 / cg" |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3110 |
"Modified: / 22-03-1997 / 16:12:17 / cg" |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3111 |
"Created: / 19-03-2012 / 18:21:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3112 |
! |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3113 |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3114 |
fileOutMethod:change on:aStream |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3115 |
"file a single method onto aStream." |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3116 |
|
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3117 |
| changeToFileOut | |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3118 |
|
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3119 |
change isMethodCategoryChange ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3120 |
self assert: changeToFileOut origin notNil. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3121 |
changeToFileOut := change origin copy. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3122 |
changeToFileOut methodCategory: change methodCategory. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3123 |
] ifFalse:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3124 |
changeToFileOut := change. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3125 |
]. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3126 |
changeToFileOut source notEmptyOrNil ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3127 |
super fileOutMethod:changeToFileOut on:aStream |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3128 |
] |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3129 |
|
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3130 |
"Created: / 20-03-2012 / 22:33:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3131 |
! |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3132 |
|
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3133 |
fileOutPrimitiveSpecsOf: nonMeta on:outStream |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3134 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3135 |
"Nothing now..." |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3136 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3137 |
"Created: / 15-03-2012 / 19:48:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3138 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3139 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3140 |
generateHeaderWithCopyrightOn:outStream |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3141 |
|copyrightChange copyrightText| |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3142 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3143 |
copyrightChange := |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3144 |
(metaInfos at: topClassName) methodAt: #copyright. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3145 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3146 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3147 |
copyrightChange notNil ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3148 |
" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3149 |
get the copyright method's comment-text, strip off empty and blank lines |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3150 |
and insert at beginning. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3151 |
" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3152 |
copyrightText := Parser methodCommentFromSource: copyrightChange source. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3153 |
copyrightText notEmptyOrNil ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3154 |
copyrightText := copyrightText asCollectionOfLines asStringCollection. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3155 |
copyrightText := copyrightText withoutLeadingBlankLines. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3156 |
copyrightText := copyrightText withoutTrailingBlankLines. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3157 |
copyrightText notEmpty ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3158 |
copyrightText addFirst:'"'. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3159 |
copyrightText addLast:'"'. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3160 |
copyrightText := copyrightText asString. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3161 |
outStream nextPutAllAsChunk:copyrightText. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3162 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3163 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3164 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3165 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3166 |
"Created: / 15-03-2012 / 19:01:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3167 |
! ! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3168 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3169 |
!ChangeSet::ClassSourceWriter::ClassInfo class methodsFor:'instance creation'! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3170 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3171 |
new |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3172 |
"return an initialized instance" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3173 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3174 |
^ self basicNew initialize. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3175 |
! ! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3176 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3177 |
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'accessing'! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3178 |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3179 |
categories |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3180 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3181 |
^ (methods collect:[:e|e category]) asSet |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3182 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3183 |
"Created: / 19-03-2012 / 18:03:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3184 |
! |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3185 |
|
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3186 |
definition |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3187 |
^ definition |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3188 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3189 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3190 |
definition:something |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3191 |
definition := something. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3192 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3193 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3194 |
methodAt: selector |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3195 |
^methods detect:[:each|each selector == selector] ifNone:[nil]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3196 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3197 |
"Created: / 15-03-2012 / 19:11:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3198 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3199 |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3200 |
methodDictionary |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3201 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3202 |
methodDictionary isNil ifTrue:[ |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3203 |
methodDictionary := Dictionary new. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3204 |
]. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3205 |
^methodDictionary |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3206 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3207 |
"Created: / 19-03-2012 / 18:11:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3208 |
! |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3209 |
|
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3210 |
methods |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3211 |
^ methods |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3212 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3213 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3214 |
methods:something |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3215 |
methods := something. |
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3216 |
methodDictionary := Dictionary new. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3217 |
methods do:[:m|methodDictionary at: m selector put: m]. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3218 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3219 |
"Modified: / 19-03-2012 / 18:12:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3220 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3221 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3222 |
name |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3223 |
^ name |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3224 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3225 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3226 |
name:something |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3227 |
name := something. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3228 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3229 |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3230 |
namespace |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3231 |
^ namespace |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3232 |
! |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3233 |
|
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3234 |
namespace:aString |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3235 |
namespace := aString. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3236 |
! |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3237 |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3238 |
selectorAtMethod: m |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3239 |
^m selector |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3240 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3241 |
"Created: / 19-03-2012 / 18:14:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3242 |
! |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3243 |
|
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3244 |
superclass |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3245 |
^ superclass |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3246 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3247 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3248 |
superclass:something |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3249 |
superclass := something. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3250 |
! ! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3251 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3252 |
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'adding'! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3253 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3254 |
addChange: change |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3255 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3256 |
change isClassDefinitionChange ifTrue:[ |
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3257 |
self assert: definition isNil. |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3258 |
definition := change. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3259 |
^self. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3260 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3261 |
change isMethodCodeChange ifTrue:[ |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3262 |
methods add: change. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3263 |
^self. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3264 |
]. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3265 |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3266 |
change isClassInstVarDefinitionChange ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3267 |
self assert: definition isNil. |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3268 |
definition := change |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3269 |
] |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3270 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3271 |
"Created: / 15-03-2012 / 19:12:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3272 |
! ! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3273 |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3274 |
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'enumerating'! |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3275 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3276 |
methodsDo: aBlock |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3277 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3278 |
methods do: aBlock |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3279 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3280 |
"Created: / 19-03-2012 / 18:14:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3281 |
! ! |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3282 |
|
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3283 |
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'initialization'! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3284 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3285 |
initialize |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3286 |
"Invoked when a new instance is created." |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3287 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3288 |
"/ please change as required (and remove this comment) |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3289 |
"/ name := nil. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3290 |
"/ instDefinition := nil. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3291 |
"/ classDefinition := nil. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3292 |
methods := OrderedCollection new. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3293 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3294 |
"/ super initialize. -- commented since inherited method does nothing |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3295 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3296 |
"Modified: / 15-03-2012 / 19:12:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3297 |
! ! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3298 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3299 |
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'printing & storing'! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3300 |
|
3033 | 3301 |
printClassNameOn:aStream |
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3302 |
| nameWithoutNs | |
3033 | 3303 |
|
3304 |
nameWithoutNs := name. |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3305 |
namespace notNil ifTrue:[ |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3306 |
self assert: (name startsWith:namespace). |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3307 |
nameWithoutNs := nameWithoutNs copyFrom: namespace size + 3. |
3033 | 3308 |
]. |
3309 |
||
3310 |
aStream nextPutAll: nameWithoutNs |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3311 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3312 |
"Created: / 19-03-2012 / 18:17:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3313 |
! |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3314 |
|
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3315 |
printOn:aStream |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3316 |
"append a printed representation if the receiver to the argument, aStream" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3317 |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3318 |
aStream nextPutAll: self class nameWithoutPrefix. |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3319 |
aStream nextPutAll:'('. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3320 |
name printOn:aStream. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3321 |
aStream nextPutAll:')'. |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3322 |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3323 |
"Modified: / 19-03-2012 / 19:43:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3324 |
! ! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3325 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3326 |
!ChangeSet::ClassSourceWriter::ClassInfo methodsFor:'queries'! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3327 |
|
3031
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3328 |
includesSelector: selector |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3329 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3330 |
^methods anySatisfy:[:m|m selector == selector]. |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3331 |
|
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3332 |
"Created: / 19-03-2012 / 18:22:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3333 |
! |
66f3216e3ea5
Fixes to fileout changeset in St/X class source format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3029
diff
changeset
|
3334 |
|
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3335 |
isPrivateClassOf: classInfo |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3336 |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3337 |
^(name startsWith: classInfo name) |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3338 |
and:[ (name at: (classInfo name size + 1)) == $: |
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3339 |
and:[ (name at: (classInfo name size + 2)) == $:]] |
3028
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3340 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3341 |
"Created: / 15-03-2012 / 19:42:47 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3342 |
! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3343 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3344 |
isSubclassOf: classInfo |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3345 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3346 |
^superclass notNil and: |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3347 |
[superclass == classInfo or:[superclass isSubclassOf: classInfo]] |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3348 |
|
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3349 |
"Created: / 15-03-2012 / 19:41:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3350 |
! ! |
679feb681da5
Initial support for writing a changeset in class source .st format
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3017
diff
changeset
|
3351 |
|
2321 | 3352 |
!ChangeSet::DiffSet class methodsFor:'documentation'! |
3353 |
||
3354 |
documentation |
|
3355 |
" |
|
3356 |
I represent the differences between two change sets. |
|
3357 |
As such, I can be used by a VersionDiffBrowser and to generate patchSets. |
|
3358 |
" |
|
3359 |
! ! |
|
3360 |
||
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3361 |
!ChangeSet::DiffSet methodsFor:'accessing'! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3362 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3363 |
changed |
1867 | 3364 |
"return the set of methods which were different" |
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3365 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3366 |
^ changed |
1867 | 3367 |
|
3368 |
"Modified: / 12-10-2006 / 22:06:55 / cg" |
|
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3369 |
! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3370 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3371 |
changed:something |
1867 | 3372 |
"set the set of changed methods" |
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3373 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3374 |
changed := something. |
1867 | 3375 |
|
3376 |
"Modified: / 12-10-2006 / 22:06:03 / cg" |
|
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3377 |
! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3378 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3379 |
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
|
3380 |
"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
|
3381 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3382 |
changed := changedArg. |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3383 |
changed isNil ifTrue:[changed := OrderedCollection new]. |
1450 | 3384 |
|
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3385 |
onlyInReceiver := onlyInReceiverArg. |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3386 |
onlyInReceiver isNil ifTrue:[onlyInReceiver := ChangeSet new]. |
1450 | 3387 |
|
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3388 |
onlyInArg := onlyInArgArg. |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3389 |
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
|
3390 |
! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3391 |
|
3032
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3392 |
changed:changedArg onlyInReceiver:onlyInReceiverArg onlyInArg:onlyInArgArg same: sameArg |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3393 |
"set instance variables (automatically generated)" |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3394 |
|
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3395 |
changed := changedArg. |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3396 |
changed isNil ifTrue:[changed := OrderedCollection new]. |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3397 |
|
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3398 |
onlyInReceiver := onlyInReceiverArg. |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3399 |
onlyInReceiver isNil ifTrue:[onlyInReceiver := ChangeSet new]. |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3400 |
|
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3401 |
onlyInArg := onlyInArgArg. |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3402 |
onlyInArg isNil ifTrue:[onlyInArg := ChangeSet new]. |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3403 |
|
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3404 |
same := sameArg. |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3405 |
same isNil ifTrue:[same := ChangeSet new]. |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3406 |
|
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3407 |
"Created: / 19-03-2012 / 21:35:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3408 |
! |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3409 |
|
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3410 |
onlyInArg |
1867 | 3411 |
"return the set of methods which were only present in the argument of the diffset" |
3412 |
||
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3413 |
^ onlyInArg |
1867 | 3414 |
|
3415 |
"Modified: / 12-10-2006 / 22:07:02 / cg" |
|
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3416 |
! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3417 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3418 |
onlyInArg:something |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3419 |
onlyInArg := something. |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3420 |
! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3421 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3422 |
onlyInReceiver |
1867 | 3423 |
"return the set of methods which were only present in the receiver of the diffset" |
3424 |
||
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3425 |
^ onlyInReceiver |
1867 | 3426 |
|
3427 |
"Modified: / 12-10-2006 / 22:07:12 / cg" |
|
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3428 |
! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3429 |
|
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3430 |
onlyInReceiver:something |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3431 |
onlyInReceiver := something. |
3032
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3432 |
! |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3433 |
|
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3434 |
same |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3435 |
^ same |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3436 |
! |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3437 |
|
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3438 |
same:something |
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3439 |
same := something. |
1156
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3440 |
! ! |
29fb7d77797d
use a rela object instead of a Dictionary as diffSet
Claus Gittinger <cg@exept.de>
parents:
1147
diff
changeset
|
3441 |
|
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3442 |
!ChangeSet::DiffSet methodsFor:'merging'! |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3443 |
|
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3444 |
addDiffSet:anotherDiffset |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3445 |
changed addAll:(anotherDiffset changed). |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3446 |
onlyInReceiver addAll:(anotherDiffset onlyInReceiver). |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3447 |
onlyInArg addAll:(anotherDiffset onlyInArg). |
3032
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3448 |
same addAll: (anotherDiffset same). |
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3449 |
|
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3450 |
"Created: / 12-10-2006 / 22:49:30 / cg" |
3032
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3451 |
"Modified: / 19-03-2012 / 21:36:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3452 |
! |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3453 |
|
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3454 |
copy |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3455 |
^ self class new |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3456 |
changed:changed copy |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3457 |
onlyInReceiver:onlyInReceiver copy |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3458 |
onlyInArg:onlyInArg copy |
3032
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3459 |
same:same copy |
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3460 |
|
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3461 |
"Created: / 12-10-2006 / 22:50:56 / cg" |
3032
f8b04203694b
ChangseSet::DiffSet now remembers the changes same in both...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3031
diff
changeset
|
3462 |
"Modified: / 19-03-2012 / 21:36:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3463 |
! ! |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3464 |
|
2186 | 3465 |
!ChangeSet::DiffSet methodsFor:'misc'! |
3466 |
||
3467 |
removeAllVersionMethods |
|
3468 |
changed := changed |
|
3469 |
reject:[:pair | |
|
3470 |
pair first isMethodChangeForVersionMethod |
|
3471 |
]. |
|
3472 |
onlyInReceiver := onlyInReceiver |
|
3473 |
reject:[:chg | |
|
3474 |
chg isMethodChangeForVersionMethod |
|
3475 |
]. |
|
3476 |
onlyInArg := onlyInArg |
|
3477 |
reject:[:chg | |
|
3478 |
chg isMethodChangeForVersionMethod |
|
3479 |
]. |
|
3480 |
! ! |
|
3481 |
||
1292 | 3482 |
!ChangeSet::DiffSet methodsFor:'queries'! |
3483 |
||
3484 |
isEmpty |
|
3485 |
^ changed isEmpty |
|
3486 |
and:[ onlyInReceiver isEmpty |
|
3487 |
and:[ onlyInArg isEmpty ] ] |
|
1869
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3488 |
! |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3489 |
|
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3490 |
notEmpty |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3491 |
^ self isEmpty not |
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3492 |
|
988269721678
+isPrivateClassDefinitionChange and other support for private classes
Claus Gittinger <cg@exept.de>
parents:
1867
diff
changeset
|
3493 |
"Created: / 12-10-2006 / 23:12:27 / cg" |
1292 | 3494 |
! ! |
3495 |
||
1182 | 3496 |
!ChangeSet::DolphinPACFileReader methodsFor:'reading-private'! |
3497 |
||
3498 |
handleCategoriesForClass |
|
3499 |
|category change| |
|
3500 |
||
2179 | 3501 |
[ |
3502 |
inputStream skipSeparators. |
|
3503 |
category := inputStream nextChunk. |
|
3504 |
category notEmpty |
|
3505 |
] whileTrue:[ |
|
3506 |
change := ClassCategoryChange new. |
|
3507 |
change |
|
3508 |
className:className |
|
3509 |
category:category. |
|
3510 |
||
3511 |
self addChange:change. |
|
3512 |
]. |
|
1182 | 3513 |
^ true |
3514 |
! |
|
3515 |
||
3516 |
handleCategoriesForMethod |
|
2179 | 3517 |
|methodSelector categories change isPrivate isPublic category| |
1182 | 3518 |
|
3519 |
methodSelector := (arguments at:1) evaluate. |
|
3520 |
inputStream skipSeparators. |
|
3521 |
isPrivate := false. |
|
3522 |
||
3523 |
categories := OrderedCollection new. |
|
3524 |
[ |
|
2179 | 3525 |
|done category | |
3526 |
||
1182 | 3527 |
category := inputStream nextChunk withoutSeparators. |
2179 | 3528 |
done := category isEmpty. |
3529 |
done ifFalse:[ |
|
1182 | 3530 |
categories add:category |
3531 |
]. |
|
2179 | 3532 |
done |
3533 |
] whileFalse. |
|
1182 | 3534 |
|
3535 |
categories size > 1 ifTrue:[ |
|
3536 |
isPrivate := categories includes:'private'. |
|
3537 |
categories remove:'private' ifAbsent:nil. |
|
3538 |
]. |
|
3539 |
categories size > 1 ifTrue:[ |
|
3540 |
isPublic := categories includes:'public'. |
|
3541 |
categories remove:'public' ifAbsent:nil. |
|
3542 |
]. |
|
3543 |
"/ categories size > 1 ifTrue:[ |
|
3544 |
"/ self halt. |
|
3545 |
"/ ]. |
|
3546 |
||
3547 |
category := categories first. |
|
3548 |
isPrivate ifTrue:[ |
|
3549 |
category := category , '-private'. |
|
3550 |
]. |
|
3551 |
||
3552 |
change := MethodCategoryChange new. |
|
3553 |
change |
|
3554 |
className:className |
|
3555 |
selector:methodSelector |
|
3556 |
category:category. |
|
3557 |
||
3558 |
self addChange:change. |
|
3559 |
^ true |
|
3560 |
! |
|
3561 |
||
3562 |
processChange |
|
3563 |
"given a parse-tree (from parsing some changes source/chunk), |
|
3564 |
create changes and evaluate changeAction on each. |
|
3565 |
The block is invoked with the change and a lineNumberOrNil as |
|
3566 |
arg; the lineNumber is only valid, if the underlying stream |
|
3567 |
provides line-numbers; otherwise, nil is passed." |
|
3568 |
||
3569 |
(selector == #'categoriesForClass') ifTrue:[ |
|
3570 |
^ self handleCategoriesForClass. |
|
3571 |
]. |
|
3572 |
(selector == #'categoriesFor:') ifTrue:[ |
|
3573 |
^ self handleCategoriesForMethod. |
|
3574 |
]. |
|
3575 |
selector == #'subclass:instanceVariableNames:classVariableNames:poolDictionaries:classInstanceVariableNames:' ifTrue:[ |
|
3576 |
^ self handleClassDefinitionChange. |
|
3577 |
]. |
|
2179 | 3578 |
"/ selector == #'guid:' ifTrue:[ |
3579 |
"/ ^ self handleGUIDChange. |
|
3580 |
"/ ]. |
|
1182 | 3581 |
^ super processChange |
3582 |
||
3583 |
||
3584 |
"/ selector == #named:superclass:indexedInstanceVariables:instanceVariableNames:classVariableNames:sharedPools:classInstanceVariableNames: ifTrue:[ |
|
3585 |
"/ ^ self handleClassDefinitionChange. |
|
3586 |
"/ ]. |
|
3587 |
"/ (selector == #'key:value:') ifTrue:[ |
|
3588 |
"/ (self checkReceiverIsGlobalNamed:'Annotation') ifTrue:[ |
|
3589 |
"/ ^ self handleAnnotation. |
|
3590 |
"/ ] |
|
3591 |
"/ ]. |
|
3592 |
"/ selector == #'method' ifTrue:[ |
|
3593 |
"/ ^ self handleMethodChange:false. |
|
3594 |
"/ ]. |
|
3595 |
"/ selector == #'classMethod' ifTrue:[ |
|
3596 |
"/ ^ self handleMethodChange:true. |
|
3597 |
"/ ]. |
|
3598 |
"/ |
|
3599 |
"/ selector == #'initializer' ifTrue:[ |
|
3600 |
"/ ^ true |
|
3601 |
"/ ]. |
|
3602 |
"/ selector == #'initialize' ifTrue:[ |
|
3603 |
"/ ^ true |
|
3604 |
"/ ]. |
|
3605 |
"/self halt. |
|
3606 |
"/ |
|
3607 |
"/ ^ false |
|
3608 |
||
3609 |
"Created: / 16.2.1998 / 13:42:40 / cg" |
|
3610 |
"Modified: / 15.12.1999 / 00:29:06 / cg" |
|
3611 |
! ! |
|
3612 |
||
1176 | 3613 |
!ChangeSet::SIFChangeFileReader methodsFor:'reading-private'! |
3614 |
||
3615 |
handleAnnotation |
|
3616 |
|key value lastChange change| |
|
3617 |
||
3618 |
key := (arguments at:1) evaluate. |
|
3619 |
value := (arguments at:2) evaluate. |
|
3620 |
||
1422 | 3621 |
key = 'Prerequisite' ifTrue:[ |
3622 |
"/ change := SIFPrerequisiteChange new prerequisiteFileName:value. |
|
3623 |
"/ self addChange:change. |
|
3624 |
^ true |
|
3625 |
]. |
|
3626 |
||
1176 | 3627 |
lastChange := changeSet last. |
3628 |
||
3629 |
key = 'package' ifTrue:[ |
|
3630 |
change := ClassCategoryChange new className:(lastChange className) category:value. |
|
3631 |
self addChange:change. |
|
3632 |
^ true |
|
3633 |
]. |
|
3634 |
key = 'category' ifTrue:[ |
|
3635 |
"/ change := MethodCategoryChange new className:(lastChange className) selector:(lastChange selector) category:value. |
|
3636 |
"/ self addChange:change. |
|
3637 |
lastChange category:value. |
|
3638 |
^ true |
|
3639 |
]. |
|
3640 |
key = 'stamp' ifTrue:[ |
|
3641 |
"/ lastChange timeStamp:value. |
|
3642 |
^ true |
|
3643 |
]. |
|
3644 |
^ false |
|
3645 |
! |
|
3646 |
||
3647 |
handleClassDefinitionChange |
|
3648 |
|nameSpace change| |
|
3649 |
||
3650 |
(self checkReceiverIsGlobalNamed:#Class) ifFalse:[ |
|
3651 |
self error:'unexpected receiver in classDefinition message' mayProceed:true. |
|
3652 |
^ false. |
|
1313 | 3653 |
]. |
1176 | 3654 |
className := (arguments at:1) evaluate. |
3655 |
||
3656 |
nameSpace := Class nameSpaceQuerySignal query. |
|
3657 |
nameSpace ~~ Smalltalk ifTrue:[ |
|
3658 |
className := nameSpace name , '::' , className |
|
3659 |
]. |
|
3660 |
||
3661 |
change := ClassDefinitionChange new. |
|
3662 |
change className:className; source:(parseTree printString). |
|
3663 |
||
3664 |
change package:(Class packageQuerySignal query). |
|
3665 |
self addChange:change. |
|
3666 |
^ true |
|
3667 |
! |
|
3668 |
||
3669 |
handleMethodChange:isMeta |
|
1188 | 3670 |
|categoryName methodSource change parser | |
1176 | 3671 |
|
3672 |
className := self receiversClassName. |
|
3673 |
isMeta ifTrue:[ |
|
3674 |
className := className , ' class' |
|
3675 |
]. |
|
3676 |
||
3677 |
categoryName := 'uncategorized'. |
|
3678 |
||
3679 |
inputStream skipSeparators. |
|
3680 |
lineNumber := inputStream lineNumber. |
|
1209
f98d5eb855d3
code rewritten to be independent of stream zero-base
Claus Gittinger <cg@exept.de>
parents:
1200
diff
changeset
|
3681 |
position := inputStream position1Based. |
1176 | 3682 |
|
3683 |
methodSource := inputStream nextChunk. |
|
3684 |
||
3685 |
parser := Parser |
|
3686 |
parseMethodArgAndVarSpecification:methodSource |
|
3687 |
in:nil |
|
3688 |
ignoreErrors:true |
|
3689 |
ignoreWarnings:true |
|
3690 |
parseBody:false. |
|
3691 |
||
3692 |
parser isNil ifTrue:[ |
|
3693 |
"/ something wierd ... |
|
3694 |
methodSelector := '????'. |
|
3695 |
] ifFalse:[ |
|
3696 |
methodSelector := parser selector. |
|
3697 |
]. |
|
3698 |
||
3699 |
change := MethodChange new. |
|
3700 |
change |
|
3701 |
className:className |
|
3702 |
selector:methodSelector |
|
3703 |
source:methodSource |
|
3704 |
category:categoryName |
|
1188 | 3705 |
privacy:nil. |
1176 | 3706 |
|
3707 |
self addChange:change. |
|
3708 |
^ true |
|
3709 |
! |
|
3710 |
||
3711 |
processChange |
|
3712 |
"given a parse-tree (from parsing some changes source/chunk), |
|
3713 |
create changes and evaluate changeAction on each. |
|
3714 |
The block is invoked with the change and a lineNumberOrNil as |
|
3715 |
arg; the lineNumber is only valid, if the underlying stream |
|
3716 |
provides line-numbers; otherwise, nil is passed." |
|
3717 |
||
3718 |
(selector == #'interchangeVersion:') ifTrue:[ |
|
3719 |
^ true |
|
3720 |
]. |
|
3721 |
selector == #named:superclass:indexedInstanceVariables:instanceVariableNames:classVariableNames:sharedPools:classInstanceVariableNames: ifTrue:[ |
|
3722 |
^ self handleClassDefinitionChange. |
|
3723 |
]. |
|
3724 |
(selector == #'key:value:') ifTrue:[ |
|
3725 |
(self checkReceiverIsGlobalNamed:'Annotation') ifTrue:[ |
|
3726 |
^ self handleAnnotation. |
|
3727 |
] |
|
3728 |
]. |
|
3729 |
selector == #'method' ifTrue:[ |
|
3730 |
^ self handleMethodChange:false. |
|
3731 |
]. |
|
3732 |
selector == #'classMethod' ifTrue:[ |
|
3733 |
^ self handleMethodChange:true. |
|
3734 |
]. |
|
3735 |
||
3736 |
selector == #'initializer' ifTrue:[ |
|
3737 |
^ true |
|
3738 |
]. |
|
3739 |
selector == #'initialize' ifTrue:[ |
|
3740 |
^ true |
|
3741 |
]. |
|
3742 |
||
3743 |
^ false |
|
3744 |
||
3745 |
"Created: / 16.2.1998 / 13:42:40 / cg" |
|
3746 |
"Modified: / 15.12.1999 / 00:29:06 / cg" |
|
3747 |
! ! |
|
3748 |
||
625
06f4ed35832b
added #patches for ST80 compatibility
Claus Gittinger <cg@exept.de>
parents:
378
diff
changeset
|
3749 |
!ChangeSet class methodsFor:'documentation'! |
100 | 3750 |
|
2179 | 3751 |
version_CVS |
3011
1997ff6e7e55
trunk branched into /branches/jv
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2745
diff
changeset
|
3752 |
^ '§Header: /cvs/stx/stx/libbasic3/ChangeSet.st,v 1.187 2012/01/24 17:39:37 vrany Exp §' |
1997ff6e7e55
trunk branched into /branches/jv
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2745
diff
changeset
|
3753 |
|
3012 | 3754 |
! |
3755 |
||
3756 |
version_SVN |
|
3034
c892671f3e2a
Improvements in merge tool - npw it could merge libtool3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3033
diff
changeset
|
3757 |
^ '$Id: ChangeSet.st 1900 2012-03-21 01:53:44Z vranyj1 $' |
3012 | 3758 |
! ! |