src/JavaLookup.st
author vranyj1
Tue, 21 Aug 2012 11:26:45 +0000
branchjk_new_structure
changeset 1637 6a971ebbfb81
parent 1508 ede3a3720ec6
child 1638 6a2600baedb7
permissions -rw-r--r--
- JavaLookup: performance optimization
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
     1
"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
     2
 Copyright (c) 2010-2011 Jan Vrany, Jan Kurs & Marcel Hlopko,
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
     3
                         SWING Research Group, Czech Technical University 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
     4
                         in Prague
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
     5
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
     6
 Permission is hereby granted, free of charge, to any person
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
     7
 obtaining a copy of this software and associated documentation
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
     8
 files (the 'Software'), to deal in the Software without
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
     9
 restriction, including without limitation the rights to use,
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    10
 copy, modify, merge, publish, distribute, sublicense, and/or sell
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    11
 copies of the Software, and to permit persons to whom the
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    12
 Software is furnished to do so, subject to the following
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    13
 conditions:
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    14
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    15
 The above copyright notice and this permission notice shall be
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    16
 included in all copies or substantial portions of the Software.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    17
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    18
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    19
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    20
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    21
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    22
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    23
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    24
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    25
 OTHER DEALINGS IN THE SOFTWARE.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    26
"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    27
"{ Package: 'stx:libjava' }"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    28
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    29
Lookup subclass:#JavaLookup
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    30
	instanceVariableNames:'s2j j2s'
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    31
	classVariableNames:'Instance'
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    32
	poolDictionaries:''
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    33
	category:'Languages-Java-Interop'
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    34
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    35
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    36
Lookup subclass:#Java2Smalltalk
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    37
	instanceVariableNames:''
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    38
	classVariableNames:''
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    39
	poolDictionaries:''
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    40
	privateIn:JavaLookup
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    41
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    42
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    43
Lookup subclass:#Smalltalk2Java
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    44
	instanceVariableNames:''
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    45
	classVariableNames:''
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    46
	poolDictionaries:''
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    47
	privateIn:JavaLookup
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    48
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    49
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    50
!JavaLookup class methodsFor:'documentation'!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    51
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    52
copyright
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    53
"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    54
 Copyright (c) 2010-2011 Jan Vrany, Jan Kurs & Marcel Hlopko,
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    55
                         SWING Research Group, Czech Technical University 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    56
                         in Prague
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    57
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    58
 Permission is hereby granted, free of charge, to any person
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    59
 obtaining a copy of this software and associated documentation
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    60
 files (the 'Software'), to deal in the Software without
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    61
 restriction, including without limitation the rights to use,
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    62
 copy, modify, merge, publish, distribute, sublicense, and/or sell
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    63
 copies of the Software, and to permit persons to whom the
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    64
 Software is furnished to do so, subject to the following
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    65
 conditions:
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    66
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    67
 The above copyright notice and this permission notice shall be
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    68
 included in all copies or substantial portions of the Software.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    69
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    70
 THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    71
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    72
 OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    73
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    74
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    75
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    76
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    77
 OTHER DEALINGS IN THE SOFTWARE.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    78
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    79
"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    80
! !
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    81
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    82
!JavaLookup class methodsFor:'instance creation'!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    83
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    84
cleanup
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    85
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    86
    Instance := nil.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    87
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    88
    "Modified: / 25-02-2011 / 14:45:03 / kursjan <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    89
    "Created: / 19-09-2011 / 23:25:08 / Jan Kurs <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    90
    "Modified: / 15-12-2011 / 23:05:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    91
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    92
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    93
instance
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    94
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    95
    Instance isNil ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    96
        Instance := self basicNew initialize
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    97
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    98
    ^Instance
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
    99
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   100
    "Modified: / 25-02-2011 / 14:45:03 / kursjan <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   101
    "Created: / 19-09-2011 / 23:20:49 / Jan Kurs <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   102
    "Modified: / 15-12-2011 / 23:05:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   103
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   104
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   105
new
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   106
    ^ self shouldNeverBeSent.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   107
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   108
    "Created: / 25-02-2011 / 14:44:43 / kursjan <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   109
    "Modified: / 29-08-2011 / 21:10:12 / Jan Kurs <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   110
! !
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   111
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   112
!JavaLookup methodsFor:'initialization'!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   113
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   114
initialize
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   115
    "Invoked when a new instance is created."
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   116
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   117
    s2j := Smalltalk2Java new.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   118
    j2s := Java2Smalltalk new.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   119
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   120
    "Modified: / 15-12-2011 / 23:06:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   121
! !
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   122
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   123
!JavaLookup methodsFor:'lookup'!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   124
1508
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   125
lookupMethodForSelector: selector directedTo: initialSearchClass
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   126
    "This method performs standard Java lookup as required JVM spec. See 
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   127
        - JVM spec, 5.4.2.1 Method overriding
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   128
        - JVM spec, 6.4 invokevirtual
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   129
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   130
     This is hacky because of those stupid package-private methods. Sigh."
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   131
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   132
    | method superMethod |
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   133
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   134
    method := super lookupMethodForSelector: selector directedTo: initialSearchClass.
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   135
    method isNil ifTrue:[ ^ nil ].
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   136
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   137
    superMethod := super lookupMethodForSelector: selector directedTo: method mclass superclass.
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   138
    [ superMethod notNil ] whileTrue:[
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   139
        (method overrides: superMethod) ifFalse:[
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   140
            method := superMethod
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   141
        ].
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   142
        superMethod := super lookupMethodForSelector: selector directedTo: superMethod mclass superclass.
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   143
    ].
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   144
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   145
    ^method
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   146
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   147
    "Created: / 05-07-2012 / 11:06:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   148
!
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   149
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   150
lookupMethodForSelector:selector directedTo:initialSearchClass for:aReceiver withArguments:argArrayOrNil from:sendingContext ilc: ilcCache
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   151
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   152
    "Invoked by the VM to ask me for a method to call.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   153
     The arguments are: the selector, receiver and arguments,
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   154
     the class to start the search in (for here-, super and directed sends)
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   155
     the sending context and the inline/poly cache (instance of
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   156
     PolymorphicInlineCache). "
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   157
1637
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   158
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   159
     "JV@2012-08-21: Following C code speeds up Java<->Smalltalk interop by
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   160
      order of 2 magnitudes. However, it breaks Java reflection. 
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   161
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   162
      This is because it does not handle package private methods correctly.
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   163
      On the other hand, PP methods are not handled correctly when not using 
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   164
      reflection anyway, so lets keep the optimization here.
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   165
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   166
      Once we will have functinal JIT compiler, we can remove it and Java
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   167
      package-private method will be supported correctly in all cases.
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   168
     "
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   169
%{
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   170
    OBJ method;
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   171
    method = __lookup(initialSearchClass, selector);
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   172
    if ( method && ilcCache ) {
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   173
        __ilcBind(ilcCache, initialSearchClass, method, selector);
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   174
    }
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   175
    RETURN (method);
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   176
%}.
6a971ebbfb81 - JavaLookup: performance optimization
vranyj1
parents: 1508
diff changeset
   177
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   178
    sendingContext programmingLanguage isSmalltalk ifTrue:[
1478
329a15eedd36 - improvements in class reloading
vranyj1
parents: 1449
diff changeset
   179
        aReceiver class theNonMetaclass programmingLanguage isJavaLike ifTrue:[
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   180
            ^s2j lookupMethodForSelector:selector directedTo:initialSearchClass for:aReceiver withArguments:argArrayOrNil from:sendingContext ilc: ilcCache.
1508
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   181
        ].
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   182
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   183
1508
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   184
    sendingContext programmingLanguage isJavaLike ifTrue:[
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   185
        initialSearchClass programmingLanguage isSmalltalk ifTrue:[
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   186
            "Java to Smalltalk send"
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   187
            ^j2s lookupMethodForSelector:selector directedTo:initialSearchClass for:aReceiver withArguments:argArrayOrNil from:sendingContext ilc: ilcCache.
1508
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   188
        ].
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   189
        initialSearchClass programmingLanguage isJavaLike ifTrue:[
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   190
            "Java to Java send"
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   191
            | m |
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   192
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   193
            m := self lookupMethodForSelector: selector directedTo: initialSearchClass.
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   194
            m notNil ifTrue:[
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   195
                ilcCache notNil ifTrue:[ ilcCache bindTo: m forClass: aReceiver class ].
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   196
                ^m.
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   197
            ]
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   198
        ].
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   199
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   200
1508
ede3a3720ec6 - JavaLookup
vranyj1
parents: 1483
diff changeset
   201
    ^super lookupMethodForSelector:selector directedTo:initialSearchClass for:aReceiver withArguments:argArrayOrNil from:sendingContext ilc: ilcCache.
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   202
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   203
    "Created: / 01-10-2011 / 13:18:40 / Jan Kurs <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   204
    "Created: / 15-12-2011 / 23:11:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   205
! !
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   206
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   207
!JavaLookup::Java2Smalltalk methodsFor:'lookup'!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   208
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   209
lookupMethodForSelector:selector directedTo:initialSearchClass for:receiver withArguments:argArrayOrNil from:sendingContext ilc: ilc
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   210
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   211
    | d m |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   212
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   213
    d := JavaDescriptor readFrom: (selector readStream skipThrough: $(; backStep; yourself).
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   214
    m := self lookupMethodForSelector: selector directedTo: initialSearchClass numArguments: d numArgs.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   215
    m notNil ifTrue: [
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   216
        m := self compileProxyWithSelector: selector descriptor: d in: receiver class calling: m.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   217
        ilc notNil ifTrue:[ilc bindTo: m forClass: receiver class].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   218
        ^m.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   219
    ] ifFalse:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   220
        ^ nil
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   221
    ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   222
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   223
    "Created: / 06-09-2011 / 22:04:04 / Jan Kurs <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   224
    "Modified: / 09-10-2011 / 22:59:18 / kursjan <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   225
    "Created: / 19-11-2011 / 12:37:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   226
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   227
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   228
lookupMethodForSelector:jselector directedTo:initialSearchClass numArguments: nArgs
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   229
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   230
    | name cls |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   231
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   232
    name := jselector upTo: $(.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   233
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   234
    "Pass 1: Search for explicitly annotated method"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   235
    cls := initialSearchClass.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   236
    [ cls notNil ] whileTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   237
        cls methodDictionary keysAndValuesDo:[:sel :mthd|
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   238
            | jdescriptor |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   239
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   240
            mthd numArgs == nArgs ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   241
                (jdescriptor := mthd annotationAt: #javaselector:) notNil ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   242
                    jdescriptor arguments first == jselector ifTrue: [
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   243
                        ^mthd    
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   244
                    ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   245
                ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   246
            ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   247
        ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   248
        cls := cls superclass.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   249
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   250
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   251
    "Pass 2: Search for method with matching name"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   252
    cls := initialSearchClass.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   253
    [ cls notNil ] whileTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   254
        cls methodDictionary keysAndValuesDo:[:sel :mthd|
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   255
            mthd numArgs == nArgs ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   256
                (sel startsWith: name) ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   257
                    ^mthd
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   258
                ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   259
            ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   260
        ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   261
        cls := cls superclass.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   262
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   263
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   264
    ^nil
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   265
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   266
    "Created: / 16-12-2011 / 00:00:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   267
! !
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   268
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   269
!JavaLookup::Java2Smalltalk methodsFor:'utilities'!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   270
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   271
addSelector:selector withMethod:proxy toClass:class 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   272
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   273
    ProxyMethod installProxies ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   274
        Class withoutUpdatingChangesDo:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   275
            class addSelector:selector withMethod:proxy.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   276
        ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   277
    ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   278
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   279
    "Modified: / 23-12-2011 / 13:09:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   280
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   281
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   282
compileProxyWithSelector:selector descriptor:descriptor in:class calling:callee 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   283
    |compiler proxy body|
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   284
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   285
    compiler := ProxyMethodCompiler new.
1385
3426388640da Improvements in interop
vranyj1
parents: 1365
diff changeset
   286
    body := compiler newJavaMethodInvocation: callee.
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   287
    body descriptor:descriptor.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   288
    proxy := compiler 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   289
                compile:body 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   290
                arguments:callee numArgs 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   291
                selector: selector.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   292
"/    JK: do nod add here
1385
3426388640da Improvements in interop
vranyj1
parents: 1365
diff changeset
   293
"/    JV: Why?
3426388640da Improvements in interop
vranyj1
parents: 1365
diff changeset
   294
    self 
3426388640da Improvements in interop
vranyj1
parents: 1365
diff changeset
   295
        addSelector:selector
3426388640da Improvements in interop
vranyj1
parents: 1365
diff changeset
   296
        withMethod:proxy
3426388640da Improvements in interop
vranyj1
parents: 1365
diff changeset
   297
        toClass:class.
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   298
    ^ proxy
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   299
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   300
    "Created: / 14-12-2011 / 20:48:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   301
    "Modified: / 01-01-2012 / 19:33:45 / kursjan <kursjan@fit.cvut.cz>"
1385
3426388640da Improvements in interop
vranyj1
parents: 1365
diff changeset
   302
    "Modified: / 24-02-2012 / 20:36:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   303
! !
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   304
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   305
!JavaLookup::Smalltalk2Java methodsFor:'lookup'!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   306
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   307
lookupMethodForSelector:selector directedTo:initialSearchClass for:receiver withArguments:argArrayOrNil from:sendingContext ilc: ilc
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   308
    "
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   309
    As a courtesy to a Smalltalker, try to map smalltalk selectors to a java ones.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   310
    Returns JavaMethodDescriptor or nil.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   311
    "
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   312
    | name nameSizePlusOne candidates finder static cls m |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   313
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   314
    name := selector upTo: $:.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   315
    nameSizePlusOne := name size + 1.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   316
    static := receiver isBehavior.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   317
    candidates := OrderedCollection new.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   318
    finder := [:cls|
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   319
        cls methodDictionary keysAndValuesDo:[:sel :mthd|
1387
4c609318f0e5 - Improvements in GroovyCompiler (error handling)
vranyj1
parents: 1385
diff changeset
   320
            "candidates may contain a method with same selector ->
4c609318f0e5 - Improvements in GroovyCompiler (error handling)
vranyj1
parents: 1385
diff changeset
   321
             do not add super-class's method"
4c609318f0e5 - Improvements in GroovyCompiler (error handling)
vranyj1
parents: 1385
diff changeset
   322
            (candidates contains:[:each|each selector == sel]) ifFalse:[
4c609318f0e5 - Improvements in GroovyCompiler (error handling)
vranyj1
parents: 1385
diff changeset
   323
                (mthd mclass ~~ ProxyMethod
4c609318f0e5 - Improvements in GroovyCompiler (error handling)
vranyj1
parents: 1385
diff changeset
   324
                    and:[((sel size >= nameSizePlusOne) and:[(sel at: nameSizePlusOne) == $( and:[(sel startsWith: name)]])
4c609318f0e5 - Improvements in GroovyCompiler (error handling)
vranyj1
parents: 1385
diff changeset
   325
                        and:[mthd descriptor numArgs == argArrayOrNil size]]) ifTrue:[
4c609318f0e5 - Improvements in GroovyCompiler (error handling)
vranyj1
parents: 1385
diff changeset
   326
                            candidates add: mthd
4c609318f0e5 - Improvements in GroovyCompiler (error handling)
vranyj1
parents: 1385
diff changeset
   327
                        ]
4c609318f0e5 - Improvements in GroovyCompiler (error handling)
vranyj1
parents: 1385
diff changeset
   328
            ]
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   329
        ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   330
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   331
1425
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   332
    "Search class for method candidates"
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   333
    cls := initialSearchClass theNonMetaclass.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   334
    static ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   335
        finder value: cls
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   336
    ] ifFalse:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   337
        [ cls notNil and:[cls ~~ JavaObject] ] whileTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   338
            finder value: cls.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   339
            cls := cls superclass.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   340
        ]     
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   341
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   342
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   343
    candidates notEmpty ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   344
        m := self compileProxyWithSelector: selector in: receiver class calling: candidates.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   345
        ilc notNil ifTrue:[ilc bindTo: m forClass: receiver class].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   346
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   347
        "Install the proxy"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   348
        self addSelector: selector withMethod: m toClass: receiver class.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   349
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   350
        ^m.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   351
    ].
1425
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   352
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   353
    "Hmm, hmm, maybe a public field?"
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   354
    (argArrayOrNil size < 2) ifTrue:[
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   355
        | field |
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   356
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   357
        field := initialSearchClass theNonMetaclass
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   358
                    lookupFieldFor: name
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   359
                    static: initialSearchClass isMetaclass
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   360
                    onlyPublic: true.
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   361
        field notNil ifTrue:[
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   362
            m := self compileProxyWithSelector: selector in: receiver class accessing: field.
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   363
            ilc notNil ifTrue:[ilc bindTo: m forClass: receiver class].
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   364
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   365
            "Install the proxy"
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   366
            self addSelector: selector withMethod: m toClass: receiver class.
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   367
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   368
            ^m.
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   369
        ]
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   370
    ].
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   371
    ^nil
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   372
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   373
    "Created: / 21-02-2011 / 13:38:55 / kursjan <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   374
    "Modified: / 29-08-2011 / 20:38:21 / kursjan"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   375
    "Modified: / 20-09-2011 / 00:03:48 / Jan Kurs <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   376
    "Modified (format): / 25-09-2011 / 21:08:45 / Jan Kurs <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   377
    "Created: / 19-11-2011 / 13:03:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   378
    "Modified: / 01-01-2012 / 19:58:59 / kursjan <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   379
    "Modified (comment): / 02-01-2012 / 10:35:25 / kursjan <kursjan@fit.cvut.cz>"
1425
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   380
    "Modified: / 17-03-2012 / 17:22:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   381
! !
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   382
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   383
!JavaLookup::Smalltalk2Java methodsFor:'lookup (old)'!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   384
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   385
old_lookupMethodForSelector:selector directedTo:initialSearchClass for:receiver withArguments:argArrayOrNil from:sendingContext ilc: ilc
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   386
    "
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   387
    As a courtesy to a Smalltalker, try to map smalltalk selectors to a java ones.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   388
    Returns JavaMethodDescriptor or nil.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   389
    "
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   390
    |descriptor candidate static cls m |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   391
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   392
    static := receiver isBehavior.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   393
    descriptor := JavaMethodDescriptor 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   394
            name: (selector upTo:$:) 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   395
            parameters: (argArrayOrNil ? #() collect:[:a|
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   396
                (a class isString and: [JavaVM booted]) ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   397
                    JavaFieldDescriptorWithUnionType new
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   398
                        addDescriptor: (JavaFieldDescriptor javaClass: a class);
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   399
                        addDescriptor: (JavaFieldDescriptor javaClass: (Java classForName: 'java.lang.String'));
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   400
                        yourself.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   401
                ] ifFalse:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   402
                    JavaFieldDescriptor javaClass: a class
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   403
                ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   404
            ]).
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   405
    cls := initialSearchClass theNonMetaclass.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   406
    [ cls notNil and:[cls ~~ JavaObject] ] whileTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   407
        cls methodsDo:[:mthd|
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   408
            "/(mthd selector startsWith: 'foo') ifTrue:[self breakPoint: #jv]. 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   409
            (mthd class ~~ ProxyMethod and:[mthd isStatic == static and:[descriptor match: mthd descriptor]]) ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   410
                candidate isNil ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   411
                    candidate := mthd
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   412
                ] ifFalse:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   413
                    candidate descriptorSymbol ~~ mthd descriptorSymbol ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   414
                        "Hm, hm, two matching methods with different descriptors means
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   415
                         ambiguity...raise an error"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   416
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   417
                        "Bit hacky - NamespaceAwareLookup already has method to generate
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   418
                         ambigouous send trampouline..."
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   419
                        ^NamespaceAwareLookup instance ambiguousMessageSend: selector withArgs: argArrayOrNil
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   420
                    ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   421
                ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   422
            ]                                                                 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   423
        ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   424
        cls := cls superclass.                
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   425
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   426
    candidate notNil ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   427
        m := self compileProxyWithSelector: selector descriptor: descriptor in: receiver class calling: candidate.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   428
        ilc notNil ifTrue:[ilc bindTo: m forClass: receiver class].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   429
        ^m.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   430
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   431
    ^nil
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   432
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   433
    "Created: / 21-02-2011 / 13:38:55 / kursjan <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   434
    "Modified: / 11-04-2011 / 20:19:50 / kursjan <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   435
    "Modified: / 29-08-2011 / 20:38:21 / kursjan"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   436
    "Modified: / 20-09-2011 / 00:03:48 / Jan Kurs <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   437
    "Modified (format): / 25-09-2011 / 21:08:45 / Jan Kurs <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   438
    "Created: / 16-12-2011 / 23:05:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   439
! !
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   440
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   441
!JavaLookup::Smalltalk2Java methodsFor:'matching'!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   442
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   443
descriptorForJavaSelector:arg
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   444
    ^ MessageDescription new 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   445
        parserClass: JavaSelectorParser;
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   446
        selector: arg;
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   447
        yourself.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   448
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   449
    "Created: / 29-08-2011 / 20:41:48 / Jan Kurs <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   450
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   451
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   452
descriptorForSmalltalkSelector:selector arguments: args
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   453
    ^ MessageDescription new 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   454
        parserClass: SmalltalkSelectorParser;
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   455
        runtimeArguments: args;
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   456
        selector: selector;
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   457
        yourself.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   458
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   459
    "Created: / 29-08-2011 / 21:44:06 / Jan Kurs <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   460
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   461
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   462
findBestMatchOf: smalltalkMethod in: javaMethods
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   463
    | methods |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   464
    javaMethods size = 1 ifTrue: [
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   465
        ^ javaMethods first.    
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   466
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   467
    javaMethods size = 0 ifTrue: [
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   468
        ^ nil
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   469
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   470
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   471
    methods := javaMethods select: [:m |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   472
        m argSize = smalltalkMethod argSize.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   473
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   474
    methods size = 1 ifTrue: [
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   475
        ^ methods first.    
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   476
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   477
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   478
    methods := methods select: [:m |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   479
        self javaMatches: m argTypes to: smalltalkMethod args.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   480
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   481
    methods size = 1 ifTrue: [
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   482
        ^ methods first.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   483
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   484
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   485
    methods size = 0 ifTrue: [
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   486
        ^ nil.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   487
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   488
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   489
    ^ Error raiseErrorString: 'Ambiguous selector: ', smalltalkMethod name.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   490
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   491
    "Created: / 29-08-2011 / 20:50:14 / Jan Kurs <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   492
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   493
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   494
javaMatches: jArgs to: sArgs
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   495
    
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   496
    1 to: jArgs size do: [ :i |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   497
        ((JavaTypeBox typeBoxForJava: (jArgs at: i)) smalltalkType = ((sArgs at: i) className)) ifFalse: [ ^ false ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   498
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   499
    ^ true.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   500
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   501
    "Created: / 29-08-2011 / 21:21:37 / Jan Kurs <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   502
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   503
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   504
javaSelectorsFor:class
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   505
    | selectors cls static |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   506
    cls := class.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   507
    selectors := IdentitySet new.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   508
    self breakPoint: #jk info: 'determine static based on class'.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   509
    static := false.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   510
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   511
    [cls = JavaObject] whileFalse: [
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   512
        cls methodDictionary keysAndValuesDo: [:k :v |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   513
            (v isJavaMethod and: [v isStatic = static]) ifTrue: [
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   514
                selectors add: k.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   515
            ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   516
        ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   517
        cls := cls superclass.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   518
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   519
    ^ selectors.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   520
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   521
    "Created: / 06-09-2011 / 22:20:34 / Jan Kurs <kursjan@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   522
! !
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   523
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   524
!JavaLookup::Smalltalk2Java methodsFor:'utilities'!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   525
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   526
addSelector:selector withMethod:proxy toClass:class 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   527
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   528
    ProxyMethod installProxies ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   529
        Class withoutUpdatingChangesDo:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   530
            class addSelector:selector withMethod:proxy.
1483
3488eebbc835 - JavaClass
vranyj1
parents: 1478
diff changeset
   531
            proxy mclass: class.
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   532
        ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   533
    ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   534
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   535
    "Created: / 01-01-2012 / 17:41:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   536
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   537
1425
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   538
compileProxyWithSelector:selector in:class accessing: field
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   539
    "For given field, create a proxy getter/setter"
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   540
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   541
    
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   542
    |compiler proxy body isSetter |
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   543
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   544
    class theNonMetaclass classInit.
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   545
    isSetter := selector last == $:.
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   546
    compiler := ProxyMethodCompiler new.
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   547
    isSetter ifTrue:[
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   548
        body := compiler newJavaFieldSetter: field.
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   549
        proxy := compiler 
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   550
                compile:body
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   551
                arguments: 1
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   552
                selector:selector.
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   553
    ] ifFalse:[
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   554
        body := compiler newJavaFieldGetter: field.
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   555
        proxy := compiler 
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   556
                compile:body
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   557
                arguments: 0
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   558
                selector:selector.
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   559
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   560
    ].
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   561
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   562
    ^ proxy
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   563
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   564
    "Modified: / 30-12-2011 / 14:44:11 / kursjan <kursjan@fit.cvut.cz>"
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   565
    "Created: / 17-03-2012 / 16:54:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   566
!
820078605f73 - Improvements in interop - now can generate getters to public field.
vranyj1
parents: 1394
diff changeset
   567
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   568
compileProxyWithSelector:selector in:class calling:methods 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   569
    "For given set of methods, create a dispatching proxy with given selector.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   570
     This method performs typechecks on arguments and dispatch to proper method"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   571
    
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   572
    |compiler proxy body fallback|
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   573
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   574
    compiler := ProxyMethodCompiler new.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   575
    fallback := self 
1365
cd6fe7944943 Fixes for syntax highlighting
vranyj1
parents: 1356
diff changeset
   576
                fallbackWithSelector:selector
cd6fe7944943 Fixes for syntax highlighting
vranyj1
parents: 1356
diff changeset
   577
                in:class
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   578
                calling:methods
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   579
                compiler:compiler.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   580
     "Generate and install dispatching tree..."
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   581
    selector numArgs == 0 ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   582
        "If method has no arguments, no dynamic method dispatch is
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   583
         required. Therefore, no fallback is needed. In theory, there is
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   584
         no need for proxy method at all..."
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   585
        self assert:methods size == 1.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   586
        body := compiler newJavaMethodInvocation:methods anyOne.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   587
    ] ifFalse:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   588
        "JV@2012-01-01: Based on discussion with JK, if there is no overloaded method
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   589
         DO NOT compile guard, call the method directly. We'll see..."
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   590
        methods size == 1 ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   591
            body := (compiler newJavaMethodInvocation:methods anElement).
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   592
        ] ifFalse:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   593
            "For every method, create a guard and add it"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   594
            body := fallback.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   595
        ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   596
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   597
    
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   598
    "/Create and install proxy
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   599
    
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   600
    proxy := compiler 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   601
                compile:body
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   602
                arguments:methods anyOne descriptor numPhysicalArgs
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   603
                selector:selector.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   604
    
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   605
"/    self halt.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   606
"/    JK: do NOT install here, just compile and return the proxy. Let someone else to install
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   607
"/    self 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   608
"/        addSelector:selector
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   609
"/        withMethod:proxy
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   610
"/        toClasS:class.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   611
    
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   612
    ^ proxy
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   613
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   614
    "Created: / 16-12-2011 / 23:21:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   615
    "Modified: / 30-12-2011 / 14:44:11 / kursjan <kursjan@fit.cvut.cz>"
1365
cd6fe7944943 Fixes for syntax highlighting
vranyj1
parents: 1356
diff changeset
   616
    "Modified: / 15-02-2012 / 01:07:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   617
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   618
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   619
compileProxyWithSelector: selector in: class calling: methods receiver: receiver arguments: arguments
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   620
    "For given receiver and arguments, selects apropriate method from methods
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   621
     and compile guard"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   622
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   623
    | compiler method proxy condition invocation fallback guard |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   624
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   625
    compiler := ProxyMethodCompiler new.    
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   626
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   627
    proxy := class compiledMethodAt: selector.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   628
    proxy notNil ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   629
        fallback := proxy body    
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   630
    ] ifFalse:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   631
        fallback := self fallbackWithSelector: selector in: class calling: methods compiler: compiler.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   632
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   633
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   634
    method := self selectMethodFrom: methods arguments: arguments.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   635
    invocation := compiler newJavaMethodInvocation:method.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   636
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   637
    condition := nil.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   638
    arguments withIndexDo:[:arg :index|
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   639
        condition isNil ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   640
            condition := compiler newTypeCheck: arg class argument: index.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   641
        ] ifFalse:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   642
            condition := condition and: (compiler newTypeCheck: arg class argument: index).
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   643
        ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   644
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   645
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   646
    guard := compiler newGuard
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   647
                condition: condition;
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   648
                action: invocation; 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   649
                fallback: fallback;
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   650
                yourself.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   651
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   652
    proxy := compiler 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   653
                compile:guard
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   654
                arguments:methods anyOne descriptor numPhysicalArgs
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   655
                selector:selector.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   656
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   657
    self 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   658
        addSelector:selector
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   659
        withMethod:proxy
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   660
        toClass:class.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   661
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   662
    "Created: / 03-01-2012 / 22:14:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   663
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   664
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   665
fallbackWithSelector:selector in:class calling:methods compiler:compiler 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   666
    ^ compiler 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   667
        newJavaBlockInvocation:[:receiver :arguments | 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   668
            self 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   669
                compileProxyWithSelector:selector
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   670
                in:class
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   671
                calling:methods
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   672
                receiver:receiver
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   673
                arguments:arguments.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   674
            "/self breakPoint:#jv.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   675
            receiver perform:selector withArguments:arguments.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   676
        ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   677
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   678
    "Modified: / 04-01-2012 / 21:35:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   679
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   680
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   681
selectMethodFrom: methods arguments: arguments
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   682
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   683
    | candidates |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   684
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   685
    candidates := methods.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   686
    arguments withIndexDo:[:arg :index|
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   687
        | cls |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   688
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   689
        cls := arg class.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   690
        candidates := candidates select:[:m|
1483
3488eebbc835 - JavaClass
vranyj1
parents: 1478
diff changeset
   691
            self breakPoint:#mh.
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   692
            self type: cls matches: (m descriptor parameters at: index) javaClass
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   693
        ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   694
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   695
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   696
    candidates size == 0 ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   697
        self halt: 'Unfinished - no matching method'        
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   698
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   699
    candidates size == 1 ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   700
        ^candidates anElement
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   701
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   702
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   703
    self halt: 'Unfinished - ambiguous'
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   704
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   705
    "Created: / 03-01-2012 / 21:40:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1449
797c2aa3bbce java compiler work
hlopkmar
parents: 1425
diff changeset
   706
    "Modified: / 03-04-2012 / 13:59:13 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1483
3488eebbc835 - JavaClass
vranyj1
parents: 1478
diff changeset
   707
    "Modified (format): / 20-04-2012 / 19:58:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   708
!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   709
1449
797c2aa3bbce java compiler work
hlopkmar
parents: 1425
diff changeset
   710
type: actual matches: formal 
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   711
    "Return true, if actual (parameter) type matches given formal (parameter) type"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   712
1483
3488eebbc835 - JavaClass
vranyj1
parents: 1478
diff changeset
   713
    formal isJavaPrimitiveType ifTrue: [ 
3488eebbc835 - JavaClass
vranyj1
parents: 1478
diff changeset
   714
        actual == SmallInteger ifTrue:[
3488eebbc835 - JavaClass
vranyj1
parents: 1478
diff changeset
   715
            ^formal == Integer or:[actual == formal].
3488eebbc835 - JavaClass
vranyj1
parents: 1478
diff changeset
   716
        ].
3488eebbc835 - JavaClass
vranyj1
parents: 1478
diff changeset
   717
        formal == Boolean ifTrue:[
3488eebbc835 - JavaClass
vranyj1
parents: 1478
diff changeset
   718
            ^actual == True or:[actual == False or:[actual == Boolean]].
3488eebbc835 - JavaClass
vranyj1
parents: 1478
diff changeset
   719
        ].
3488eebbc835 - JavaClass
vranyj1
parents: 1478
diff changeset
   720
        ^ actual == formal. 
3488eebbc835 - JavaClass
vranyj1
parents: 1478
diff changeset
   721
    ].
1449
797c2aa3bbce java compiler work
hlopkmar
parents: 1425
diff changeset
   722
    actual isJavaPrimitiveType ifTrue: [
797c2aa3bbce java compiler work
hlopkmar
parents: 1425
diff changeset
   723
        ^ formal isJavaWrapperClass and: [ formal javaWrapperClass == actual. ]
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   724
    ].
1449
797c2aa3bbce java compiler work
hlopkmar
parents: 1425
diff changeset
   725
    (actual includesBehavior: String "care about multi-byte strings") ifTrue: [
797c2aa3bbce java compiler work
hlopkmar
parents: 1425
diff changeset
   726
        ^ formal name == #'java/lang/String'
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   727
    ].
1449
797c2aa3bbce java compiler work
hlopkmar
parents: 1425
diff changeset
   728
    ^ JavaVM canCast: actual to: formal
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   729
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   730
    "Created: / 03-01-2012 / 22:36:19 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1449
797c2aa3bbce java compiler work
hlopkmar
parents: 1425
diff changeset
   731
    "Modified: / 03-04-2012 / 13:59:28 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
1483
3488eebbc835 - JavaClass
vranyj1
parents: 1478
diff changeset
   732
    "Modified: / 20-04-2012 / 20:17:47 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1356
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   733
! !
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   734
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   735
!JavaLookup::Smalltalk2Java methodsFor:'utilities (old)'!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   736
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   737
old_compileProxyWithSelector: selector descriptor: descriptor in: class calling: callee
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   738
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   739
    | proxy invocation fallback |
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   740
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   741
    "This method might (indirectly) be invoked by guarded method itself,
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   742
     when all guards fails and method gets recompiled during fallback action.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   743
     In that case, we should not throw away existing proxy, but just extend it."
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   744
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   745
    proxy := class compiledMethodAt: selector.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   746
    proxy isNil ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   747
        "No method exists, create one..."
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   748
        proxy := ProxyMethod new.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   749
        proxy numberOfArgs: callee descriptor numPhysicalArgs.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   750
        proxy source:'I''m a proxy method, please inspect my body'.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   751
        "Create default fallback"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   752
        fallback := ProxyMethod newJavaBlockInvocation: [ self halt: 'Launch recompile, not yet implemented'].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   753
        "Install it..."
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   754
        Class withoutUpdatingChangesDo:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   755
            class addSelector: selector withMethod: proxy.        
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   756
        ]
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   757
    ] ifFalse:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   758
        "Method already exists, then the fallback is currently 
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   759
         installed body"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   760
        fallback := proxy body.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   761
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   762
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   763
    "Now, create and install a node that invokes given method"   
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   764
    callee numArgs == 0 ifTrue:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   765
        "If method has no arguments, no dynamic method dispatch is
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   766
        required. Therefore, no fallback is needed. In theory, there is
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   767
        no need for proxy method at all..."
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   768
        self assert: descriptor numArgs size == 0.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   769
        invocation := ProxyMethod newJavaMethodInvocation: callee.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   770
        "Install it"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   771
        proxy body: invocation
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   772
    ] ifFalse:[
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   773
        "Create a guard"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   774
        invocation := ProxyMethod newGuard.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   775
        invocation condition: callee descriptor guardCondition.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   776
        invocation action: (ProxyMethod newJavaMethodInvocation: callee).
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   777
        invocation fallback: fallback.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   778
        "Install it"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   779
        proxy addGuard: invocation.
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   780
    ].
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   781
    "/Finally, return the method                                
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   782
    ^ proxy
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   783
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   784
    "Created: / 16-12-2011 / 23:06:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   785
! !
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   786
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   787
!JavaLookup class methodsFor:'documentation'!
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   788
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   789
version_SVN
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   790
    ^ '$Id$'
0dd28400803e Proxy methods from libjava/experiments moved to libjava
vranyj1
parents:
diff changeset
   791
! !