src/JavaFieldRef2.st
author hlopkmar
Fri, 20 May 2011 15:32:09 +0000
branchjk_new_structure
changeset 806 7d1f2ba6d2df
parent 794 9635f32d1723
child 807 b9dde0678965
permissions -rw-r--r--
fixed lookup of fields.. at least I hope so :)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
     1
"{ Package: 'stx:libjava' }"
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
     2
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
     3
JavaClassContentRef2 subclass:#JavaFieldRef2
792
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
     4
	instanceVariableNames:'offset type'
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
     5
	classVariableNames:'T_LONG T_DOUBLE'
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
     6
	poolDictionaries:''
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
     7
	category:'Languages-Java-Reader-Support-new'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
     8
!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
     9
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
    10
792
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    11
!JavaFieldRef2 class methodsFor:'initialization'!
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    12
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    13
initialize
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    14
    T_LONG := 1.
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    15
    T_DOUBLE := 2.
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    16
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    17
    "Created: / 15-05-2011 / 22:31:19 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    18
! !
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    19
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    20
!JavaFieldRef2 methodsFor:'accessing'!
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    21
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    22
isJavaFieldRef
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    23
^true.
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    24
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    25
    "Created: / 11-04-2011 / 21:47:51 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
791
46666ff1f9b6 added offset to JavaFieldRef2
hlopkmar
parents: 772
diff changeset
    26
!
46666ff1f9b6 added offset to JavaFieldRef2
hlopkmar
parents: 772
diff changeset
    27
46666ff1f9b6 added offset to JavaFieldRef2
hlopkmar
parents: 772
diff changeset
    28
offset
46666ff1f9b6 added offset to JavaFieldRef2
hlopkmar
parents: 772
diff changeset
    29
    ^ offset.
46666ff1f9b6 added offset to JavaFieldRef2
hlopkmar
parents: 772
diff changeset
    30
46666ff1f9b6 added offset to JavaFieldRef2
hlopkmar
parents: 772
diff changeset
    31
    "Created: / 15-05-2011 / 22:26:08 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
792
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    32
!
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    33
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    34
type
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    35
    type == T_LONG ifTrue: [ ^ #long. ].
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    36
    type == T_DOUBLE ifTrue: [ ^ #double ].
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    37
    ^ type.
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    38
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    39
    "Created: / 15-05-2011 / 22:29:05 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    40
! !
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    41
758
be8e84381ce0 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    42
!JavaFieldRef2 methodsFor:'private - resolving'!
be8e84381ce0 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    43
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    44
findResolvedStaticValue
791
46666ff1f9b6 added offset to JavaFieldRef2
hlopkmar
parents: 772
diff changeset
    45
    valueCache := JavaResolver uniqueInstance 
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    46
                resolveStaticFieldIndentifiedByRef: self.
794
9635f32d1723 implemented deeper caching in new resolving refs to help keeping C-code lean and clean
hlopkmar
parents: 793
diff changeset
    47
    classCache := (constantPool at: classRefIndex) resolve.
9635f32d1723 implemented deeper caching in new resolving refs to help keeping C-code lean and clean
hlopkmar
parents: 793
diff changeset
    48
    classCache ifNil: [ self breakPoint: #mh ].
806
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    49
    self resolveStaticOffset.
794
9635f32d1723 implemented deeper caching in new resolving refs to help keeping C-code lean and clean
hlopkmar
parents: 793
diff changeset
    50
    nameAndTypeCache := (constantPool at: nameAndTypeIndex) resolve.
9635f32d1723 implemented deeper caching in new resolving refs to help keeping C-code lean and clean
hlopkmar
parents: 793
diff changeset
    51
    self resolveType.
806
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    52
    nameAndTypeCache ifNil: [ self breakPoint: #mh ].
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    53
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    54
    "Created: / 28-04-2011 / 22:05:10 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
794
9635f32d1723 implemented deeper caching in new resolving refs to help keeping C-code lean and clean
hlopkmar
parents: 793
diff changeset
    55
    "Modified: / 18-05-2011 / 12:44:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
761
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    56
!
43e017ec7958 Merged with /branches/jk
vranyj1
parents: 758
diff changeset
    57
758
be8e84381ce0 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
    58
findResolvedValue
791
46666ff1f9b6 added offset to JavaFieldRef2
hlopkmar
parents: 772
diff changeset
    59
    valueCache := JavaResolver uniqueInstance 
46666ff1f9b6 added offset to JavaFieldRef2
hlopkmar
parents: 772
diff changeset
    60
                resolveFieldIndentifiedByRef: self.
794
9635f32d1723 implemented deeper caching in new resolving refs to help keeping C-code lean and clean
hlopkmar
parents: 793
diff changeset
    61
    classCache := (constantPool at: classRefIndex) resolve.
9635f32d1723 implemented deeper caching in new resolving refs to help keeping C-code lean and clean
hlopkmar
parents: 793
diff changeset
    62
    classCache ifNil: [ self breakPoint: #mh ].
806
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    63
    self resolveOffset.
794
9635f32d1723 implemented deeper caching in new resolving refs to help keeping C-code lean and clean
hlopkmar
parents: 793
diff changeset
    64
    nameAndTypeCache := (constantPool at: nameAndTypeIndex) resolve.
793
bf00d8585c8e forgot to resolve type in JavaFieldRef2
hlopkmar
parents: 792
diff changeset
    65
    self resolveType.
806
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    66
    nameAndTypeCache ifNil: [ self breakPoint: #mh ].
791
46666ff1f9b6 added offset to JavaFieldRef2
hlopkmar
parents: 772
diff changeset
    67
794
9635f32d1723 implemented deeper caching in new resolving refs to help keeping C-code lean and clean
hlopkmar
parents: 793
diff changeset
    68
    "Modified: / 18-05-2011 / 12:44:17 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
792
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    69
!
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    70
806
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    71
resolveOffset
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    72
    "fieldRef must be resolved before calling me"
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    73
    
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    74
    | currentClass |
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    75
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    76
    currentClass := classCache.
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    77
    
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    78
    [ offset := currentClass class instVarOffsetOf: self name.
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    79
    offset isNil and: [ currentClass superclass ~= JavaObject ]. ] whileTrue: [ currentClass := currentClass superclass. ].
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    80
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    81
    "Modified: / 20-05-2011 / 17:32:02 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    82
!
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    83
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    84
resolveStaticOffset
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    85
    "fieldRef must be resolved before calling me"
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    86
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    87
    | currentClass |
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    88
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    89
    currentClass := classCache.
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    90
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    91
    [ offset := currentClass instVarOffsetOf: self name.
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    92
    offset isNil and: [ currentClass superclass ~= JavaObject ]. ] whileTrue: [ currentClass := currentClass superclass. ].
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    93
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    94
    "Modified: / 20-05-2011 / 17:32:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    95
!
7d1f2ba6d2df fixed lookup of fields.. at least I hope so :)
hlopkmar
parents: 794
diff changeset
    96
792
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    97
resolveType
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    98
    type := JavaMethod typeFromSignature:((constantPool at: nameAndTypeIndex) descriptor) in:nil.
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
    99
    type == #long ifTrue:[
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
   100
        type := T_LONG.
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
   101
    ] ifFalse:[
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
   102
        type == #double ifTrue:[
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
   103
            type := T_DOUBLE
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
   104
        ]
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
   105
    ].
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
   106
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
   107
    "Created: / 15-05-2011 / 22:29:02 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
758
be8e84381ce0 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   108
! !
be8e84381ce0 Merged with /branches/jk
vranyj1
parents: 752
diff changeset
   109
752
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   110
!JavaFieldRef2 class methodsFor:'documentation'!
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   111
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   112
version_SVN
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   113
    ^ '$Id$'
ff7bc6428c9c branch jk_new_structure resurrected
vranyj1
parents:
diff changeset
   114
! !
792
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
   115
14aa43c34268 fixes + added type to JavaFieldRef2
hlopkmar
parents: 791
diff changeset
   116
JavaFieldRef2 initialize!