JavaDescriptor.st
author vranyj1
Mon, 03 Dec 2012 22:09:19 +0000
branchdevelopment
changeset 1859 4d42d0099c74
parent 1818 2e5ed72e7dfd
child 1864 60a8dc26c8c6
permissions -rw-r--r--
Ignore tests in MemberVisibilityTests (package-private methods not yet supported)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
     1
"
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
     2
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1068
diff changeset
     3
1155
vranyj1
parents: 1152
diff changeset
     4
 New code and modifications done at SWING Research Group [1]:
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1068
diff changeset
     5
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
     6
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
     7
                            SWING Research Group, Czech Technical University in Prague
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
     8
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
     9
 This software is furnished under a license and may be used
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    10
 only in accordance with the terms of that license and with the
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    11
 inclusion of the above copyright notice.   This software may not
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    12
 be provided or otherwise made available to, or used by, any
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    13
 other person.  No title to or ownership of the software is
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    14
 hereby transferred.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    15
1155
vranyj1
parents: 1152
diff changeset
    16
 [1] Code written at SWING Research Group contains a signature
vranyj1
parents: 1152
diff changeset
    17
     of one of the above copright owners. For exact set of such code,
vranyj1
parents: 1152
diff changeset
    18
     see the differences between this version and version stx:libjava
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1068
diff changeset
    19
     as of 1.9.2010
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    20
"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    21
"{ Package: 'stx:libjava' }"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    22
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    23
Object subclass:#JavaDescriptor
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    24
	instanceVariableNames:''
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    25
	classVariableNames:'BaseTypes BaseTypesByTypeName ArrayTypes'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    26
	poolDictionaries:''
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    27
	category:'Languages-Java-Support'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    28
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    29
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    30
!JavaDescriptor class methodsFor:'documentation'!
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    31
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    32
copyright
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    33
"
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    34
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1068
diff changeset
    35
1155
vranyj1
parents: 1152
diff changeset
    36
 New code and modifications done at SWING Research Group [1]:
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1068
diff changeset
    37
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    38
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    39
                            SWING Research Group, Czech Technical University in Prague
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    40
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    41
 This software is furnished under a license and may be used
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    42
 only in accordance with the terms of that license and with the
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    43
 inclusion of the above copyright notice.   This software may not
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    44
 be provided or otherwise made available to, or used by, any
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    45
 other person.  No title to or ownership of the software is
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    46
 hereby transferred.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    47
1155
vranyj1
parents: 1152
diff changeset
    48
 [1] Code written at SWING Research Group contains a signature
vranyj1
parents: 1152
diff changeset
    49
     of one of the above copright owners. For exact set of such code,
vranyj1
parents: 1152
diff changeset
    50
     see the differences between this version and version stx:libjava
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1068
diff changeset
    51
     as of 1.9.2010
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    52
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    53
"
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 873
diff changeset
    54
! !
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    55
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    56
!JavaDescriptor class methodsFor:'instance creation'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    57
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    58
fromString: aString
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    59
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    60
    ^self readFromString: aString
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    61
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    62
    "Created: / 25-11-2010 / 18:20:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    63
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    64
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    65
readFrom: aStream
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    66
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    67
    ^ self
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    68
        readFrom:aStream
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    69
        onError:[ self conversionErrorSignal
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    70
                    raiseErrorString:'invalid java descriptor']
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    71
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    72
    "Created: / 25-11-2010 / 18:04:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    73
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    74
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    75
readFrom:stream onError:exceptionBlock
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    76
912
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
    77
    (stream peek == $( or:[stream peek == $<])
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    78
        ifTrue: [^self readMethodDescriptorFrom: stream onError: exceptionBlock]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    79
        ifFalse:[^self readFieldDescriptorFrom:  stream onError: exceptionBlock].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    80
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    81
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    82
        JavaDescriptor fromString:'Ljava/lang/Object;'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    83
        JavaDescriptor fromString:'[I'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    84
        JavaDescriptor fromString:'[[I'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    85
        JavaDescriptor fromString:'(ILjava/lang/Object;)V'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    86
        JavaDescriptor fromString:'(ILjava/lang/Object;)Ljava/lang/Class;'    
912
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
    87
        JavaDescriptor fromString:'<T:Ljava/lang/Object;>(Ljava/util/Collection<TT;>;I)Ljava/util/Collection<TT;>;'
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
    88
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    89
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    90
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    91
    "Created: / 25-11-2010 / 17:50:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
912
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
    92
    "Modified: / 13-08-2011 / 01:37:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    93
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    94
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    95
!JavaDescriptor class methodsFor:'accessing'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    96
812
62e917825364 - JavaDescriptor, JavaResolver, JavaArray: fixes for primitive and array types
vranyj1
parents: 752
diff changeset
    97
baseTypes
62e917825364 - JavaDescriptor, JavaResolver, JavaArray: fixes for primitive and array types
vranyj1
parents: 752
diff changeset
    98
62e917825364 - JavaDescriptor, JavaResolver, JavaArray: fixes for primitive and array types
vranyj1
parents: 752
diff changeset
    99
    ^BaseTypes
62e917825364 - JavaDescriptor, JavaResolver, JavaArray: fixes for primitive and array types
vranyj1
parents: 752
diff changeset
   100
62e917825364 - JavaDescriptor, JavaResolver, JavaArray: fixes for primitive and array types
vranyj1
parents: 752
diff changeset
   101
    "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
   102
!
62e917825364 - JavaDescriptor, JavaResolver, JavaArray: fixes for primitive and array types
vranyj1
parents: 752
diff changeset
   103
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   104
baseTypesByTypeName
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   105
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   106
    ^BaseTypesByTypeName
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   107
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   108
    "Created: / 03-02-2011 / 21:08:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   109
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   110
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   111
!JavaDescriptor class methodsFor:'class initialization'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   112
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   113
initialize
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   114
    "
1385
3426388640da Improvements in interop
vranyj1
parents: 1271
diff changeset
   115
     WindowGroup activeApplication  spawnClassBrowserFor: BaseTypes values label:'Java primitive types' in:#buffer
3426388640da Improvements in interop
vranyj1
parents: 1271
diff changeset
   116
    "
873
933263bd2d27 Fixes for primitive array types (uses Signed* variant of an array)
vranyj1
parents: 866
diff changeset
   117
    "/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
   118
    "/         change JavaField class>>#initialize !!!!!!
1155
vranyj1
parents: 1152
diff changeset
   119
    
vranyj1
parents: 1152
diff changeset
   120
    BaseTypes := (IdentityDictionary new)
vranyj1
parents: 1152
diff changeset
   121
                at: $B put: JavaByte;
vranyj1
parents: 1152
diff changeset
   122
                at: $C put: Character;
vranyj1
parents: 1152
diff changeset
   123
                at: $D put: Float;
vranyj1
parents: 1152
diff changeset
   124
                at: $F put: ShortFloat;
vranyj1
parents: 1152
diff changeset
   125
                at: $I put: Integer;
vranyj1
parents: 1152
diff changeset
   126
                at: $J put: LargeInteger;
vranyj1
parents: 1152
diff changeset
   127
                at: $S put: JavaShort;
vranyj1
parents: 1152
diff changeset
   128
                at: $Z put: Boolean;
vranyj1
parents: 1152
diff changeset
   129
                at: $V put: UndefinedObject;
vranyj1
parents: 1152
diff changeset
   130
                yourself.
vranyj1
parents: 1152
diff changeset
   131
    BaseTypesByTypeName := (Dictionary new)
vranyj1
parents: 1152
diff changeset
   132
                at: 'byte' put: JavaByte;
vranyj1
parents: 1152
diff changeset
   133
                at: 'char' put: Character;
vranyj1
parents: 1152
diff changeset
   134
                at: 'double' put: Float;
vranyj1
parents: 1152
diff changeset
   135
                at: 'float' put: ShortFloat;
vranyj1
parents: 1152
diff changeset
   136
                at: 'int' put: Integer;
vranyj1
parents: 1152
diff changeset
   137
                at: 'long' put: LargeInteger;
vranyj1
parents: 1152
diff changeset
   138
                at: 'short' put: JavaShort;
vranyj1
parents: 1152
diff changeset
   139
                at: 'boolean' put: Boolean;
vranyj1
parents: 1152
diff changeset
   140
                at: 'void' put: UndefinedObject;
vranyj1
parents: 1152
diff changeset
   141
                yourself.
vranyj1
parents: 1152
diff changeset
   142
     "
vranyj1
parents: 1152
diff changeset
   143
     Tools::NewSystemBrowser basicNew spawnClassBrowserFor: ArrayTypes values label:'Java primitive array types' in:#newBrowser
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   144
    "
873
933263bd2d27 Fixes for primitive array types (uses Signed* variant of an array)
vranyj1
parents: 866
diff changeset
   145
    "/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
   146
    "/         change JavaField class>>#initialize !!!!!!
1155
vranyj1
parents: 1152
diff changeset
   147
    
vranyj1
parents: 1152
diff changeset
   148
    ArrayTypes := (IdentityDictionary new)
vranyj1
parents: 1152
diff changeset
   149
                at: $B put: ByteArray;
vranyj1
parents: 1152
diff changeset
   150
                at: $C put: Unicode16String;
vranyj1
parents: 1152
diff changeset
   151
                at: $D put: DoubleArray;
vranyj1
parents: 1152
diff changeset
   152
                at: $F put: FloatArray;
vranyj1
parents: 1152
diff changeset
   153
                at: $I put: SignedIntegerArray;
vranyj1
parents: 1152
diff changeset
   154
                at: $J put: SignedLongIntegerArray;
vranyj1
parents: 1152
diff changeset
   155
                at: $S put: WordArray;
vranyj1
parents: 1152
diff changeset
   156
                at: $Z put: BooleanArray;
vranyj1
parents: 1152
diff changeset
   157
                yourself
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   158
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   159
    "Created: / 25-11-2010 / 17:51:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
900
af7f94374272 - more native methods
vranyj1
parents: 880
diff changeset
   160
    "Modified: / 10-08-2011 / 00:48:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1385
3426388640da Improvements in interop
vranyj1
parents: 1271
diff changeset
   161
    "Modified (comment): / 24-02-2012 / 19:40:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   162
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   163
1021
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   164
!JavaDescriptor class methodsFor:'queries'!
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   165
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   166
isJavaPrimitiveArrayName: className 
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   167
    | justTypeSymbol |
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   168
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   169
    (className startsWith: $[) ifTrue: [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   170
        justTypeSymbol := className copyFrom: ((className lastIndexOf: $[) + 1)
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   171
                    to: className size
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   172
    ]  ifFalse: [ ^ false ].
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   173
    ^(  justTypeSymbol size = 1 ) 
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   174
        and: [BaseTypes includesKey: justTypeSymbol first].
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   175
! !
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   176
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   177
!JavaDescriptor class methodsFor:'reading-private'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   178
1021
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   179
readArrayTypeFrom: stream onError: exceptionBlock 
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   180
    | p  c |
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   181
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   182
    stream next. "eat $["
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   183
    p := stream peek.
1021
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   184
    "byte" "char" "double" "float" "int" "long" "short" "boolean" (#( $B
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   185
     $C
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   186
     $D
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   187
     $F
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   188
     $I
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   189
     $J
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   190
     $S
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   191
     $Z ) includes: p) ifTrue: [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   192
        ^ JavaFieldDescriptor javaClass: (ArrayTypes at: stream next)
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   193
    ].
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 912
diff changeset
   194
     "OK, not a primitive array..."
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   195
    c := self readFrom: stream onError: exceptionBlock.
1610
15c74eeadcc0 - JavaDescriptor, JavaFieldDescriptor: array descriptors refactored to allow lazy (array) class loading
vranyj1
parents: 1511
diff changeset
   196
    c dimensions: c dimensions + 1.
15c74eeadcc0 - JavaDescriptor, JavaFieldDescriptor: array descriptors refactored to allow lazy (array) class loading
vranyj1
parents: 1511
diff changeset
   197
    ^c
1511
7bba867f71e3 - JavaClass
vranyj1
parents: 1385
diff changeset
   198
7bba867f71e3 - JavaClass
vranyj1
parents: 1385
diff changeset
   199
    "Created: / 25-11-2010 / 18:12:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1610
15c74eeadcc0 - JavaDescriptor, JavaFieldDescriptor: array descriptors refactored to allow lazy (array) class loading
vranyj1
parents: 1511
diff changeset
   200
    "Modified: / 16-08-2012 / 13:31:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   201
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   202
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   203
readBaseTypeFrom:  stream onError: exceptionBlock
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   204
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   205
    ^JavaFieldDescriptor javaClass: (BaseTypes at: (stream next) ifAbsent: exceptionBlock)
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   206
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   207
    "Created: / 25-11-2010 / 18:11:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   208
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   209
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   210
readFieldDescriptorFrom:  stream onError: exceptionBlock
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   211
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   212
    | p |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   213
    p := stream peek.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   214
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   215
    p == $L ifTrue:[^self readObjectTypeFrom: stream onError: exceptionBlock].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   216
    p == $[ ifTrue:[^self readArrayTypeFrom: stream onError: exceptionBlock].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   217
    (#(
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   218
         $B "byte"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   219
         $C "char"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   220
         $D "double"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   221
         $F "float"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   222
         $I "int"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   223
         $J "long"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   224
         $S "short"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   225
         $Z "boolean"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   226
         $V "void"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   227
    ) includes: p) ifTrue:[^self readBaseTypeFrom: stream onError: exceptionBlock].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   228
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   229
    exceptionBlock value
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   230
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   231
    "Created: / 25-11-2010 / 17:55:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   232
    "Modified: / 21-12-2010 / 22:47:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   233
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   234
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   235
readMethodDescriptorFrom: stream onError: exceptionBlock
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   236
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   237
    | parameterDescriptors returnDescriptor |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   238
912
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   239
    stream peek == $< ifTrue:[
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   240
        self readTypeVariableFrom: stream onError: exceptionBlock
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   241
    ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   242
    stream next. "eat $("
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   243
    parameterDescriptors := OrderedCollection new.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   244
    [ stream peek ~= $) ] whileTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   245
        parameterDescriptors add:( self readFieldDescriptorFrom: stream onError: exceptionBlock).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   246
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   247
    stream next. "eat $)"
1271
2caa288596fd Fixed some errors in Java - Smalltalk interop.
kursjan
parents: 1155
diff changeset
   248
"/    stream peek == $V ifFalse:[
2caa288596fd Fixed some errors in Java - Smalltalk interop.
kursjan
parents: 1155
diff changeset
   249
"/        returnDescriptor := self readFieldDescriptorFrom: stream onError: exceptionBlock.
2caa288596fd Fixed some errors in Java - Smalltalk interop.
kursjan
parents: 1155
diff changeset
   250
"/    ] ifTrue:[
2caa288596fd Fixed some errors in Java - Smalltalk interop.
kursjan
parents: 1155
diff changeset
   251
"/        stream next. "eat $V"
2caa288596fd Fixed some errors in Java - Smalltalk interop.
kursjan
parents: 1155
diff changeset
   252
"/    ].
2caa288596fd Fixed some errors in Java - Smalltalk interop.
kursjan
parents: 1155
diff changeset
   253
    returnDescriptor := self readFieldDescriptorFrom: stream onError: exceptionBlock.
2caa288596fd Fixed some errors in Java - Smalltalk interop.
kursjan
parents: 1155
diff changeset
   254
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   255
    ^JavaMethodDescriptor parameters: parameterDescriptors return: returnDescriptor
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   256
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   257
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   258
        JavaDescriptor fromString:'(ILjava/lang/Object;)V'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   259
        JavaDescriptor fromString:'(ILjava/lang/Object;)Ljava/lang/Class;'  
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   260
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   261
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   262
    "Created: / 25-11-2010 / 18:36:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
912
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   263
    "Modified: / 13-08-2011 / 01:39:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1271
2caa288596fd Fixed some errors in Java - Smalltalk interop.
kursjan
parents: 1155
diff changeset
   264
    "Modified: / 12-12-2011 / 17:22:48 / kursjan <kursjan@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   265
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   266
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   267
readObjectTypeFrom:  stream onError: exceptionBlock
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   268
912
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   269
    | clsName out |
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   270
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   271
    stream next. "/eat $L.
1063
vranyj1
parents: 1021
diff changeset
   272
    out := String new writeStream.    
vranyj1
parents: 1021
diff changeset
   273
    [ stream peek ~~ $; and:[stream peek ~~ $< ]] whileTrue:[
vranyj1
parents: 1021
diff changeset
   274
        | c |
vranyj1
parents: 1021
diff changeset
   275
vranyj1
parents: 1021
diff changeset
   276
        c := stream next.
vranyj1
parents: 1021
diff changeset
   277
        c isNil ifTrue:[exceptionBlock value. ^nil].
1068
508b924b7499 Bug fix
vranyj1
parents: 1063
diff changeset
   278
        out nextPut: c.
1063
vranyj1
parents: 1021
diff changeset
   279
    ].
912
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   280
    clsName := out contents.
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   281
    stream peek == $< ifTrue:[
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   282
        self readTypeVariableFrom: stream onError: exceptionBlock
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   283
    ].
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   284
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   285
    "Just a check"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   286
    stream next ~= $; ifTrue:[exceptionBlock value].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   287
    ^JavaFieldDescriptor javaClassName: clsName.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   288
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   289
    "Created: / 25-11-2010 / 18:08:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
912
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   290
!
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   291
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   292
readTypeVariableFrom:  stream onError: exceptionBlock
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   293
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   294
    | nangles |
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   295
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   296
    stream next. "/eat $<.
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   297
    nangles := 1.
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   298
    [ nangles ~~ 0 ] whileTrue:[
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   299
        stream peek == $< ifTrue:[nangles := nangles + 1].
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   300
        stream peek == $> ifTrue:[nangles := nangles - 1].
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   301
        stream next.
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   302
    ]
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   303
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 900
diff changeset
   304
    "Created: / 13-08-2011 / 01:39:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   305
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   306
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   307
!JavaDescriptor class methodsFor:'documentation'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   308
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   309
version_SVN
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   310
    ^ '$Id$'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   311
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   312
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   313
JavaDescriptor initialize!