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