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