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