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