JavaClassReader.st
author Marcel Hlopko <marcel.hlopko@gmail.com>
Sat, 25 Jan 2014 21:35:58 +0100
branchdevelopment
changeset 3002 c1ec15d94457
parent 2966 afd174546057
child 3003 c9f0019485ff
permissions -rw-r--r--
fix javaHome for oracle-7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
454
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
     1
"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
     2
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
     3
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
     4
 New code and modifications done at SWING Research Group [1]:
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
     5
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
     6
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
     7
                            SWING Research Group, Czech Technical University in Prague
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
     8
454
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
     9
 This software is furnished under a license and may be used
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    10
 only in accordance with the terms of that license and with the
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    11
 inclusion of the above copyright notice.   This software may not
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    12
 be provided or otherwise made available to, or used by, any
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    13
 other person.  No title to or ownership of the software is
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    14
 hereby transferred.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    15
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    16
 [1] Code written at SWING Research Group contains a signature
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    17
     of one of the above copright owners. For exact set of such code,
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    18
     see the differences between this version and version stx:libjava
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    19
     as of 1.9.2010
454
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    20
"
695
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
    21
"{ Package: 'stx:libjava' }"
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
    22
1
083530508d9c intitial checkin
cg
parents:
diff changeset
    23
Object subclass:#JavaClassReader
91
9b325648aa77 resolve rewritten; interpreter fixes
cg
parents: 86
diff changeset
    24
	instanceVariableNames:'inStream msb constants majorVsn minorVsn constNeeds2Slots
2965
bac7022ca26a Merged 7c3b2a89f173 and 80a1a085a982 (branch performance-optimizations)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2960 2604
diff changeset
    25
                constSlot classBeingLoaded classLoader attributes'
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    26
	classVariableNames:'Verbose AnnotationsVerbose Silent AbsolutelySilent
2965
bac7022ca26a Merged 7c3b2a89f173 and 80a1a085a982 (branch performance-optimizations)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2960 2604
diff changeset
    27
                LazyClassLoading InvalidClassFormatSignal ClassLoaderQuerySignal
bac7022ca26a Merged 7c3b2a89f173 and 80a1a085a982 (branch performance-optimizations)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2960 2604
diff changeset
    28
                JavaArchiveCache JavaArchiveCacheLock LastJavaArchive
bac7022ca26a Merged 7c3b2a89f173 and 80a1a085a982 (branch performance-optimizations)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2960 2604
diff changeset
    29
                LastJavaArchiveLock MaxContextSize MaxContextSizeLimit'
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    30
	poolDictionaries:'JavaConstants'
2108
ca8c4e7db2e8 category change
Claus Gittinger <cg@exept.de>
parents: 2089
diff changeset
    31
	category:'Languages-Java-Support'
1
083530508d9c intitial checkin
cg
parents:
diff changeset
    32
!
083530508d9c intitial checkin
cg
parents:
diff changeset
    33
454
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    34
!JavaClassReader class methodsFor:'documentation'!
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    35
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    36
copyright
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    37
"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    38
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    39
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    40
 New code and modifications done at SWING Research Group [1]:
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    41
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    42
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    43
                            SWING Research Group, Czech Technical University in Prague
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    44
454
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    45
 This software is furnished under a license and may be used
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    46
 only in accordance with the terms of that license and with the
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    47
 inclusion of the above copyright notice.   This software may not
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    48
 be provided or otherwise made available to, or used by, any
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    49
 other person.  No title to or ownership of the software is
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    50
 hereby transferred.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    51
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    52
 [1] Code written at SWING Research Group contains a signature
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    53
     of one of the above copright owners. For exact set of such code,
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    54
     see the differences between this version and version stx:libjava
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    55
     as of 1.9.2010
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    56
454
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    57
"
38f590639d65 *** empty log message ***
cg
parents: 443
diff changeset
    58
! !
1
083530508d9c intitial checkin
cg
parents:
diff changeset
    59
135
098936234135 *** empty log message ***
cg
parents: 128
diff changeset
    60
!JavaClassReader class methodsFor:'initialization'!
1
083530508d9c intitial checkin
cg
parents:
diff changeset
    61
083530508d9c intitial checkin
cg
parents:
diff changeset
    62
initialize
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    63
    InvalidClassFormatSignal := Signal new mayProceed: true.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    64
    InvalidClassFormatSignal notifierString: 'class load failure'.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    65
    InvalidClassFormatSignal nameClass: self message: #invalidClassFormatSignal.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    66
    Verbose := false.
91
9b325648aa77 resolve rewritten; interpreter fixes
cg
parents: 86
diff changeset
    67
    Silent := true.
9b325648aa77 resolve rewritten; interpreter fixes
cg
parents: 86
diff changeset
    68
    AbsolutelySilent := false.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
    69
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    70
    "/LazyClassLoading := false.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
    71
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    72
    LazyClassLoading := true.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    73
    ClassLoaderQuerySignal := QuerySignal new.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
    74
    ClassLoaderQuerySignal defaultAnswer: [ JavaVM systemClassLoader ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    75
    OperatingSystem isMSWINDOWSlike ifFalse:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    76
        JavaArchiveCache := CacheDictionary new: 32.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    77
    ] ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    78
        JavaArchiveCache := CacheDictionary new: 8.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    79
    ].
2931
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
    80
    JavaArchiveCacheLock :=  RecursionLock new.
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
    81
    LastJavaArchiveLock :=  RecursionLock new.
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
    82
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
    83
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    84
    AnnotationsVerbose := false.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    85
    MaxContextSize := 0.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    86
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    87
    "Maximum stack depth supported by the VM.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    88
     if you change it, make sure it is equal (or lower)
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    89
     to CONSIZE in jinterpret.c (line 111 or so)
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    90
     Otherwise, VM may crash!!!!!!"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    91
    MaxContextSizeLimit := 100.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
    92
29
eb3367f8fb9b checkin from browser
cg
parents: 27
diff changeset
    93
eb3367f8fb9b checkin from browser
cg
parents: 27
diff changeset
    94
    "
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    95
     JavaClassReader initialize"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    96
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    97
    "Modified: / 27-01-1998 / 17:54:23 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    98
    "Modified: / 17-12-2010 / 17:37:45 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
    99
    "Modified: / 10-05-2011 / 23:59:53 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   100
    "Modified: / 14-08-2012 / 02:01:37 / jv"
2960
d133d35e293b Class loading refactoring (part 1)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2946
diff changeset
   101
    "Modified: / 10-12-2013 / 17:50:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
198
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   102
! !
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   103
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   104
!JavaClassReader class methodsFor:'Signal constants'!
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   105
223
4dd38bd4f6b2 allow trampoulining back into java for sub-loads
cg
parents: 219
diff changeset
   106
classLoaderQuerySignal
4dd38bd4f6b2 allow trampoulining back into java for sub-loads
cg
parents: 219
diff changeset
   107
    ^ ClassLoaderQuerySignal
4dd38bd4f6b2 allow trampoulining back into java for sub-loads
cg
parents: 219
diff changeset
   108
4dd38bd4f6b2 allow trampoulining back into java for sub-loads
cg
parents: 219
diff changeset
   109
    "Created: 14.8.1997 / 19:56:03 / cg"
4dd38bd4f6b2 allow trampoulining back into java for sub-loads
cg
parents: 219
diff changeset
   110
!
4dd38bd4f6b2 allow trampoulining back into java for sub-loads
cg
parents: 219
diff changeset
   111
198
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   112
invalidClassFormatSignal
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   113
    ^ InvalidClassFormatSignal
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   114
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   115
    "Created: 3.8.1997 / 18:17:21 / cg"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   116
! !
083530508d9c intitial checkin
cg
parents:
diff changeset
   117
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   118
!JavaClassReader class methodsFor:'constants'!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   119
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   120
fileMajorVersions
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   121
    ^#(
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   122
        45  "Java 1.0.2"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   123
        46  "Java 1.2"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   124
        47  "???"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   125
        48  "???"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   126
        49  "Java 5"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   127
        50  "Java 6"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   128
      ).
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   129
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   130
    "
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   131
     JSR 202:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   132
     The Java virtual machine implementation of Sun's JDK release 1.0.2 supports
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   133
     class file format versions 45.0 through 45.3 inclusive. Sun's JDK releases
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   134
     1.1.X can support class file formats of versions in the range 45.0 through
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   135
     45.65535 inclusive. For k > 1 implementations of version 1.k of the Java 2
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   136
     platform can support class file formats of versions in the range 45.0 through
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   137
     44+k.0 inclusive.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   138
"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   139
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   140
    "Created: / 19-10-2010 / 21:40:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   141
    "Modified: / 02-06-2011 / 22:50:17 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   142
    "Modified: / 18-08-2011 / 19:32:37 / jv"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   143
    "Modified (comment): / 16-08-2012 / 15:34:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   144
!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   145
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   146
fileMinorVersions
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   147
    ^ #(
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   148
        3 "Java 1.0.2 , Java 1.2"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   149
        0 "Java 6"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   150
    )
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   152
    "Created: / 19-10-2010 / 21:41:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   153
!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   154
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   155
magic_LSB
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   156
    ^ 16rBEBAFECA
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   157
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   158
    "Modified: / 7.5.1998 / 13:14:27 / cg"
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   159
    "Created: / 7.5.1998 / 13:15:05 / cg"
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   160
!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   161
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   162
magic_MSB
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   163
    ^ 16rCAFEBABE
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   164
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   165
    "Modified: / 7.5.1998 / 13:14:27 / cg"
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   166
! !
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
   167
135
098936234135 *** empty log message ***
cg
parents: 128
diff changeset
   168
!JavaClassReader class methodsFor:'debugging'!
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   169
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   170
annotationsVerbose:aBoolean
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   171
    AnnotationsVerbose := aBoolean
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   172
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   173
    "
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   174
     Java flushClasses.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   175
     JavaClassReader verbose:true
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   176
     JavaClassReader verbose:false"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   177
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   178
    "Created: / 25-02-2011 / 12:25:23 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   179
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   180
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   181
verbose:aBoolean
083530508d9c intitial checkin
cg
parents:
diff changeset
   182
    Verbose := aBoolean
083530508d9c intitial checkin
cg
parents:
diff changeset
   183
083530508d9c intitial checkin
cg
parents:
diff changeset
   184
    "
67
a72c949d86dd *** empty log message ***
cg
parents: 62
diff changeset
   185
     Java flushClasses.
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   186
     JavaClassReader verbose:true
083530508d9c intitial checkin
cg
parents:
diff changeset
   187
     JavaClassReader verbose:false
083530508d9c intitial checkin
cg
parents:
diff changeset
   188
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
   189
! !
083530508d9c intitial checkin
cg
parents:
diff changeset
   190
135
098936234135 *** empty log message ***
cg
parents: 128
diff changeset
   191
!JavaClassReader class methodsFor:'file reading'!
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   192
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   193
readClass: aClassName
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   194
    "reads a class, and returns it.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   195
     <clinit> is NOT called, class is NOT installed"
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   196
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   197
    ^ self readClass: aClassName ignoring: Set new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   198
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   199
    "Created: / 15-04-1996 / 14:58:53 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   200
    "Modified: / 20-10-1998 / 17:24:54 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   201
    "Modified: / 08-09-2011 / 08:10:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   202
    "Modified (comment): / 07-02-2013 / 14:21:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
21
b9dd73f299dd checkin from browser
cg
parents: 14
diff changeset
   203
!
b9dd73f299dd checkin from browser
cg
parents: 14
diff changeset
   204
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   205
readClass: aClassName classPath: classPath
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   206
    "reads a class, and returns it.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   207
     <clinit> is NOT called, class is NOT installed"
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   208
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   209
    ^ self readClass: aClassName ignoring: Set new classPath: classPath
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   210
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   211
    "Created: / 15-04-1996 / 14:58:53 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   212
    "Modified: / 20-10-1998 / 17:24:54 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   213
    "Modified: / 08-09-2011 / 08:10:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   214
    "Created: / 30-10-2011 / 12:27:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   215
    "Modified (comment): / 07-02-2013 / 14:21:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   216
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   217
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   218
readClass: className ignoring: classesBeingLoadedOrNil
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   219
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   220
    "This method is bit hacky, as it tries to supply 'correct'
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   221
     classloader.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   222
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   223
    If the class is loaded from Java release classPath (containing
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   224
    base java classes shipped with JDK/JRE), then set the classloader
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   225
    to null. Otherwise set class's loader to system class loader
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   226
    (as returned by ClassLoader#getSystemClassLoader())
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   227
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   228
    This is required to run groovy and other SW that uses resources
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   229
    or other classloader dependent stuff. When changing, make sure
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   230
    Groovy is running afterwards!!!!!!
7
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   231
    "
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   232
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   233
    | class |
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   234
    class := self
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   235
                readClass: className ignoring: classesBeingLoadedOrNil
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   236
                classPath: Java release classPath.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   237
    class notNil ifTrue:[ ^ class ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   238
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   239
    class isNil ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   240
        JavaVM booted ifFalse:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   241
            ^nil
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
   242
        ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   243
        JavaClassReader classLoaderQuerySignal answer: JavaVM systemClassLoader do:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   244
            class := self
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   245
                readClass: className ignoring: classesBeingLoadedOrNil
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   246
                classPath: Java classPath.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   247
        ].
327
990c71581df3 support reading from zip-archives
cg
parents: 318
diff changeset
   248
    ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   249
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   250
    ^class
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   251
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   252
    "Created: / 15-04-1996 / 14:58:53 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   253
    "Modified: / 20-10-1998 / 17:24:54 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   254
    "Modified: / 21-10-2011 / 13:39:14 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   255
    "Modified: / 30-10-2011 / 16:50:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   256
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   257
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   258
readClass: className ignoring: ignoring classPath: classPath
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   259
    | cls |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   260
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   261
    cls := self new readClass: className ignoring: ignoring classPath: classPath.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   262
    cls notNil ifTrue:[
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   263
        Logger
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   264
            log: 'loaded class ' , cls displayString
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   265
            severity: #info
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   266
            facility: 'JVM'.
54
f37bcefb7091 avoid loading classes twice
cg
parents: 52
diff changeset
   267
    ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   268
    ^cls.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   269
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   270
    "Created: / 07-02-2013 / 14:34:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   271
    "Modified: / 08-02-2013 / 01:20:13 / Jan Vrany <jan.vrany@fit.cvut.cz>"
43
2c4ca2eb8d07 checkin from browser
cg
parents: 40
diff changeset
   272
!
2c4ca2eb8d07 checkin from browser
cg
parents: 40
diff changeset
   273
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   274
readFile:aFilename ignoring:classesBeingLoaded
7
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   275
    "reads a class from aFilename and returns it.
91
9b325648aa77 resolve rewritten; interpreter fixes
cg
parents: 86
diff changeset
   276
     The JavaClass is NOT installed as global and unresolved
9b325648aa77 resolve rewritten; interpreter fixes
cg
parents: 86
diff changeset
   277
     refs are NOT patched."
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   278
2476
d24ce8174195 JavaClass can now keep it's classfile bytes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2431
diff changeset
   279
    | inStream |
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   280
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   281
    [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   282
        JavaVM commonOpenStreamUsing:[ inStream := aFilename asFilename readStream ]
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   283
    ] on:StreamError do:[:ex |
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   284
        Logger
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   285
            log:('cannot read .class file: ' , ex description) severity:#error facility:'JVM'.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   286
        self breakPoint: #jv.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   287
        ^ nil
43
2c4ca2eb8d07 checkin from browser
cg
parents: 40
diff changeset
   288
    ].
21
b9dd73f299dd checkin from browser
cg
parents: 14
diff changeset
   289
2476
d24ce8174195 JavaClass can now keep it's classfile bytes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2431
diff changeset
   290
    ^[
d24ce8174195 JavaClass can now keep it's classfile bytes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2431
diff changeset
   291
        self readStream:inStream ignoring:classesBeingLoaded.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   292
    ] ensure:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   293
        inStream close.
91
9b325648aa77 resolve rewritten; interpreter fixes
cg
parents: 86
diff changeset
   294
    ].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   295
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   296
    "Created: / 15-04-1996 / 14:58:53 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   297
    "Modified: / 09-05-1998 / 01:44:24 / cg"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   298
    "Modified: / 14-08-2012 / 02:17:26 / jv"
2476
d24ce8174195 JavaClass can now keep it's classfile bytes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2431
diff changeset
   299
    "Modified: / 29-03-2013 / 23:54:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   300
!
083530508d9c intitial checkin
cg
parents:
diff changeset
   301
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   302
readStream: aStream
198
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   303
    "reads a class from aStream and returns it.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   304
     The JavaClass is not installed as global"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   305
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   306
    ^self readStream: aStream ignoring: Set new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   307
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   308
    "Created: / 24-10-2011 / 00:12:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
198
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   309
!
5543d1079a4a *** empty log message ***
cg
parents: 193
diff changeset
   310
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   311
readStream: stream ignoring: classesBeingLoaded
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   312
    "reads a class from aStream and returns it.
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   313
     The JavaClass is not installed as global"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   314
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   315
    ^self readStream: stream loader: self classLoaderQuerySignal query ignoring: classesBeingLoaded
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   316
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   317
    "Modified: / 30-03-1998 / 18:14:40 / cg"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   318
    "Modified: / 09-05-2011 / 23:15:30 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   319
    "Modified: / 02-05-2013 / 09:51:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   320
!
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   321
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   322
readStream: stream loader: classloader
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   323
    "reads a class from aStream and returns it.
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   324
     The JavaClass is not installed as global"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   325
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   326
    ^self readStream: stream loader: classloader ignoring: Set new.
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   327
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   328
    "Created: / 02-05-2013 / 09:51:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   329
!
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   330
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   331
readStream: stream loader: classloader ignoring: classesBeingLoaded
7
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   332
    "reads a class from aStream and returns it.
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   333
     The JavaClass is not installed as global"
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   334
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   335
    | javaClass |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   336
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   337
    javaClass := JavaClassReader new readStream: stream loader: classloader ignoring: classesBeingLoaded.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   338
    Logger
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   339
        log: 'loaded class ' , javaClass displayString
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   340
        severity: #info
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   341
        facility: 'JVM'.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   342
    ^ javaClass.
327
990c71581df3 support reading from zip-archives
cg
parents: 318
diff changeset
   343
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   344
    "Created: / 02-05-2013 / 09:50:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   345
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   346
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   347
!JavaClassReader class methodsFor:'obsolete'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   348
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   349
resolveClass: aJavaClass
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   350
    "Resolve a particular classes' constants.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   351
     Perform all class initialization functions
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   352
     (of those which are not yet initialized)."
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   353
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   354
    | loader  classToLoad |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   355
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   356
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   357
     "new resolving does not need this - shouldn't be called at all"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   358
    LazyClassLoading ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   359
        loader := (aJavaClass classLoader).
399
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   360
        [
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   361
            classToLoad := nil.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   362
            aJavaClass constantPool do: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   363
                :item |
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   364
                | itemClass |
399
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   365
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   366
                itemClass := item class.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   367
                itemClass == JavaUnresolvedClassConstant ifTrue: [
399
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   368
                    classToLoad := item className.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   369
399
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   370
"/                ] ifFalse:[
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   371
"/                    itemClass == JavaUnresolvedMethodrefConstant ifTrue:[
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   372
"/self halt.
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   373
"/                    ] ifFalse:[
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   374
"/                        itemClass == JavaUnresolvedInterfaceMethodrefConstant ifTrue:[
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   375
"/self halt.
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   376
"/                        ]
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   377
"/                    ]
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   378
                ].
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   379
            ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   380
            classToLoad notNil ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   381
                loader isNil ifTrue: [ JavaVM classForName: classToLoad. ] ifFalse: [
399
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   382
                    "/
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   383
                    "/ the aquired loader is a javaClassLoader
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   384
                    "/ which expects an URL as arg.
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   385
                    "/
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   386
                    "/ classURL := Java as_URL:('file:' , nextUnresolved asString , '.class').
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   387
                    "/ loader loadClass:classURL
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   388
                    loader perform: #'loadClass(Ljava/lang/String;)Ljava/lang/Class;'
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   389
                        with: (Java as_String: (classToLoad asString)).
399
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   390
                ]
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   391
            ].
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   392
            classToLoad notNil.
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   393
        ] whileTrue.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   394
        aJavaClass isInitialized ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   395
            Silent ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   396
                'performing class initialization of ' print.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   397
                aJavaClass fullName printCR.
399
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   398
            ].
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   399
            aJavaClass classInit
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   400
        ].
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   401
    ]
94d37f2032a1 classloader fixes.
cg
parents: 386
diff changeset
   402
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   403
    "Created: / 20-10-1998 / 17:53:22 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   404
    "Modified: / 16-11-2011 / 14:39:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   405
! !
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   406
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   407
!JavaClassReader class methodsFor:'others'!
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   408
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   409
version_HG
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   410
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   411
    ^ '$Changeset: <not expanded> $'
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   412
! !
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   413
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   414
!JavaClassReader methodsFor:'accessing'!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   415
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   416
constants
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   417
^ constants.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   418
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   419
    "Created: / 10-05-2011 / 13:48:30 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   420
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   421
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   422
constants: aJavaConstantPool
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   423
    constants := aJavaConstantPool.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   424
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   425
    "Created: / 10-05-2011 / 13:48:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   426
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   427
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   428
stream
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   429
^ inStream.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   430
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   431
    "Created: / 09-05-2011 / 23:22:38 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   432
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   433
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   434
stream:aReadStream
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   435
    inStream := aReadStream.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   436
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   437
    "Created: / 09-05-2011 / 23:23:11 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   438
! !
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   439
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   440
!JavaClassReader methodsFor:'file reading'!
083530508d9c intitial checkin
cg
parents:
diff changeset
   441
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   442
readClass: clsName from: path ignoring: classesBeingLoaded
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   443
    "load class named clsName from directory or .jar archive path.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   444
     <clinit> is NOT called, class is NOT installed as global"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   445
2931
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   446
    | nm  p  zar zarAndRefcount entry  zipFile  read rslt |
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   447
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   448
    p := path asString.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   449
    p asFilename isDirectory ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   450
        | f |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   451
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   452
        (p endsWith: Filename separator) ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   453
            p := p , (Filename separator asString)
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   454
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   455
        nm := p , clsName , '.class'.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   456
        (f := nm asFilename) exists ifTrue: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   457
            (Java isExcludedFromClassPath: nm) ifFalse: [
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   458
                "means we are successfully going to read something :)"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   459
                f readingFileDo:[:s|rslt := self readStream: s ignoring: classesBeingLoaded].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   460
                rslt notNil ifTrue: [ ^ rslt. ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   461
            ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   462
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   463
    ] ifFalse: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   464
        ((zipFile := p asFilename withSuffix: 'jar') exists
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   465
            or: [ (zipFile := p asFilename withSuffix: 'zip') exists ])
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   466
                ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   467
                    "/ Do not use at:ifAbsentPut: here, JavaArchiveCache is a CacheDictionary!!!!!!
2931
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   468
                    JavaArchiveCacheLock critical:[
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   469
                        zarAndRefcount := JavaArchiveCache at: zipFile ifAbsent: nil.
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   470
                        zarAndRefcount isNil ifTrue:[
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   471
                            JavaVM commonOpenStreamUsing:[ zar := ZipArchive oldFileNamed: zipFile ].
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   472
                            JavaArchiveCache at: zipFile put: (zarAndRefcount := Array with: zar with: 1)
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   473
                        ] ifFalse:[
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   474
                            zar := zarAndRefcount first.
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   475
                            zarAndRefcount at: 2 put: (zarAndRefcount at: 2) + 1.
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   476
                        ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   477
                    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   478
                    read := [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   479
                            nm := clsName , '.class'.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   480
2604
b9cb81e47766 Lost changes meant to be commited in 7af1671fc73f.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2602
diff changeset
   481
                            (zar isValidFile: nm) ifTrue: [
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   482
                                (Java isExcludedFromClassPath: nm) ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   483
                                    JavaVM commonOpenStreamUsing:[ zar := zar reopenForReading ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   484
                                    entry := zar extract: nm.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   485
                                    rslt := self readStream: (entry readStream) ignoring: classesBeingLoaded.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   486
                                    rslt notNil ifTrue: [
2931
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   487
                                        JavaArchiveCacheLock critical:[
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   488
                                            zarAndRefcount at: 2 put: (zarAndRefcount at: 2) - 1.
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   489
                                        ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   490
                                        ^ rslt
2931
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   491
                                    ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   492
                                ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   493
                            ].
2931
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   494
                            JavaArchiveCacheLock critical:[
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   495
                                zarAndRefcount at: 2 put: (zarAndRefcount at: 2) - 1.
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   496
                                (zarAndRefcount at: 2) == 0 ifTrue:[
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   497
                                    zar closeFile.
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   498
                                ].
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   499
                            ].
e215dba1f0fb Fix in JavaClassReader for concurrent access to zipa archives.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2914
diff changeset
   500
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   501
                        ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   502
                    JavaClassReader invalidClassFormatSignal
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   503
                        handle: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   504
                            "Kludge, sometimes zar gets corrupted"
2946
5f8f0ac505a5 Fix in JavaClassReader>>#readClass:from:ignoring: (fix wrong code for zar refcounting)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2942
diff changeset
   505
                            JavaArchiveCache at: zipFile put: (Array with: (zar := JavaVM commonOpenStreamUsing: [ZipArchive oldFileNamed: zipFile]) with: 1).
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   506
                            read value
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   507
                        ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   508
                        do: [ read value ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   509
                ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   510
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   511
    ^nil
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   512
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   513
    "Created: / 03-12-2012 / 22:47:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   514
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   515
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   516
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   517
readClass: className ignoring: classesBeingLoadedOrNil classPath: classPath
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   518
    "searches classspath for a class, loads it and returns.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   519
     <clinit> is not called, class is not installed as global"
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   520
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   521
    | rslt  clsName  classesBeingLoaded |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   522
    clsName := className asSlashedJavaClassName.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   523
    classesBeingLoaded := classesBeingLoadedOrNil.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   524
    classesBeingLoaded isNil ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   525
        classesBeingLoaded := Set new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   526
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   527
    classesBeingLoaded add: clsName.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   528
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   529
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   530
    classPath do: [:path |
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   531
        rslt := self readClass: clsName from: path ignoring: classesBeingLoaded.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   532
        rslt notNil ifTrue:[ ^rslt ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   533
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   534
    ^nil.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   535
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   536
    "Created: / 15-04-1996 / 14:58:53 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   537
    "Modified: / 20-10-1998 / 17:24:54 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   538
    "Created: / 23-10-2011 / 21:48:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   539
    "Modified: / 03-11-2011 / 18:14:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   540
    "Modified: / 14-08-2012 / 02:17:59 / jv"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   541
    "Modified: / 07-02-2013 / 14:19:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   542
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   543
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   544
readClassFileIgnoring: classesbeingLoaded
7
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   545
    "reads a class from inStream and returns it.
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
   546
     The JavaClass is not installed as global and its constants
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
   547
     (especially strings) may not be fully resolved."
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   548
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   549
    | magic  access_flags  this_class_index  super_class  super_class_index  this_class_ref  existingSuperClass  fields  interfaces  staticFields  nStatic  superClassName  thisClassName  existing_class  thisMetaClass |
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   550
083530508d9c intitial checkin
cg
parents:
diff changeset
   551
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
   552
    "/ read magic, determine byte order
083530508d9c intitial checkin
cg
parents:
diff changeset
   553
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
   554
    msb := true.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   555
    magic := inStream nextUnsignedLongMSB: true.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   556
    magic = (self class magic_MSB) ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   557
        magic = (self class magic_LSB) ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   558
            InvalidClassFormatSignal raiseErrorString: 'not a java class file'.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   559
            ^ nil
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   560
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   561
        msb := false.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   562
        Verbose ifTrue: [ Transcript showCR: 'file is lsb' ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   563
    ] ifTrue: [ Verbose ifTrue: [ Transcript showCR: 'file is msb' ]. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   564
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   565
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
   566
    "/ get version
083530508d9c intitial checkin
cg
parents:
diff changeset
   567
    "/
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   568
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   569
    minorVsn := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   570
    majorVsn := inStream nextUnsignedShortMSB: msb.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   571
    ((self class fileMajorVersions includes: majorVsn) not
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   572
        or: [ (self class fileMinorVersions includes: minorVsn) not ])
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   573
            ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   574
                | path |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   575
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   576
                path := inStream isFileStream ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   577
                    path := inStream pathName
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   578
                ] ifFalse:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   579
                    path := '<memory>'
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   580
                ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   581
                self info:
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   582
                    ('class reader: file ', path , ' has version ' ,
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   583
                         majorVsn printString ,
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   584
                            '.' , minorVsn printString)
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   585
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   586
            ].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   587
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
   588
    "/ get constant pool
083530508d9c intitial checkin
cg
parents:
diff changeset
   589
    "/
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   590
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   591
    self readConstantPool.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   592
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   593
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
   594
    "/ access flags
083530508d9c intitial checkin
cg
parents:
diff changeset
   595
    "/
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   596
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   597
    access_flags := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   598
    this_class_index := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   599
    super_class_index := inStream nextUnsignedShortMSB: msb.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   600
    super_class_index == 0 ifTrue: [ super_class := nil ] ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   601
        super_class := constants at: super_class_index.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   602
        superClassName := super_class fullName.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   603
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   604
        "/ special for ST-classes
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   605
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   606
        (superClassName startsWith: 'smalltalk.') ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   607
            "/ a Smalltalk class
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   608
            superClassName := superClassName copyFrom: 11.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   609
            existingSuperClass := Smalltalk at: superClassName asSymbol.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   610
            existingSuperClass notNil ifTrue: [ super_class := existingSuperClass ] ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   611
                "/ self halt - must load superclass ...
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   612
            ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   613
        ] ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   614
            "/ a JAVA class
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   615
            super_class := JavaVM classNamed: superClassName definedBy: classLoader.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   616
            super_class isNil ifTrue: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   617
                super_class := self
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   618
                                loadSuperclassIdentifiedBy: (constants at: super_class_index)
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   619
                                ignoring: classesbeingLoaded
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   620
            ].
2460
f89d54b4673c class: JavaClassReader
Claus Gittinger <cg@exept.de>
parents: 2428
diff changeset
   621
            super_class isNil ifTrue: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   622
                self breakPoint:#jv info: 'Cannot find super class?!!'
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   623
            ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   624
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   625
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   626
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   627
    "/ If superclass is finalized, mark class so as well.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   628
    (super_class notNil and:[super_class hasFinalize]) ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   629
        access_flags := access_flags bitOr: ACX_HASFINALIZE
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   630
    ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   631
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   632
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
   633
    "/ get interfaces
083530508d9c intitial checkin
cg
parents:
diff changeset
   634
    "/
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   635
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
   636
    interfaces := self readInterfaces.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   637
    interfaces do:[:interface |
2914
1f4c3054998c Native java.lang.Object#clone() refactored to use ACX_CLOENABLE flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2868
diff changeset
   638
        interface javaClassName = 'java/lang/Cloneable' ifTrue:[
1f4c3054998c Native java.lang.Object#clone() refactored to use ACX_CLOENABLE flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2868
diff changeset
   639
            access_flags := access_flags bitOr: ACX_CLONEABLE.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   640
        ].
2914
1f4c3054998c Native java.lang.Object#clone() refactored to use ACX_CLOENABLE flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2868
diff changeset
   641
    ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   642
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   643
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
   644
    "/ get fields
083530508d9c intitial checkin
cg
parents:
diff changeset
   645
    "/
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   646
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
   647
    fields := self readFieldInfofields.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   648
40
7f332a95e015 checkin from browser
cg
parents: 39
diff changeset
   649
    "/
7f332a95e015 checkin from browser
cg
parents: 39
diff changeset
   650
    "/ create the fields as instVars
7f332a95e015 checkin from browser
cg
parents: 39
diff changeset
   651
    "/ static fields are created as class-InstVars
7f332a95e015 checkin from browser
cg
parents: 39
diff changeset
   652
    "/
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   653
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   654
    staticFields := fields select: [:f | f isStatic ].
40
7f332a95e015 checkin from browser
cg
parents: 39
diff changeset
   655
    nStatic := staticFields size.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   656
    this_class_ref := constants at: this_class_index.
2868
90724c4fa7f8 Fix to recompile erroneous classes upon reload.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2866
diff changeset
   657
    thisClassName := this_class_ref name.
2914
1f4c3054998c Native java.lang.Object#clone() refactored to use ACX_CLOENABLE flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2868
diff changeset
   658
    thisClassName = 'java/lang/Cloneable' ifTrue:[
1f4c3054998c Native java.lang.Object#clone() refactored to use ACX_CLOENABLE flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2868
diff changeset
   659
        access_flags := access_flags bitOr: ACX_CLONEABLE.
1f4c3054998c Native java.lang.Object#clone() refactored to use ACX_CLOENABLE flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2868
diff changeset
   660
    ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   661
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
   662
    "/ care for smalltalk classes ...
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   663
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   664
    (thisClassName startsWith: 'smalltalk.') ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   665
        thisClassName := thisClassName copyFrom: 11.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   666
        existing_class := Smalltalk at: thisClassName asSymbol.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   667
        existing_class notNil ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   668
            self halt: ('overloading existing class: ' , thisClassName).
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   669
            thisClassName := (thisClassName , '_new') asSymbol.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   670
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   671
        thisMetaClass := Metaclass new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   672
        thisMetaClass setSuperclass: super_class class.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   673
        thisMetaClass instSize: (super_class class instSize + nStatic).
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   674
        classBeingLoaded := thisMetaClass new.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   675
        classBeingLoaded setSuperclass: super_class.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   676
        classBeingLoaded setName: thisClassName asSymbol.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   677
    ] ifFalse: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   678
        "/ a java class
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   679
        Class withoutUpdatingChangesDo:[
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
   680
            classBeingLoaded := JavaClass binaryName: thisClassName numStatic: nStatic.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   681
            classBeingLoaded classLoader: self class classLoaderQuerySignal query.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   682
            fields := fields select: [:f | f isStatic not ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   683
            JavaClass setInstanceVariableStringFromFields: staticFields
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   684
                in: classBeingLoaded class.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   685
            classBeingLoaded setStaticFields: staticFields.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   686
            classBeingLoaded setAccessFlags: access_flags.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   687
            classBeingLoaded setSuperclass: super_class.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   688
            classBeingLoaded setConstantPool: constants.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   689
            classBeingLoaded setFields: fields.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   690
            classBeingLoaded setInterfaces: interfaces.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   691
        ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   692
    ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   693
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   694
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
   695
    "/ get methods
083530508d9c intitial checkin
cg
parents:
diff changeset
   696
    "/
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   697
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   698
    self readMethodsFor: classBeingLoaded.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   699
    self readAttributesFor: classBeingLoaded.
2729
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
   700
    classBeingLoaded setAttributes: attributes.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   701
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   702
    "/
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   703
    "/ get extensions
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   704
    "/
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   705
    self readExtensionsFor: classBeingLoaded.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   706
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   707
    classBeingLoaded fields do: [:each | self updateOwnerInField: each ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   708
    classBeingLoaded staticFields do: [:each | self updateOwnerInField: each ].
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   709
    classBeingLoaded classLoader: classLoader.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   710
    classesbeingLoaded remove: classBeingLoaded name ifAbsent:[].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   711
    ^ classBeingLoaded.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   712
1
083530508d9c intitial checkin
cg
parents:
diff changeset
   713
    "
355
9452f8876652 *** empty log message ***
cg
parents: 353
diff changeset
   714
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
9452f8876652 *** empty log message ***
cg
parents: 353
diff changeset
   715
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
9452f8876652 *** empty log message ***
cg
parents: 353
diff changeset
   716
     JavaClassReader loadFile:'foo.cls'
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
   717
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
   718
     JavaClassReader verbose:true.
355
9452f8876652 *** empty log message ***
cg
parents: 353
diff changeset
   719
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/java/lang/ArithmeticException.class'
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   720
     JavaClassReader loadFile:'/phys/ibm3/java/lib/java/lang/ArithmeticException.class'"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   721
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   722
    "Created: / 15-04-1996 / 15:02:47 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   723
    "Modified: / 12-11-1998 / 21:14:45 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   724
    "Modified: / 15-10-2010 / 17:37:38 / Jan Kurs <kurs.jan@post.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   725
    "Modified: / 28-01-2011 / 15:09:48 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   726
    "Modified: / 18-05-2011 / 15:30:29 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2914
1f4c3054998c Native java.lang.Object#clone() refactored to use ACX_CLOENABLE flag.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2868
diff changeset
   727
    "Modified: / 12-11-2013 / 00:39:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   728
!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   729
54
f37bcefb7091 avoid loading classes twice
cg
parents: 52
diff changeset
   730
readStream:aStream ignoring:classesBeingLoaded
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   731
    <resource: #obsolete>
7
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   732
    "reads a class from aStream and returns it.
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   733
     The JavaClass is not installed as global"
de8ce26e1f2c checkin from browser
cg
parents: 5
diff changeset
   734
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   735
    ^self readStream:aStream loader: self class classLoaderQuerySignal query ignoring:classesBeingLoaded
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   736
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   737
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   738
    "
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   739
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   740
    "
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   741
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   742
    "Created: / 15-04-1996 / 15:00:55 / cg"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   743
    "Modified: / 02-05-2013 / 09:53:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   744
!
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   745
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   746
readStream:stream loader: classloader ignoring:classesBeingLoaded
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   747
    "reads a class from aStream and returns it.
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   748
     The JavaClass is not installed as global"
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   749
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   750
    inStream := stream.
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   751
    classLoader := classloader.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   752
    inStream binary.
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
   753
54
f37bcefb7091 avoid loading classes twice
cg
parents: 52
diff changeset
   754
    ^ self readClassFileIgnoring:classesBeingLoaded
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   755
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   756
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   757
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   758
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   759
2578
fc6186a4961f Performance optimization: rewrote 'JavaVM classNamed:' to 'JavaVM classNamed:...definedBy:...'.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2566
diff changeset
   760
    "Created: / 02-05-2013 / 09:52:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   761
! !
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   762
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   763
!JavaClassReader methodsFor:'file reading - attributes'!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
   764
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   765
readAnnotationDefaultAttributeFor:something
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   766
    "/        ('JAVA [info]: unhandled attribute: AnnotationDefault') infoPrintCR.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   767
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   768
    |len startPos endPos annotationDefault|
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   769
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   770
    self assert:something isJavaMethod
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   771
    message:'AnnotationDefault may only occure for methods!!'.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   772
    len := inStream nextUnsignedLongMSB:msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   773
    startPos := inStream position.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   774
    annotationDefault := (something ensureHasAnnotations)
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   775
                default:(JavaAnnotationDefault new
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   776
                            value:(self readAnnotationValueFor:something));
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   777
                default.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   778
    endPos := inStream position.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   779
    inStream position:startPos.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   780
    annotationDefault bytes:(inStream next:len).
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   781
    self assert:inStream position = endPos
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   782
    message:'self readAnnotationValueFor: something is reading what it shouldn'.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   783
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   784
    "Modified: / 28-02-2011 / 17:08:28 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   785
    "Modified: / 03-03-2011 / 23:06:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   786
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   787
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   788
readAnnotationFor:something
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   789
    | typeIndex  type  result  attrsCount |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   790
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   791
    typeIndex := inStream nextUnsignedShortMSB:msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   792
    type := constants at:typeIndex.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   793
    attrsCount := inStream nextUnsignedShortMSB:msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   794
    result := JavaAnnotation for:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   795
    result name:type.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   796
    attrsCount timesRepeat:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   797
            [ | nameIndex  name  valueIndex  attr |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   798
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   799
            nameIndex := inStream nextUnsignedShortMSB:msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   800
            name := constants at:nameIndex.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   801
            attr := self readAnnotationValueFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   802
            attr name:name.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   803
            result values at:attr name put:attr.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   804
            AnnotationsVerbose
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   805
                ifTrue:[ ('JAVA [INFO]: Reading annotation attribute: ' , name) infoPrintCR. ]. ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   806
    ^ result.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   807
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   808
    "Created: / 17-12-2010 / 16:21:28 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   809
    "Modified: / 25-02-2011 / 12:25:36 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   810
    "Modified: / 27-07-2011 / 09:37:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
   811
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
   812
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   813
readAnnotationValueFor:something
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   814
    | tag  result |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   815
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   816
    tag := (inStream nextByte) asCharacter.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   817
    tag = $e
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   818
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   819
            [ result := JavaAnnotationEnumValue for:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   820
            result nameIndex:(inStream nextUnsignedShortMSB:msb).
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   821
            result valueIndex:(inStream nextUnsignedShortMSB:msb).
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   822
            AnnotationsVerbose
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   823
                ifTrue:
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   824
                    [ ('JAVA [INFO]: Reading annotation enum value: ' , result name printString, ' -> '
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   825
                        , result value printString) infoPrintCR ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   826
            ^ result ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   827
    tag = $c
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   828
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   829
            [ result := JavaAnnotationClassValue for:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   830
            result classIndex:(inStream nextUnsignedShortMSB:msb).
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   831
            AnnotationsVerbose
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   832
                ifTrue:
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   833
                    [ ('JAVA [INFO]: Reading annotation class value: ' , result name printString, ' -> '
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   834
                        , result value printString) infoPrintCR ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   835
            ^ result ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   836
    tag = $@
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   837
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   838
            [ result := JavaAnnotationNestedAnnotationValue for:something.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   839
            result nestedAnnotation:(self readAnnotationFor: something).
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   840
            AnnotationsVerbose
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   841
                ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   842
                    [ ('JAVA [INFO]: Reading annotation nested annotation value: ' , result name printString
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   843
                        , ' -> ' , result value printString)
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   844
                        infoPrintCR ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   845
            ^ result ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   846
    tag = $[
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   847
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   848
            [ result := JavaAnnotationArrayValue for:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   849
            result count:(inStream nextUnsignedShortMSB:msb).
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   850
            AnnotationsVerbose
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   851
                ifTrue:[ ('JAVA [INFO]: Reading annotation array value') infoPrintCR ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   852
            1 to:result count
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   853
                do:[:index | result values at:index put:(self readAnnotationValueFor:something) ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   854
            AnnotationsVerbose
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   855
                ifTrue:
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   856
                    [ ('JAVA [INFO]: Finished reading annotation array value: '
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   857
                        , result value printString) infoPrintCR ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   858
            ^ result ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   859
    result := JavaAnnotationPrimitiveValue for:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   860
    result valueIndex:(inStream nextUnsignedShortMSB:msb).
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   861
     AnnotationsVerbose
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   862
                ifTrue:
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   863
                    [ ('JAVA [INFO]: Finished reading annotation primitive value: '
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   864
                             , result name printString , ' -> ' , result value printString) infoPrintCR ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   865
    ^ result.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   866
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   867
    "Created: / 17-12-2010 / 16:44:14 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   868
    "Modified: / 28-02-2011 / 16:12:09 / Marcel Hlopko <hlopik@gmail.com>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
   869
    "Modified: / 12-02-2013 / 19:35:15 / Marcel Hlopko <marcel.hlopko@fit.cvut.cz>"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   870
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   871
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   872
readAttribute:attributeName for:something
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
   873
    "/ implemented JAVA attributes
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   874
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   875
    (attributeName = 'ConstantValue')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   876
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   877
            [ self readConstantValueAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   878
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   879
    (attributeName = 'Code')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   880
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   881
            [ self readCodeAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   882
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   883
    (attributeName = 'Exceptions')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   884
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   885
            [ self readExceptionsAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   886
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   887
    (attributeName = 'InnerClasses')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   888
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   889
            [ self readInnerClassesAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   890
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   891
    (attributeName = 'EnclosingMethod')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   892
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   893
            [ self readEnclosingMethodAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   894
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   895
    (attributeName = 'LineNumberTable')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   896
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   897
            [ self readLineNumberTableAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   898
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   899
    (attributeName = 'LocalVariableTable')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   900
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   901
            [ self readLocalVariableTableAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   902
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   903
    (attributeName = 'LocalVariableTypeTable')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   904
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   905
            [ self readLocalVariableTypeTableAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   906
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   907
    (attributeName = 'SourceFile')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   908
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   909
            [ self readSourceFileAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   910
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   911
    (attributeName = 'SourceDebugExtension')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   912
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   913
            [ self readSourceDebugExtensionAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   914
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   915
    (attributeName = 'Synthetic')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   916
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   917
            [ self readSyntheticAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   918
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   919
    (attributeName = 'Signature')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   920
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   921
            [ self readSignatureAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   922
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   923
    (attributeName = 'Deprecated')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   924
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   925
            [ self readDeprecatedAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   926
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   927
    (attributeName = 'RuntimeVisibleAnnotations')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   928
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   929
            [ self readRuntimeAnnotationsAttributeFor:something visible:true.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   930
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   931
    (attributeName = 'RuntimeInvisibleAnnotations')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   932
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   933
            [  self readRuntimeAnnotationsAttributeFor:something visible:false.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   934
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   935
    (attributeName = 'RuntimeVisibleParameterAnnotations')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   936
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   937
            [ self readRuntimeParameterAnnotationsAttributeFor:something visible:true.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   938
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   939
    (attributeName = 'RuntimeInvisibleParameterAnnotations')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   940
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   941
            [ self readRuntimeParameterAnnotationsAttributeFor:something visible:false.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   942
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   943
    (attributeName = 'AnnotationDefault')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   944
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   945
            [ self readAnnotationDefaultAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   946
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   947
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
   948
    "/ ignored JAVA attributes
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   949
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   950
    (attributeName = 'FastJavac1.0')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   951
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   952
            [ "/        ('JAVA [info]: unhandled attribute: ' , attributeName) infoPrintCR.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   953
            self skipAttribute:attributeName.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   954
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   955
    (attributeName = 'AbsoluteSourcePath')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   956
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   957
            [ ('JAVA [info]: unhandled attribute: ' , attributeName) infoPrintCR.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   958
            self skipAttribute:attributeName.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   959
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   960
    (attributeName startsWith:((Character value:13) asString , 'WARNING:'))
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   961
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   962
            [ "/        ('JAVA [info]: unhandled attribute: ' , attributeName) infoPrintCR.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   963
            self skipAttribute:attributeName.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   964
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   965
    (attributeName = 'StackMapTable')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   966
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   967
            [ "/        ('JAVA [info]: unhandled attribute: ' , attributeName) infoPrintCR.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   968
            self readStackMapTableAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   969
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   970
2089
f90b44f9c9e0 utf8 string decoding
Claus Gittinger <cg@exept.de>
parents: 749
diff changeset
   971
    "/ implemented ST attributes
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   972
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   973
    (attributeName = 'STLiterals')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   974
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   975
            [ self readSTLiteralsAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   976
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   977
    (attributeName = 'ClassRevision')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   978
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   979
            [ self readSTClassRevisionAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   980
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   981
    (attributeName = 'ClassPackage')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   982
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   983
            [ self readSTClassPackageAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   984
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   985
    (attributeName = 'ClassCategory')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   986
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   987
            [ self readSTClassCategoryAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   988
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   989
    (attributeName = 'ClassVarNames')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   990
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   991
            [ self readSTClassVarNamesAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   992
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   993
    (attributeName = 'ClassInstVarNames')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   994
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   995
            [ self readSTClassInstVarNamesAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   996
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
   997
    (attributeName = 'InstVarNames')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   998
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
   999
            [ self readSTInstVarNamesAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1000
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1001
    (attributeName = 'STCode')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1002
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1003
            [ self readSTCodeAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1004
            ^ self. ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1005
    (attributeName = 'MethodCategory')
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1006
        ifTrue:
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1007
            [ self readSTMethodCategoryAttributeFor:something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1008
            ^ self. ].
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1009
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1010
    "/ Eclipse Java Compiler Specific Attributes
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1011
    (attributeName = 'MissingTypes')
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1012
        ifTrue:
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1013
            [ self readMissingTypesAttributeFor:something.
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1014
            ^ self. ].
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1015
355
9452f8876652 *** empty log message ***
cg
parents: 353
diff changeset
  1016
    "/ unknown attributes
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1017
335
5309d0a795b1 checkin from browser
cg
parents: 333
diff changeset
  1018
    ('JAVA [warning]: unrecognized attribute: ' , attributeName) infoPrintCR.
333
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1019
    self skipAttribute:attributeName.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1020
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1021
    "Modified: / 03-12-1998 / 13:13:42 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1022
    "Modified: / 25-02-2011 / 18:09:21 / Marcel Hlopko <hlopik@gmail.com>"
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1023
    "Modified: / 16-10-2013 / 02:01:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1024
!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1025
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1026
readAttributeFor:something
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1027
    |attribute_name_index attribute_name attribute_length attribute_info|
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1028
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  1029
    Verbose ifTrue:[Transcript show:'attrib at pos: '; showCR:inStream position].
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1030
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1031
    attribute_name_index := inStream nextUnsignedShortMSB:msb.
2142
4836ff0780cd *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2115
diff changeset
  1032
    attribute_name_index == 0 ifTrue:[
4836ff0780cd *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2115
diff changeset
  1033
        self halt.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1034
        "/self skipAttribute:'unnamed'.
2142
4836ff0780cd *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2115
diff changeset
  1035
        ^ self.
4836ff0780cd *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2115
diff changeset
  1036
    ].
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1037
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1038
    "/
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1039
    "/ UNDOC feature ?
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1040
    "/
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1041
    attribute_name_index > constants size ifTrue:[
333
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1042
        attribute_name_index == 16rb700 ifTrue:[
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1043
            self halt.
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1044
        ]
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1045
    ].
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1046
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1047
    attribute_name := constants at:attribute_name_index.
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1048
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  1049
    Verbose ifTrue:[Transcript show:'attrib name: '; showCR:attribute_name].
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  1050
333
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1051
    self readAttribute:attribute_name for:something.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1052
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1053
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1054
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1055
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1056
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1057
    "Created: / 15-04-1996 / 15:40:17 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1058
    "Modified: / 09-04-1998 / 18:13:34 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1059
    "Modified: / 19-10-2010 / 21:43:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1060
!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1061
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1062
readAttributesFor:something
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1063
    |attributes_count|
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1064
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1065
    attributes_count := inStream nextUnsignedShortMSB:msb.
2729
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1066
    attributes := OrderedCollection new: attributes_count * 2.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1067
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1068
    1 to:attributes_count do:[:i |
2729
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1069
        self readAttributeFor:something.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1070
    ].
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1071
2729
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1072
    "Created: / 15-04-1996 / 15:40:17 / cg"
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1073
    "Modified: / 13-09-2013 / 01:01:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
333
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1074
!
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1075
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1076
readDeprecatedAttributeFor:aJavaMethodWithHandler
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1077
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1078
    self skipAttribute:'Deprecated'.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1079
    ^self
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1080
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1081
    "Created: / 18-10-2010 / 22:26:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1082
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1083
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1084
readEnclosingMethodAttributeFor:something
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1085
"/        ('JAVA [info]: unhandled attribute: EnclosingMethod') infoPrintCR.
2729
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1086
"/        self skipAttribute:'EnclosingMethod'.
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1087
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1088
    |attribute_length class_index class_ref method_index method_ref |
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1089
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1090
    attribute_length := inStream nextUnsignedLongMSB:msb.
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1091
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1092
    class_index := inStream nextUnsignedShortMSB:msb.
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1093
    class_ref := constants at: class_index.
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1094
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1095
    method_index := inStream nextUnsignedShortMSB:msb.
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1096
    method_index ~~ 0 ifTrue:[
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1097
        method_ref := constants at: method_index.
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1098
    ].
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1099
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1100
    attributes add: #EnclosingMethod; add: (Array with: class_ref with: method_ref)
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1101
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1102
    "Modified: / 13-09-2013 / 01:07:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1103
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1104
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1105
readInnerClassesAttributeFor:something
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1106
    | attribute_length number_of_classes classes |
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1107
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1108
    attribute_length := inStream nextUnsignedLongMSB:msb. "/ skip attribute length.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1109
    number_of_classes := inStream nextUnsignedShortMSB:msb.
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1110
    classes := JavaInnerClasses new: number_of_classes.
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1111
    self assert: attribute_length == ((number_of_classes * 8) + 2).
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1112
    1 to: number_of_classes do:[:i |
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1113
        | entry index |
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1114
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1115
        entry := JavaInnerClasses::Entry new.
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1116
        index := inStream nextUnsignedShortMSB:msb.
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1117
        index ~~ 0 ifTrue:[
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1118
            entry setInnerClassRef: (constants at: index).
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1119
        ].
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1120
        index := inStream nextUnsignedShortMSB:msb.
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1121
        index ~~ 0 ifTrue:[
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1122
            entry setOuterClassRef: (constants at: index).
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1123
        ].
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1124
        index := inStream nextUnsignedShortMSB:msb.
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1125
        index ~~ 0 ifTrue:[
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1126
            entry setName: (constants at: index)
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1127
        ].
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1128
        entry setAccessFlags: (inStream nextUnsignedShortMSB:msb).
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1129
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1130
        classes at: i put:  entry
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1131
    ].
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1132
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1133
    attributes add: #InnerClasses; add: classes.
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1134
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1135
    "Modified: / 16-10-2013 / 09:53:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1136
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1137
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1138
readLocalVariableTypeTableAttributeFor:something
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1139
"/        ('JAVA [info]: unhandled attribute: LocalVariableTypeTable') infoPrintCR.
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1140
        self skipAttribute:'LocalVariableTypeTable'.
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1141
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1142
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1143
readMissingTypesAttributeFor:something
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1144
    | attribute_length numMissingTypes missingTypes |
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1145
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1146
    attribute_length := inStream nextUnsignedLongMSB:msb. "/ skip attribute length.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1147
    numMissingTypes := inStream nextUnsignedShortMSB:msb.
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1148
    missingTypes := Array new: numMissingTypes.
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1149
    self assert: attribute_length == ((numMissingTypes * 2) + 2).
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1150
    1 to: numMissingTypes do:[: i |
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1151
        missingTypes at: i put: (constants at:  (inStream nextUnsignedShortMSB:msb))
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1152
    ].
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1153
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1154
    attributes add: #MissingTypes; add: missingTypes.
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1155
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1156
    "Created: / 16-10-2013 / 02:04:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1157
!
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1158
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1159
readRuntimeAnnotationsAttributeFor: something visible: visible
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1160
    | length  annotationsCount  annotations  rawAnnotations  startPos  endPos |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1161
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1162
    self assert: inStream isPositionable
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1163
        message: '.class file stream must be positionable'.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1164
    length := inStream nextUnsignedLongMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1165
    startPos := inStream position.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1166
    annotationsCount := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1167
    annotationsCount = 0 ifTrue: [ ^ nil ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1168
    annotations := visible ifTrue: [something ensureHasAnnotations ensureRuntimeVisible] ifFalse: [something ensureHasAnnotations ensureRuntimeInvisible].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1169
    annotationsCount timesRepeat:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1170
            [ | currentAnnotation |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1171
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1172
            currentAnnotation := self readAnnotationFor: something.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1173
            annotations at: currentAnnotation name put: currentAnnotation. ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1174
     "Cut raw annotations as required by getRawAnnotations()"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1175
    endPos := inStream position.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1176
    inStream position: startPos.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1177
    rawAnnotations := inStream next: length.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1178
    inStream position ~= endPos
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1179
        ifTrue: [ self halt: 'annotations are probably reading what they shouldnt' ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1180
    annotations rawAnnotations: rawAnnotations.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1181
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1182
    "Modified: / 07-01-2011 / 22:00:07 / Jan Kurs <kurs.jan@post.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1183
    "Modified: / 25-02-2011 / 18:45:58 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1184
    "Modified: / 03-03-2011 / 23:01:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1185
    "Modified: / 16-03-2011 / 16:57:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1186
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1187
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1188
readRuntimeParameterAnnotationsAttributeFor: javaMethod visible: visible
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1189
    | length  paramsCount  annotationsCount  rawAnnotations  startPos  endPos |
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1190
    self assert: inStream isPositionable
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1191
        message: '.class file stream must be positionable'.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1192
    length := inStream nextUnsignedLongMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1193
    startPos := inStream position.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1194
    paramsCount := inStream nextByte.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1195
    paramsCount = 0 ifTrue: [ ^ nil ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1196
    1 to: paramsCount do: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1197
        :paramIndex |
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1198
        annotationsCount := inStream nextUnsignedShortMSB: msb.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1199
        annotationsCount > 0 ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1200
            | annotations |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1201
            annotations := visible ifTrue: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1202
                    javaMethod ensureHasAnnotations
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1203
                        ensureVisibleParameterAnnotationsAt: paramIndex
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1204
                ] ifFalse: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1205
                    javaMethod ensureHasAnnotations
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1206
                        ensureInvisibleParameterAnnotationsAt: paramIndex
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1207
                ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1208
            annotationsCount timesRepeat: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1209
                | annotation |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1210
                annotation := self readAnnotationFor: javaMethod.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1211
                annotations at: (annotation name) put: annotation.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1212
            ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1213
        ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1214
    ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1215
    endPos := inStream position.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1216
    inStream position: startPos.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1217
    rawAnnotations := inStream next: length.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1218
    inStream position ~= endPos ifTrue: [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1219
        self halt: 'annotations are probably reading what they shouldnt'
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1220
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1221
    self breakPoint:#mh.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1222
    javaMethod annotations rawParamAnnotations: rawAnnotations.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1223
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1224
    "Modified: / 28-02-2011 / 17:05:47 / Marcel Hlopko <hlopik@gmail.com>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1225
    "Modified: / 01-12-2012 / 22:54:35 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1226
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1227
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1228
readSignatureAttributeFor:something
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1229
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1230
    |attribute_length signature_index signature|
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1231
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1232
    attribute_length := inStream nextUnsignedLongMSB:msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1233
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1234
    signature_index := inStream nextUnsignedShortMSB:msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1235
    signature := constants at:signature_index.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1236
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1237
    something setSignature: signature.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1238
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1239
    "Modified: / 13-08-2011 / 00:28:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1240
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1241
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1242
readSourceDebugExtensionAttributeFor:something
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1243
"/        ('JAVA [info]: unhandled attribute: SourceDebugExtension') infoPrintCR.
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1244
        self skipAttribute:'SourceDebugExtension'.
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1245
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1246
353
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1247
readSourceFileAttributeFor:aClass
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1248
    |attribute_length sourceFile_index sourceFile|
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1249
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1250
    attribute_length := inStream nextUnsignedLongMSB:msb.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1251
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1252
    sourceFile_index := inStream nextUnsignedShortMSB:msb.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1253
    sourceFile := constants at:sourceFile_index.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1254
353
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1255
    aClass isJavaClass ifTrue:[
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1256
        aClass setSourceFile:sourceFile.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1257
    ] ifFalse:[
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1258
        aClass setClassFilename:sourceFile
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1259
    ].
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1260
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1261
    Verbose ifTrue:[Transcript show:'sourceFile: '; showCR:sourceFile].
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1262
    ^ true
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1263
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1264
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1265
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1266
     JavaClassReader loadFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1267
     JavaClassReader loadFile:'foo.cls'
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1268
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1269
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1270
    "Created: / 15.4.1996 / 15:40:17 / cg"
353
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1271
    "Modified: / 12.5.1998 / 22:01:07 / cg"
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1272
!
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1273
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1274
readStackMapTableAttributeFor:something
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1275
"/        ('JAVA [info]: unhandled attribute: StackMapTable') infoPrintCR.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1276
    self skipAttribute:'StackMapTable'.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1277
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1278
    "Created: / 09-02-2011 / 01:19:20 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1279
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1280
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1281
readSyntheticAttributeFor:something
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1282
"/        ('JAVA [info]: unhandled attribute: Synthetic') infoPrintCR.
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1283
        self skipAttribute:'Synthetic'.
2729
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1284
        attributes add: #Synthetic; add: true.
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1285
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  1286
    "Modified: / 13-09-2013 / 01:08:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1287
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  1288
333
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1289
skipAttribute:attributeName
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1290
    "dont know about this attribute - skip it here"
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1291
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1292
    |attribute_length attribute_info|
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1293
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1294
    attribute_length := inStream nextUnsignedLongMSB:msb.
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1295
    attribute_info := ByteArray new:(attribute_length).
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1296
    inStream nextBytes:attribute_length into:attribute_info startingAt:1.
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1297
    attribute_info.
333
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1298
    Verbose ifTrue:[Transcript show:'skipped '; show:attributeName; showCR:'-attribute'].
1622ff2b686b checkin from browser
cg
parents: 330
diff changeset
  1299
2866
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1300
    "Created: / 09-04-1998 / 18:12:46 / cg"
d92f88db7514 Improved JavaClassReader to read InnerClasses and MissingTypes attributes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2841
diff changeset
  1301
    "Modified: / 16-10-2013 / 01:54:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1302
! !
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1303
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1304
!JavaClassReader methodsFor:'file reading - attributes-ST'!
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1305
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1306
readSTClassCategoryAttributeFor:aClass
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1307
    |attribute_length categoryString_index categoryString|
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1308
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1309
    attribute_length := inStream nextUnsignedLongMSB:msb.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1310
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1311
    categoryString_index := inStream nextUnsignedShortMSB:msb.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1312
    categoryString := constants at:categoryString_index.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1313
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1314
    aClass category:categoryString.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1315
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1316
    Verbose ifTrue:[Transcript show:'categoryString: '; showCR:categoryString].
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1317
    ^ true
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1318
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1319
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1320
     JavaClassReader loadFile:'foo.cls'
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1321
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1322
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1323
    "Created: / 9.5.1998 / 02:33:13 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1324
    "Modified: / 9.5.1998 / 02:36:55 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1325
!
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1326
353
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1327
readSTClassInstVarNamesAttributeFor:aClass
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1328
    |attribute_length nameString_index nameString|
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1329
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1330
    attribute_length := inStream nextUnsignedLongMSB:msb.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1331
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1332
    nameString_index := inStream nextUnsignedShortMSB:msb.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1333
    nameString := constants at:nameString_index.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1334
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1335
    aClass class instanceVariableString:nameString.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1336
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1337
    Verbose ifTrue:[Transcript show:'nameString: '; showCR:nameString].
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1338
    ^ true
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1339
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1340
    "
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1341
     JavaClassReader loadFile:'foo.cls'
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1342
    "
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1343
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1344
    "Modified: / 12.5.1998 / 22:18:03 / cg"
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1345
    "Created: / 12.5.1998 / 22:18:24 / cg"
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1346
!
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1347
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1348
readSTClassPackageAttributeFor:aClass
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1349
    |attribute_length packageString_index packageString|
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1351
    attribute_length := inStream nextUnsignedLongMSB:msb.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1352
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1353
    packageString_index := inStream nextUnsignedShortMSB:msb.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1354
    packageString := constants at:packageString_index.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1355
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1356
    aClass package:packageString asSymbol.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1357
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1358
    Verbose ifTrue:[Transcript show:'packageString: '; showCR:packageString].
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1359
    ^ true
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1360
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1361
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1362
     JavaClassReader loadFile:'foo.cls'
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1363
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1364
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1365
    "Modified: / 9.5.1998 / 02:32:38 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1366
    "Created: / 9.5.1998 / 02:33:44 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1367
!
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1368
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1369
readSTClassRevisionAttributeFor:aClass
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1370
    |attribute_length revisionString_index revisionString|
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1371
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1372
    attribute_length := inStream nextUnsignedLongMSB:msb.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1373
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1374
    revisionString_index := inStream nextUnsignedShortMSB:msb.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1375
    revisionString := constants at:revisionString_index.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1376
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1377
    aClass setBinaryRevision:revisionString.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1378
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1379
    Verbose ifTrue:[Transcript show:'revisionString: '; showCR:revisionString].
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1380
    ^ true
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1381
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1382
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1383
     JavaClassReader loadFile:'foo.cls'
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1384
    "
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1385
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1386
    "Created: / 9.5.1998 / 02:33:13 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1387
    "Modified: / 9.5.1998 / 02:35:01 / cg"
353
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1388
!
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1389
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1390
readSTClassVarNamesAttributeFor:aClass
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1391
    |attribute_length nameString_index nameString|
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1392
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1393
    attribute_length := inStream nextUnsignedLongMSB:msb.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1394
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1395
    nameString_index := inStream nextUnsignedShortMSB:msb.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1396
    nameString := constants at:nameString_index.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1397
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1398
    aClass classVariableString:nameString.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1399
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1400
    Verbose ifTrue:[Transcript show:'nameString: '; showCR:nameString].
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1401
    ^ true
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1402
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1403
    "
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1404
     JavaClassReader loadFile:'foo.cls'
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1405
    "
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1406
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1407
    "Created: / 9.5.1998 / 02:33:13 / cg"
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1408
    "Modified: / 12.5.1998 / 22:18:03 / cg"
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1409
!
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1410
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1411
readSTInstVarNamesAttributeFor:aClass
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1412
    |attribute_length nameString_index nameString|
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1413
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1414
    attribute_length := inStream nextUnsignedLongMSB:msb.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1415
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1416
    nameString_index := inStream nextUnsignedShortMSB:msb.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1417
    nameString := constants at:nameString_index.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1418
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1419
    aClass setInstanceVariableString:nameString.
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1420
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1421
    Verbose ifTrue:[Transcript show:'nameString: '; showCR:nameString].
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1422
    ^ true
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1423
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1424
    "
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1425
     JavaClassReader loadFile:'foo.cls'
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1426
    "
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1427
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1428
    "Created: / 12.5.1998 / 22:18:14 / cg"
666b33cfc98f *** empty log message ***
cg
parents: 352
diff changeset
  1429
    "Modified: / 12.5.1998 / 22:21:10 / cg"
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1430
! !
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1431
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1432
!JavaClassReader methodsFor:'file reading - constants'!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1433
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1434
readConstant
083530508d9c intitial checkin
cg
parents:
diff changeset
  1435
    |tag constReader const|
083530508d9c intitial checkin
cg
parents:
diff changeset
  1436
083530508d9c intitial checkin
cg
parents:
diff changeset
  1437
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1438
    constNeeds2Slots := false.
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1439
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1440
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
  1441
    "/ get tag
083530508d9c intitial checkin
cg
parents:
diff changeset
  1442
    "/
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1443
    tag := inStream nextByte.
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  1444
    Verbose ifTrue:[Transcript show:'tag = '; showCR:tag].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1445
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1446
    tag >= 250 ifTrue:[
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1447
        constReader := #(
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1448
                        "/ ST types
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1449
                        readConstant_ST_Large           "/ 249
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1450
                        readConstant_ST_Special         "/ 250
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1451
                        readConstant_ST_Character       "/ 251
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1452
                        readConstant_ST_ByteArray       "/ 252
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1453
                        readConstant_ST_Array           "/ 253
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1454
                        readConstant_ST_Symbol          "/ 254
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1455
                        readConstant_ST_Reserved        "/ 255
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1456
                    ) at:tag-249+1.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1457
    ] ifFalse:[
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1458
        constReader := #(
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1459
                        "/ JAVA types
695
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1460
                        readConstant_Utf8               "/ 1  - now called Utf8
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1461
                        readConstant_Unicode            "/ 2
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1462
                        readConstant_Integer            "/ 3
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1463
                        readConstant_Float              "/ 4
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1464
                        readConstant_Long               "/ 5
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1465
                        readConstant_Double             "/ 6
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1466
                        readConstant_Class              "/ 7
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1467
                        readConstant_String             "/ 8
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1468
                        readConstant_Fieldref           "/ 9
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1469
                        readConstant_Methodref          "/ 10
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1470
                        readConstant_InterfaceMethodref "/ 11
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1471
                        readConstant_NameAndType        "/ 12
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1472
                    ) at:tag ifAbsent:[#readConstant_Undef].
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1473
    ].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1474
    ^ self perform:constReader.
083530508d9c intitial checkin
cg
parents:
diff changeset
  1475
083530508d9c intitial checkin
cg
parents:
diff changeset
  1476
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  1477
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
083530508d9c intitial checkin
cg
parents:
diff changeset
  1478
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  1479
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1480
    "Created: / 15.4.1996 / 15:46:32 / cg"
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1481
    "Modified: / 9.5.1998 / 01:26:05 / cg"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1482
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1483
083530508d9c intitial checkin
cg
parents:
diff changeset
  1484
readConstantPool
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1485
    | constantPoolSize  const |
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1486
083530508d9c intitial checkin
cg
parents:
diff changeset
  1487
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
  1488
    "/ get constant pool
083530508d9c intitial checkin
cg
parents:
diff changeset
  1489
    "/
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1490
    constantPoolSize := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1491
    self info: 'constantPoolSize = ' , constantPoolSize printString.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1492
    constants := JavaConstantPool new: constantPoolSize - 1.
21
b9dd73f299dd checkin from browser
cg
parents: 14
diff changeset
  1493
    constSlot := 1.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1494
    [ constSlot < constantPoolSize ] whileTrue: [
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1495
            self info: 'const slot: ' , constSlot printString.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1496
            const := self readConstant.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1497
            constants at: constSlot put: const.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1498
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1499
            "/ long & double consts take 2 slots
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1500
            "/ (only first is used)
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1501
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1502
            constNeeds2Slots
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1503
                ifTrue: [ constSlot := constSlot + 2. ]
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1504
                ifFalse: [ constSlot := constSlot + 1. ]].
52
1dc41619b6f8 checkin from browser
cg
parents: 50
diff changeset
  1505
    constSlot := -1.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1506
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1507
    constants do:[:ref|ref isJavaRef ifTrue:[ref preResolve]].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1508
"/    1 to: constantPoolSize - 1
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1509
"/        do:
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1510
"/            [:i |
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1511
"/            | const  value |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1512
"/
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1513
"/            const := constants at: i.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1514
"/            const notNil ifTrue:
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1515
"/                    [ "/ kludge for 2-slot constants (which only take 1 slot in ST/X)
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1516
"/                    (const isKindOf: JavaUnresolvedConstant)
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1517
"/                        ifTrue:
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1518
"/                            [ value := const preResolve.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1519
"/                            value ~~ const ifTrue: [ constants at: i put: value. ] ] ] ].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1520
083530508d9c intitial checkin
cg
parents:
diff changeset
  1521
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  1522
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1523
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1524
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1525
    "Modified: / 07-05-1998 / 11:44:06 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1526
    "Created: / 13-05-2011 / 16:52:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1527
    "Modified: / 15-10-2012 / 23:15:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1528
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1529
083530508d9c intitial checkin
cg
parents:
diff changeset
  1530
readConstant_Asciz
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1531
    | len  string |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1532
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1533
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1534
    len := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1535
    string := String new: len.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1536
    inStream
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1537
        nextBytes: len
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1538
        into: string
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1539
        startingAt: 1.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1540
    Verbose
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1541
        ifTrue:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1542
            [ Transcript
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1543
                show: 'asciz; string= ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1544
                showCR: string ].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1545
    ^ string
083530508d9c intitial checkin
cg
parents:
diff changeset
  1546
083530508d9c intitial checkin
cg
parents:
diff changeset
  1547
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  1548
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1549
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1550
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1551
    "Created: / 15-04-1996 / 15:15:35 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1552
    "Modified: / 15-04-1996 / 16:33:45 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1553
    "Modified: / 13-05-2011 / 17:31:39 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1554
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1555
083530508d9c intitial checkin
cg
parents:
diff changeset
  1556
readConstant_Class
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1557
    | nameIndex |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1558
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1559
    nameIndex := inStream nextUnsignedShortMSB: msb.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1560
    ((constants at: nameIndex) isNil)
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1561
        ifTrue:
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1562
            [ self info: ('reading class; index=' , nameIndex printString , ' name='
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1563
                        , (constants at: nameIndex) printString) ]
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1564
        ifFalse: [ self info: ('reading class; index= ' , nameIndex printString) ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1565
    ^ JavaClassRef2 in: constants withNameAt: nameIndex.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1566
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1567
    "Modified: / 18-05-2011 / 18:21:16 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1568
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1569
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1570
readConstant_Double
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1571
    |high low aFloat bytes|
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1572
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1573
"/ new code - to be tested
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1574
"/    bytes := ByteArray new:8.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1575
"/
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1576
"/    inStream nextBytes:8 into:bytes startingAt:1.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1577
"/    msb ~~ UninterpretedBytes isBigEndian ifTrue:[
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1578
"/        bytes reverse
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1579
"/    ].
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1580
"/    aFloat := bytes doubleAt:1.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1581
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1582
"/ old code
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1583
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1584
    high := inStream nextUnsignedLongMSB:msb.
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1585
    low := inStream nextUnsignedLongMSB:msb.
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1586
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1587
    aFloat := Float new.
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1588
    UninterpretedBytes isBigEndian ifTrue:[
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1589
        aFloat basicAt:1 put:((high bitShift:-24) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1590
        aFloat basicAt:2 put:((high bitShift:-16) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1591
        aFloat basicAt:3 put:((high bitShift:-8) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1592
        aFloat basicAt:4 put:(high bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1593
        aFloat basicAt:5 put:((low bitShift:-24) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1594
        aFloat basicAt:6 put:((low bitShift:-16) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1595
        aFloat basicAt:7 put:((low bitShift:-8) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1596
        aFloat basicAt:8 put:(low bitAnd:16rFF).
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1597
    ] ifFalse:[
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1598
        aFloat basicAt:1 put:(low bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1599
        aFloat basicAt:2 put:((low bitShift:-8) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1600
        aFloat basicAt:3 put:((low bitShift:-16) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1601
        aFloat basicAt:4 put:((low bitShift:-24) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1602
        aFloat basicAt:5 put:(high bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1603
        aFloat basicAt:6 put:((high bitShift:-8) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1604
        aFloat basicAt:7 put:((high bitShift:-16) bitAnd:16rFF).
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1605
        aFloat basicAt:8 put:((high bitShift:-24) bitAnd:16rFF).
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1606
    ].
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1607
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1608
    constNeeds2Slots := true.
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1609
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  1610
    Verbose ifTrue:[Transcript show:'double; value= ';     showCR:aFloat].
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1611
    ^ aFloat
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1612
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1613
    "
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1614
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1615
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1616
    "
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1617
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1618
    "Created: / 15.4.1996 / 16:34:42 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1619
    "Modified: / 8.5.1998 / 22:06:07 / cg"
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1620
!
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1621
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1622
readConstant_Fieldref
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1623
    "incrementally changing resolving logic, fields will come later"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1624
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1625
    | classIndex  nameAndTypeIndex |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1626
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1627
    classIndex := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1628
    nameAndTypeIndex := inStream nextUnsignedShortMSB: msb.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1629
    self
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1630
        info: 'reading fieldref; classindex=' , classIndex printString
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1631
                , ' nameAndTypeIndex=' , nameAndTypeIndex printString.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1632
    ^ JavaFieldRef2
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1633
        in: constants
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1634
        withNameAndTypeAt: nameAndTypeIndex
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1635
        andClassAt: classIndex.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1636
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1637
    "Modified: / 15-05-2011 / 14:20:23 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1638
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1639
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1640
readConstant_Float
433
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1641
    |b1 b2 b3 b4 aFloat bytes|
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1642
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1643
"/ new code - to be tested ...
352
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1644
"/
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1645
"/    bytes := ByteArray new:4.
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1646
"/    inStream nextBytes:4 into:bytes startingAt:1.
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1647
"/    msb ~~ UninterpretedBytes isBigEndian ifTrue:[
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1648
"/        bytes reverse
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1649
"/    ].
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1650
"/    aFloat := bytes floatAt:1.
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1651
"/    Verbose ifTrue:[Transcript show:'float; value= ';     showCR:aFloat].
9093171ef0a6 oops - float reading
cg
parents: 350
diff changeset
  1652
"/    ^ aFloat.
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1653
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1654
"/ old code
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1655
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1656
    aFloat := ShortFloat basicNew.
433
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1657
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1658
    b1 := inStream nextByte.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1659
    b2 := inStream nextByte.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1660
    b3 := inStream nextByte.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1661
    b4 := inStream nextByte.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1662
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1663
    UninterpretedBytes isBigEndian ifTrue:[
433
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1664
        aFloat basicAt:1 put:b1.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1665
        aFloat basicAt:2 put:b2.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1666
        aFloat basicAt:3 put:b3.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1667
        aFloat basicAt:4 put:b4.
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1668
    ] ifFalse:[
433
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1669
        aFloat basicAt:4 put:b1.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1670
        aFloat basicAt:3 put:b2.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1671
        aFloat basicAt:2 put:b3.
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1672
        aFloat basicAt:1 put:b4.
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1673
    ].
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  1674
    Verbose ifTrue:[Transcript show:'float; value= ';     showCR:aFloat].
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1675
    ^ aFloat
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1676
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1677
    "
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1678
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1679
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1680
    "
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1681
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1682
    "Created: / 15.4.1996 / 16:34:42 / cg"
433
d9d6841784f1 checkin from browser
cg
parents: 423
diff changeset
  1683
    "Modified: / 10.11.1998 / 22:04:59 / cg"
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1684
!
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1685
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1686
readConstant_Integer
083530508d9c intitial checkin
cg
parents:
diff changeset
  1687
    |value|
083530508d9c intitial checkin
cg
parents:
diff changeset
  1688
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1689
    value := inStream nextLongMSB:msb.
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1690
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  1691
    Verbose ifTrue:[Transcript show:'integer; value= ';     showCR:value].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1692
083530508d9c intitial checkin
cg
parents:
diff changeset
  1693
    ^ value
083530508d9c intitial checkin
cg
parents:
diff changeset
  1694
083530508d9c intitial checkin
cg
parents:
diff changeset
  1695
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  1696
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
083530508d9c intitial checkin
cg
parents:
diff changeset
  1697
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
083530508d9c intitial checkin
cg
parents:
diff changeset
  1698
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  1699
083530508d9c intitial checkin
cg
parents:
diff changeset
  1700
    "Modified: 15.4.1996 / 15:42:16 / cg"
083530508d9c intitial checkin
cg
parents:
diff changeset
  1701
    "Created: 15.4.1996 / 16:34:42 / cg"
083530508d9c intitial checkin
cg
parents:
diff changeset
  1702
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1703
14
c1d9f60eb650 can now load all java.class files (see JavaClassReader>>loadFile:)
cg
parents: 11
diff changeset
  1704
readConstant_InterfaceMethodref
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1705
    | classIndex  nameAndTypeIndex  |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1706
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1707
    classIndex := inStream nextUnsignedShortMSB: msb.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1708
    nameAndTypeIndex := inStream nextUnsignedShortMSB: msb.
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1709
    self
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1710
        info: 'reading interface methodref; classindex=' , classIndex printString
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1711
                , ' nameAndTypeIndex=' , nameAndTypeIndex printString.
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1712
    ^ JavaInterfaceMethodRef2
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1713
        in: constants
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1714
        withNameAndTypeAt: nameAndTypeIndex
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1715
        andClassAt: classIndex.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1716
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1717
    "Modified: / 12-05-2011 / 18:57:47 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
14
c1d9f60eb650 can now load all java.class files (see JavaClassReader>>loadFile:)
cg
parents: 11
diff changeset
  1718
!
c1d9f60eb650 can now load all java.class files (see JavaClassReader>>loadFile:)
cg
parents: 11
diff changeset
  1719
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1720
readConstant_Long
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1721
    |high low value|
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1722
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1723
    high := inStream nextUnsignedLongMSB:msb.
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  1724
    low := inStream nextUnsignedLongMSB:msb.
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1725
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1726
    value := (high bitShift:32) bitOr:low.
60
a763b1780ec0 checkin from browser
cg
parents: 59
diff changeset
  1727
    (high bitTest:16r80000000) ifTrue:[
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  1728
	value := value - 16r10000000000000000.
60
a763b1780ec0 checkin from browser
cg
parents: 59
diff changeset
  1729
    ].
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1730
    constNeeds2Slots := true.
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1731
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  1732
    Verbose ifTrue:[Transcript show:'long; value= ';     showCR:value].
11
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1733
    ^ value
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1734
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1735
    "
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1736
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1737
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1738
    "
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1739
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1740
    "Modified: 15.4.1996 / 15:42:16 / cg"
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1741
    "Created: 15.4.1996 / 16:34:42 / cg"
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1742
!
30997f6943a4 checkin from browser
cg
parents: 9
diff changeset
  1743
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1744
readConstant_Methodref
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1745
    | classIndex  nameAndTypeIndex   |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1746
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1747
    classIndex := inStream nextUnsignedShortMSB: msb.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1748
    nameAndTypeIndex := inStream nextUnsignedShortMSB: msb.
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1749
    self
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1750
        info: 'reading methodref; classindex=' , classIndex printString , ' nameAndTypeIndex='
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1751
                , nameAndTypeIndex printString.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1752
    ^ JavaMethodRef2
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1753
        in: constants
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1754
        withNameAndTypeAt: nameAndTypeIndex
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1755
        andClassAt: classIndex.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1756
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1757
    "Modified: / 15-05-2011 / 14:20:38 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1758
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1759
91
9b325648aa77 resolve rewritten; interpreter fixes
cg
parents: 86
diff changeset
  1760
readConstant_NameAndType
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1761
    | nameIndex  descriptorIndex |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1762
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1763
    nameIndex := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1764
    descriptorIndex := inStream nextUnsignedShortMSB: msb.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1765
    self
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1766
        info: 'reading nameAndType; nameindex=' , nameIndex printString
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1767
                , ' descriptorIndex= ' , descriptorIndex printString.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1768
    ^JavaNameAndType2
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1769
                in: constants
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1770
                withNameAt: nameIndex
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1771
                andDescriptorAt: descriptorIndex.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1772
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1773
    "Modified: / 10-05-2011 / 17:09:47 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  1774
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  1775
083530508d9c intitial checkin
cg
parents:
diff changeset
  1776
readConstant_String
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1777
    | string_index |
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1778
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1779
    string_index := inStream nextUnsignedShortMSB: msb.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1780
    ^ JavaStringRef2 in: constants withValueAt: string_index.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1781
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1782
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1783
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1784
    "Created: / 15-04-1996 / 15:20:33 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1785
    "Modified: / 07-05-1998 / 11:42:45 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1786
    "Modified: / 13-05-2011 / 17:31:54 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1787
    "Modified: / 10-08-2011 / 23:25:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
695
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1788
!
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1789
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1790
readConstant_Unicode
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1791
    | len  string  ascii |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1792
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1793
    len := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1794
    string := TwoByteString new: len.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1795
    1 to: len
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1796
        do:
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1797
            [:idx |
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1798
            ascii := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1799
            string at: idx put: (Character value: ascii). ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1800
    Verbose
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1801
        ifTrue:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1802
            [ Transcript
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1803
                show: 'asciz; unicodeString= ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1804
                showCR: string ].
695
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1805
    ^ string
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1806
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1807
    "Modified: / 13-05-2011 / 17:31:44 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
695
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1808
!
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1809
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1810
readConstant_Utf8
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1811
    | len  bytes  string |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1812
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1813
    len := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1814
    bytes := ByteArray new: len.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1815
    inStream
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1816
        nextBytes: len
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1817
        into: bytes
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1818
        startingAt: 1.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1819
    string := CharacterArray fromJavaUTF8Bytes: bytes.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1820
    Verbose
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1821
        ifTrue:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1822
            [ Transcript
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1823
                show: 'asciz; string= ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1824
                showCR: string ].
695
fd5acdd14995 utf8 string decoding
cg
parents: 667
diff changeset
  1825
    ^ string
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1826
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1827
    "Modified: / 19-10-2010 / 12:38:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1828
    "Modified: / 13-05-2011 / 17:31:48 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1829
! !
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1830
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1831
!JavaClassReader methodsFor:'file reading - constants-ST'!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1832
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1833
readConstant_ST_Array
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1834
    |aSize arr|
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1835
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1836
    aSize := inStream nextUnsignedShortMSB:msb.
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1837
    arr := Array new:aSize.
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1838
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1839
    1 to:aSize do:[:i |
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1840
        |element_index element|
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1841
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1842
        element_index := inStream nextUnsignedShortMSB:msb.
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1843
        arr at:i put:element_index.
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1844
    ].
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1845
    Verbose ifTrue:[Transcript show:'array; size= ';     showCR:aSize].
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1846
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1847
    ^ JavaUnresolvedSTArrayConstant
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1848
                pool:constants
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1849
                poolIndex:constSlot
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1850
                array:arr
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1851
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1852
    "Created: / 7.5.1998 / 11:47:01 / cg"
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1853
    "Modified: / 9.5.1998 / 00:25:34 / cg"
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1854
!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1855
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1856
readConstant_ST_ByteArray
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1857
    |aSize arr|
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1858
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1859
    aSize := inStream nextUnsignedShortMSB:msb.
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1860
    arr := ByteArray new:aSize.
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1861
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1862
    1 to:aSize do:[:i |
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1863
        |element_index|
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1864
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1865
        arr at:i put:(inStream nextByte).
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1866
    ].
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1867
    Verbose ifTrue:[Transcript show:'byteArray; size= ';     showCR:aSize].
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1868
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1869
    ^ arr
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1870
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1871
    "Created: / 7.5.1998 / 11:47:12 / cg"
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1872
!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1873
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1874
readConstant_ST_Character
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1875
    |ascii|
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1876
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1877
    ascii := inStream nextUnsignedShortMSB:msb.
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1878
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1879
    Verbose ifTrue:[Transcript show:'char; ascii= '; showCR:ascii].
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1880
    ^ Character value:ascii
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1881
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1882
    "Created: / 7.5.1998 / 11:48:12 / cg"
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1883
!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1884
350
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1885
readConstant_ST_Special
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1886
    |type|
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1887
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1888
    type := inStream nextUnsignedShortMSB:msb.
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1889
    ^ #(
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1890
        nil
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1891
        true
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1892
        false
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1893
     ) at:(type + 1)
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1894
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1895
    "Created: / 8.5.1998 / 23:06:56 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1896
    "Modified: / 9.5.1998 / 00:40:14 / cg"
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1897
!
bf3f92fb2629 support for ST-classes
cg
parents: 348
diff changeset
  1898
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1899
readConstant_ST_String
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1900
    | tag  string_index  chars |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1901
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1902
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1903
    string_index := inStream nextUnsignedShortMSB: msb.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1904
    Verbose
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1905
        ifTrue:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1906
            [ Transcript
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1907
                show: 'string; index= ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1908
                showCR: string_index ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1909
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1910
    "/ resolve here if possible
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1911
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1912
    string_index < constSlot
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1913
        ifTrue:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1914
            [ chars := (constants at: string_index).
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1915
            ^ chars ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1916
    ^ JavaUnresolvedSTStringConstant
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1917
        pool: constants
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1918
        poolIndex: constSlot
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1919
        stringIndex: string_index
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1920
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1921
    "Created: / 07-05-1998 / 11:49:55 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1922
    "Modified: / 13-05-2011 / 17:32:03 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1923
!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1924
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1925
readConstant_ST_Symbol
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1926
    | tag  string_index  chars |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1927
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1928
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1929
    string_index := inStream nextUnsignedShortMSB: msb.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1930
    Verbose
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1931
        ifTrue:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1932
            [ Transcript
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1933
                show: 'symbol; index= ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1934
                showCR: string_index ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1935
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  1936
    "/ resolve here if possible
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1937
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1938
    string_index < constSlot
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1939
        ifTrue:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1940
            [ chars := (constants at: string_index).
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1941
            chars isString ifFalse: [ self halt: 'should not happen' ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1942
            ^ chars asSymbol ].
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  1943
    ^ JavaUnresolvedSTSymbolConstant
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1944
        pool: constants
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1945
        poolIndex: constSlot
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1946
        stringIndex: string_index
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1947
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1948
    "Modified: / 07-05-1998 / 11:48:28 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  1949
    "Modified: / 13-05-2011 / 17:32:09 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1950
! !
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  1951
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1952
!JavaClassReader methodsFor:'file reading - extensions'!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1953
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1954
readExtensionsFor: class
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1955
    "Given a class, load extensions (i.e., non-java methods) for that class"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1956
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1957
    | classnameAsPath |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1958
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  1959
    classnameAsPath := class binaryName copyReplaceAll: $/ with: Filename separator.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1960
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1961
    Java effectiveExtensionsPath do:[:each|
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1962
        ProgrammingLanguage allDo:[:lang|
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1963
            lang supportsExtensionMethods ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1964
                | file |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1965
                file := each asString , Filename separator , classnameAsPath , '.' , lang sourceFileSuffix.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1966
                file := file asFilename.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1967
                file exists ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1968
                    self readExtensionsFor: class from: file language: lang
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1969
                ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1970
            ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1971
        ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1972
    ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1973
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1974
    "Created: / 06-09-2012 / 11:37:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  1975
    "Modified: / 08-10-2013 / 22:59:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1976
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1977
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1978
readExtensionsFor: class from: file
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1979
    "Given a class, load extensions (i.e., non-java methods) for that class"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1980
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1981
    JAVA isNil ifTrue:[ JavaPackage initialize ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1982
    [
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1983
        Smalltalk fileIn: file.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1984
    ] on: JavaClassQuery do:[:query |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1985
        query className = class name ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1986
            query resumeWith: class
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1987
        ] ifFalse:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1988
            query resumeWith: nil.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1989
        ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1990
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1991
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1992
    "Created: / 06-09-2012 / 12:04:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1993
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1994
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1995
readExtensionsFor: class from: file language: language
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1996
    "Given a class, load extensions (i.e., non-java methods) for that class"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1997
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1998
    JAVA isNil ifTrue:[ JavaPackage initialize ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  1999
    [
2812
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2000
        | wasSilent |
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2001
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2002
        wasSilent := Smalltalk silentLoading.
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2003
        Smalltalk silentLoading: true.
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2004
        [
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2005
            Class withoutUpdatingChangesDo:[
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2006
                language fileIn: file.
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2007
            ].
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2008
        ] ensure:[
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2009
            Smalltalk silentLoading: wasSilent
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2010
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2011
    ] on: JavaClassQuery do:[:query |
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2012
        query className = class binaryName ifTrue:[
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2013
            query resumeWith: class
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2014
        ] ifFalse:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2015
            query resumeWith: nil.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2016
        ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2017
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2018
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2019
    "Created: / 06-09-2012 / 12:14:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2812
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2020
    "Modified: / 08-10-2013 / 11:12:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2021
! !
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2022
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2023
!JavaClassReader methodsFor:'file reading - fields'!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2024
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2025
readConstantValueAttributeFor:aField
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2026
    |attribute_length constantvalue_index constantValue|
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2027
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2028
    attribute_length := inStream nextUnsignedLongMSB:msb.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2029
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2030
    constantvalue_index := inStream nextUnsignedShortMSB:msb.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2031
    constantValue := constants at:constantvalue_index.
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2032
59
38114c3e3e77 checkin from browser
cg
parents: 54
diff changeset
  2033
    aField constantValue:constantValue.
38114c3e3e77 checkin from browser
cg
parents: 54
diff changeset
  2034
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  2035
    Verbose ifTrue:[Transcript show:'constantValue: '; showCR:constantValue].
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2036
    ^ true
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2037
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2038
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2039
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2040
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2041
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2042
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2043
    "Modified: 15.4.1996 / 15:33:28 / cg"
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2044
    "Created: 15.4.1996 / 15:40:17 / cg"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2045
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  2046
083530508d9c intitial checkin
cg
parents:
diff changeset
  2047
readFieldInfofield
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2048
    | access_flags  name_index  descriptor_index  attributes_count  field |
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2049
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2050
    access_flags := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2051
    name_index := inStream nextUnsignedShortMSB: msb.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2052
    descriptor_index := inStream nextUnsignedShortMSB: msb.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2053
    field := JavaField new.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2054
    field setAccessFlags: access_flags.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2055
    field setName: (constants at: name_index) asSymbol.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2056
    field setDescriptor: (constants at: descriptor_index) asSymbol.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2057
    field setConstantPool: constants.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2058
    attributes_count := inStream nextUnsignedShortMSB: msb.
2729
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  2059
    attributes := OrderedCollection new: attributes_count * 2.
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2060
    Verbose
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2061
        ifTrue:
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2062
            [ Transcript
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2063
                show: '  field name: ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2064
                show: (constants at: name_index);
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2065
                show: ' access: ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2066
                show: access_flags;
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2067
                show: ' attrib_cnt: ';
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2068
                showCR: attributes_count ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2069
    1 to: attributes_count do: [:i | self readAttributeFor: field. ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2070
    ^ field.
27
4560bb77bb36 checkin from browser
cg
parents: 21
diff changeset
  2071
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2072
    "
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2073
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2074
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2075
    "Created: / 15-04-1996 / 15:38:43 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2076
    "Modified: / 15-10-1998 / 10:38:01 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2077
    "Modified: / 17-12-2010 / 18:44:30 / Marcel Hlopko <hlopik@gmail.com>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2078
    "Modified: / 18-05-2011 / 14:11:37 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2729
ac412f6ea6d4 More support for method's source display. Not yet working.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2591
diff changeset
  2079
    "Modified: / 13-09-2013 / 02:03:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2080
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  2081
083530508d9c intitial checkin
cg
parents:
diff changeset
  2082
readFieldInfofields
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2083
    |nFields fields|
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2084
083530508d9c intitial checkin
cg
parents:
diff changeset
  2085
    "/
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2086
    "/ get fieldInfos
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2087
    "/
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2088
    nFields := inStream nextUnsignedShortMSB:msb.
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  2089
    Verbose ifTrue:[Transcript show:'fieldsCount = '; showCR:nFields].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2090
27
4560bb77bb36 checkin from browser
cg
parents: 21
diff changeset
  2091
    fields := Array new:nFields.
4560bb77bb36 checkin from browser
cg
parents: 21
diff changeset
  2092
4560bb77bb36 checkin from browser
cg
parents: 21
diff changeset
  2093
    1 to:nFields do:[:i |
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2094
	Verbose ifTrue:[Transcript show:'field: '; showCR:i].
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2095
	fields at:i put:(self readFieldInfofield)
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2096
    ].
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2097
    ^ fields
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2098
083530508d9c intitial checkin
cg
parents:
diff changeset
  2099
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2100
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
083530508d9c intitial checkin
cg
parents:
diff changeset
  2101
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2102
083530508d9c intitial checkin
cg
parents:
diff changeset
  2103
    "Created: 15.4.1996 / 15:34:41 / cg"
083530508d9c intitial checkin
cg
parents:
diff changeset
  2104
    "Modified: 15.4.1996 / 15:35:28 / cg"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2105
! !
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2106
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2107
!JavaClassReader methodsFor:'file reading - interfaces'!
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2108
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2109
readInterfaces
110
dfb03e2ea321 *** empty log message ***
cg
parents: 104
diff changeset
  2110
    |interfacesCount interface_index interface interfaces|
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2111
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2112
    "/
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2113
    "/ get interfaces
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2114
    "/
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2115
    interfacesCount := inStream nextUnsignedShortMSB:msb.
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  2116
    Verbose ifTrue:[Transcript show:'interfacesCount = '; showCR:interfacesCount].
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2117
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2118
    interfaces := Array new:interfacesCount.
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2119
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2120
    1 to:interfacesCount do:[:i |
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2121
	Verbose ifTrue:[Transcript show:'interface: '; showCR:i].
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2122
	interface_index := inStream nextUnsignedShortMSB:msb.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2123
	interface := constants at:interface_index.
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2124
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2125
	interfaces at:i put:interface.
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2126
    ].
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2127
    ^ interfaces
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2128
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2129
    "
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2130
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2131
    "
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2132
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2133
    "Created: 15.4.1996 / 15:31:59 / cg"
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2134
    "Modified: 15.4.1996 / 15:33:28 / cg"
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2135
! !
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2136
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2137
!JavaClassReader methodsFor:'file reading - methods'!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2138
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2139
readCodeAttributeFor:aJavaMethod
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2140
    |attribute_length max_stack max_locals code_length code
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2141
     exception_table_length exception_table unknown1 unknown2 |
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2142
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2143
    attribute_length := inStream nextUnsignedLongMSB:msb.
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2144
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2145
    Verbose ifTrue:[Transcript show:'code_attribute_length: 0x'; showCR:(attribute_length printStringRadix:16)].
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  2146
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2147
    ((minorVsn > 2) or:[majorVsn > 45]) ifTrue:[
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2148
        "/ should be:
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2149
        max_stack := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2150
        max_locals := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2151
        code_length := inStream nextUnsignedLongMSB:msb.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2152
        "/ Remember max context size so far, will be used to
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2153
        "/ optimize context size as alloca() won't work.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2154
        MaxContextSize := MaxContextSize max: (max_stack + max_locals + 4"safe area").
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2155
"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2156
        MaxContextSize > MaxContextSizeLimit ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2157
            self error:'method''s stack depth overflows VM limit'.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2158
            ^false
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2159
        ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2160
"
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2161
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2162
"/        unknown1 := inStream nextByte.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2163
"/        max_stack := inStream nextByte.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2164
"/        max_locals := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2165
"/        unknown2 := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2166
"/        code_length := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2167
"/        Verbose ifTrue:[Transcript show:'?1: '; showCR:unknown1].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2168
"/        Verbose ifTrue:[Transcript show:'?2: '; showCR:unknown2].
39
20fa5af3b873 checkin from browser
cg
parents: 38
diff changeset
  2169
    ] ifFalse:[
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2170
        max_stack := inStream nextByte.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2171
        max_locals := inStream nextByte.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2172
        code_length := inStream nextUnsignedShortMSB:msb.
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  2173
    ].
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  2174
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2175
    Verbose ifTrue:[
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2176
        Transcript show:'code_length: '; showCR:(code_length printStringRadix:16).
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2177
        Transcript show:'code at pos: '; showCR:inStream position
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2178
    ].
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2179
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2180
    code_length ~~ 0 ifTrue:[
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2181
        code := ByteArray new:code_length.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2182
        inStream nextBytes:code_length into:code startingAt:1.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2183
    ].
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2184
    Verbose ifTrue:[Transcript show:'method code: '; showCR:code.].
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  2185
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2186
    exception_table_length := inStream nextUnsignedShortMSB:msb.
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  2187
    Verbose ifTrue:[Transcript show:'exception_table_length: '; showCR:(exception_table_length printStringRadix:16)].
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2188
    exception_table_length ~~ 0 ifTrue:[
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2189
        Verbose ifTrue:[Transcript show:'exceptionTable length:'; showCR:exception_table_length.].
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  2190
2585
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2191
        exception_table := JavaExceptionTable new:exception_table_length * 4.
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2192
        1 to:exception_table_length do:[:i |
2585
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2193
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2194
            "/ start PC
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2195
            exception_table at:((i-1) * 4) + 1 put: (inStream nextUnsignedShortMSB:msb).
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2196
            "/ end PC
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2197
            exception_table at:((i-1) * 4) + 2 put: (inStream nextUnsignedShortMSB:msb).
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2198
            "/ handler PC
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2199
            exception_table at:((i-1) * 4) + 3 put: (inStream nextUnsignedShortMSB:msb).
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2200
            "/ catch type
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2201
            exception_table at:((i-1) * 4) + 4 put: (inStream nextUnsignedShortMSB:msb).
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2202
        ].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2203
        aJavaMethod setExceptionHandlerTable:exception_table.
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2204
    ].
083530508d9c intitial checkin
cg
parents:
diff changeset
  2205
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2206
    (max_stack + max_locals + 4) > MaxContextSizeLimit ifTrue:[
2585
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2207
        code := nil
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2208
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2209
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2210
    aJavaMethod
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2211
        setCode:code
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2212
        maxStack:max_stack
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2213
        maxLocals:max_locals
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2214
        u1:unknown1
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2215
        u2:unknown2.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2216
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2217
    self readAttributesFor:aJavaMethod.
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2218
    ^ true
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2219
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2220
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2221
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2222
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/Alignable.class'
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2223
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2224
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2225
    "Created: / 15-04-1996 / 15:40:17 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2226
    "Modified: / 16-05-1998 / 01:39:42 / cg"
2585
14ab287e17ca Exception table refactored to use more compact & VM friendly format.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2578
diff changeset
  2227
    "Modified: / 06-05-2013 / 22:08:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2228
!
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2229
83
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2230
readExceptionsAttributeFor:aJavaMethod
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2231
    |attribute_length exception_table_length exception_table|
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2232
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2233
    attribute_length := inStream nextUnsignedLongMSB:msb.
83
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2234
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2235
    exception_table_length := inStream nextUnsignedShortMSB:msb.
83
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2236
    exception_table_length ~~ 0 ifTrue:[
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2237
	exception_table := Array new:exception_table_length.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2238
	1 to:exception_table_length do:[:i |
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2239
	    |idx ex|
83
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2240
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2241
	    idx := inStream nextUnsignedShortMSB:msb.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2242
	    ex := constants at:idx.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2243
	    exception_table at:i put:ex.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2244
	].
83
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2245
    ].
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2246
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2247
    Verbose ifTrue:[Transcript showCR:'method has an exceptionTable'].
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2248
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2249
    aJavaMethod setExceptionTable:exception_table.
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2250
    ^ true
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2251
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2252
    "Modified: 15.4.1996 / 15:33:28 / cg"
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2253
    "Created: 15.4.1996 / 15:40:17 / cg"
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2254
!
2d61ef3579e4 *** empty log message ***
cg
parents: 73
diff changeset
  2255
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2256
readLineNumberTableAttributeFor:aJavaMethod
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2257
    |attribute_length line_number_table_length line_number_table|
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2258
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2259
    attribute_length := inStream nextUnsignedLongMSB:msb.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2260
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2261
    line_number_table_length := inStream nextUnsignedShortMSB:msb.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2262
    line_number_table_length ~~ 0 ifTrue:[
330
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2263
        line_number_table := Array new:line_number_table_length.
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2264
        1 to:line_number_table_length do:[:i |
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2265
            |start_pc line_number|
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2266
330
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2267
            start_pc := inStream nextUnsignedShortMSB:msb.
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2268
            line_number := inStream nextUnsignedShortMSB:msb.
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2269
            line_number_table at:i put:(start_pc -> line_number).
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2270
        ].
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2271
        Verbose ifTrue:[Transcript showCR:'method has a lineNumberTable'].
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2272
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2273
        aJavaMethod setLineNumberTable:line_number_table.
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2274
    ].
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2275
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2276
    ^ true
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2277
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2278
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2279
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2280
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/java/lang/Boolean.class'
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2281
    "
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2282
330
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2283
    "Created: / 15.4.1996 / 15:40:17 / cg"
c452e536a822 checkin from browser
cg
parents: 327
diff changeset
  2284
    "Modified: / 7.4.1998 / 19:08:42 / cg"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2285
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  2286
50
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2287
readLocalVariableTableAttributeFor:aJavaMethod
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2288
    |attribute_length local_variable_table_length local_variable_table|
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2289
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2290
    attribute_length := inStream nextUnsignedLongMSB:msb.
50
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2291
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2292
    local_variable_table_length := inStream nextUnsignedShortMSB:msb.
50
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2293
    local_variable_table_length ~~ 0 ifTrue:[
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2294
	local_variable_table := JavaLocalVariableTable new:local_variable_table_length.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2295
	1 to:local_variable_table_length do:[:i |
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2296
	    |start_pc length name_index sig_index slot name signature|
50
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2297
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2298
	    start_pc := inStream nextUnsignedShortMSB:msb.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2299
	    length := inStream nextUnsignedShortMSB:msb.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2300
	    name_index := inStream nextUnsignedShortMSB:msb.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2301
	    name := constants at:name_index.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2302
	    sig_index := inStream nextUnsignedShortMSB:msb.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2303
	    signature := constants at:sig_index.
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2304
	    slot := inStream nextUnsignedShortMSB:msb.
50
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2305
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2306
	    local_variable_table at:i put:(JavaLocalVariableTableEntry new
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2307
						startPC:start_pc
252
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2308
						length:length
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2309
						name:name
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2310
						signature:signature
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2311
						slot:slot)
04b330744577 new javaVM stuff & back to pre-stefans changes
cg
parents: 229
diff changeset
  2312
	].
50
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2313
    ].
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2314
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  2315
    Verbose ifTrue:[Transcript showCR:'method has a localvariableTable'].
50
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2316
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2317
    aJavaMethod setLocalVariableTable:local_variable_table.
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2318
    ^ true
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2319
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2320
    "
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2321
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2322
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/java/lang/Boolean.class'
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2323
    "
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2324
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2325
    "Modified: 15.4.1996 / 15:33:28 / cg"
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2326
    "Created: 15.4.1996 / 15:40:17 / cg"
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2327
!
458467ce0e15 checkin from browser
cg
parents: 43
diff changeset
  2328
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2329
readMethodFor:aClass
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2330
    |m access_flags name_index name descriptor_index descriptor
273
bcbea5ac4860 checkin from browser
cg
parents: 269
diff changeset
  2331
     tooManyArgs|
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2332
083530508d9c intitial checkin
cg
parents:
diff changeset
  2333
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
  2334
    "/ get a method
083530508d9c intitial checkin
cg
parents:
diff changeset
  2335
    "/
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2336
    access_flags := inStream nextUnsignedShortMSB:msb.
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2337
    name_index := inStream nextUnsignedShortMSB:msb.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2338
    descriptor_index := inStream nextUnsignedShortMSB:msb.
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2339
5
f026f5d20c15 checkin from browser
cg
parents: 3
diff changeset
  2340
    name := constants at:name_index.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2341
    descriptor := constants at:descriptor_index.
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  2342
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2343
    Verbose ifTrue:[
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2344
        Transcript show:'method name:'; showCR:name.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2345
        Transcript show:'descriptor:'; showCR:descriptor.
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2346
    ].
9
bc65152d7610 can no read (undoc) 3.45 format
cg
parents: 7
diff changeset
  2347
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2348
    aClass isJavaClass ifTrue:[
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2349
        (access_flags bitAnd:ACC_NATIVE) ~~ 0 ifTrue:[
612
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2350
            m := JavaNativeMethod new.
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2351
        ] ifFalse:[
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2352
            m := JavaMethodWithHandler new.
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2353
        ].
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2354
        m setAccessFlags:access_flags.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2355
        m setJavaClass:aClass.
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2356
        tooManyArgs := false.
2142
4836ff0780cd *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2115
diff changeset
  2357
        ArgumentError handle:[:ex |
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2358
            Logger log: 'java method has too many arguments - will fail to execute' severity: #warn facility: 'JVM'.
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2359
            tooManyArgs := true.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2360
            ex proceed.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2361
        ] do:[
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2362
            m setName:name descriptor:descriptor.
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2363
        ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2364
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2365
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2366
        self readAttributesFor:m.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2367
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2368
        tooManyArgs ifTrue:[
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2369
            m code:nil.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2370
            m byteCode:nil.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2371
        ].
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2372
423
08af061c56a8 javaClass now uses its fullName in name
cg
parents: 407
diff changeset
  2373
        (m exceptionHandlerTable isNil) ifTrue:[
612
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2374
            m isNative ifFalse:[
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2375
                m getExceptionTable isNil ifTrue:[
612
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2376
                    m := JavaMethod fromMethod:m
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2377
                ] ifFalse:[
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2378
                    m := JavaMethodWithException fromMethod:m
00e005c99126 create JavaNativeMethod instances for native methods.
cg
parents: 583
diff changeset
  2379
                ]
423
08af061c56a8 javaClass now uses its fullName in name
cg
parents: 407
diff changeset
  2380
            ]
468
4d4f1cb9786b *** empty log message ***
cg
parents: 454
diff changeset
  2381
        ] ifFalse:[
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2382
            | newAccessFlags |
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2383
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2384
            newAccessFlags := m accessFlags.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2385
            newAccessFlags := newAccessFlags bitOr:ACX_HASHANDLER.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2386
            m hasFinallyBasedOnExceptionTable ifTrue:[
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2387
                newAccessFlags := newAccessFlags bitOr:ACX_HASFINALLY.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2388
            ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2389
            m setAccessFlags:newAccessFlags.
386
ed3f417b7d02 checkin from browser
cg
parents: 376
diff changeset
  2390
        ].
2812
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2391
        "/ Force symbol creation here - only to avoid red selectors in\
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2392
        "/ Smalltalk highlighted code when calling Java methods.
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2393
        name asSymbol.
2428
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2394
        self addSelector: (name , descriptor) asSymbol withMethod: m toClass: aClass.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2395
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2396
        ( m selector == #'finalize()V' ) ifTrue:[
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2397
            ( aClass binaryName ~~ #'java/lang/Object' ) ifTrue:[
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2398
                aClass setAccessFlags: (aClass accessFlags bitOr:ACX_HASFINALIZE)
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2399
            ]
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2400
        ].
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2401
    ] ifFalse:[
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2402
        m := Method new.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2403
        self readAttributesFor:m.
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2404
        (access_flags bitTest:ACC_STATIC) ifTrue:[
2428
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2405
            self addSelector:name asSymbol withMethod:m toClass: aClass class.
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2406
        ] ifFalse:[
2428
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2407
            self addSelector:name asSymbol withMethod:m toClass: aClass.
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2408
        ]
273
bcbea5ac4860 checkin from browser
cg
parents: 269
diff changeset
  2409
    ].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2410
083530508d9c intitial checkin
cg
parents:
diff changeset
  2411
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2412
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
083530508d9c intitial checkin
cg
parents:
diff changeset
  2413
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2414
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2415
    "Created: / 15-04-1996 / 16:48:49 / cg"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2416
    "Modified: / 25-09-1999 / 23:16:25 / cg"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2417
    "Modified: / 28-10-2011 / 16:56:48 / m"
2812
7cd5e50a6c5a Load java extension methods silently.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2732
diff changeset
  2418
    "Modified (comment): / 08-10-2013 / 10:54:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2419
!
083530508d9c intitial checkin
cg
parents:
diff changeset
  2420
38
3f1b61722466 checkin from browser
cg
parents: 32
diff changeset
  2421
readMethodsFor:aJavaClass
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2422
    |methodsCount method|
083530508d9c intitial checkin
cg
parents:
diff changeset
  2423
083530508d9c intitial checkin
cg
parents:
diff changeset
  2424
    "/
083530508d9c intitial checkin
cg
parents:
diff changeset
  2425
    "/ get methods
083530508d9c intitial checkin
cg
parents:
diff changeset
  2426
    "/
128
acc4e8e77092 *** empty log message ***
cg
parents: 122
diff changeset
  2427
    methodsCount := inStream nextUnsignedShortMSB:msb.
61
ff1579eb825f showCr: -> showCR:
cg
parents: 60
diff changeset
  2428
    Verbose ifTrue:[Transcript show:'methodsCount = '; showCR:methodsCount].
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2429
083530508d9c intitial checkin
cg
parents:
diff changeset
  2430
    1 to:methodsCount do:[:i |
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2431
        Verbose ifTrue:[Transcript show:'method: '; showCR:i].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2432
        method := self readMethodFor:aJavaClass
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2433
    ].
083530508d9c intitial checkin
cg
parents:
diff changeset
  2434
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2435
    Smalltalk changed: #methodDictionary with: aJavaClass.
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2436
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2437
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2438
     JavaClassReader readFile:'/phys/ibm3/hotjava/classes/browser/AddButton.class'
083530508d9c intitial checkin
cg
parents:
diff changeset
  2439
    "
083530508d9c intitial checkin
cg
parents:
diff changeset
  2440
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2441
    "Created: / 15-04-1996 / 16:46:30 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2442
    "Modified: / 08-05-1998 / 21:20:59 / cg"
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2443
    "Modified: / 04-04-2012 / 01:18:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2444
! !
083530508d9c intitial checkin
cg
parents:
diff changeset
  2445
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2446
!JavaClassReader methodsFor:'file reading - methods-ST'!
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2447
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2448
readSTCodeAttributeFor:aSmalltalkMethod
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2449
    |attribute_length max_stack max_locals code_length code
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2450
     exception_table_length unknown1 unknown2|
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2451
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2452
    attribute_length := inStream nextUnsignedLongMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2453
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2454
    Verbose ifTrue:[Transcript show:'attribute_length: 0x'; showCR:(attribute_length printStringRadix:16)].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2455
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2456
    max_stack := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2457
    max_locals := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2458
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2459
    code_length := inStream nextUnsignedLongMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2460
    Verbose ifTrue:[Transcript show:'code_length: '; showCR:(code_length printStringRadix:16)].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2461
    Verbose ifTrue:[Transcript show:'code at pos: '; showCR:inStream position].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2462
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2463
    code_length ~~ 0 ifTrue:[
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2464
        code := ByteArray new:code_length.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2465
        inStream nextBytes:code_length into:code startingAt:1.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2466
    ].
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2467
    Verbose ifTrue:[Transcript show:'method code: '; showCR:code.].
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2468
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2469
    exception_table_length := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2470
    Verbose ifTrue:[Transcript show:'exception_table_length: '; showCR:(exception_table_length printStringRadix:16)].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2471
    exception_table_length ~~ 0 ifTrue:[
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2472
        self error:'unexpected exceptionTable length'.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2473
        "/ skip it.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2474
        1 to:exception_table_length do:[:i |
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2475
            "start_pc :="   inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2476
            "end_pc :="     inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2477
            "handler_pc :=" inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2478
            "catch_type :=" inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2479
        ].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2480
    ].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2481
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2482
    aSmalltalkMethod byteCode:code.
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2483
    aSmalltalkMethod stackSize:max_stack .
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2484
    aSmalltalkMethod numberOfVars:max_locals.
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2485
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2486
    self readAttributesFor:aSmalltalkMethod.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2487
    ^ true
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2488
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2489
    "Modified: / 16.5.1998 / 01:39:30 / cg"
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2490
!
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2491
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2492
readSTLiteralsAttributeFor:aSmalltalkMethod
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2493
    |attribute_length literal_table_length literal_table litIndex literal|
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2494
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2495
    attribute_length := inStream nextUnsignedLongMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2496
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2497
    literal_table_length := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2498
    literal_table_length ~~ 0 ifTrue:[
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2499
        literal_table := Array new:literal_table_length.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2500
        1 to:literal_table_length do:[:i |
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2501
            litIndex := inStream nextUnsignedShortMSB:msb.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2502
            literal := (constants at:litIndex).
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2503
            literal_table at:i put:literal.
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2504
        ].
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2505
    ].
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2506
    Verbose ifTrue:[Transcript show:'literals: '; showCR:literal_table storeString.].
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2507
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2508
    "Created: / 7.5.1998 / 11:52:28 / cg"
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2509
    "Modified: / 16.5.1998 / 01:52:27 / cg"
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2510
!
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2511
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2512
readSTMethodCategoryAttributeFor:aSmalltalkMethod
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2513
    |attribute_length name_index name|
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2514
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2515
    attribute_length := inStream nextUnsignedLongMSB:msb.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2516
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2517
    name_index := inStream nextUnsignedShortMSB:msb.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2518
    name := (constants at:name_index).
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2519
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2520
    aSmalltalkMethod category:name.
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2521
348
10725e1a2aee more st-class reading
cg
parents: 344
diff changeset
  2522
    "Modified: / 8.5.1998 / 20:39:59 / cg"
357
90d866d87398 more st-class reading
cg
parents: 355
diff changeset
  2523
    "Created: / 16.5.1998 / 01:04:19 / cg"
344
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2524
! !
e97744a854f7 code cleanup;
cg
parents: 335
diff changeset
  2525
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2526
!JavaClassReader methodsFor:'helpers'!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2527
2428
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2528
addSelector: selector withMethod: method toClass: javaClass
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2529
    "Basically a primAddSelector:withMethod:. This indirection
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2530
     is required by Expecco (it uses custom class reader so
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2531
     which overrides this method"
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2532
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2533
    javaClass primAddSelector:selector withMethod: method
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2534
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2535
    "Created: / 26-02-2013 / 11:42:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2536
!
392a2eba9c42 Cherry-picked JavaClassReader from rev 8762fc7137c6.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2396
diff changeset
  2537
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2538
loadSuperclassIdentifiedBy: aJavaClassRef ignoring: classesBeingLoaded
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2539
    "overriding method, here we expect something to be new JavaClassRef2"
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2540
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2541
    self assert: aJavaClassRef isJavaRef
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2542
        message: 'class identifier is not a java reference'.
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2543
    self assert: aJavaClassRef isJavaClassRef
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2544
        message: 'class identifier is not a java class reference'.
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2545
    (classesBeingLoaded includes: aJavaClassRef name) ifTrue: [
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2546
        self
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2547
            error: 'class we want to load is being loaded and that means something went wrong. tell mh'
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2548
    ].
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2549
     "hint in case of bug - is parent of something set? surely jv will know more :)" "find out which classloader is used"
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2550
    ^ JavaVM classForName: aJavaClassRef name definedBy: classLoader.
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2551
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2552
    "Created: / 18-05-2011 / 14:55:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2841
6fa1bcf9c997 JavaClass>>#name vs. #binaryName refactoring
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2812
diff changeset
  2553
    "Modified: / 08-10-2013 / 22:57:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2554
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2555
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2556
updateOwnerInCPItem: each
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2557
    ((each isJavaRef and: [ each isNewJavaRef ])
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2558
        or: [ each isJavaNameAndType and: [ each isNewJavaNameAndType ] ])
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2559
            ifTrue: [ each owner: classBeingLoaded ].
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2560
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2561
    "Created: / 12-05-2011 / 17:40:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2562
!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2563
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2564
updateOwnerInField: each
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2565
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2566
            each setClass: classBeingLoaded.
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2567
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2568
    "Created: / 18-05-2011 / 13:57:20 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2569
! !
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2570
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2571
!JavaClassReader methodsFor:'logging'!
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2572
2966
afd174546057 Post-merge fixes.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2965
diff changeset
  2573
info: message
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2574
    Verbose ifTrue: [ Logger log: message severity: #info facility: 'JVM' ].
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2575
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2576
    "Created: / 18-05-2011 / 15:06:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2577
    "Modified (format): / 14-09-2011 / 21:39:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2578
! !
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2579
135
098936234135 *** empty log message ***
cg
parents: 128
diff changeset
  2580
!JavaClassReader class methodsFor:'documentation'!
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2581
083530508d9c intitial checkin
cg
parents:
diff changeset
  2582
version
2460
f89d54b4673c class: JavaClassReader
Claus Gittinger <cg@exept.de>
parents: 2428
diff changeset
  2583
    ^ '$Header: /cvs/stx/stx/libjava/JavaClassReader.st,v 1.97 2013-03-18 16:59:01 cg Exp $'
2148
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  2584
!
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  2585
b51eb5830f48 added:11 methods
Claus Gittinger <cg@exept.de>
parents: 2142
diff changeset
  2586
version_CVS
2460
f89d54b4673c class: JavaClassReader
Claus Gittinger <cg@exept.de>
parents: 2428
diff changeset
  2587
    ^ '$Header: /cvs/stx/stx/libjava/JavaClassReader.st,v 1.97 2013-03-18 16:59:01 cg Exp $'
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2588
!
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2589
2151
c0b6570c6f9b Jan's version
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2148
diff changeset
  2590
version_SVN
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2591
    ^ '§Id§'
1
083530508d9c intitial checkin
cg
parents:
diff changeset
  2592
! !
2108
ca8c4e7db2e8 category change
Claus Gittinger <cg@exept.de>
parents: 2089
diff changeset
  2593
2353
fa7400d022a0 Updated to https://swing.fit.cvut.cz/hg/stx.libjava/rev/31f8b995905e
Jan Vrany <jan.vrany@fit.cvut.cz>
parents: 2151
diff changeset
  2594
2089
f90b44f9c9e0 utf8 string decoding
Claus Gittinger <cg@exept.de>
parents: 749
diff changeset
  2595
JavaClassReader initialize!