JavaNameAndType2.st
author hlopkmar
Wed, 12 Dec 2012 23:26:59 +0000
branchdevelopment
changeset 1869 0ae14ac1c9af
parent 1864 60a8dc26c8c6
child 2069 75d40b7b986f
permissions -rw-r--r--
java compiler (javac wrapper) and basic class reloading tests
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
     1
"
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
     2
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1000
diff changeset
     3
1155
vranyj1
parents: 1152
diff changeset
     4
 New code and modifications done at SWING Research Group [1]:
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1000
diff changeset
     5
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
     6
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
     7
                            SWING Research Group, Czech Technical University in Prague
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
     8
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
     9
 This software is furnished under a license and may be used
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    10
 only in accordance with the terms of that license and with the
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    11
 inclusion of the above copyright notice.   This software may not
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    12
 be provided or otherwise made available to, or used by, any
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    13
 other person.  No title to or ownership of the software is
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    14
 hereby transferred.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    15
1155
vranyj1
parents: 1152
diff changeset
    16
 [1] Code written at SWING Research Group contains a signature
vranyj1
parents: 1152
diff changeset
    17
     of one of the above copright owners. For exact set of such code,
vranyj1
parents: 1152
diff changeset
    18
     see the differences between this version and version stx:libjava
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1000
diff changeset
    19
     as of 1.9.2010
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    20
"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    21
"{ Package: 'stx:libjava' }"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    22
774
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
    23
Object subclass:#JavaNameAndType2
795
6c81c73755c7 JavaNameAndType2>>resolve
hlopkmar
parents: 788
diff changeset
    24
	instanceVariableNames:'constantPool nameIndex descriptorIndex nameCache descriptorCache'
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    25
	classVariableNames:''
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    26
	poolDictionaries:''
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    27
	category:'Languages-Java-Reader-Support-new'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    28
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    29
758
be8e84381ce0 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    30
!JavaNameAndType2 class methodsFor:'documentation'!
be8e84381ce0 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    31
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    32
copyright
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    33
"
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    34
 COPYRIGHT (c) 1996-2011 by Claus Gittinger
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1000
diff changeset
    35
1155
vranyj1
parents: 1152
diff changeset
    36
 New code and modifications done at SWING Research Group [1]:
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1000
diff changeset
    37
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    38
 COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    39
                            SWING Research Group, Czech Technical University in Prague
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    40
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    41
 This software is furnished under a license and may be used
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    42
 only in accordance with the terms of that license and with the
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    43
 inclusion of the above copyright notice.   This software may not
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    44
 be provided or otherwise made available to, or used by, any
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    45
 other person.  No title to or ownership of the software is
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    46
 hereby transferred.
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    47
1155
vranyj1
parents: 1152
diff changeset
    48
 [1] Code written at SWING Research Group contains a signature
vranyj1
parents: 1152
diff changeset
    49
     of one of the above copright owners. For exact set of such code,
vranyj1
parents: 1152
diff changeset
    50
     see the differences between this version and version stx:libjava
1152
040cba55a7d2 Copyright fixes
vranyj1
parents: 1000
diff changeset
    51
     as of 1.9.2010
877
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    52
f5a5b93e1c78 Cleanup phase 1
vranyj1
parents: 843
diff changeset
    53
"
758
be8e84381ce0 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    54
! !
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    55
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    56
!JavaNameAndType2 class methodsFor:'instance creation'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    57
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
    58
in: aJavaConstantPool withNameAt: arg1 andDescriptorAt: arg2 
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    59
    "Create & return a new instance for arg."
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
    60
    
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
    61
    ^ self basicNew 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
    62
        initializeIn: aJavaConstantPool
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
    63
        withNameAt: arg1
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
    64
        andDescriptorAt: arg2
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    65
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
    66
    "Created: / 10-05-2011 / 15:45:28 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    67
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    68
1376
c4b2cf1467c3 Fixes for Groovy and class reloading
vranyj1
parents: 1155
diff changeset
    69
!JavaNameAndType2 methodsFor:'* As yet uncategorized *'!
c4b2cf1467c3 Fixes for Groovy and class reloading
vranyj1
parents: 1155
diff changeset
    70
c4b2cf1467c3 Fixes for Groovy and class reloading
vranyj1
parents: 1155
diff changeset
    71
invalidateForClass:aSymbol
c4b2cf1467c3 Fixes for Groovy and class reloading
vranyj1
parents: 1155
diff changeset
    72
    "Name and type cannot be invalid..."
c4b2cf1467c3 Fixes for Groovy and class reloading
vranyj1
parents: 1155
diff changeset
    73
c4b2cf1467c3 Fixes for Groovy and class reloading
vranyj1
parents: 1155
diff changeset
    74
    ^false
c4b2cf1467c3 Fixes for Groovy and class reloading
vranyj1
parents: 1155
diff changeset
    75
c4b2cf1467c3 Fixes for Groovy and class reloading
vranyj1
parents: 1155
diff changeset
    76
    "Created: / 22-02-2012 / 20:50:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
c4b2cf1467c3 Fixes for Groovy and class reloading
vranyj1
parents: 1155
diff changeset
    77
! !
c4b2cf1467c3 Fixes for Groovy and class reloading
vranyj1
parents: 1155
diff changeset
    78
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    79
!JavaNameAndType2 methodsFor:'accessing'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    80
774
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
    81
constantPool
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
    82
^constantPool.
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
    83
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
    84
    "Created: / 10-05-2011 / 17:16:23 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
    85
!
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
    86
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
    87
constantPool: aJavaConstantPool
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
    88
    constantPool := aJavaConstantPool.
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
    89
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
    90
    "Created: / 10-05-2011 / 17:16:37 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
    91
!
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
    92
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    93
descriptor
777
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
    94
    ^constantPool at: descriptorIndex.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    95
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    96
    "Created: / 08-04-2011 / 11:55:33 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
777
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
    97
    "Modified: / 12-05-2011 / 18:51:04 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    98
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    99
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   100
name
777
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   101
    ^ constantPool at: nameIndex.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   102
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   103
    "Created: / 08-04-2011 / 11:55:23 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
777
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   104
    "Modified: / 12-05-2011 / 18:42:16 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
   105
!
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
   106
774
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   107
owner
777
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   108
    ^ constantPool owner.
774
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   109
777
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   110
    "Created: / 12-05-2011 / 18:43:06 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
774
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   111
!
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   112
777
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   113
owner: javaClass
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   114
    constantPool owner: javaClass.
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   115
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   116
    "Created: / 12-05-2011 / 18:43:12 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   117
!
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   118
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   119
selector    
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   120
    ^ (self name , self descriptor) asSymbol.
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
   121
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
   122
    "Created: / 11-04-2011 / 21:31:27 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
777
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   123
    "Modified: / 12-05-2011 / 18:51:55 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   124
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   125
787
cae769b9b5c1 added JavaNameAndType2>>isUnresolved - only temporarily
hlopkmar
parents: 777
diff changeset
   126
!JavaNameAndType2 methodsFor:'backward compatibility'!
cae769b9b5c1 added JavaNameAndType2>>isUnresolved - only temporarily
hlopkmar
parents: 777
diff changeset
   127
cae769b9b5c1 added JavaNameAndType2>>isUnresolved - only temporarily
hlopkmar
parents: 777
diff changeset
   128
isUnresolved
cae769b9b5c1 added JavaNameAndType2>>isUnresolved - only temporarily
hlopkmar
parents: 777
diff changeset
   129
^false.
cae769b9b5c1 added JavaNameAndType2>>isUnresolved - only temporarily
hlopkmar
parents: 777
diff changeset
   130
cae769b9b5c1 added JavaNameAndType2>>isUnresolved - only temporarily
hlopkmar
parents: 777
diff changeset
   131
    "Created: / 13-05-2011 / 18:43:17 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
788
bdc1ee670ef9 added JavaNameAndType2>>signature..
hlopkmar
parents: 787
diff changeset
   132
!
bdc1ee670ef9 added JavaNameAndType2>>signature..
hlopkmar
parents: 787
diff changeset
   133
bdc1ee670ef9 added JavaNameAndType2>>signature..
hlopkmar
parents: 787
diff changeset
   134
signature
bdc1ee670ef9 added JavaNameAndType2>>signature..
hlopkmar
parents: 787
diff changeset
   135
^self descriptor.
bdc1ee670ef9 added JavaNameAndType2>>signature..
hlopkmar
parents: 787
diff changeset
   136
bdc1ee670ef9 added JavaNameAndType2>>signature..
hlopkmar
parents: 787
diff changeset
   137
    "Created: / 13-05-2011 / 18:45:59 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
787
cae769b9b5c1 added JavaNameAndType2>>isUnresolved - only temporarily
hlopkmar
parents: 777
diff changeset
   138
! !
cae769b9b5c1 added JavaNameAndType2>>isUnresolved - only temporarily
hlopkmar
parents: 777
diff changeset
   139
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   140
!JavaNameAndType2 methodsFor:'comparing'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   141
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   142
= aNameAndType 
777
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   143
    self name ~= aNameAndType name ifTrue: [ ^ false ].
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   144
    ^ self descriptor = aNameAndType descriptor.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   145
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   146
    "Created: / 08-04-2011 / 11:56:35 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
777
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   147
    "Modified: / 12-05-2011 / 18:44:15 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   148
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   149
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   150
hash
777
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   151
    ^ self name hash bitXor: self descriptor hash.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   152
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   153
    "Created: / 08-04-2011 / 11:57:35 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
777
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   154
    "Modified: / 12-05-2011 / 18:44:26 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   155
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   156
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   157
!JavaNameAndType2 methodsFor:'initialization'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   158
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   159
initializeIn: aJavaConstantPool withNameAt: nameCPIndex andDescriptorAt: descriptorCPIndex 
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   160
    nameIndex := nameCPIndex.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   161
    descriptorIndex := descriptorCPIndex.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   162
    constantPool := aJavaConstantPool.
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   163
    super initialize.
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   164
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   165
    "Created: / 10-05-2011 / 15:45:00 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   166
! !
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   167
774
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   168
!JavaNameAndType2 methodsFor:'logging'!
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   169
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   170
info: arg 
1000
cfa982260238 Lot of debug/info prints rewritten to use Logger
vranyj1
parents: 877
diff changeset
   171
cfa982260238 Lot of debug/info prints rewritten to use Logger
vranyj1
parents: 877
diff changeset
   172
    Logger log: arg severity: #info facility: 'JVM'
774
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   173
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   174
    "Created: / 10-05-2011 / 16:50:48 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1000
cfa982260238 Lot of debug/info prints rewritten to use Logger
vranyj1
parents: 877
diff changeset
   175
    "Modified: / 14-09-2011 / 21:42:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
774
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   176
!
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   177
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   178
warning: arg 
1000
cfa982260238 Lot of debug/info prints rewritten to use Logger
vranyj1
parents: 877
diff changeset
   179
cfa982260238 Lot of debug/info prints rewritten to use Logger
vranyj1
parents: 877
diff changeset
   180
    Logger log: arg severity: #warn facility: 'JVM'
774
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   181
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   182
    "Created: / 10-05-2011 / 15:01:08 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1000
cfa982260238 Lot of debug/info prints rewritten to use Logger
vranyj1
parents: 877
diff changeset
   183
    "Modified: / 14-09-2011 / 21:42:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
774
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   184
! !
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   185
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   186
!JavaNameAndType2 methodsFor:'printing'!
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   187
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   188
printString
777
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   189
    ^ 'JavaNameAndType name=' , self name printString , ' descriptor= ' 
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   190
        , self descriptor printString.
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   191
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   192
    "Created: / 10-05-2011 / 14:17:38 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
777
e6e61412ae43 refactoring tests.. and more needed
hlopkmar
parents: 774
diff changeset
   193
    "Modified: / 12-05-2011 / 18:44:46 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
771
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   194
! !
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   195
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   196
!JavaNameAndType2 methodsFor:'queries'!
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   197
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   198
isJavaNameAndType
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   199
    "return true, if given object represents name and type struct in java constant pool"
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   200
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   201
    ^ true.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   202
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   203
    "Created: / 10-05-2011 / 12:23:45 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   204
!
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   205
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   206
isNewJavaNameAndType
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   207
    "only temporary, to know if name and type is old (claus' version) or new (m version)"
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   208
    
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   209
    ^ true.
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   210
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   211
    "Created: / 10-05-2011 / 12:24:16 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   212
! !
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   213
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   214
!JavaNameAndType2 methodsFor:'resolving'!
fb8026dda011 Merged with /trunk
vranyj1
parents: 761
diff changeset
   215
1728
0d275432230d - JavaRef2
vranyj1
parents: 1378
diff changeset
   216
preresolve
0d275432230d - JavaRef2
vranyj1
parents: 1378
diff changeset
   217
   self resolve
0d275432230d - JavaRef2
vranyj1
parents: 1378
diff changeset
   218
0d275432230d - JavaRef2
vranyj1
parents: 1378
diff changeset
   219
    "Created: / 15-10-2012 / 23:09:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0d275432230d - JavaRef2
vranyj1
parents: 1378
diff changeset
   220
!
0d275432230d - JavaRef2
vranyj1
parents: 1378
diff changeset
   221
795
6c81c73755c7 JavaNameAndType2>>resolve
hlopkmar
parents: 788
diff changeset
   222
resolve
6c81c73755c7 JavaNameAndType2>>resolve
hlopkmar
parents: 788
diff changeset
   223
    nameCache := constantPool at: nameIndex.
6c81c73755c7 JavaNameAndType2>>resolve
hlopkmar
parents: 788
diff changeset
   224
    descriptorCache := constantPool at: descriptorIndex.
6c81c73755c7 JavaNameAndType2>>resolve
hlopkmar
parents: 788
diff changeset
   225
    (nameCache isNil or: [ descriptorCache isNil ]) 
6c81c73755c7 JavaNameAndType2>>resolve
hlopkmar
parents: 788
diff changeset
   226
        ifTrue: [ self breakPoint: #mh ].
6c81c73755c7 JavaNameAndType2>>resolve
hlopkmar
parents: 788
diff changeset
   227
    ^self.
6c81c73755c7 JavaNameAndType2>>resolve
hlopkmar
parents: 788
diff changeset
   228
6c81c73755c7 JavaNameAndType2>>resolve
hlopkmar
parents: 788
diff changeset
   229
    "Created: / 18-05-2011 / 13:19:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
6c81c73755c7 JavaNameAndType2>>resolve
hlopkmar
parents: 788
diff changeset
   230
!
6c81c73755c7 JavaNameAndType2>>resolve
hlopkmar
parents: 788
diff changeset
   231
1378
9d64d8357509 cleaning java references
hlopkmar
parents: 1376
diff changeset
   232
resolve: doClassInit
9d64d8357509 cleaning java references
hlopkmar
parents: 1376
diff changeset
   233
   ^ self resolve.
9d64d8357509 cleaning java references
hlopkmar
parents: 1376
diff changeset
   234
9d64d8357509 cleaning java references
hlopkmar
parents: 1376
diff changeset
   235
    "Created: / 18-05-2011 / 13:19:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
9d64d8357509 cleaning java references
hlopkmar
parents: 1376
diff changeset
   236
    "Created: / 23-02-2012 / 17:14:51 / Marcel Hlopko <hlopik@gmail.com>"
9d64d8357509 cleaning java references
hlopkmar
parents: 1376
diff changeset
   237
!
9d64d8357509 cleaning java references
hlopkmar
parents: 1376
diff changeset
   238
774
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   239
updateClassRefsFrom: oldOwner to: newOwner 
843
83d38f26b481 another annoying output is gone (JavaNameAndType2>>updatingClassRefFrom:to:)
hlopkmar
parents: 795
diff changeset
   240
    self owner = oldOwner ifTrue: [
83d38f26b481 another annoying output is gone (JavaNameAndType2>>updatingClassRefFrom:to:)
hlopkmar
parents: 795
diff changeset
   241
        self owner: newOwner.
83d38f26b481 another annoying output is gone (JavaNameAndType2>>updatingClassRefFrom:to:)
hlopkmar
parents: 795
diff changeset
   242
    ].
774
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   243
ac54730a2b74 cleaning.. removed JavaConstantPoolContent
hlopkmar
parents: 772
diff changeset
   244
    "Created: / 10-05-2011 / 16:50:48 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
843
83d38f26b481 another annoying output is gone (JavaNameAndType2>>updatingClassRefFrom:to:)
hlopkmar
parents: 795
diff changeset
   245
    "Modified: / 04-06-2011 / 18:40:32 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   246
! !
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   247
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   248
!JavaNameAndType2 class methodsFor:'documentation'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   249
1864
60a8dc26c8c6 Updated from HG
vranyj1
parents: 1818
diff changeset
   250
version_HG
60a8dc26c8c6 Updated from HG
vranyj1
parents: 1818
diff changeset
   251
60a8dc26c8c6 Updated from HG
vranyj1
parents: 1818
diff changeset
   252
    ^ '$Changeset: <not expanded> $'
60a8dc26c8c6 Updated from HG
vranyj1
parents: 1818
diff changeset
   253
!
60a8dc26c8c6 Updated from HG
vranyj1
parents: 1818
diff changeset
   254
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   255
version_SVN
1864
60a8dc26c8c6 Updated from HG
vranyj1
parents: 1818
diff changeset
   256
    ^ '§Id§'
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   257
! !