author | vranyj1 |
Wed, 20 Jul 2011 12:02:02 +0000 | |
branch | jk_new_structure |
changeset 873 | 933263bd2d27 |
parent 866 | 10d1f47af6d9 |
child 877 | f5a5b93e1c78 |
permissions | -rw-r--r-- |
752 | 1 |
"{ Package: 'stx:libjava' }" |
2 |
||
3 |
Object subclass:#JavaDescriptor |
|
4 |
instanceVariableNames:'' |
|
5 |
classVariableNames:'BaseTypes BaseTypesByTypeName ArrayTypes' |
|
6 |
poolDictionaries:'' |
|
7 |
category:'Languages-Java-Support' |
|
8 |
! |
|
9 |
||
10 |
||
11 |
!JavaDescriptor class methodsFor:'instance creation'! |
|
12 |
||
13 |
fromString: aString |
|
14 |
||
15 |
^self readFromString: aString |
|
16 |
||
17 |
"Created: / 25-11-2010 / 18:20:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
18 |
! |
|
19 |
||
20 |
readFrom: aStream |
|
21 |
||
22 |
^ self |
|
23 |
readFrom:aStream |
|
24 |
onError:[ self conversionErrorSignal |
|
25 |
raiseErrorString:'invalid java descriptor'] |
|
26 |
||
27 |
"Created: / 25-11-2010 / 18:04:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
28 |
! |
|
29 |
||
30 |
readFrom:stream onError:exceptionBlock |
|
31 |
||
32 |
stream peek == $( |
|
33 |
ifTrue: [^self readMethodDescriptorFrom: stream onError: exceptionBlock] |
|
34 |
ifFalse:[^self readFieldDescriptorFrom: stream onError: exceptionBlock]. |
|
35 |
||
36 |
" |
|
37 |
JavaDescriptor fromString:'Ljava/lang/Object;' |
|
38 |
JavaDescriptor fromString:'[I' |
|
39 |
JavaDescriptor fromString:'[[I' |
|
40 |
JavaDescriptor fromString:'(ILjava/lang/Object;)V' |
|
41 |
JavaDescriptor fromString:'(ILjava/lang/Object;)Ljava/lang/Class;' |
|
42 |
" |
|
43 |
||
44 |
"Created: / 25-11-2010 / 17:50:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
45 |
"Modified: / 06-02-2011 / 15:08:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
46 |
! ! |
|
47 |
||
48 |
!JavaDescriptor class methodsFor:'accessing'! |
|
49 |
||
812
62e917825364
- JavaDescriptor, JavaResolver, JavaArray: fixes for primitive and array types
vranyj1
parents:
752
diff
changeset
|
50 |
baseTypes |
62e917825364
- JavaDescriptor, JavaResolver, JavaArray: fixes for primitive and array types
vranyj1
parents:
752
diff
changeset
|
51 |
|
62e917825364
- JavaDescriptor, JavaResolver, JavaArray: fixes for primitive and array types
vranyj1
parents:
752
diff
changeset
|
52 |
^BaseTypes |
62e917825364
- JavaDescriptor, JavaResolver, JavaArray: fixes for primitive and array types
vranyj1
parents:
752
diff
changeset
|
53 |
|
62e917825364
- JavaDescriptor, JavaResolver, JavaArray: fixes for primitive and array types
vranyj1
parents:
752
diff
changeset
|
54 |
"Created: / 22-05-2011 / 17:45:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
62e917825364
- JavaDescriptor, JavaResolver, JavaArray: fixes for primitive and array types
vranyj1
parents:
752
diff
changeset
|
55 |
! |
62e917825364
- JavaDescriptor, JavaResolver, JavaArray: fixes for primitive and array types
vranyj1
parents:
752
diff
changeset
|
56 |
|
752 | 57 |
baseTypesByTypeName |
58 |
||
59 |
^BaseTypesByTypeName |
|
60 |
||
61 |
"Created: / 03-02-2011 / 21:08:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
62 |
! ! |
|
63 |
||
64 |
!JavaDescriptor class methodsFor:'class initialization'! |
|
65 |
||
66 |
initialize |
|
67 |
||
68 |
" |
|
69 |
Tools::NewSystemBrowser browseClasses: BaseTypes values label:'Java primitive types' |
|
70 |
" |
|
71 |
||
873
933263bd2d27
Fixes for primitive array types (uses Signed* variant of an array)
vranyj1
parents:
866
diff
changeset
|
72 |
"/WARNING: If you change something here, you MUST also |
933263bd2d27
Fixes for primitive array types (uses Signed* variant of an array)
vranyj1
parents:
866
diff
changeset
|
73 |
"/ change JavaField class>>#initialize !!!!!! |
752 | 74 |
BaseTypes := IdentityDictionary new |
75 |
at: $B put: Byte; |
|
76 |
at: $C put: Character; |
|
77 |
at: $D put: Float; |
|
78 |
at: $F put: ShortFloat; |
|
79 |
at: $I put: Integer; "Kludge: instances of java int are in fact SmallIntegers" |
|
80 |
at: $J put: LargeInteger; |
|
81 |
at: $S put: Short; |
|
82 |
at: $Z put: Boolean; |
|
83 |
at: $V put: UndefinedObject; |
|
84 |
yourself. |
|
85 |
||
86 |
BaseTypesByTypeName := Dictionary new |
|
87 |
at: 'byte' put: Byte; |
|
88 |
at: 'char' put: Character; |
|
89 |
at: 'double' put: Float; |
|
90 |
at: 'float' put: ShortFloat; |
|
91 |
at: 'int' put: Integer; "Kludge: instances of java int are in fact SmallIntegers" |
|
92 |
at: 'long' put: LargeInteger; |
|
93 |
at: 'short' put: Short; |
|
94 |
at: 'boolean' put: Boolean; |
|
95 |
at: 'void' put: UndefinedObject; |
|
96 |
yourself. |
|
97 |
||
98 |
" |
|
99 |
Tools::NewSystemBrowser browseClasses: ArrayTypes values label:'Java primitive array types' |
|
100 |
" |
|
101 |
||
873
933263bd2d27
Fixes for primitive array types (uses Signed* variant of an array)
vranyj1
parents:
866
diff
changeset
|
102 |
"/WARNING: If you change something here, you MUST also |
933263bd2d27
Fixes for primitive array types (uses Signed* variant of an array)
vranyj1
parents:
866
diff
changeset
|
103 |
"/ change JavaField class>>#initialize !!!!!! |
933263bd2d27
Fixes for primitive array types (uses Signed* variant of an array)
vranyj1
parents:
866
diff
changeset
|
104 |
|
752 | 105 |
ArrayTypes := IdentityDictionary new |
106 |
at: $B put: ByteArray; |
|
865 | 107 |
at: $C put: Unicode32String; |
752 | 108 |
at: $D put: DoubleArray; |
109 |
at: $F put: FloatArray; |
|
866 | 110 |
at: $I put: SignedIntegerArray; |
111 |
at: $J put: SignedLongIntegerArray; |
|
752 | 112 |
at: $S put: WordArray; |
113 |
at: $Z put: BooleanArray; |
|
114 |
yourself |
|
115 |
||
116 |
"Created: / 25-11-2010 / 17:51:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
866 | 117 |
"Modified: / 25-06-2011 / 08:35:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
873
933263bd2d27
Fixes for primitive array types (uses Signed* variant of an array)
vranyj1
parents:
866
diff
changeset
|
118 |
"Modified (comment): / 20-07-2011 / 10:41:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
752 | 119 |
! ! |
120 |
||
121 |
!JavaDescriptor class methodsFor:'reading-private'! |
|
122 |
||
123 |
readArrayTypeFrom: stream onError: exceptionBlock |
|
124 |
||
125 |
| p c | |
|
126 |
stream next. "eat $[" |
|
127 |
p := stream peek. |
|
128 |
(#( |
|
129 |
$B "byte" |
|
130 |
$C "char" |
|
131 |
$D "double" |
|
132 |
$F "float" |
|
133 |
$I "int" |
|
134 |
$J "long" |
|
135 |
$S "short" |
|
136 |
$Z "boolean" |
|
137 |
) includes: p) ifTrue:[^JavaFieldDescriptor javaClass: (ArrayTypes at: stream next)]. |
|
138 |
||
139 |
"OK, not a primitive array..." |
|
140 |
c := self readFrom: stream onError: exceptionBlock. |
|
141 |
^JavaFieldDescriptor javaClass: (JavaVM javaArrayClassFor: c javaClass) |
|
142 |
||
143 |
"Created: / 25-11-2010 / 18:12:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
144 |
"Modified: / 06-02-2011 / 23:15:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
145 |
! |
|
146 |
||
147 |
readBaseTypeFrom: stream onError: exceptionBlock |
|
148 |
||
149 |
^JavaFieldDescriptor javaClass: (BaseTypes at: (stream next) ifAbsent: exceptionBlock) |
|
150 |
||
151 |
"Created: / 25-11-2010 / 18:11:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
152 |
! |
|
153 |
||
154 |
readFieldDescriptorFrom: stream onError: exceptionBlock |
|
155 |
||
156 |
| p | |
|
157 |
p := stream peek. |
|
158 |
||
159 |
p == $L ifTrue:[^self readObjectTypeFrom: stream onError: exceptionBlock]. |
|
160 |
p == $[ ifTrue:[^self readArrayTypeFrom: stream onError: exceptionBlock]. |
|
161 |
(#( |
|
162 |
$B "byte" |
|
163 |
$C "char" |
|
164 |
$D "double" |
|
165 |
$F "float" |
|
166 |
$I "int" |
|
167 |
$J "long" |
|
168 |
$S "short" |
|
169 |
$Z "boolean" |
|
170 |
$V "void" |
|
171 |
) includes: p) ifTrue:[^self readBaseTypeFrom: stream onError: exceptionBlock]. |
|
172 |
||
173 |
exceptionBlock value |
|
174 |
||
175 |
"Created: / 25-11-2010 / 17:55:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
176 |
"Modified: / 21-12-2010 / 22:47:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
177 |
! |
|
178 |
||
179 |
readMethodDescriptorFrom: stream onError: exceptionBlock |
|
180 |
||
181 |
| parameterDescriptors returnDescriptor | |
|
182 |
||
183 |
stream next. "eat $(" |
|
184 |
parameterDescriptors := OrderedCollection new. |
|
185 |
[ stream peek ~= $) ] whileTrue:[ |
|
186 |
parameterDescriptors add:( self readFieldDescriptorFrom: stream onError: exceptionBlock). |
|
187 |
]. |
|
188 |
stream next. "eat $)" |
|
189 |
stream peek == $V ifFalse:[ |
|
190 |
returnDescriptor := self readFieldDescriptorFrom: stream onError: exceptionBlock. |
|
191 |
] ifTrue:[ |
|
192 |
stream next. "eat $V" |
|
193 |
]. |
|
194 |
^JavaMethodDescriptor parameters: parameterDescriptors return: returnDescriptor |
|
195 |
||
196 |
" |
|
197 |
JavaDescriptor fromString:'(ILjava/lang/Object;)V' |
|
198 |
JavaDescriptor fromString:'(ILjava/lang/Object;)Ljava/lang/Class;' |
|
199 |
" |
|
200 |
||
201 |
"Created: / 25-11-2010 / 18:36:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
202 |
"Modified: / 21-12-2010 / 22:50:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
203 |
! |
|
204 |
||
205 |
readObjectTypeFrom: stream onError: exceptionBlock |
|
206 |
||
207 |
| clsName | |
|
208 |
||
209 |
stream next. "/eat $L. |
|
210 |
clsName := stream upTo: $;. |
|
211 |
"Just a check" |
|
212 |
stream skip: -1. |
|
213 |
stream next ~= $; ifTrue:[exceptionBlock value]. |
|
214 |
^JavaFieldDescriptor javaClassName: clsName. |
|
215 |
||
216 |
"Created: / 25-11-2010 / 18:08:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
217 |
! ! |
|
218 |
||
219 |
!JavaDescriptor class methodsFor:'documentation'! |
|
220 |
||
221 |
version_SVN |
|
222 |
^ '$Id$' |
|
223 |
! ! |
|
224 |
||
225 |
JavaDescriptor initialize! |