author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Thu, 27 Sep 2018 23:09:30 +0100 | |
changeset 3854 | 193b04caef42 |
parent 3508 | 622620308fee |
child 3860 | e87f2f1439e9 |
permissions | -rw-r--r-- |
3415
f9924b63a007
Fixed a bad bug in JavaDescriptor array parsing which incorrectly dropped dimensions for primitive arrays.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3324
diff
changeset
|
1 |
"{ Encoding: utf8 }" |
f9924b63a007
Fixed a bad bug in JavaDescriptor array parsing which incorrectly dropped dimensions for primitive arrays.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3324
diff
changeset
|
2 |
|
749 | 3 |
" |
3324
a58245c0e83a
Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2993
diff
changeset
|
4 |
COPYRIGHT (c) 1996-2015 by Claus Gittinger |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
5 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
6 |
New code and modifications done at SWING Research Group [1]: |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
7 |
|
3324
a58245c0e83a
Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2993
diff
changeset
|
8 |
COPYRIGHT (c) 2010-2015 by Jan Vrany, Jan Kurs and Marcel Hlopko |
749 | 9 |
SWING Research Group, Czech Technical University in Prague |
10 |
||
11 |
This software is furnished under a license and may be used |
|
12 |
only in accordance with the terms of that license and with the |
|
13 |
inclusion of the above copyright notice. This software may not |
|
14 |
be provided or otherwise made available to, or used by, any |
|
15 |
other person. No title to or ownership of the software is |
|
16 |
hereby transferred. |
|
17 |
||
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
18 |
[1] Code written at SWING Research Group contains a signature |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
19 |
of one of the above copright owners. For exact set of such code, |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
20 |
see the differences between this version and version stx:libjava |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
21 |
as of 1.9.2010 |
749 | 22 |
" |
23 |
"{ Package: 'stx:libjava' }" |
|
24 |
||
3415
f9924b63a007
Fixed a bad bug in JavaDescriptor array parsing which incorrectly dropped dimensions for primitive arrays.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3324
diff
changeset
|
25 |
"{ NameSpace: Smalltalk }" |
f9924b63a007
Fixed a bad bug in JavaDescriptor array parsing which incorrectly dropped dimensions for primitive arrays.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3324
diff
changeset
|
26 |
|
749 | 27 |
Object subclass:#JavaDescriptor |
28 |
instanceVariableNames:'' |
|
3415
f9924b63a007
Fixed a bad bug in JavaDescriptor array parsing which incorrectly dropped dimensions for primitive arrays.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3324
diff
changeset
|
29 |
classVariableNames:'BaseTypes BaseTypesByTypeName' |
749 | 30 |
poolDictionaries:'' |
31 |
category:'Languages-Java-Support' |
|
32 |
! |
|
33 |
||
34 |
!JavaDescriptor class methodsFor:'documentation'! |
|
35 |
||
36 |
copyright |
|
37 |
" |
|
3324
a58245c0e83a
Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2993
diff
changeset
|
38 |
COPYRIGHT (c) 1996-2015 by Claus Gittinger |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
39 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
40 |
New code and modifications done at SWING Research Group [1]: |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
41 |
|
3324
a58245c0e83a
Updated copyright notices.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2993
diff
changeset
|
42 |
COPYRIGHT (c) 2010-2015 by Jan Vrany, Jan Kurs and Marcel Hlopko |
749 | 43 |
SWING Research Group, Czech Technical University in Prague |
44 |
||
45 |
This software is furnished under a license and may be used |
|
46 |
only in accordance with the terms of that license and with the |
|
47 |
inclusion of the above copyright notice. This software may not |
|
48 |
be provided or otherwise made available to, or used by, any |
|
49 |
other person. No title to or ownership of the software is |
|
50 |
hereby transferred. |
|
51 |
||
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
52 |
[1] Code written at SWING Research Group contains a signature |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
53 |
of one of the above copright owners. For exact set of such code, |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
54 |
see the differences between this version and version stx:libjava |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
55 |
as of 1.9.2010 |
749 | 56 |
|
57 |
" |
|
58 |
! ! |
|
59 |
||
60 |
!JavaDescriptor class methodsFor:'instance creation'! |
|
61 |
||
62 |
fromString: aString |
|
63 |
||
64 |
^self readFromString: aString |
|
65 |
||
66 |
"Created: / 25-11-2010 / 18:20:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
67 |
! |
|
68 |
||
69 |
readFrom: aStream |
|
70 |
||
71 |
^ self |
|
72 |
readFrom:aStream |
|
73 |
onError:[ self conversionErrorSignal |
|
74 |
raiseErrorString:'invalid java descriptor'] |
|
75 |
||
76 |
"Created: / 25-11-2010 / 18:04:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
77 |
! |
|
78 |
||
79 |
readFrom:stream onError:exceptionBlock |
|
80 |
||
81 |
(stream peek == $( or:[stream peek == $<]) |
|
82 |
ifTrue: [^self readMethodDescriptorFrom: stream onError: exceptionBlock] |
|
83 |
ifFalse:[^self readFieldDescriptorFrom: stream onError: exceptionBlock]. |
|
84 |
||
85 |
" |
|
86 |
JavaDescriptor fromString:'Ljava/lang/Object;' |
|
87 |
JavaDescriptor fromString:'[I' |
|
88 |
JavaDescriptor fromString:'[[I' |
|
89 |
JavaDescriptor fromString:'(ILjava/lang/Object;)V' |
|
90 |
JavaDescriptor fromString:'(ILjava/lang/Object;)Ljava/lang/Class;' |
|
91 |
JavaDescriptor fromString:'<T:Ljava/lang/Object;>(Ljava/util/Collection<TT;>;I)Ljava/util/Collection<TT;>;' |
|
92 |
||
93 |
" |
|
94 |
||
95 |
"Created: / 25-11-2010 / 17:50:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
96 |
"Modified: / 13-08-2011 / 01:37:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
97 |
! ! |
|
98 |
||
99 |
!JavaDescriptor class methodsFor:'accessing'! |
|
100 |
||
101 |
baseTypes |
|
102 |
||
103 |
^BaseTypes |
|
104 |
||
105 |
"Created: / 22-05-2011 / 17:45:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
106 |
! |
|
107 |
||
108 |
baseTypesByTypeName |
|
109 |
||
110 |
^BaseTypesByTypeName |
|
111 |
||
112 |
"Created: / 03-02-2011 / 21:08:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
113 |
! ! |
|
114 |
||
115 |
!JavaDescriptor class methodsFor:'class initialization'! |
|
116 |
||
117 |
initialize |
|
118 |
" |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
119 |
WindowGroup activeApplication spawnClassBrowserFor: BaseTypes values label:'Java primitive types' in:#buffer |
749 | 120 |
" |
121 |
"/WARNING: If you change something here, you MUST also |
|
122 |
"/ change JavaField class>>#initialize !!!!!! |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
123 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
124 |
BaseTypes := (IdentityDictionary new) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
125 |
at: $B put: JavaByte; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
126 |
at: $C put: Character; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
127 |
at: $D put: Float; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
128 |
at: $F put: ShortFloat; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
129 |
at: $I put: Integer; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
130 |
at: $J put: LargeInteger; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
131 |
at: $S put: JavaShort; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
132 |
at: $Z put: Boolean; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
133 |
at: $V put: UndefinedObject; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
134 |
yourself. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
135 |
BaseTypesByTypeName := (Dictionary new) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
136 |
at: 'byte' put: JavaByte; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
137 |
at: 'char' put: Character; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
138 |
at: 'double' put: Float; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
139 |
at: 'float' put: ShortFloat; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
140 |
at: 'int' put: Integer; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
141 |
at: 'long' put: LargeInteger; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
142 |
at: 'short' put: JavaShort; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
143 |
at: 'boolean' put: Boolean; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
144 |
at: 'void' put: UndefinedObject; |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
145 |
yourself. |
749 | 146 |
|
147 |
"Created: / 25-11-2010 / 17:51:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3415
f9924b63a007
Fixed a bad bug in JavaDescriptor array parsing which incorrectly dropped dimensions for primitive arrays.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3324
diff
changeset
|
148 |
"Modified: / 30-03-2015 / 10:17:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
149 |
! ! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
150 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
151 |
!JavaDescriptor class methodsFor:'queries'! |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
152 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
153 |
isJavaPrimitiveArrayName: className |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
154 |
| justTypeSymbol | |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
155 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
156 |
(className startsWith: $[) ifTrue: [ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
157 |
justTypeSymbol := className copyFrom: ((className lastIndexOf: $[) + 1) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
158 |
to: className size |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
159 |
] ifFalse: [ ^ false ]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
160 |
^( justTypeSymbol size = 1 ) |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
161 |
and: [BaseTypes includesKey: justTypeSymbol first]. |
749 | 162 |
! ! |
163 |
||
164 |
!JavaDescriptor class methodsFor:'reading-private'! |
|
165 |
||
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
166 |
readArrayTypeFrom: stream onError: exceptionBlock |
3415
f9924b63a007
Fixed a bad bug in JavaDescriptor array parsing which incorrectly dropped dimensions for primitive arrays.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3324
diff
changeset
|
167 |
| c | |
749 | 168 |
|
169 |
stream next. "eat $[" |
|
170 |
c := self readFrom: stream onError: exceptionBlock. |
|
3415
f9924b63a007
Fixed a bad bug in JavaDescriptor array parsing which incorrectly dropped dimensions for primitive arrays.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3324
diff
changeset
|
171 |
c beArrayType. |
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
172 |
^c |
749 | 173 |
|
174 |
"Created: / 25-11-2010 / 18:12:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3415
f9924b63a007
Fixed a bad bug in JavaDescriptor array parsing which incorrectly dropped dimensions for primitive arrays.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3324
diff
changeset
|
175 |
"Modified: / 30-03-2015 / 10:08:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
749 | 176 |
! |
177 |
||
178 |
readBaseTypeFrom: stream onError: exceptionBlock |
|
179 |
||
180 |
^JavaFieldDescriptor javaClass: (BaseTypes at: (stream next) ifAbsent: exceptionBlock) |
|
181 |
||
182 |
"Created: / 25-11-2010 / 18:11:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
183 |
! |
|
184 |
||
185 |
readFieldDescriptorFrom: stream onError: exceptionBlock |
|
186 |
||
187 |
| p | |
|
188 |
p := stream peek. |
|
189 |
||
190 |
p == $L ifTrue:[^self readObjectTypeFrom: stream onError: exceptionBlock]. |
|
191 |
p == $[ ifTrue:[^self readArrayTypeFrom: stream onError: exceptionBlock]. |
|
192 |
(#( |
|
193 |
$B "byte" |
|
194 |
$C "char" |
|
195 |
$D "double" |
|
196 |
$F "float" |
|
197 |
$I "int" |
|
198 |
$J "long" |
|
199 |
$S "short" |
|
200 |
$Z "boolean" |
|
201 |
$V "void" |
|
202 |
) includes: p) ifTrue:[^self readBaseTypeFrom: stream onError: exceptionBlock]. |
|
203 |
||
204 |
exceptionBlock value |
|
205 |
||
206 |
"Created: / 25-11-2010 / 17:55:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
207 |
"Modified: / 21-12-2010 / 22:47:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
208 |
! |
|
209 |
||
210 |
readMethodDescriptorFrom: stream onError: exceptionBlock |
|
211 |
||
212 |
| parameterDescriptors returnDescriptor | |
|
213 |
||
214 |
stream peek == $< ifTrue:[ |
|
215 |
self readTypeVariableFrom: stream onError: exceptionBlock |
|
216 |
]. |
|
217 |
stream next. "eat $(" |
|
218 |
parameterDescriptors := OrderedCollection new. |
|
219 |
[ stream peek ~= $) ] whileTrue:[ |
|
220 |
parameterDescriptors add:( self readFieldDescriptorFrom: stream onError: exceptionBlock). |
|
221 |
]. |
|
222 |
stream next. "eat $)" |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
223 |
"/ stream peek == $V ifFalse:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
224 |
"/ returnDescriptor := self readFieldDescriptorFrom: stream onError: exceptionBlock. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
225 |
"/ ] ifTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
226 |
"/ stream next. "eat $V" |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
227 |
"/ ]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
228 |
returnDescriptor := self readFieldDescriptorFrom: stream onError: exceptionBlock. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
229 |
|
749 | 230 |
^JavaMethodDescriptor parameters: parameterDescriptors return: returnDescriptor |
231 |
||
232 |
" |
|
233 |
JavaDescriptor fromString:'(ILjava/lang/Object;)V' |
|
234 |
JavaDescriptor fromString:'(ILjava/lang/Object;)Ljava/lang/Class;' |
|
235 |
" |
|
236 |
||
237 |
"Created: / 25-11-2010 / 18:36:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
238 |
"Modified: / 13-08-2011 / 01:39:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
239 |
"Modified: / 12-12-2011 / 17:22:48 / kursjan <kursjan@fit.cvut.cz>" |
749 | 240 |
! |
241 |
||
242 |
readObjectTypeFrom: stream onError: exceptionBlock |
|
243 |
||
244 |
| clsName out | |
|
245 |
||
246 |
stream next. "/eat $L. |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
247 |
out := String new writeStream. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
248 |
[ stream peek ~~ $; and:[stream peek ~~ $< ]] whileTrue:[ |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
249 |
| c | |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
250 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
251 |
c := stream next. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
252 |
c isNil ifTrue:[exceptionBlock value. ^nil]. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
253 |
out nextPut: c. |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
254 |
]. |
749 | 255 |
clsName := out contents. |
256 |
stream peek == $< ifTrue:[ |
|
257 |
self readTypeVariableFrom: stream onError: exceptionBlock |
|
258 |
]. |
|
259 |
||
260 |
"Just a check" |
|
261 |
stream next ~= $; ifTrue:[exceptionBlock value]. |
|
262 |
^JavaFieldDescriptor javaClassName: clsName. |
|
263 |
||
264 |
"Created: / 25-11-2010 / 18:08:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
265 |
! |
|
266 |
||
267 |
readTypeVariableFrom: stream onError: exceptionBlock |
|
268 |
||
269 |
| nangles | |
|
270 |
||
271 |
stream next. "/eat $<. |
|
272 |
nangles := 1. |
|
273 |
[ nangles ~~ 0 ] whileTrue:[ |
|
274 |
stream peek == $< ifTrue:[nangles := nangles + 1]. |
|
275 |
stream peek == $> ifTrue:[nangles := nangles - 1]. |
|
276 |
stream next. |
|
277 |
] |
|
278 |
||
279 |
"Created: / 13-08-2011 / 01:39:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
280 |
! ! |
|
281 |
||
282 |
!JavaDescriptor class methodsFor:'documentation'! |
|
283 |
||
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
284 |
version_CVS |
3412
df11bb428463
Merged with mercurial revision 4f3cc813be4 (8 changesets total)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
3360
diff
changeset
|
285 |
^ '$Header: /cvs/stx/stx/libjava/JavaDescriptor.st,v 1.7 2015-03-20 12:08:00 vrany Exp $' |
2308
5355d2734b8e
fixed: #version_SVN ($ to §)
Claus Gittinger <cg@exept.de>
parents:
2152
diff
changeset
|
286 |
! |
5355d2734b8e
fixed: #version_SVN ($ to §)
Claus Gittinger <cg@exept.de>
parents:
2152
diff
changeset
|
287 |
|
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
288 |
version_HG |
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
289 |
|
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
290 |
^ '$Changeset: <not expanded> $' |
2308
5355d2734b8e
fixed: #version_SVN ($ to §)
Claus Gittinger <cg@exept.de>
parents:
2152
diff
changeset
|
291 |
! |
5355d2734b8e
fixed: #version_SVN ($ to §)
Claus Gittinger <cg@exept.de>
parents:
2152
diff
changeset
|
292 |
|
749 | 293 |
version_SVN |
2731
13f5be2bf83b
Merged d87e89dd5276 and fe83a843a7bf (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
294 |
^ 'Id' |
749 | 295 |
! ! |
296 |
||
2353
fa7400d022a0
Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
2308
diff
changeset
|
297 |
|
2152 | 298 |
JavaDescriptor initialize! |