src/JavaClassReader.st
author hlopkmar
Wed, 19 Oct 2011 16:18:27 +0000
branchjk_new_structure
changeset 1026 5badd1d31864
parent 1025 2c9c84bdd863
child 1028 d30cabc12354
permissions -rw-r--r--
introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
     1
"
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
     2
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
     3
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
     4
                            SWING Research Group, Czech Technical University in Prague
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
     5
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
     6
 Parts of the code written by Claus Gittinger are under following
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
     7
 license:
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
     8
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
     9
 This software is furnished under a license and may be used
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    10
 only in accordance with the terms of that license and with the
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    11
 inclusion of the above copyright notice.   This software may not
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    12
 be provided or otherwise made available to, or used by, any
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    13
 other person.  No title to or ownership of the software is
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    14
 hereby transferred.
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    15
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    16
 Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    17
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    18
 Permission is hereby granted, free of charge, to any person
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    19
 obtaining a copy of this software and associated documentation
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    20
 files (the 'Software'), to deal in the Software without
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    21
 restriction, including without limitation the rights to use,
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    22
 copy, modify, merge, publish, distribute, sublicense, and/or sell
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    23
 copies of the Software, and to permit persons to whom the
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    24
 Software is furnished to do so, subject to the following
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    25
 conditions:
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    26
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    27
 The above copyright notice and this permission notice shall be
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    28
 included in all copies or substantial portions of the Software.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    29
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    30
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    31
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    32
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    33
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    34
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    35
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    36
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    37
 OTHER DEALINGS IN THE SOFTWARE.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    38
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    39
 [1] Code written at SWING Research Group contain a signature
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    40
     of one of the above copright owners.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    41
"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    42
"{ Package: 'stx:libjava' }"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    43
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    44
Object subclass:#JavaClassReader
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    45
	instanceVariableNames:'inStream msb constants majorVsn minorVsn constNeeds2Slots
775
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
    46
		constSlot classBeingLoaded'
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    47
	classVariableNames:'Verbose AnnotationsVerbose Silent AbsolutelySilent
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    48
		LazyClassLoading InvalidClassFormatSignal ClassLoaderQuerySignal
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    49
		JavaArchiveCache'
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    50
	poolDictionaries:''
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    51
	category:'Languages-Java-Support'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    52
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    53
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    54
!JavaClassReader class methodsFor:'documentation'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    55
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    56
copyright
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    57
"
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    58
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    59
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    60
                            SWING Research Group, Czech Technical University in Prague
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    61
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    62
 Parts of the code written by Claus Gittinger are under following
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    63
 license:
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    64
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    65
 This software is furnished under a license and may be used
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    66
 only in accordance with the terms of that license and with the
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    67
 inclusion of the above copyright notice.   This software may not
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    68
 be provided or otherwise made available to, or used by, any
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    69
 other person.  No title to or ownership of the software is
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    70
 hereby transferred.
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    71
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    72
 Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    73
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    74
 Permission is hereby granted, free of charge, to any person
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    75
 obtaining a copy of this software and associated documentation
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    76
 files (the 'Software'), to deal in the Software without
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    77
 restriction, including without limitation the rights to use,
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    78
 copy, modify, merge, publish, distribute, sublicense, and/or sell
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    79
 copies of the Software, and to permit persons to whom the
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    80
 Software is furnished to do so, subject to the following
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    81
 conditions:
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    82
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    83
 The above copyright notice and this permission notice shall be
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    84
 included in all copies or substantial portions of the Software.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    85
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    86
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    87
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    88
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    89
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    90
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    91
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    92
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    93
 OTHER DEALINGS IN THE SOFTWARE.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    94
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    95
 [1] Code written at SWING Research Group contain a signature
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    96
     of one of the above copright owners.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
    97
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    98
"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    99
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   100
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   101
!JavaClassReader class methodsFor:'initialization'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   102
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   103
initialize
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   104
    InvalidClassFormatSignal := Signal new mayProceed: true.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   105
    InvalidClassFormatSignal notifierString: 'class load failure'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   106
    InvalidClassFormatSignal nameClass: self message: #invalidClassFormatSignal.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   107
    Verbose := false.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   108
    Silent := true.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   109
    AbsolutelySilent := false.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   110
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   111
    "/LazyClassLoading := false.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   112
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   113
    LazyClassLoading := true.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   114
    ClassLoaderQuerySignal := QuerySignal new.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   115
    JavaArchiveCache := CacheDictionary new: 32.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   116
    AnnotationsVerbose := false.
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   117
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   118
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   119
     JavaClassReader initialize"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   120
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   121
    "Modified: / 27-01-1998 / 17:54:23 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   122
    "Modified: / 17-12-2010 / 17:37:45 / Marcel Hlopko <hlopik@gmail.com>"
772
0f92c23b80ee testing new project structure + fixing tiny litle bug which caused java not to work at all :)
hlopkmar
parents: 771
diff changeset
   123
    "Modified: / 10-05-2011 / 23:59:53 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
   124
    "Modified: / 26-07-2011 / 17:21:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   125
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   126
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   127
!JavaClassReader class methodsFor:'Signal constants'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   128
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   129
classLoaderQuerySignal
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   130
    ^ ClassLoaderQuerySignal
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   131
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   132
    "Created: 14.8.1997 / 19:56:03 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   133
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   134
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   135
invalidClassFormatSignal
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   136
    ^ InvalidClassFormatSignal
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   137
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   138
    "Created: 3.8.1997 / 18:17:21 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   139
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   140
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   141
!JavaClassReader class methodsFor:'constants'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   142
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   143
fileMajorVersions
831
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   144
    ^#( 
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   145
        46  "Java 1.2"
920
e6e8a96b217c Fixes for Groovy and Saxon
vranyj1
parents: 913
diff changeset
   146
        47  "???"
e6e8a96b217c Fixes for Groovy and Saxon
vranyj1
parents: 913
diff changeset
   147
        48  "???"
831
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   148
        49  "Java 5"
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   149
        50  "Java 6"
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   150
      ).
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   151
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   152
    "
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   153
     JSR 202:
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   154
     The Java virtual machine implementation of Sun's JDK release 1.0.2 supports
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   155
     class file format versions 45.0 through 45.3 inclusive. Sun's JDK releases
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   156
     1.1.X can support class file formats of versions in the range 45.0 through
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   157
     45.65535 inclusive. For k > 1 implementations of version 1.k of the Java 2
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   158
     platform can support class file formats of versions in the range 45.0 through
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   159
     44+k.0 inclusive.
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   160
"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   161
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   162
    "Created: / 19-10-2010 / 21:40:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
830
235c482b462f - JavaClassReader: do not want about .class file version 50.0
vranyj1
parents: 828
diff changeset
   163
    "Modified: / 01-06-2011 / 21:44:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
831
275795af397d pedantic change in documentation :)
hlopkmar
parents: 830
diff changeset
   164
    "Modified: / 02-06-2011 / 22:50:17 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
920
e6e8a96b217c Fixes for Groovy and Saxon
vranyj1
parents: 913
diff changeset
   165
    "Modified: / 18-08-2011 / 19:32:37 / jv"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   166
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   167
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   168
fileMinorVersions
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   169
    ^ #(
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   170
        3 "Java 1.2"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   171
        0 "Java 6"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   172
    )
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   173
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   174
    "Created: / 19-10-2010 / 21:41:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   175
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   176
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   177
magic_LSB
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   178
    ^ 16rBEBAFECA
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   179
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   180
    "Modified: / 7.5.1998 / 13:14:27 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   181
    "Created: / 7.5.1998 / 13:15:05 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   182
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   183
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   184
magic_MSB
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   185
    ^ 16rCAFEBABE
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   186
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   187
    "Modified: / 7.5.1998 / 13:14:27 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   188
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   189
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   190
!JavaClassReader class methodsFor:'debugging'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   191
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   192
annotationsVerbose:aBoolean 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   193
    AnnotationsVerbose := aBoolean
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   194
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   195
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   196
     Java flushClasses.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   197
     JavaClassReader verbose:true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   198
     JavaClassReader verbose:false"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   199
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   200
    "Created: / 25-02-2011 / 12:25:23 / Marcel Hlopko <hlopik@gmail.com>"
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
verbose:aBoolean
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   204
    Verbose := aBoolean
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   205
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   206
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   207
     Java flushClasses.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   208
     JavaClassReader verbose:true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   209
     JavaClassReader verbose:false
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   210
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   211
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   212
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   213
!JavaClassReader class methodsFor:'file reading'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   214
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   215
readClass: aClassName 
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   216
    "reads a class, and returns it.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   217
     <clinit> is called, class is not installed"
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   218
    
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   219
    ^ self readClass: aClassName ignoring: Set new.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   220
960
1c7fd32d1f26 Few fixes
vranyj1
parents: 959
diff changeset
   221
    "Created: / 15-04-1996 / 14:58:53 / cg"
1c7fd32d1f26 Few fixes
vranyj1
parents: 959
diff changeset
   222
    "Modified: / 20-10-1998 / 17:24:54 / cg"
992
6d3e3d937fda Class loader mess cleanup, more will come later...
vranyj1
parents: 984
diff changeset
   223
    "Modified: / 08-09-2011 / 08:10:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   224
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   225
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   226
readClass: className ignoring: classesBeingLoadedOrNil 
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   227
    "reads a class, and returns it.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   228
     <clinit> is called, class is not installed
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   229
1021
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   230
     className expected format:
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   231
     foo.bar.Baz - normal class
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   232
     foo/bar/Baz - alternative format
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   233
     [[Lfoo/bar/Baz; - array
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   234
     [[I - primitive array"
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   235
    
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   236
    | rslt  clsName  cls  classesBeingLoaded |
1021
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   237
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   238
    (JavaDescriptor isJavaPrimitiveArrayName: className) ifTrue: [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   239
        ^ (JavaDescriptor fromString: className) javaClass.
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   240
    ].
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   241
    (cls := Java javaRegistry at: clsName) ifNotNil: [ ^ cls. ].
1021
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   242
    clsName := self getCleanClassNameFrom: className.
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   243
    (classesBeingLoadedOrNil notNil 
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   244
        and: [ classesBeingLoadedOrNil includes: clsName ]) 
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   245
            ifTrue: [ self halt: 'recursive load - should not happen'. ].
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   246
    classesBeingLoadedOrNil isNil ifTrue: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   247
        classesBeingLoaded := Set with: clsName
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   248
    ] ifFalse: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   249
        classesBeingLoaded := classesBeingLoadedOrNil
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   250
                    add: clsName;
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   251
                    yourself.
1021
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   252
    ].
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   253
    Java effectiveClassPath do: [
1021
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   254
        :path | 
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   255
        | nm  p  zar  entry  zipFile  read |
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   256
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   257
        p := path.
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   258
        p asFilename isDirectory ifTrue: [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   259
            (p endsWith: Filename separator) ifFalse: [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   260
                p := p , (Filename separator asString)
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   261
            ].
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   262
            (Array 
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   263
                with: clsName
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   264
                with: clsName asLowercase
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   265
                with: clsName asUppercase) 
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   266
                    do: [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   267
                        :tryName | 
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   268
                        nm := p , tryName , '.class'.
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   269
                        nm asFilename exists ifTrue: [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   270
                            (Java isExcludedFromClassPath: nm) ifFalse: [
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   271
                                self breakPoint:#mh.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   272
                                "means we are successfully going to read something :)"
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   273
                                rslt := self readFile: nm ignoring: classesBeingLoaded.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   274
                                rslt notNil ifTrue: [                                   
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   275
                                    ^ rslt.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   276
                                ].
1021
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   277
                            ]
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   278
                        ].
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   279
                    ]
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   280
        ] ifFalse: [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   281
            ((zipFile := p asFilename withSuffix: 'jar') exists 
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   282
                or: [ (zipFile := p asFilename withSuffix: 'zip') exists ]) 
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   283
                    ifTrue: [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   284
                        zar := JavaArchiveCache at: zipFile
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   285
                                    ifAbsentPut: [ ZipArchive oldFileNamed: zipFile ].
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   286
                        read := [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   287
                                nm := clsName , '.class'.
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   288
                                entry := zar extract: nm.
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   289
                                entry notNil ifTrue: [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   290
                                    (Java isExcludedFromClassPath: nm) ifFalse: [
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   291
                                        rslt := self readStream: (entry readStream) ignoring: classesBeingLoaded.
1021
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   292
                                        rslt notNil ifTrue: [ ^ rslt ].
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   293
                                    ]
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   294
                                ]
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   295
                            ].
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   296
                        JavaClassReader invalidClassFormatSignal 
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   297
                            handle: [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   298
                                "Kludge, sometimes zar gets corrupted"
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   299
                                zar := JavaArchiveCache at: zipFile put: (ZipArchive oldFileNamed: zipFile).
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   300
                                read value
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   301
                            ]
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   302
                            do: [ read value ].
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   303
                    ]
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   304
        ]
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   305
    ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   306
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   307
  
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   308
    "Created: / 15-04-1996 / 14:58:53 / cg"
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   309
    "Modified: / 20-10-1998 / 17:24:54 / cg"
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   310
    "Modified: / 08-09-2011 / 08:10:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   311
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   312
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   313
readFile: aFilename ignoring: classesBeingLoaded 
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   314
    "reads a class from aFilename and returns it.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   315
     The JavaClass is NOT installed as global and unresolved
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   316
     refs are NOT patched."
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   317
    
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   318
    | inStream  javaClass |
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   319
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   320
    [ inStream := aFilename asFilename readStream. ] on: StreamError
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   321
        do: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   322
    :ex | 
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   323
    Logger 
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   324
        log: ('no file: ' , aFilename asString)
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   325
        severity: #error
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   326
        facility: 'JVM'.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   327
    self halt.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   328
    ^ nil
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   329
].
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   330
    javaClass := self readStream: inStream ignoring: classesBeingLoaded.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   331
    (javaClass notNil and: [ javaClass isJavaClass ]) ifTrue: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   332
        javaClass setBinaryFilePath: (inStream pathName).
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   333
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   334
    inStream close.
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   335
    AbsolutelySilent ifFalse: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   336
        Logger 
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   337
            log: 'loaded class ' , javaClass displayString
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   338
            severity: #info
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   339
            facility: 'JVM'.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   340
    ].
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   341
    ^ javaClass.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   342
898
94eb1038a323 - add native to close InputFileStream
vranyj1
parents: 890
diff changeset
   343
    "Created: / 15-04-1996 / 14:58:53 / cg"
94eb1038a323 - add native to close InputFileStream
vranyj1
parents: 890
diff changeset
   344
    "Modified: / 09-05-1998 / 01:44:24 / cg"
1000
cfa982260238 Lot of debug/info prints rewritten to use Logger
vranyj1
parents: 992
diff changeset
   345
    "Modified: / 14-09-2011 / 22:20:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   346
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   347
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   348
readStream: aStream ignoring: classesBeingLoaded 
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   349
    "reads a class from aStream and returns it.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   350
     The JavaClass is not installed as global"
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   351
    
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   352
    | javaClass |
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   353
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   354
    javaClass := JavaClassReader new readStream: aStream
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   355
                ignoring: classesBeingLoaded.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   356
    Logger 
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   357
        log: 'loaded class ' , javaClass displayString
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   358
        severity: #info
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   359
        facility: 'JVM'.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   360
    ^ javaClass.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   361
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   362
    "Modified: / 30-03-1998 / 18:14:40 / cg"
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   363
    "Modified: / 09-05-2011 / 23:15:30 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1000
cfa982260238 Lot of debug/info prints rewritten to use Logger
vranyj1
parents: 992
diff changeset
   364
    "Modified: / 14-09-2011 / 22:21:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   365
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   366
1021
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   367
!JavaClassReader class methodsFor:'helpers'!
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   368
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   369
getCleanClassNameFrom: className 
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   370
    | cleanClassName |
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   371
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   372
    cleanClassName := className utf8Encoded.
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   373
    (cleanClassName matches: '*\[*') ifTrue: [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   374
        cleanClassName := cleanClassName 
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   375
                    copyFrom: (cleanClassName lastIndexOf: $[) + 1
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   376
                    to: cleanClassName size.
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   377
    ].
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   378
    (cleanClassName startsWith:$L) ifTrue: [cleanClassName := cleanClassName copyFrom:2 to: cleanClassName size - 1].
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   379
    (cleanClassName endsWith: '[]') ifTrue: [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   380
        ('oops - loading of ' , className , ' not supported') infoPrintCR.
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   381
        self halt: 'should not happen'.
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   382
        ^ nil
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   383
    ].
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   384
    (cleanClassName includes: $.) ifTrue: [
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   385
        cleanClassName := cleanClassName asString copyReplaceAll: $. with: $/
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   386
    ].
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   387
    ^ cleanClassName.
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   388
!
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   389
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   390
makeArrayOf: loadedJavaClass withDimensions: numOfDimensions 
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   391
    | arrayClass |
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   392
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   393
    arrayClass := loadedJavaClass.
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   394
    numOfDimensions timesRepeat: [ arrayClass := arrayClass javaArrayClass. ].
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   395
    ^ arrayClass.
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   396
! !
8ae6c261878a changed class loaders order, loading of primitive arrays, refactoring coming soon..
hlopkmar
parents: 1000
diff changeset
   397
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   398
!JavaClassReader class methodsFor:'obsolete'!
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   399
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   400
resolveClass: aJavaClass 
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   401
    "Resolve a particular classes' constants.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   402
     Perform all class initialization functions
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   403
     (of those which are not yet initialized)."
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   404
    
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   405
    | loader  classToLoad |
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   406
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   407
    self breakPoint: #mh.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   408
     "new resolving does not need this - shouldn't be called at all"
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   409
    LazyClassLoading ifFalse: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   410
        loader := (aJavaClass classLoader).
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   411
        [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   412
            classToLoad := nil.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   413
            aJavaClass constantPool do: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   414
                :item | 
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   415
                | itemClass |
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   416
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   417
                itemClass := item class.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   418
                itemClass == JavaUnresolvedClassConstant ifTrue: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   419
                    classToLoad := item className.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   420
                    
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   421
"/                ] ifFalse:[
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   422
"/                    itemClass == JavaUnresolvedMethodrefConstant ifTrue:[
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   423
"/self halt.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   424
"/                    ] ifFalse:[
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   425
"/                        itemClass == JavaUnresolvedInterfaceMethodrefConstant ifTrue:[
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   426
"/self halt.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   427
"/                        ]
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   428
"/                    ]
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   429
                ].
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   430
            ].
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   431
            classToLoad notNil ifTrue: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   432
                loader isNil ifTrue: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   433
                    Java javaRegistry classForName: classToLoad.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   434
                ] ifFalse: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   435
                    "/
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   436
                    "/ the aquired loader is a javaClassLoader
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   437
                    "/ which expects an URL as arg.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   438
                    "/
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   439
                    "/ classURL := Java as_URL:('file:' , nextUnresolved asString , '.class').
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   440
                    "/ loader loadClass:classURL
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   441
                    loader perform: #'loadClass(Ljava/lang/String;)Ljava/lang/Class;'
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   442
                        with: (Java as_String: (classToLoad asString)).
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   443
                ]
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   444
            ].
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   445
            classToLoad notNil.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   446
        ] whileTrue.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   447
        aJavaClass isInitialized ifFalse: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   448
            Silent ifFalse: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   449
                'performing class initialization of ' print.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   450
                aJavaClass fullName printCR.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   451
            ].
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   452
            aJavaClass classInit
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   453
        ].
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   454
    ]
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   455
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   456
    "Created: / 20.10.1998 / 17:53:22 / cg"
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
   457
    "Modified: / 20.10.1998 / 17:59:09 / cg"
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   458
! !
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   459
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   460
!JavaClassReader methodsFor:'accessing'!
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   461
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   462
constants   
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   463
^ constants.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   464
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   465
    "Created: / 10-05-2011 / 13:48:30 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   466
!
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   467
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   468
constants: aJavaConstantPool
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   469
    constants := aJavaConstantPool.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   470
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   471
    "Created: / 10-05-2011 / 13:48:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   472
!
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   473
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   474
stream
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   475
^ inStream.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   476
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   477
    "Created: / 09-05-2011 / 23:22:38 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   478
!
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   479
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   480
stream:aReadStream
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   481
    inStream := aReadStream.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   482
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   483
    "Created: / 09-05-2011 / 23:23:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   484
! !
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   485
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   486
!JavaClassReader methodsFor:'file reading'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   487
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   488
readClassFileIgnoring: classesbeingLoaded 
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   489
    "reads a class from inStream and returns it.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   490
     The JavaClass is not installed as global and its constants
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   491
     (especially strings) may not be fully resolved."
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   492
    
798
b534e73eaf7e JavaClassReader2 now uses correct superclass loading
hlopkmar
parents: 797
diff changeset
   493
    | magic  access_flags  this_class_index  super_class  super_class_index  this_class_ref  existingSuperClass  fields  interfaces  staticFields  nStatic  superClassName  thisClassName  existing_class  thisMetaClass |
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   494
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   495
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   496
    "/ read magic, determine byte order
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   497
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   498
    msb := true.
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   499
    magic := inStream nextUnsignedLongMSB: true.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   500
    magic = (self class magic_MSB) 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   501
        ifFalse: 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   502
            [ magic = (self class magic_LSB) 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   503
                ifFalse: 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   504
                    [ InvalidClassFormatSignal raiseErrorString: 'not a java class file'.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   505
                    ^ nil ].
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   506
            msb := false.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   507
            Verbose ifTrue: [ Transcript showCR: 'file is lsb' ]. ]
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   508
        ifTrue: [ Verbose ifTrue: [ Transcript showCR: 'file is msb' ]. ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   509
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   510
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   511
    "/ get version
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   512
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   513
    
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   514
    minorVsn := inStream nextUnsignedShortMSB: msb.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   515
    majorVsn := inStream nextUnsignedShortMSB: msb.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   516
    ((self class fileMajorVersions includes: majorVsn) not 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   517
        or: [ (self class fileMinorVersions includes: minorVsn) not ]) 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   518
            ifTrue: 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   519
                [ Transcript
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   520
                    show: 'warning this file has version ';
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   521
                    show: majorVsn;
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   522
                    show: '.';
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   523
                    showCR: minorVsn. ].
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   524
    Verbose 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   525
        ifTrue: 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   526
            [ Transcript
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   527
                show: 'version = ';
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   528
                show: (majorVsn printString);
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   529
                show: '.';
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   530
                showCR: (minorVsn printString). ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   531
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   532
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   533
    "/ get constant pool
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   534
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   535
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   536
    self readConstantPool.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   537
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   538
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   539
    "/ access flags
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   540
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   541
    
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   542
    access_flags := inStream nextUnsignedShortMSB: msb.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   543
    this_class_index := inStream nextUnsignedShortMSB: msb.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   544
    super_class_index := inStream nextUnsignedShortMSB: msb.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   545
    super_class_index == 0 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   546
        ifTrue: [ super_class := nil ]
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   547
        ifFalse: 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   548
            [ super_class := constants at: super_class_index.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   549
            superClassName := super_class fullName.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   550
            
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   551
            "/ special for ST-classes
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   552
            
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   553
            (superClassName startsWith: 'smalltalk.') 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   554
                ifTrue: 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   555
                    [ "/ a Smalltalk class
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   556
                    superClassName := superClassName copyFrom: 11.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   557
                    existingSuperClass := Smalltalk at: superClassName asSymbol.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   558
                    existingSuperClass notNil 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   559
                        ifTrue: [ super_class := existingSuperClass ]
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   560
                        ifFalse: 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   561
                            [ "/ self halt - must load superclass ...
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   562
                             ] ]
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   563
                ifFalse: 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   564
                    [ "/ a JAVA class
798
b534e73eaf7e JavaClassReader2 now uses correct superclass loading
hlopkmar
parents: 797
diff changeset
   565
                    super_class := Java classNamed: superClassName.
b534e73eaf7e JavaClassReader2 now uses correct superclass loading
hlopkmar
parents: 797
diff changeset
   566
                    super_class ifNil: 
799
0c3c4a787b1c small refactoring + forgotten assignment
hlopkmar
parents: 798
diff changeset
   567
                            [ super_class := self loadSuperclassIdentifiedBy: (constants at: super_class_index)
798
b534e73eaf7e JavaClassReader2 now uses correct superclass loading
hlopkmar
parents: 797
diff changeset
   568
                                ignoring: classesbeingLoaded ].
b534e73eaf7e JavaClassReader2 now uses correct superclass loading
hlopkmar
parents: 797
diff changeset
   569
                    super_class ifNil: [ self halt: 'Cannot find super class?!!' ]. ]. ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   570
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   571
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   572
    "/ get interfaces
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   573
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   574
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   575
    interfaces := self readInterfaces.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   576
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   577
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   578
    "/ get fields
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   579
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   580
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   581
    fields := self readFieldInfofields.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   582
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   583
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   584
    "/ create the fields as instVars
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   585
    "/ static fields are created as class-InstVars
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   586
    "/
798
b534e73eaf7e JavaClassReader2 now uses correct superclass loading
hlopkmar
parents: 797
diff changeset
   587
    
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   588
    staticFields := fields select: [:f | f isStatic ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   589
    nStatic := staticFields size.
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   590
    this_class_ref := constants at: this_class_index.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   591
    thisClassName := this_class_ref fullName.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   592
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   593
    "/ care for smalltalk classes ...
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   594
    
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   595
    (thisClassName startsWith: 'smalltalk.') 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   596
        ifTrue: 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   597
            [ thisClassName := thisClassName copyFrom: 11.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   598
            existing_class := Smalltalk at: thisClassName asSymbol.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   599
            existing_class notNil 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   600
                ifTrue: 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   601
                    [ self halt: ('overloading existing class: ' , thisClassName).
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   602
                    thisClassName := (thisClassName , '_new') asSymbol. ].
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   603
            thisMetaClass := Metaclass new.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   604
            thisMetaClass setSuperclass: super_class class.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   605
            thisMetaClass instSize: (super_class class instSize + nStatic).
775
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
   606
            classBeingLoaded := thisMetaClass new.
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
   607
            classBeingLoaded setSuperclass: super_class.
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
   608
            classBeingLoaded setName: thisClassName asSymbol. ]
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   609
        ifFalse: 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   610
            [ "/ a java class
775
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
   611
            classBeingLoaded := JavaClass fullName: thisClassName numStatic: nStatic.
811
2921f70489c1 - JavaClass: field lookup improved.
vranyj1
parents: 809
diff changeset
   612
2921f70489c1 - JavaClass: field lookup improved.
vranyj1
parents: 809
diff changeset
   613
            fields := fields select: [:f | f isStatic not ].
2921f70489c1 - JavaClass: field lookup improved.
vranyj1
parents: 809
diff changeset
   614
2921f70489c1 - JavaClass: field lookup improved.
vranyj1
parents: 809
diff changeset
   615
            JavaClass setInstanceVariableStringFromFields: staticFields
2921f70489c1 - JavaClass: field lookup improved.
vranyj1
parents: 809
diff changeset
   616
                      in: classBeingLoaded class.
2921f70489c1 - JavaClass: field lookup improved.
vranyj1
parents: 809
diff changeset
   617
2921f70489c1 - JavaClass: field lookup improved.
vranyj1
parents: 809
diff changeset
   618
            classBeingLoaded setStaticFields: staticFields.
2921f70489c1 - JavaClass: field lookup improved.
vranyj1
parents: 809
diff changeset
   619
            classBeingLoaded initializeStaticFields.
775
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
   620
            classBeingLoaded setAccessFlags: access_flags.
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
   621
            classBeingLoaded setSuperclass: super_class.
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
   622
            classBeingLoaded setConstantPool: constants.
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
   623
            classBeingLoaded setFields: fields.
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
   624
            classBeingLoaded setInterfaces: interfaces.
809
0fd3dbe06abb Few fixes in resolving.
vranyj1
parents: 800
diff changeset
   625
            ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   626
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   627
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   628
    "/ get methods
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   629
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   630
    
775
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
   631
    self readMethodsFor: classBeingLoaded.
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
   632
    self readAttributesFor: classBeingLoaded.
809
0fd3dbe06abb Few fixes in resolving.
vranyj1
parents: 800
diff changeset
   633
"/    classBeingLoaded constantPool 
0fd3dbe06abb Few fixes in resolving.
vranyj1
parents: 800
diff changeset
   634
"/        do: [:each | self updateOwnerInCPItem: each ].
796
9b3e00dd3196 Small fix, so JavaFields have their javaClass always set.
hlopkmar
parents: 784
diff changeset
   635
    classBeingLoaded fields do: [:each | self updateOwnerInField: each ].
797
8d4e7c17eadd fixed JavaClassReader so it always sets staticFields
hlopkmar
parents: 796
diff changeset
   636
    classBeingLoaded staticFields do: [:each | self updateOwnerInField: each ].
992
6d3e3d937fda Class loader mess cleanup, more will come later...
vranyj1
parents: 984
diff changeset
   637
6d3e3d937fda Class loader mess cleanup, more will come later...
vranyj1
parents: 984
diff changeset
   638
        
775
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
   639
    ^ classBeingLoaded.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   640
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   641
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   642
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   643
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   644
     JavaClassReader loadFile:'foo.cls'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   645
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   646
     JavaClassReader verbose:true.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   647
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/java/lang/ArithmeticException.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   648
     JavaClassReader loadFile:'/phys/ibm3/java/lib/java/lang/ArithmeticException.class'"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   649
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   650
    "Created: / 15-04-1996 / 15:02:47 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   651
    "Modified: / 12-11-1998 / 21:14:45 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   652
    "Modified: / 15-10-2010 / 17:37:38 / Jan Kurs <kurs.jan@post.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   653
    "Modified: / 28-01-2011 / 15:09:48 / Marcel Hlopko <hlopik@gmail.com>"
800
11f2222f816d forgotten return and fixed broken class reading (static field were not set up correctly)..
hlopkmar
parents: 799
diff changeset
   654
    "Modified: / 18-05-2011 / 15:30:29 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
992
6d3e3d937fda Class loader mess cleanup, more will come later...
vranyj1
parents: 984
diff changeset
   655
    "Modified: / 08-09-2011 / 08:25:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   656
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   657
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   658
readStream:aStream ignoring:classesBeingLoaded
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   659
    "reads a class from aStream and returns it.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   660
     The JavaClass is not installed as global"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   661
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   662
    inStream := aStream.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   663
    inStream binary.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   664
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   665
    ^ self readClassFileIgnoring:classesBeingLoaded
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   666
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   667
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   668
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   669
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   670
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   671
    "Created: 15.4.1996 / 15:00:55 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   672
    "Modified: 15.4.1996 / 15:06:18 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   673
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   674
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   675
!JavaClassReader methodsFor:'file reading - attributes'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   676
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   677
readAnnotationDefaultAttributeFor:something 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   678
    "/        ('JAVA [info]: unhandled attribute: AnnotationDefault') infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   679
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   680
    |len startPos endPos annotationDefault|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   681
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   682
    self assert:something isJavaMethod
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   683
        description:'AnnotationDefault may only occure for methods!!'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   684
    len := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   685
    startPos := inStream position.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   686
    annotationDefault := (something ensureHasAnnotations)
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   687
                default:(JavaAnnotationDefault new 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   688
                            value:(self readAnnotationValueFor:something));
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   689
                default.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   690
    endPos := inStream position.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   691
    inStream position:startPos.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   692
    annotationDefault bytes:(inStream next:len).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   693
    self assert:inStream position = endPos
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   694
        description:'self readAnnotationValueFor: something is reading what it shouldn'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   695
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   696
    "Modified: / 28-02-2011 / 17:08:28 / Marcel Hlopko <hlopik@gmail.com>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   697
    "Modified: / 03-03-2011 / 23:06:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   698
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   699
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   700
readAnnotationFor:something 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   701
    | typeIndex  type  result  attrsCount |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   702
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   703
    typeIndex := inStream nextUnsignedShortMSB:msb.
879
8bb82d1ea058 Cleanup phase 3: old JavaRef class removed
vranyj1
parents: 877
diff changeset
   704
    type := constants at:typeIndex.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   705
    attrsCount := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   706
    result := JavaAnnotation for:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   707
    result name:type.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   708
    attrsCount timesRepeat:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   709
            [ | nameIndex  name  valueIndex  attr |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   710
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   711
            nameIndex := inStream nextUnsignedShortMSB:msb.
879
8bb82d1ea058 Cleanup phase 3: old JavaRef class removed
vranyj1
parents: 877
diff changeset
   712
            name := constants at:nameIndex.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   713
            attr := self readAnnotationValueFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   714
            attr name:name.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   715
            result values at:attr name put:attr.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   716
            AnnotationsVerbose 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   717
                ifTrue:[ ('JAVA [INFO]: Reading annotation attribute: ' , name) infoPrintCR. ]. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   718
    ^ result.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   719
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   720
    "Created: / 17-12-2010 / 16:21:28 / Marcel Hlopko <hlopik@gmail.com>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   721
    "Modified: / 25-02-2011 / 12:25:36 / Marcel Hlopko <hlopik@gmail.com>"
879
8bb82d1ea058 Cleanup phase 3: old JavaRef class removed
vranyj1
parents: 877
diff changeset
   722
    "Modified: / 27-07-2011 / 09:37:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   723
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   724
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   725
readAnnotationValueFor:something 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   726
    | tag  result |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   727
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   728
    tag := (inStream nextByte) asCharacter.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   729
    tag = $e 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   730
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   731
            [ result := JavaAnnotationEnumValue for:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   732
            result nameIndex:(inStream nextUnsignedShortMSB:msb).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   733
            result valueIndex:(inStream nextUnsignedShortMSB:msb).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   734
            AnnotationsVerbose 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   735
                ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   736
                    [ ('JAVA [INFO]: Reading annotation enum value: ' , result name printString, ' -> ' 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   737
                        , result value printString) infoPrintCR ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   738
            ^ result ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   739
    tag = $c 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   740
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   741
            [ result := JavaAnnotationClassValue for:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   742
            result classIndex:(inStream nextUnsignedShortMSB:msb).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   743
            AnnotationsVerbose 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   744
                ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   745
                    [ ('JAVA [INFO]: Reading annotation class value: ' , result name printString, ' -> ' 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   746
                        , result value printString) infoPrintCR ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   747
            ^ result ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   748
    tag = $@ 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   749
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   750
            [ result := JavaAnnotationNestedAnnotationValue for:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   751
            result classIndex:(inStream nextUnsignedShortMSB:msb).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   752
            AnnotationsVerbose 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   753
                ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   754
                    [ ('JAVA [INFO]: Reading annotation nested annotation value: ' , result name printString
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   755
                        , ' -> ' , result value printString) 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   756
                        infoPrintCR ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   757
            ^ result ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   758
    tag = $[ 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   759
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   760
            [ result := JavaAnnotationArrayValue for:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   761
            result count:(inStream nextUnsignedShortMSB:msb).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   762
            AnnotationsVerbose 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   763
                ifTrue:[ ('JAVA [INFO]: Reading annotation array value') infoPrintCR ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   764
            1 to:result count
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   765
                do:[:index | result values at:index put:(self readAnnotationValueFor:something) ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   766
            AnnotationsVerbose 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   767
                ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   768
                    [ ('JAVA [INFO]: Finished reading annotation array value: ' 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   769
                        , result value printString) infoPrintCR ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   770
            ^ result ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   771
    result := JavaAnnotationPrimitiveValue for:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   772
    result valueIndex:(inStream nextUnsignedShortMSB:msb).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   773
     AnnotationsVerbose 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   774
                ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   775
                    [ ('JAVA [INFO]: Finished reading annotation primitive value: ' 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   776
                             , result name printString , ' -> ' , result value printString) infoPrintCR ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   777
    ^ result.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   778
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   779
    "Created: / 17-12-2010 / 16:44:14 / Marcel Hlopko <hlopik@gmail.com>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   780
    "Modified: / 28-02-2011 / 16:12:09 / Marcel Hlopko <hlopik@gmail.com>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   781
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   782
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   783
readAttribute:attributeName for:something 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   784
    "/ implemented JAVA attributes
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   785
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   786
    (attributeName = 'ConstantValue') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   787
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   788
            [ self readConstantValueAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   789
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   790
    (attributeName = 'Code') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   791
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   792
            [ self readCodeAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   793
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   794
    (attributeName = 'Exceptions') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   795
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   796
            [ self readExceptionsAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   797
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   798
    (attributeName = 'InnerClasses') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   799
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   800
            [ self readInnerClassesAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   801
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   802
    (attributeName = 'EnclosingMethod') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   803
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   804
            [ self readEnclosingMethodAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   805
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   806
    (attributeName = 'LineNumberTable') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   807
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   808
            [ self readLineNumberTableAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   809
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   810
    (attributeName = 'LocalVariableTable') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   811
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   812
            [ self readLocalVariableTableAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   813
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   814
    (attributeName = 'LocalVariableTypeTable') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   815
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   816
            [ self readLocalVariableTypeTableAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   817
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   818
    (attributeName = 'SourceFile') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   819
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   820
            [ self readSourceFileAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   821
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   822
    (attributeName = 'SourceDebugExtension') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   823
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   824
            [ self readSourceDebugExtensionAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   825
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   826
    (attributeName = 'Synthetic') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   827
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   828
            [ self readSyntheticAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   829
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   830
    (attributeName = 'Signature') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   831
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   832
            [ self readSignatureAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   833
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   834
    (attributeName = 'Deprecated') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   835
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   836
            [ self readDeprecatedAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   837
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   838
    (attributeName = 'RuntimeVisibleAnnotations') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   839
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   840
            [ self readRuntimeAnnotationsAttributeFor:something visible:true.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   841
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   842
    (attributeName = 'RuntimeInvisibleAnnotations') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   843
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   844
            [  self readRuntimeAnnotationsAttributeFor:something visible:false.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   845
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   846
    (attributeName = 'RuntimeVisibleParameterAnnotations') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   847
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   848
            [ self readRuntimeParameterAnnotationsAttributeFor:something visible:true.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   849
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   850
    (attributeName = 'RuntimeInvisibleParameterAnnotations') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   851
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   852
            [ self readRuntimeParameterAnnotationsAttributeFor:something visible:false.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   853
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   854
    (attributeName = 'AnnotationDefault') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   855
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   856
            [ self readAnnotationDefaultAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   857
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   858
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   859
    "/ ignored JAVA attributes
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   860
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   861
    (attributeName = 'FastJavac1.0') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   862
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   863
            [ "/        ('JAVA [info]: unhandled attribute: ' , attributeName) infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   864
            self skipAttribute:attributeName.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   865
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   866
    (attributeName = 'AbsoluteSourcePath') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   867
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   868
            [ ('JAVA [info]: unhandled attribute: ' , attributeName) infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   869
            self skipAttribute:attributeName.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   870
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   871
    (attributeName startsWith:((Character value:13) asString , 'WARNING:')) 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   872
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   873
            [ "/        ('JAVA [info]: unhandled attribute: ' , attributeName) infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   874
            self skipAttribute:attributeName.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   875
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   876
    (attributeName = 'StackMapTable') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   877
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   878
            [ "/        ('JAVA [info]: unhandled attribute: ' , attributeName) infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   879
            self readStackMapTableAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   880
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   881
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   882
    "/ implemented ST attributes
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   883
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   884
    (attributeName = 'STLiterals') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   885
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   886
            [ self readSTLiteralsAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   887
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   888
    (attributeName = 'ClassRevision') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   889
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   890
            [ self readSTClassRevisionAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   891
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   892
    (attributeName = 'ClassPackage') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   893
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   894
            [ self readSTClassPackageAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   895
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   896
    (attributeName = 'ClassCategory') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   897
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   898
            [ self readSTClassCategoryAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   899
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   900
    (attributeName = 'ClassVarNames') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   901
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   902
            [ self readSTClassVarNamesAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   903
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   904
    (attributeName = 'ClassInstVarNames') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   905
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   906
            [ self readSTClassInstVarNamesAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   907
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   908
    (attributeName = 'InstVarNames') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   909
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   910
            [ self readSTInstVarNamesAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   911
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   912
    (attributeName = 'STCode') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   913
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   914
            [ self readSTCodeAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   915
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   916
    (attributeName = 'MethodCategory') 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   917
        ifTrue:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   918
            [ self readSTMethodCategoryAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   919
            ^ self. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   920
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   921
    "/ unknown attributes
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   922
    
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   923
    ('JAVA [warning]: unrecognized attribute: ' , attributeName) infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   924
    self skipAttribute:attributeName.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   925
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   926
    "Modified: / 03-12-1998 / 13:13:42 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   927
    "Modified: / 25-02-2011 / 18:09:21 / Marcel Hlopko <hlopik@gmail.com>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   928
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   929
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   930
readAttributeFor:something
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   931
    |attribute_name_index attribute_name attribute_length attribute_info|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   932
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   933
    Verbose ifTrue:[Transcript show:'attrib at pos: '; showCR:inStream position].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   934
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   935
    attribute_name_index := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   936
    attribute_name_index == 0 ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   937
        self halt.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   938
        "/self skipAttribute:'unnamed'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   939
        ^ self.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   940
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   941
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   942
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   943
    "/ UNDOC feature ?
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   944
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   945
    attribute_name_index > constants size ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   946
        attribute_name_index == 16rb700 ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   947
            self halt.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   948
        ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   949
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   950
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   951
    attribute_name := constants at:attribute_name_index.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   952
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   953
    Verbose ifTrue:[Transcript show:'attrib name: '; showCR:attribute_name].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   954
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   955
    self readAttribute:attribute_name for:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   956
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   957
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   958
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   959
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   960
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   961
    "Created: / 15-04-1996 / 15:40:17 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   962
    "Modified: / 09-04-1998 / 18:13:34 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   963
    "Modified: / 19-10-2010 / 21:43:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   964
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   965
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   966
readAttributesFor:something
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   967
    |attributes_count|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   968
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   969
    attributes_count := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   970
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   971
    1 to:attributes_count do:[:i |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   972
	self readAttributeFor:something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   973
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   974
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   975
    "Modified: 15.4.1996 / 15:33:28 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   976
    "Created: 15.4.1996 / 15:40:17 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   977
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   978
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   979
readDeprecatedAttributeFor:aJavaMethodWithHandler
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   980
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   981
    self skipAttribute:'Deprecated'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   982
    ^self
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   983
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   984
    "Created: / 18-10-2010 / 22:26:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   985
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   986
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   987
readEnclosingMethodAttributeFor:something
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   988
"/        ('JAVA [info]: unhandled attribute: EnclosingMethod') infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   989
        self skipAttribute:'EnclosingMethod'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   990
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   991
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   992
readInnerClassesAttributeFor:something
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   993
"/        ('JAVA [info]: unhandled attribute: InnerClasses') infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   994
        self skipAttribute:'InnerClasses'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   995
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   996
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   997
readLocalVariableTypeTableAttributeFor:something
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   998
"/        ('JAVA [info]: unhandled attribute: LocalVariableTypeTable') infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   999
        self skipAttribute:'LocalVariableTypeTable'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1000
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1001
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1002
readRuntimeAnnotationsAttributeFor: something visible: visible 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1003
    | length  annotationsCount  annotations  rawAnnotations  startPos  endPos |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1004
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1005
    self assert: inStream isPositionable
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1006
        message: '.class file stream must be positionable'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1007
    length := inStream nextUnsignedLongMSB: msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1008
    startPos := inStream position.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1009
    annotationsCount := inStream nextUnsignedShortMSB: msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1010
    annotationsCount = 0 ifTrue: [ ^ nil ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1011
    annotations := visible ifTrue: [something ensureHasAnnotations ensureRuntimeVisible] ifFalse: [something ensureHasAnnotations ensureRuntimeInvisible].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1012
    annotationsCount timesRepeat: 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1013
            [ | currentAnnotation |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1014
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1015
            currentAnnotation := self readAnnotationFor: something.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1016
            annotations at: currentAnnotation name put: currentAnnotation. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1017
     "Cut raw annotations as required by getRawAnnotations()"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1018
    endPos := inStream position.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1019
    inStream position: startPos.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1020
    rawAnnotations := inStream next: length.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1021
    inStream position ~= endPos 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1022
        ifTrue: [ self halt: 'annotations are probably reading what they shouldnt' ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1023
    annotations rawAnnotations: rawAnnotations.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1024
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1025
    "Modified: / 07-01-2011 / 22:00:07 / Jan Kurs <kurs.jan@post.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1026
    "Modified: / 25-02-2011 / 18:45:58 / Marcel Hlopko <hlopik@gmail.com>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1027
    "Modified: / 03-03-2011 / 23:01:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1028
    "Modified: / 16-03-2011 / 16:57:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1029
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1030
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1031
readRuntimeParameterAnnotationsAttributeFor: javaMethod visible: visible 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1032
    | length  paramsCount  annotationsCount rawAnnotations  startPos  endPos |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1033
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1034
    self assert: inStream isPositionable
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1035
        message: '.class file stream must be positionable'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1036
    length := inStream nextUnsignedLongMSB: msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1037
    startPos := inStream position.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1038
    paramsCount := inStream nextByte.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1039
    paramsCount = 0 ifTrue: [ ^ nil ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1040
    1 to: paramsCount
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1041
        do: 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1042
            [:paramIndex | 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1043
            annotationsCount := inStream nextUnsignedShortMSB: msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1044
            annotationsCount > 0 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1045
                ifTrue: 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1046
                    [ | annotations |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1047
                    annotations := visible 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1048
                                ifTrue: 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1049
                                    [ javaMethod ensureHasAnnotations ensureVisibleParameterAnnotationsAt: paramIndex ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1050
                                ifFalse: 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1051
                                    [javaMethod ensureHasAnnotations ensureInvisibleParameterAnnotationsAt: paramIndex ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1052
                    annotationsCount timesRepeat: 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1053
                    [ | annotation |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1054
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1055
                    annotation := self readAnnotationFor: javaMethod.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1056
                    annotations at: (annotation name) put: annotation. ] ]].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1057
    endPos := inStream position.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1058
    rawAnnotations := inStream position: startPos.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1059
    rawAnnotations := inStream next: length.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1060
    inStream position ~= endPos 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1061
        ifTrue: [ self halt: 'annotations are probably reading what they shouldnt' ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1062
    javaMethod annotations rawAnnotations: rawAnnotations.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1063
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1064
    "Modified: / 28-02-2011 / 17:05:47 / Marcel Hlopko <hlopik@gmail.com>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1065
    "Modified: / 16-03-2011 / 17:26:42 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1066
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1067
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1068
readSignatureAttributeFor:something
912
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 908
diff changeset
  1069
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 908
diff changeset
  1070
    |attribute_length signature_index signature|
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 908
diff changeset
  1071
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 908
diff changeset
  1072
    attribute_length := inStream nextUnsignedLongMSB:msb.
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 908
diff changeset
  1073
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 908
diff changeset
  1074
    signature_index := inStream nextUnsignedShortMSB:msb.
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 908
diff changeset
  1075
    signature := constants at:signature_index.
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 908
diff changeset
  1076
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 908
diff changeset
  1077
    something setSignature: signature.
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 908
diff changeset
  1078
e651488f5741 Many fixes in reflection, expecially for generic types support
vranyj1
parents: 908
diff changeset
  1079
    "Modified: / 13-08-2011 / 00:28:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1080
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1081
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1082
readSourceDebugExtensionAttributeFor:something
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1083
"/        ('JAVA [info]: unhandled attribute: SourceDebugExtension') infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1084
        self skipAttribute:'SourceDebugExtension'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1085
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1086
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1087
readSourceFileAttributeFor:aClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1088
    |attribute_length sourceFile_index sourceFile|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1089
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1090
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1091
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1092
    sourceFile_index := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1093
    sourceFile := constants at:sourceFile_index.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1094
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1095
    aClass isJavaClass ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1096
        aClass setSourceFile:sourceFile.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1097
    ] ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1098
        aClass setClassFilename:sourceFile
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1099
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1100
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1101
    Verbose ifTrue:[Transcript show:'sourceFile: '; showCR:sourceFile].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1102
    ^ true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1103
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1104
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1105
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1106
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1107
     JavaClassReader loadFile:'foo.cls'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1108
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1109
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1110
    "Created: / 15.4.1996 / 15:40:17 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1111
    "Modified: / 12.5.1998 / 22:01:07 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1112
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1113
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1114
readStackMapTableAttributeFor:something 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1115
"/        ('JAVA [info]: unhandled attribute: StackMapTable') infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1116
    self skipAttribute:'StackMapTable'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1117
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1118
    "Created: / 09-02-2011 / 01:19:20 / Marcel Hlopko <hlopik@gmail.com>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1119
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1120
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1121
readSyntheticAttributeFor:something
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1122
"/        ('JAVA [info]: unhandled attribute: Synthetic') infoPrintCR.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1123
        self skipAttribute:'Synthetic'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1124
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1125
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1126
skipAttribute:attributeName
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1127
    "dont know about this attribute - skip it here"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1128
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1129
    |attribute_length attribute_info|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1130
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1131
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1132
    attribute_info := ByteArray new:(attribute_length).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1133
    inStream nextBytes:attribute_length into:attribute_info startingAt:1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1134
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1135
    Verbose ifTrue:[Transcript show:'skipped '; show:attributeName; showCR:'-attribute'].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1136
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1137
    "Created: / 9.4.1998 / 18:12:46 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1138
    "Modified: / 9.4.1998 / 18:13:20 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1139
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1140
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1141
!JavaClassReader methodsFor:'file reading - attributes-ST'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1142
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1143
readSTClassCategoryAttributeFor:aClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1144
    |attribute_length categoryString_index categoryString|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1145
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1146
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1147
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1148
    categoryString_index := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1149
    categoryString := constants at:categoryString_index.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1150
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1151
    aClass category:categoryString.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1152
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1153
    Verbose ifTrue:[Transcript show:'categoryString: '; showCR:categoryString].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1154
    ^ true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1155
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1156
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1157
     JavaClassReader loadFile:'foo.cls'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1158
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1159
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1160
    "Created: / 9.5.1998 / 02:33:13 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1161
    "Modified: / 9.5.1998 / 02:36:55 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1162
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1163
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1164
readSTClassInstVarNamesAttributeFor:aClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1165
    |attribute_length nameString_index nameString|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1166
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1167
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1168
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1169
    nameString_index := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1170
    nameString := constants at:nameString_index.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1171
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1172
    aClass class instanceVariableString:nameString.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1173
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1174
    Verbose ifTrue:[Transcript show:'nameString: '; showCR:nameString].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1175
    ^ true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1176
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1177
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1178
     JavaClassReader loadFile:'foo.cls'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1179
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1180
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1181
    "Modified: / 12.5.1998 / 22:18:03 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1182
    "Created: / 12.5.1998 / 22:18:24 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1183
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1184
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1185
readSTClassPackageAttributeFor:aClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1186
    |attribute_length packageString_index packageString|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1187
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1188
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1189
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1190
    packageString_index := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1191
    packageString := constants at:packageString_index.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1192
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1193
    aClass package:packageString asSymbol.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1194
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1195
    Verbose ifTrue:[Transcript show:'packageString: '; showCR:packageString].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1196
    ^ true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1197
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1198
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1199
     JavaClassReader loadFile:'foo.cls'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1200
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1201
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1202
    "Modified: / 9.5.1998 / 02:32:38 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1203
    "Created: / 9.5.1998 / 02:33:44 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1204
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1205
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1206
readSTClassRevisionAttributeFor:aClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1207
    |attribute_length revisionString_index revisionString|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1208
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1209
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1210
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1211
    revisionString_index := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1212
    revisionString := constants at:revisionString_index.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1213
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1214
    aClass setBinaryRevision:revisionString.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1215
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1216
    Verbose ifTrue:[Transcript show:'revisionString: '; showCR:revisionString].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1217
    ^ true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1218
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1219
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1220
     JavaClassReader loadFile:'foo.cls'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1221
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1222
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1223
    "Created: / 9.5.1998 / 02:33:13 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1224
    "Modified: / 9.5.1998 / 02:35:01 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1225
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1226
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1227
readSTClassVarNamesAttributeFor:aClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1228
    |attribute_length nameString_index nameString|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1229
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1230
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1231
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1232
    nameString_index := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1233
    nameString := constants at:nameString_index.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1234
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1235
    aClass classVariableString:nameString.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1236
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1237
    Verbose ifTrue:[Transcript show:'nameString: '; showCR:nameString].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1238
    ^ true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1239
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1240
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1241
     JavaClassReader loadFile:'foo.cls'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1242
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1243
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1244
    "Created: / 9.5.1998 / 02:33:13 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1245
    "Modified: / 12.5.1998 / 22:18:03 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1246
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1247
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1248
readSTInstVarNamesAttributeFor:aClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1249
    |attribute_length nameString_index nameString|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1250
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1251
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1252
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1253
    nameString_index := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1254
    nameString := constants at:nameString_index.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1255
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1256
    aClass setInstanceVariableString:nameString.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1257
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1258
    Verbose ifTrue:[Transcript show:'nameString: '; showCR:nameString].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1259
    ^ true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1260
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1261
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1262
     JavaClassReader loadFile:'foo.cls'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1263
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1264
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1265
    "Created: / 12.5.1998 / 22:18:14 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1266
    "Modified: / 12.5.1998 / 22:21:10 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1267
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1268
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1269
!JavaClassReader methodsFor:'file reading - constants'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1270
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1271
readConstant
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1272
    |tag constReader const|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1273
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1274
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1275
    constNeeds2Slots := false.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1276
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1277
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1278
    "/ get tag
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1279
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1280
    tag := inStream nextByte.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1281
    Verbose ifTrue:[Transcript show:'tag = '; showCR:tag].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1282
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1283
    tag >= 250 ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1284
        constReader := #(
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1285
                        "/ ST types
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1286
                        readConstant_ST_Large           "/ 249
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1287
                        readConstant_ST_Special         "/ 250
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1288
                        readConstant_ST_Character       "/ 251
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1289
                        readConstant_ST_ByteArray       "/ 252
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1290
                        readConstant_ST_Array           "/ 253
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1291
                        readConstant_ST_Symbol          "/ 254
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1292
                        readConstant_ST_Reserved        "/ 255
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1293
                    ) at:tag-249+1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1294
    ] ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1295
        constReader := #(
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1296
                        "/ JAVA types
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1297
                        readConstant_Utf8               "/ 1  - now called Utf8
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1298
                        readConstant_Unicode            "/ 2
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1299
                        readConstant_Integer            "/ 3
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1300
                        readConstant_Float              "/ 4
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1301
                        readConstant_Long               "/ 5
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1302
                        readConstant_Double             "/ 6
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1303
                        readConstant_Class              "/ 7
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1304
                        readConstant_String             "/ 8
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1305
                        readConstant_Fieldref           "/ 9
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1306
                        readConstant_Methodref          "/ 10
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1307
                        readConstant_InterfaceMethodref "/ 11
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1308
                        readConstant_NameAndType        "/ 12
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1309
                    ) at:tag ifAbsent:[#readConstant_Undef].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1310
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1311
    ^ self perform:constReader.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1312
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1313
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1314
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1315
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1316
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1317
    "Created: / 15.4.1996 / 15:46:32 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1318
    "Modified: / 9.5.1998 / 01:26:05 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1319
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1320
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1321
readConstantPool
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1322
    | constantPoolSize  const |
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1323
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1324
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1325
    "/ get constant pool
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1326
    "/
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1327
    constantPoolSize := inStream nextUnsignedShortMSB: msb.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1328
    self info: 'constantPoolSize = ' , constantPoolSize printString.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1329
    constants := JavaConstantPool new: constantPoolSize - 1.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1330
    constSlot := 1.
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1331
    [ constSlot < constantPoolSize ] whileTrue: [
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1332
            self info: 'const slot: ' , constSlot printString.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1333
            const := self readConstant.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1334
            constants at: constSlot put: const.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1335
            
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1336
            "/ long & double consts take 2 slots
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1337
            "/ (only first is used)
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1338
            
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1339
            constNeeds2Slots 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1340
                ifTrue: [ constSlot := constSlot + 2. ]
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1341
                ifFalse: [ constSlot := constSlot + 1. ]].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1342
    constSlot := -1.
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1343
    
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1344
    1 to: constantPoolSize - 1
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1345
        do: 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1346
            [:i | 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1347
            | const  value |
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1348
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1349
            const := constants at: i.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1350
            const ifNotNil: 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1351
                    [ "/ kludge for 2-slot constants (which only take 1 slot in ST/X)
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1352
                    (const isKindOf: JavaUnresolvedConstant) 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1353
                        ifTrue: 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1354
                            [ value := const preResolve.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1355
                            value ~~ const ifTrue: [ constants at: i put: value. ] ] ] ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1356
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1357
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1358
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1359
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'"
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1360
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1361
    "Modified: / 07-05-1998 / 11:44:06 / cg"
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1362
    "Created: / 13-05-2011 / 16:52:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1363
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1364
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1365
readConstant_Asciz
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1366
    | len  string |
782
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1367
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1368
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1369
    len := inStream nextUnsignedShortMSB: msb.
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1370
    string := String new: len.
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1371
    inStream 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1372
        nextBytes: len
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1373
        into: string
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1374
        startingAt: 1.
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1375
    Verbose 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1376
        ifTrue: 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1377
            [ Transcript
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1378
                show: 'asciz; string= ';
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1379
                showCR: string ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1380
    ^ string
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1381
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1382
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1383
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1384
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'"
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1385
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1386
    "Created: / 15-04-1996 / 15:15:35 / cg"
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1387
    "Modified: / 15-04-1996 / 16:33:45 / cg"
782
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1388
    "Modified: / 13-05-2011 / 17:31:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1389
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1390
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1391
readConstant_Class
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1392
    | nameIndex |
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1393
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1394
    nameIndex := inStream nextUnsignedShortMSB: msb.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1395
    ((constants at: nameIndex) isNil) 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1396
        ifTrue: 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1397
            [ self info: ('reading class; index=' , nameIndex printString , ' name=' 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1398
                        , (constants at: nameIndex) printString) ]
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1399
        ifFalse: [ self info: ('reading class; index= ' , nameIndex printString) ].
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1400
    ^ JavaClassRef2 in: constants withNameAt: nameIndex.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1401
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1402
    "Modified: / 18-05-2011 / 18:21:16 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1403
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1404
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1405
readConstant_Double
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1406
    |high low aFloat bytes|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1407
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1408
"/ new code - to be tested
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1409
"/    bytes := ByteArray new:8.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1410
"/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1411
"/    inStream nextBytes:8 into:bytes startingAt:1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1412
"/    msb ~~ UninterpretedBytes isBigEndian ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1413
"/        bytes reverse
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1414
"/    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1415
"/    aFloat := bytes doubleAt:1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1416
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1417
"/ old code
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1418
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1419
    high := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1420
    low := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1421
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1422
    aFloat := Float new.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1423
    UninterpretedBytes isBigEndian ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1424
        aFloat basicAt:1 put:((high bitShift:-24) bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1425
        aFloat basicAt:2 put:((high bitShift:-16) bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1426
        aFloat basicAt:3 put:((high bitShift:-8) bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1427
        aFloat basicAt:4 put:(high bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1428
        aFloat basicAt:5 put:((low bitShift:-24) bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1429
        aFloat basicAt:6 put:((low bitShift:-16) bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1430
        aFloat basicAt:7 put:((low bitShift:-8) bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1431
        aFloat basicAt:8 put:(low bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1432
    ] ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1433
        aFloat basicAt:1 put:(low bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1434
        aFloat basicAt:2 put:((low bitShift:-8) bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1435
        aFloat basicAt:3 put:((low bitShift:-16) bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1436
        aFloat basicAt:4 put:((low bitShift:-24) bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1437
        aFloat basicAt:5 put:(high bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1438
        aFloat basicAt:6 put:((high bitShift:-8) bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1439
        aFloat basicAt:7 put:((high bitShift:-16) bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1440
        aFloat basicAt:8 put:((high bitShift:-24) bitAnd:16rFF).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1441
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1442
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1443
    constNeeds2Slots := true.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1444
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1445
    Verbose ifTrue:[Transcript show:'double; value= ';     showCR:aFloat].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1446
    ^ aFloat
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1447
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1448
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1449
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1450
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1451
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1452
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1453
    "Created: / 15.4.1996 / 16:34:42 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1454
    "Modified: / 8.5.1998 / 22:06:07 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1455
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1456
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1457
readConstant_Fieldref    
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1458
    "incrementally changing resolving logic, fields will come later"
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1459
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1460
    | classIndex  nameAndTypeIndex |
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1461
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1462
    classIndex := inStream nextUnsignedShortMSB: msb.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1463
    nameAndTypeIndex := inStream nextUnsignedShortMSB: msb.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1464
    self 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1465
        info: 'reading fieldref; classindex=' , classIndex printString 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1466
                , ' nameAndTypeIndex=' , nameAndTypeIndex printString.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1467
    ^ JavaFieldRef2 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1468
        in: constants
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1469
        withNameAndTypeAt: nameAndTypeIndex
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1470
        andClassAt: classIndex.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1471
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1472
    "Modified: / 15-05-2011 / 14:20:23 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1473
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1474
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1475
readConstant_Float
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1476
    |b1 b2 b3 b4 aFloat bytes|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1477
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1478
"/ new code - to be tested ...
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1479
"/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1480
"/    bytes := ByteArray new:4.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1481
"/    inStream nextBytes:4 into:bytes startingAt:1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1482
"/    msb ~~ UninterpretedBytes isBigEndian ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1483
"/        bytes reverse
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1484
"/    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1485
"/    aFloat := bytes floatAt:1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1486
"/    Verbose ifTrue:[Transcript show:'float; value= ';     showCR:aFloat].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1487
"/    ^ aFloat.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1488
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1489
"/ old code
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1490
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1491
    aFloat := ShortFloat basicNew.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1492
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1493
    b1 := inStream nextByte.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1494
    b2 := inStream nextByte.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1495
    b3 := inStream nextByte.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1496
    b4 := inStream nextByte.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1497
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1498
    UninterpretedBytes isBigEndian ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1499
        aFloat basicAt:1 put:b1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1500
        aFloat basicAt:2 put:b2.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1501
        aFloat basicAt:3 put:b3.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1502
        aFloat basicAt:4 put:b4.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1503
    ] ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1504
        aFloat basicAt:4 put:b1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1505
        aFloat basicAt:3 put:b2.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1506
        aFloat basicAt:2 put:b3.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1507
        aFloat basicAt:1 put:b4.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1508
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1509
    Verbose ifTrue:[Transcript show:'float; value= ';     showCR:aFloat].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1510
    ^ aFloat
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1511
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1512
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1513
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1514
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1515
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1516
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1517
    "Created: / 15.4.1996 / 16:34:42 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1518
    "Modified: / 10.11.1998 / 22:04:59 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1519
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1520
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1521
readConstant_Integer
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1522
    |value|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1523
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1524
    value := inStream nextLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1525
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1526
    Verbose ifTrue:[Transcript show:'integer; value= ';     showCR:value].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1527
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1528
    ^ value
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1529
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1530
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1531
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1532
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1533
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1534
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1535
    "Modified: 15.4.1996 / 15:42:16 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1536
    "Created: 15.4.1996 / 16:34:42 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1537
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1538
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1539
readConstant_InterfaceMethodref
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1540
    | classIndex  nameAndTypeIndex  |
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1541
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1542
    classIndex := inStream nextUnsignedShortMSB: msb.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1543
    nameAndTypeIndex := inStream nextUnsignedShortMSB: msb.    
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1544
    self 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1545
        info: 'reading interface methodref; classindex=' , classIndex printString                 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1546
                , ' nameAndTypeIndex=' , nameAndTypeIndex printString.                
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1547
    ^ JavaInterfaceMethodRef2 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1548
        in: constants
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1549
        withNameAndTypeAt: nameAndTypeIndex
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1550
        andClassAt: classIndex.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1551
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1552
    "Modified: / 12-05-2011 / 18:57:47 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1553
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1554
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1555
readConstant_Long
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1556
    |high low value|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1557
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1558
    high := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1559
    low := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1560
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1561
    value := (high bitShift:32) bitOr:low.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1562
    (high bitTest:16r80000000) ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1563
	value := value - 16r10000000000000000.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1564
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1565
    constNeeds2Slots := true.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1566
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1567
    Verbose ifTrue:[Transcript show:'long; value= ';     showCR:value].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1568
    ^ value
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1569
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1570
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1571
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1572
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1573
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1574
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1575
    "Modified: 15.4.1996 / 15:42:16 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1576
    "Created: 15.4.1996 / 16:34:42 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1577
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1578
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1579
readConstant_Methodref
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1580
    | classIndex  nameAndTypeIndex   |
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1581
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1582
    classIndex := inStream nextUnsignedShortMSB: msb.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1583
    nameAndTypeIndex := inStream nextUnsignedShortMSB: msb.   
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1584
    self 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1585
        info: 'reading methodref; classindex=' , classIndex printString , ' nameAndTypeIndex=' 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1586
                , nameAndTypeIndex printString.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1587
    ^ JavaMethodRef2 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1588
        in: constants
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1589
        withNameAndTypeAt: nameAndTypeIndex
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1590
        andClassAt: classIndex.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1591
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1592
    "Modified: / 15-05-2011 / 14:20:38 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1593
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1594
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1595
readConstant_NameAndType
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1596
    | nameIndex  descriptorIndex |
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1597
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1598
    nameIndex := inStream nextUnsignedShortMSB: msb.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1599
    descriptorIndex := inStream nextUnsignedShortMSB: msb.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1600
    self 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1601
        info: 'reading nameAndType; nameindex=' , nameIndex printString 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1602
                , ' descriptorIndex= ' , descriptorIndex printString.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1603
    ^JavaNameAndType2 
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1604
                in: constants
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1605
                withNameAt: nameIndex
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1606
                andDescriptorAt: descriptorIndex.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1607
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  1608
    "Modified: / 10-05-2011 / 17:09:47 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1609
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1610
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1611
readConstant_String
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
  1612
    | string_index |
782
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1613
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1614
    string_index := inStream nextUnsignedShortMSB: msb.
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
  1615
    ^ JavaStringRef2 in: constants withValueAt: string_index.
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
  1616
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1617
    
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
  1618
    
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1619
    "Created: / 15-04-1996 / 15:20:33 / cg"
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1620
    "Modified: / 07-05-1998 / 11:42:45 / cg"
782
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1621
    "Modified: / 13-05-2011 / 17:31:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
906
fea23aa2b228 Few more fixes and workarounds for Saxon 6.5.5: the Othello example works fine...
vranyj1
parents: 898
diff changeset
  1622
    "Modified: / 10-08-2011 / 23:25:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1623
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1624
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1625
readConstant_Unicode
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1626
    | len  string  ascii |
782
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1627
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1628
    len := inStream nextUnsignedShortMSB: msb.
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1629
    string := TwoByteString new: len.
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1630
    1 to: len
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1631
        do: 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1632
            [:idx | 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1633
            ascii := inStream nextUnsignedShortMSB: msb.
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1634
            string at: idx put: (Character value: ascii). ].
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1635
    Verbose 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1636
        ifTrue: 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1637
            [ Transcript
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1638
                show: 'asciz; unicodeString= ';
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1639
                showCR: string ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1640
    ^ string
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1641
782
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1642
    "Modified: / 13-05-2011 / 17:31:44 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1643
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1644
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1645
readConstant_Utf8
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1646
    | len  bytes  string |
782
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1647
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1648
    len := inStream nextUnsignedShortMSB: msb.
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1649
    bytes := ByteArray new: len.
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1650
    inStream 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1651
        nextBytes: len
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1652
        into: bytes
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1653
        startingAt: 1.
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1654
    string := CharacterArray fromJavaUTF8Bytes: bytes.
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1655
    Verbose 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1656
        ifTrue: 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1657
            [ Transcript
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1658
                show: 'asciz; string= ';
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1659
                showCR: string ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1660
    ^ string
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1661
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1662
    "Modified: / 19-10-2010 / 12:38:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
782
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1663
    "Modified: / 13-05-2011 / 17:31:48 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1664
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1665
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1666
!JavaClassReader methodsFor:'file reading - constants-ST'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1667
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1668
readConstant_ST_Array
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1669
    |aSize arr|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1670
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1671
    aSize := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1672
    arr := Array new:aSize.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1673
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1674
    1 to:aSize do:[:i |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1675
        |element_index element|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1676
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1677
        element_index := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1678
        arr at:i put:element_index.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1679
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1680
    Verbose ifTrue:[Transcript show:'array; size= ';     showCR:aSize].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1681
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1682
    ^ JavaUnresolvedSTArrayConstant 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1683
                pool:constants
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1684
                poolIndex:constSlot
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1685
                array:arr
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1686
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1687
    "Created: / 7.5.1998 / 11:47:01 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1688
    "Modified: / 9.5.1998 / 00:25:34 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1689
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1690
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1691
readConstant_ST_ByteArray
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1692
    |aSize arr|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1693
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1694
    aSize := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1695
    arr := ByteArray new:aSize.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1696
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1697
    1 to:aSize do:[:i |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1698
        |element_index|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1699
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1700
        arr at:i put:(inStream nextByte).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1701
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1702
    Verbose ifTrue:[Transcript show:'byteArray; size= ';     showCR:aSize].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1703
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1704
    ^ arr
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1705
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1706
    "Created: / 7.5.1998 / 11:47:12 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1707
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1708
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1709
readConstant_ST_Character
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1710
    |ascii|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1711
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1712
    ascii := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1713
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1714
    Verbose ifTrue:[Transcript show:'char; ascii= '; showCR:ascii].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1715
    ^ Character value:ascii
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1716
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1717
    "Created: / 7.5.1998 / 11:48:12 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1718
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1719
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1720
readConstant_ST_Special
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1721
    |type|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1722
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1723
    type := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1724
    ^ #(
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1725
        nil
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1726
        true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1727
        false
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1728
     ) at:(type + 1)
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1729
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1730
    "Created: / 8.5.1998 / 23:06:56 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1731
    "Modified: / 9.5.1998 / 00:40:14 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1732
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1733
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1734
readConstant_ST_String
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1735
    | tag  string_index  chars |
782
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1736
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1737
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1738
    string_index := inStream nextUnsignedShortMSB: msb.
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1739
    Verbose 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1740
        ifTrue: 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1741
            [ Transcript
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1742
                show: 'string; index= ';
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1743
                showCR: string_index ].
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1744
    
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1745
    "/ resolve here if possible
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1746
    
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1747
    string_index < constSlot 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1748
        ifTrue: 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1749
            [ chars := (constants at: string_index).
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1750
            ^ chars ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1751
    ^ JavaUnresolvedSTStringConstant 
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1752
        pool: constants
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1753
        poolIndex: constSlot
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1754
        stringIndex: string_index
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1755
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1756
    "Created: / 07-05-1998 / 11:49:55 / cg"
782
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1757
    "Modified: / 13-05-2011 / 17:32:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1758
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1759
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1760
readConstant_ST_Symbol
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1761
    | tag  string_index  chars |
782
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1762
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1763
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1764
    string_index := inStream nextUnsignedShortMSB: msb.
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1765
    Verbose 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1766
        ifTrue: 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1767
            [ Transcript
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1768
                show: 'symbol; index= ';
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1769
                showCR: string_index ].
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1770
    
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1771
    "/ resolve here if possible
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1772
    
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1773
    string_index < constSlot 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1774
        ifTrue: 
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1775
            [ chars := (constants at: string_index).
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1776
            chars isString ifFalse: [ self halt: 'should not happen' ].
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1777
            ^ chars asSymbol ].
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1778
    ^ JavaUnresolvedSTSymbolConstant 
781
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1779
        pool: constants
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1780
        poolIndex: constSlot
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1781
        stringIndex: string_index
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1782
d27c59bcf38a added preResolve compatibility method + JavaStringRef - will be used soon
hlopkmar
parents: 775
diff changeset
  1783
    "Modified: / 07-05-1998 / 11:48:28 / cg"
782
06d80d58370b removed forgotten halts.. sry
hlopkmar
parents: 781
diff changeset
  1784
    "Modified: / 13-05-2011 / 17:32:09 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1785
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1786
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1787
!JavaClassReader methodsFor:'file reading - fields'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1788
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1789
readConstantValueAttributeFor:aField
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1790
    |attribute_length constantvalue_index constantValue|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1791
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1792
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1793
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1794
    constantvalue_index := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1795
    constantValue := constants at:constantvalue_index.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1796
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1797
    aField constantValue:constantValue.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1798
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1799
    Verbose ifTrue:[Transcript show:'constantValue: '; showCR:constantValue].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1800
    ^ true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1801
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1802
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1803
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1804
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1805
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1806
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1807
    "Modified: 15.4.1996 / 15:33:28 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1808
    "Created: 15.4.1996 / 15:40:17 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1809
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1810
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1811
readFieldInfofield
913
1781f130b005 signature instvars renamed to descriptor
vranyj1
parents: 912
diff changeset
  1812
    | access_flags  name_index  descriptor_index  attributes_count  field |
797
8d4e7c17eadd fixed JavaClassReader so it always sets staticFields
hlopkmar
parents: 796
diff changeset
  1813
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1814
    access_flags := inStream nextUnsignedShortMSB: msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1815
    name_index := inStream nextUnsignedShortMSB: msb.
913
1781f130b005 signature instvars renamed to descriptor
vranyj1
parents: 912
diff changeset
  1816
    descriptor_index := inStream nextUnsignedShortMSB: msb.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1817
    field := JavaField new.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1818
    field setAccessFlags: access_flags.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1819
    field setName: (constants at: name_index) asSymbol.
913
1781f130b005 signature instvars renamed to descriptor
vranyj1
parents: 912
diff changeset
  1820
    field setDescriptor: (constants at: descriptor_index) asSymbol.
879
8bb82d1ea058 Cleanup phase 3: old JavaRef class removed
vranyj1
parents: 877
diff changeset
  1821
    field setConstantPool: constants.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1822
    attributes_count := inStream nextUnsignedShortMSB: msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1823
    Verbose 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1824
        ifTrue: 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1825
            [ Transcript
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1826
                show: '  field name: ';
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1827
                show: (constants at: name_index);
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1828
                show: ' access: ';
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1829
                show: access_flags;
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1830
                show: ' attrib_cnt: ';
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1831
                showCR: attributes_count ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1832
    1 to: attributes_count do: [:i | self readAttributeFor: field. ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1833
    ^ field.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1834
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1835
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1836
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1837
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1838
    "Created: / 15-04-1996 / 15:38:43 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1839
    "Modified: / 15-10-1998 / 10:38:01 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1840
    "Modified: / 17-12-2010 / 18:44:30 / Marcel Hlopko <hlopik@gmail.com>"
797
8d4e7c17eadd fixed JavaClassReader so it always sets staticFields
hlopkmar
parents: 796
diff changeset
  1841
    "Modified: / 18-05-2011 / 14:11:37 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
913
1781f130b005 signature instvars renamed to descriptor
vranyj1
parents: 912
diff changeset
  1842
    "Modified: / 14-08-2011 / 19:40:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1843
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1844
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1845
readFieldInfofields
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1846
    |nFields fields|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1847
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1848
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1849
    "/ get fieldInfos
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1850
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1851
    nFields := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1852
    Verbose ifTrue:[Transcript show:'fieldsCount = '; showCR:nFields].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1853
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1854
    fields := Array new:nFields.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1855
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1856
    1 to:nFields do:[:i |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1857
	Verbose ifTrue:[Transcript show:'field: '; showCR:i].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1858
	fields at:i put:(self readFieldInfofield)
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1859
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1860
    ^ fields
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1861
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1862
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1863
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1864
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1865
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1866
    "Created: 15.4.1996 / 15:34:41 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1867
    "Modified: 15.4.1996 / 15:35:28 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1868
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1869
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1870
!JavaClassReader methodsFor:'file reading - interfaces'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1871
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1872
readInterfaces
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1873
    |interfacesCount interface_index interface interfaces|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1874
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1875
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1876
    "/ get interfaces
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1877
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1878
    interfacesCount := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1879
    Verbose ifTrue:[Transcript show:'interfacesCount = '; showCR:interfacesCount].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1880
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1881
    interfaces := Array new:interfacesCount.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1882
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1883
    1 to:interfacesCount do:[:i |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1884
	Verbose ifTrue:[Transcript show:'interface: '; showCR:i].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1885
	interface_index := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1886
	interface := constants at:interface_index.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1887
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1888
	interfaces at:i put:interface.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1889
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1890
    ^ interfaces
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1891
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1892
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1893
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1894
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1895
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1896
    "Created: 15.4.1996 / 15:31:59 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1897
    "Modified: 15.4.1996 / 15:33:28 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1898
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1899
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1900
!JavaClassReader methodsFor:'file reading - methods'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1901
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1902
readCodeAttributeFor:aJavaMethod
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1903
    |attribute_length max_stack max_locals code_length code
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1904
     exception_table_length exception_table unknown1 unknown2|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1905
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1906
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1907
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1908
    Verbose ifTrue:[Transcript show:'code_attribute_length: 0x'; showCR:(attribute_length printStringRadix:16)].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1909
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1910
    ((minorVsn > 2) or:[majorVsn > 45]) ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1911
        "/ should be:
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1912
        max_stack := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1913
        max_locals := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1914
        code_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1915
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1916
"/        unknown1 := inStream nextByte.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1917
"/        max_stack := inStream nextByte.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1918
"/        max_locals := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1919
"/        unknown2 := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1920
"/        code_length := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1921
"/        Verbose ifTrue:[Transcript show:'?1: '; showCR:unknown1].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1922
"/        Verbose ifTrue:[Transcript show:'?2: '; showCR:unknown2].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1923
    ] ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1924
        max_stack := inStream nextByte.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1925
        max_locals := inStream nextByte.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1926
        code_length := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1927
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1928
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1929
    Verbose ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1930
        Transcript show:'code_length: '; showCR:(code_length printStringRadix:16).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1931
        Transcript show:'code at pos: '; showCR:inStream position
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1932
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1933
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1934
    code_length ~~ 0 ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1935
        code := ByteArray new:code_length.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1936
        inStream nextBytes:code_length into:code startingAt:1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1937
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1938
    Verbose ifTrue:[Transcript show:'method code: '; showCR:code.].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1939
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1940
    exception_table_length := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1941
    Verbose ifTrue:[Transcript show:'exception_table_length: '; showCR:(exception_table_length printStringRadix:16)].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1942
    exception_table_length ~~ 0 ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1943
        Verbose ifTrue:[Transcript show:'exceptionTable length:'; showCR:exception_table_length.].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1944
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1945
        exception_table := Array new:exception_table_length.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1946
        1 to:exception_table_length do:[:i |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1947
            |start_pc end_pc handler_pc catch_type|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1948
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1949
            start_pc := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1950
            end_pc := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1951
            handler_pc := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1952
            catch_type := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1953
            catch_type ~= 0 ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1954
                catch_type := constants at:catch_type.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1955
            ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1956
            exception_table at:i put:(JavaExceptionTableEntry
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1957
                                            startPC:start_pc
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1958
                                            endPC:end_pc
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1959
                                            handlerPC:handler_pc
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1960
                                            catchType:catch_type).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1961
        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1962
        aJavaMethod setExceptionHandlerTable:exception_table.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1963
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1964
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1965
    aJavaMethod 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1966
        setCode:code 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1967
        maxStack:max_stack 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1968
        maxLocals:max_locals 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1969
        u1:unknown1 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1970
        u2:unknown2.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1971
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1972
    self readAttributesFor:aJavaMethod.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1973
    ^ true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1974
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1975
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1976
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1977
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1978
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1979
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1980
    "Created: / 15-04-1996 / 15:40:17 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1981
    "Modified: / 16-05-1998 / 01:39:42 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1982
    "Modified: / 17-12-2010 / 00:24:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1983
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1984
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1985
readExceptionsAttributeFor:aJavaMethod
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1986
    |attribute_length exception_table_length exception_table|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1987
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1988
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1989
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1990
    exception_table_length := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1991
    exception_table_length ~~ 0 ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1992
	exception_table := Array new:exception_table_length.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1993
	1 to:exception_table_length do:[:i |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1994
	    |idx ex|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1995
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1996
	    idx := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1997
	    ex := constants at:idx.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1998
	    exception_table at:i put:ex.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  1999
	].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2000
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2001
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2002
    Verbose ifTrue:[Transcript showCR:'method has an exceptionTable'].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2003
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2004
    aJavaMethod setExceptionTable:exception_table.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2005
    ^ true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2006
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2007
    "Modified: 15.4.1996 / 15:33:28 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2008
    "Created: 15.4.1996 / 15:40:17 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2009
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2010
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2011
readLineNumberTableAttributeFor:aJavaMethod
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2012
    |attribute_length line_number_table_length line_number_table|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2013
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2014
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2015
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2016
    line_number_table_length := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2017
    line_number_table_length ~~ 0 ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2018
        line_number_table := Array new:line_number_table_length.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2019
        1 to:line_number_table_length do:[:i |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2020
            |start_pc line_number|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2021
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2022
            start_pc := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2023
            line_number := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2024
            line_number_table at:i put:(start_pc -> line_number).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2025
        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2026
        Verbose ifTrue:[Transcript showCR:'method has a lineNumberTable'].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2027
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2028
        aJavaMethod setLineNumberTable:line_number_table.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2029
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2030
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2031
    ^ true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2032
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2033
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2034
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2035
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/java/lang/Boolean.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2036
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2037
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2038
    "Created: / 15.4.1996 / 15:40:17 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2039
    "Modified: / 7.4.1998 / 19:08:42 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2040
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2041
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2042
readLocalVariableTableAttributeFor:aJavaMethod
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2043
    |attribute_length local_variable_table_length local_variable_table|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2044
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2045
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2046
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2047
    local_variable_table_length := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2048
    local_variable_table_length ~~ 0 ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2049
	local_variable_table := JavaLocalVariableTable new:local_variable_table_length.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2050
	1 to:local_variable_table_length do:[:i |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2051
	    |start_pc length name_index sig_index slot name signature|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2052
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2053
	    start_pc := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2054
	    length := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2055
	    name_index := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2056
	    name := constants at:name_index.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2057
	    sig_index := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2058
	    signature := constants at:sig_index.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2059
	    slot := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2060
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2061
	    local_variable_table at:i put:(JavaLocalVariableTableEntry new 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2062
						startPC:start_pc 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2063
						length:length
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2064
						name:name
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2065
						signature:signature
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2066
						slot:slot)
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2067
	].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2068
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2069
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2070
    Verbose ifTrue:[Transcript showCR:'method has a localvariableTable'].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2071
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2072
    aJavaMethod setLocalVariableTable:local_variable_table.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2073
    ^ true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2074
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2075
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2076
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2077
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/java/lang/Boolean.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2078
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2079
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2080
    "Modified: 15.4.1996 / 15:33:28 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2081
    "Created: 15.4.1996 / 15:40:17 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2082
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2083
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2084
readMethodFor:aClass
913
1781f130b005 signature instvars renamed to descriptor
vranyj1
parents: 912
diff changeset
  2085
    |m access_flags name_index name descriptor_index descriptor
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2086
     tooManyArgs|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2087
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2088
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2089
    "/ get a method
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2090
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2091
    access_flags := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2092
    name_index := inStream nextUnsignedShortMSB:msb.
913
1781f130b005 signature instvars renamed to descriptor
vranyj1
parents: 912
diff changeset
  2093
    descriptor_index := inStream nextUnsignedShortMSB:msb.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2094
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2095
    name := constants at:name_index.
913
1781f130b005 signature instvars renamed to descriptor
vranyj1
parents: 912
diff changeset
  2096
    descriptor := constants at:descriptor_index.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2097
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2098
    Verbose ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2099
        Transcript show:'method name:'; showCR:name.
913
1781f130b005 signature instvars renamed to descriptor
vranyj1
parents: 912
diff changeset
  2100
        Transcript show:'descriptor:'; showCR:descriptor.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2101
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2102
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2103
    aClass isJavaClass ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2104
        (access_flags bitAnd:JavaMethod A_NATIVE) ~~ 0 ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2105
            m := JavaNativeMethod new.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2106
        ] ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2107
            m := JavaMethodWithHandler new.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2108
        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2109
        m setAccessFlags:access_flags.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2110
        tooManyArgs := false.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2111
        ArgumentError handle:[:ex |
1000
cfa982260238 Lot of debug/info prints rewritten to use Logger
vranyj1
parents: 992
diff changeset
  2112
            Logger log: 'java method has too many arguments - will fail to execute' severity: #warn facility: 'JVM'.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2113
            tooManyArgs := true.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2114
            ex proceed.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2115
        ] do:[
913
1781f130b005 signature instvars renamed to descriptor
vranyj1
parents: 912
diff changeset
  2116
            m setName:name descriptor:descriptor.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2117
        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2118
        m setJavaClass:aClass.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2119
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2120
        self readAttributesFor:m.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2121
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2122
        tooManyArgs ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2123
            m code:nil.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2124
            m byteCode:nil.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2125
        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2126
        (m exceptionHandlerTable isNil) ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2127
            m isNative ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2128
                m getExceptionTable isNil ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2129
                    m := JavaMethod fromMethod:m
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2130
                ] ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2131
                    m := JavaMethodWithException fromMethod:m
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2132
                ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2133
            ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2134
        ] ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2135
            m setAccessFlags:(m accessFlags bitOr:JavaMethod A_HASHANDLER)
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2136
        ].
913
1781f130b005 signature instvars renamed to descriptor
vranyj1
parents: 912
diff changeset
  2137
        aClass addMethod:m name:name signature:descriptor.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2138
    ] ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2139
        m := Method new.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2140
        self readAttributesFor:m.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2141
        (access_flags bitTest:JavaMethod A_STATIC) ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2142
            aClass class primAddSelector:name asSymbol withMethod:m.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2143
        ] ifFalse:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2144
            aClass primAddSelector:name asSymbol withMethod:m.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2145
        ]
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2146
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2147
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2148
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2149
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2150
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2151
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2152
    "Created: / 15-04-1996 / 16:48:49 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2153
    "Modified: / 25-09-1999 / 23:16:25 / cg"
1000
cfa982260238 Lot of debug/info prints rewritten to use Logger
vranyj1
parents: 992
diff changeset
  2154
    "Modified: / 14-09-2011 / 22:08:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2155
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2156
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2157
readMethodsFor:aJavaClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2158
    |methodsCount method|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2159
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2160
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2161
    "/ get methods
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2162
    "/
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2163
    methodsCount := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2164
    Verbose ifTrue:[Transcript show:'methodsCount = '; showCR:methodsCount].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2165
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2166
    1 to:methodsCount do:[:i |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2167
        Verbose ifTrue:[Transcript show:'method: '; showCR:i].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2168
        method := self readMethodFor:aJavaClass
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2169
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2170
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2171
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2172
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2173
    "
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2174
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2175
    "Created: / 15.4.1996 / 16:46:30 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2176
    "Modified: / 8.5.1998 / 21:20:59 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2177
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2178
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2179
!JavaClassReader methodsFor:'file reading - methods-ST'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2180
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2181
readSTCodeAttributeFor:aSmalltalkMethod
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2182
    |attribute_length max_stack max_locals code_length code
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2183
     exception_table_length unknown1 unknown2|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2184
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2185
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2186
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2187
    Verbose ifTrue:[Transcript show:'attribute_length: 0x'; showCR:(attribute_length printStringRadix:16)].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2188
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2189
    max_stack := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2190
    max_locals := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2191
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2192
    code_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2193
    Verbose ifTrue:[Transcript show:'code_length: '; showCR:(code_length printStringRadix:16)].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2194
    Verbose ifTrue:[Transcript show:'code at pos: '; showCR:inStream position].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2195
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2196
    code_length ~~ 0 ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2197
        code := ByteArray new:code_length.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2198
        inStream nextBytes:code_length into:code startingAt:1.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2199
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2200
    Verbose ifTrue:[Transcript show:'method code: '; showCR:code.].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2201
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2202
    exception_table_length := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2203
    Verbose ifTrue:[Transcript show:'exception_table_length: '; showCR:(exception_table_length printStringRadix:16)].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2204
    exception_table_length ~~ 0 ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2205
        self error:'unexpected exceptionTable length'.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2206
        "/ skip it.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2207
        1 to:exception_table_length do:[:i |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2208
            "start_pc :="   inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2209
            "end_pc :="     inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2210
            "handler_pc :=" inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2211
            "catch_type :=" inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2212
        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2213
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2214
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2215
    aSmalltalkMethod byteCode:code. 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2216
    aSmalltalkMethod stackSize:max_stack .
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2217
    aSmalltalkMethod numberOfVars:max_locals. 
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2218
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2219
    self readAttributesFor:aSmalltalkMethod.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2220
    ^ true
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2221
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2222
    "Modified: / 16.5.1998 / 01:39:30 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2223
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2224
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2225
readSTLiteralsAttributeFor:aSmalltalkMethod
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2226
    |attribute_length literal_table_length literal_table litIndex literal|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2227
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2228
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2229
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2230
    literal_table_length := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2231
    literal_table_length ~~ 0 ifTrue:[
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2232
        literal_table := Array new:literal_table_length.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2233
        1 to:literal_table_length do:[:i |
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2234
            litIndex := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2235
            literal := (constants at:litIndex).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2236
            literal_table at:i put:literal.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2237
        ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2238
    ].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2239
    Verbose ifTrue:[Transcript show:'literals: '; showCR:literal_table storeString.].
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2240
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2241
    "Created: / 7.5.1998 / 11:52:28 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2242
    "Modified: / 16.5.1998 / 01:52:27 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2243
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2244
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2245
readSTMethodCategoryAttributeFor:aSmalltalkMethod
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2246
    |attribute_length name_index name|
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2247
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2248
    attribute_length := inStream nextUnsignedLongMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2249
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2250
    name_index := inStream nextUnsignedShortMSB:msb.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2251
    name := (constants at:name_index).
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2252
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2253
    aSmalltalkMethod category:name.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2254
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2255
    "Modified: / 8.5.1998 / 20:39:59 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2256
    "Created: / 16.5.1998 / 01:04:19 / cg"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2257
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2258
775
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
  2259
!JavaClassReader methodsFor:'helpers'!
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
  2260
798
b534e73eaf7e JavaClassReader2 now uses correct superclass loading
hlopkmar
parents: 797
diff changeset
  2261
loadSuperclassIdentifiedBy: something ignoring: classesBeingLoaded 
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  2262
    "overriding method, here we expect something to be new JavaClassRef2"
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
  2263
    
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  2264
    self assert: something isJavaRef
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  2265
        message: 'class identifier is not a java reference'.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  2266
    self assert: something isJavaClassRef
1026
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
  2267
        message: 'class identifier is not a java class reference'.  
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
  2268
    (classesBeingLoaded includes: something name) ifTrue: [
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
  2269
        self 
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
  2270
            error: 'class we want to load is being loaded and that means something went wrong. tell mh'
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
  2271
    ].
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
  2272
     "hint in case of bug - is parent of something set? surely jv will know more :)" "find out which classloader is used"
5badd1d31864 introduced JavaClassRegistry, taken loading responsibilities from JavaClassReader, got rid of stringConstants and started using StringRefs.. Bugs very likely :)
hlopkmar
parents: 1025
diff changeset
  2273
    ^ Java javaRegistry classForName: something name definedBy: nil.
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  2274
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 863
diff changeset
  2275
    "Created: / 18-05-2011 / 14:55:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
960
1c7fd32d1f26 Few fixes
vranyj1
parents: 959
diff changeset
  2276
    "Modified: / 31-08-2011 / 21:25:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
798
b534e73eaf7e JavaClassReader2 now uses correct superclass loading
hlopkmar
parents: 797
diff changeset
  2277
!
b534e73eaf7e JavaClassReader2 now uses correct superclass loading
hlopkmar
parents: 797
diff changeset
  2278
775
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
  2279
updateOwnerInCPItem: each 
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
  2280
    ((each isJavaRef and: [ each isNewJavaRef ]) 
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
  2281
        or: [ each isJavaNameAndType and: [ each isNewJavaNameAndType ] ]) 
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
  2282
            ifTrue: [ each owner: classBeingLoaded ].
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
  2283
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
  2284
    "Created: / 12-05-2011 / 17:40:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
796
9b3e00dd3196 Small fix, so JavaFields have their javaClass always set.
hlopkmar
parents: 784
diff changeset
  2285
!
9b3e00dd3196 Small fix, so JavaFields have their javaClass always set.
hlopkmar
parents: 784
diff changeset
  2286
9b3e00dd3196 Small fix, so JavaFields have their javaClass always set.
hlopkmar
parents: 784
diff changeset
  2287
updateOwnerInField: each 
9b3e00dd3196 Small fix, so JavaFields have their javaClass always set.
hlopkmar
parents: 784
diff changeset
  2288
9b3e00dd3196 Small fix, so JavaFields have their javaClass always set.
hlopkmar
parents: 784
diff changeset
  2289
            each setClass: classBeingLoaded.
9b3e00dd3196 Small fix, so JavaFields have their javaClass always set.
hlopkmar
parents: 784
diff changeset
  2290
9b3e00dd3196 Small fix, so JavaFields have their javaClass always set.
hlopkmar
parents: 784
diff changeset
  2291
    "Created: / 18-05-2011 / 13:57:20 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
775
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
  2292
! !
8b0e1974c289 small renaming
hlopkmar
parents: 774
diff changeset
  2293
799
0c3c4a787b1c small refactoring + forgotten assignment
hlopkmar
parents: 798
diff changeset
  2294
!JavaClassReader methodsFor:'logging'!
0c3c4a787b1c small refactoring + forgotten assignment
hlopkmar
parents: 798
diff changeset
  2295
0c3c4a787b1c small refactoring + forgotten assignment
hlopkmar
parents: 798
diff changeset
  2296
info: message 
1000
cfa982260238 Lot of debug/info prints rewritten to use Logger
vranyj1
parents: 992
diff changeset
  2297
    Verbose ifTrue: [ Logger log: message severity: #info facility: 'JVM' ].
799
0c3c4a787b1c small refactoring + forgotten assignment
hlopkmar
parents: 798
diff changeset
  2298
0c3c4a787b1c small refactoring + forgotten assignment
hlopkmar
parents: 798
diff changeset
  2299
    "Created: / 18-05-2011 / 15:06:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1000
cfa982260238 Lot of debug/info prints rewritten to use Logger
vranyj1
parents: 992
diff changeset
  2300
    "Modified (format): / 14-09-2011 / 21:39:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
799
0c3c4a787b1c small refactoring + forgotten assignment
hlopkmar
parents: 798
diff changeset
  2301
! !
0c3c4a787b1c small refactoring + forgotten assignment
hlopkmar
parents: 798
diff changeset
  2302
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2303
!JavaClassReader class methodsFor:'documentation'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2304
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2305
version
1022
38b710d7dfbc svn properties fixed
vranyj1
parents: 1021
diff changeset
  2306
    ^ '$Id$'
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2307
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2308
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2309
version_CVS
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2310
    ^ '§Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaClassReader.st,v 1.92 2009/10/09 14:21:53 cg Exp §'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2311
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2312
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2313
version_SVN
1022
38b710d7dfbc svn properties fixed
vranyj1
parents: 1021
diff changeset
  2314
    ^ '$Id$'
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2315
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
  2316
959
1f3342b2e728 Fixes...
vranyj1
parents: 923
diff changeset
  2317
JavaClassReader initialize!