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