[PATCH] compareTo for Number sub-classes in java.lang

[Dalibor Topic]

--------------Boundary-00=_WJZ9E0KLEULK4XR5DLWC
Content-Type: text/plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 8bit

Hi,

I tried to run make check with javac 1.3.1 and it failed on SortTest.java. It 
turned out that javac was using jdk's classes and generating code to call 
Integer.compareTo(Integer). That method is not implemented yet, so kaffe 
complained.

It is an interoperability issue. In Klasses.jar, only 
Integer.compareTo(Object) exists, thus all virtual calls go there. In jdk 
1.2+, there is a compareTo(own type) method. The compiler generates calls to 
the own type version, if it can.

This patch adds the compareTo(own type) method to sub classes of 
java.lang.Number, and adapts the compareTo(Object) method to call it.

have fun,

dalibor topic
--------------Boundary-00=_WJZ9E0KLEULK4XR5DLWC
Content-Type: text/plain;
  charset="iso-8859-15";
  name="ChangeLog"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="ChangeLog"

CSogbGlicmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL0J5dGUuamF2YSwKCWxpYnJhcmllcy9qYXZh
bGliL2phdmEvbGFuZy9DaGFyYWN0ZXIuamF2YSwKCWxpYnJhcmllcy9qYXZhbGliL2phdmEvbGFu
Zy9Eb3VibGUuamF2YSwKCWxpYnJhcmllcy9qYXZhbGliL2phdmEvbGFuZy9GbG9hdC5qYXZhLAoJ
bGlicmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL0ludGVnZXIuamF2YSwKCWxpYnJhcmllcy9qYXZh
bGliL2phdmEvbGFuZy9Mb25nLmphdmEsCglsaWJyYXJpZXMvamF2YWxpYi9qYXZhL2xhbmcvU2hv
cnQuamF2YToKCWFkZGVkIGNvbXBhcmVUbyBtZXRob2RzIHRvIGNvbXBhcmUgd2l0aCBzYW1lIHR5
cGUuCg==

--------------Boundary-00=_WJZ9E0KLEULK4XR5DLWC
Content-Type: text/x-diff;
  charset="iso-8859-15";
  name="compareTo.patch"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="compareTo.patch"

ZGlmZiAtdXIga2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL0J5dGUuamF2YSBwYXRj
aGVkLWthZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvbGFuZy9CeXRlLmphdmEKLS0tIGthZmZl
L2xpYnJhcmllcy9qYXZhbGliL2phdmEvbGFuZy9CeXRlLmphdmEJVGh1IEp1bCAgOCAyMDowNToy
NCAxOTk5CisrKyBwYXRjaGVkLWthZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvbGFuZy9CeXRl
LmphdmEJV2VkIE1hciAyMCAxNDoyMjoxOSAyMDAyCkBAIC05Myw4ICs5MywxMSBAQAogCXJldHVy
biAobmV3IEJ5dGUocGFyc2VCeXRlKHMsIHJhZGl4KSkpOwogfQogCi1wdWJsaWMgaW50IGNvbXBh
cmVUbyhPYmplY3QgbykgewotCXJldHVybiAoaW50KXZhbHVlIC0gKGludCkoKEJ5dGUpbykudmFs
dWU7CitwdWJsaWMgaW50IGNvbXBhcmVUbyhCeXRlIGIpIHsKKwlyZXR1cm4gKGludCl2YWx1ZSAt
IChpbnQpYi52YWx1ZTsKIH0KIAorcHVibGljIGludCBjb21wYXJlVG8oT2JqZWN0IG8pIHsKKwly
ZXR1cm4gY29tcGFyZVRvKChCeXRlKSBvKTsKK30KIH0KZGlmZiAtdXIga2FmZmUvbGlicmFyaWVz
L2phdmFsaWIvamF2YS9sYW5nL0NoYXJhY3Rlci5qYXZhIHBhdGNoZWQta2FmZmUvbGlicmFyaWVz
L2phdmFsaWIvamF2YS9sYW5nL0NoYXJhY3Rlci5qYXZhCi0tLSBrYWZmZS9saWJyYXJpZXMvamF2
YWxpYi9qYXZhL2xhbmcvQ2hhcmFjdGVyLmphdmEJU2F0IFNlcCAxOCAwMTowOTo1MiAxOTk5Cisr
KyBwYXRjaGVkLWthZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvbGFuZy9DaGFyYWN0ZXIuamF2
YQlXZWQgTWFyIDIwIDE0OjIyOjM2IDIwMDIKQEAgLTg0LDkgKzg0LDE0IEBACiAgICAgcmV0dXJu
IChTdHJpbmcudmFsdWVPZih2YWx1ZSkpOwogICB9CiAKKyAgcHVibGljIGludCBjb21wYXJlVG8o
Q2hhcmFjdGVyIGMpCisgIHsKKyAgICByZXR1cm4gKGludCl2YWx1ZSAtIChpbnQpYy52YWx1ZTsK
KyAgfQorCiAgIHB1YmxpYyBpbnQgY29tcGFyZVRvKE9iamVjdCBvKQogICB7Ci0gICAgcmV0dXJu
IChpbnQpdmFsdWUgLSAoaW50KSgoQ2hhcmFjdGVyKW8pLnZhbHVlOworICAgIHJldHVybiBjb21w
YXJlVG8oKENoYXJhY3RlcilvKTsKICAgfQogCiAgIC8qKgpkaWZmIC11ciBrYWZmZS9saWJyYXJp
ZXMvamF2YWxpYi9qYXZhL2xhbmcvRG91YmxlLmphdmEgcGF0Y2hlZC1rYWZmZS9saWJyYXJpZXMv
amF2YWxpYi9qYXZhL2xhbmcvRG91YmxlLmphdmEKLS0tIGthZmZlL2xpYnJhcmllcy9qYXZhbGli
L2phdmEvbGFuZy9Eb3VibGUuamF2YQlNb24gRGVjICAzIDEzOjExOjQxIDIwMDEKKysrIHBhdGNo
ZWQta2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL0RvdWJsZS5qYXZhCVdlZCBNYXIg
MjAgMTQ6MDQ6MTAgMjAwMgpAQCAtNTksMTEgKzU5LDE1IEBACiAgICAgcmV0dXJuIHZhbHVlOwog
ICB9CiAKLSAgcHVibGljIGludCBjb21wYXJlVG8oT2JqZWN0IHRoYXQpIHsKKyAgcHVibGljIGlu
dCBjb21wYXJlVG8oRG91YmxlIHRoYXQpIHsKICAgICBmaW5hbCBsb25nIGJpdHMxID0gZG91Ymxl
VG9Mb25nQml0cyh0aGlzLnZhbHVlKTsKLSAgICBmaW5hbCBsb25nIGJpdHMyID0gZG91YmxlVG9M
b25nQml0cygoKERvdWJsZSl0aGF0KS52YWx1ZSk7CisgICAgZmluYWwgbG9uZyBiaXRzMiA9IGRv
dWJsZVRvTG9uZ0JpdHModGhhdC52YWx1ZSk7CiAKICAgICByZXR1cm4gKGJpdHMxIDwgYml0czIp
ID8gLTEgOiAoYml0czEgPT0gYml0czIpID8gMCA6IDE7CisgIH0KKworICBwdWJsaWMgaW50IGNv
bXBhcmVUbyhPYmplY3QgdGhhdCkgeworICAgIHJldHVybiBjb21wYXJlVG8oKERvdWJsZSkgdGhh
dCk7CiAgIH0KIAogICBwdWJsaWMgc3RhdGljIFN0cmluZyB0b1N0cmluZyhkb3VibGUgdmFsdWUp
IHsKZGlmZiAtdXIga2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL0Zsb2F0LmphdmEg
cGF0Y2hlZC1rYWZmZS9saWJyYXJpZXMvamF2YWxpYi9qYXZhL2xhbmcvRmxvYXQuamF2YQotLS0g
a2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL0Zsb2F0LmphdmEJTW9uIERlYyAgMyAx
MzoxMTo0MSAyMDAxCisrKyBwYXRjaGVkLWthZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvbGFu
Zy9GbG9hdC5qYXZhCVdlZCBNYXIgMjAgMTQ6MDY6MDUgMjAwMgpAQCAtNTIsMTEgKzUyLDE1IEBA
CiAgICAgICAmJiBmbG9hdFRvSW50Qml0cyh2YWx1ZSkgPT0gZmxvYXRUb0ludEJpdHMoKChGbG9h
dCl0aGF0KS52YWx1ZSkpOwogICB9CiAKLSAgcHVibGljIGludCBjb21wYXJlVG8oT2JqZWN0IHRo
YXQpIHsKKyAgcHVibGljIGludCBjb21wYXJlVG8oRmxvYXQgdGhhdCkgewogICAgIGZpbmFsIGlu
dCBiaXRzMSA9IGZsb2F0VG9JbnRCaXRzKHRoaXMudmFsdWUpOwotICAgIGZpbmFsIGludCBiaXRz
MiA9IGZsb2F0VG9JbnRCaXRzKCgoRmxvYXQpdGhhdCkudmFsdWUpOworICAgIGZpbmFsIGludCBi
aXRzMiA9IGZsb2F0VG9JbnRCaXRzKHRoYXQudmFsdWUpOwogCiAgICAgcmV0dXJuIChiaXRzMSA8
IGJpdHMyKSA/IC0xIDogKGJpdHMxID09IGJpdHMyKSA/IDAgOiAxOworICB9CisKKyAgcHVibGlj
IGludCBjb21wYXJlVG8oT2JqZWN0IHRoYXQpIHsKKyAgICByZXR1cm4gY29tcGFyZVRvKChGbG9h
dCkgdGhhdCk7CiAgIH0KIAogICBwdWJsaWMgaW50IGhhc2hDb2RlKCkgewpkaWZmIC11ciBrYWZm
ZS9saWJyYXJpZXMvamF2YWxpYi9qYXZhL2xhbmcvSW50ZWdlci5qYXZhIHBhdGNoZWQta2FmZmUv
bGlicmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL0ludGVnZXIuamF2YQotLS0ga2FmZmUvbGlicmFy
aWVzL2phdmFsaWIvamF2YS9sYW5nL0ludGVnZXIuamF2YQlTYXQgSnVsIDI0IDAyOjU2OjI2IDE5
OTkKKysrIHBhdGNoZWQta2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL0ludGVnZXIu
amF2YQlXZWQgTWFyIDIwIDE0OjE5OjM4IDIwMDIKQEAgLTczLDExICs3MywxNSBAQAogCQkoKChJ
bnRlZ2VyKW9iaikudmFsdWUgPT0gdGhpcy52YWx1ZSk7CiB9CiAKLXB1YmxpYyBpbnQgY29tcGFy
ZVRvKE9iamVjdCBvKSB7CitwdWJsaWMgaW50IGNvbXBhcmVUbyhJbnRlZ2VyIGkpIHsKIAlmaW5h
bCBpbnQgaW50MSA9IHRoaXMudmFsdWU7Ci0JZmluYWwgaW50IGludDIgPSAoKEludGVnZXIpbyku
dmFsdWU7CisJZmluYWwgaW50IGludDIgPSBpLnZhbHVlOwogCiAJcmV0dXJuIChpbnQxID09IGlu
dDIpID8gMCA6IChpbnQxIDwgaW50MikgPyAtMSA6IDE7Cit9CisKK3B1YmxpYyBpbnQgY29tcGFy
ZVRvKE9iamVjdCBvKSB7CisJcmV0dXJuIGNvbXBhcmVUbygoSW50ZWdlcikgbyk7CiB9CiAKIHB1
YmxpYyBmbG9hdCBmbG9hdFZhbHVlKCkgewpkaWZmIC11ciBrYWZmZS9saWJyYXJpZXMvamF2YWxp
Yi9qYXZhL2xhbmcvTG9uZy5qYXZhIHBhdGNoZWQta2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2
YS9sYW5nL0xvbmcuamF2YQotLS0ga2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL0xv
bmcuamF2YQlNb24gTWFyIDE4IDAyOjEzOjE0IDIwMDIKKysrIHBhdGNoZWQta2FmZmUvbGlicmFy
aWVzL2phdmFsaWIvamF2YS9sYW5nL0xvbmcuamF2YQlXZWQgTWFyIDIwIDE0OjIxOjAwIDIwMDIK
QEAgLTM4LDExICszOCwxNSBAQAogCQkoKChMb25nKW9iaikudmFsdWUgPT0gdGhpcy52YWx1ZSk7
CiB9CiAKLXB1YmxpYyBpbnQgY29tcGFyZVRvKE9iamVjdCBvKSB7CitwdWJsaWMgaW50IGNvbXBh
cmVUbyhMb25nIGwpIHsKIAlmaW5hbCBsb25nIGxvbmcxID0gdGhpcy52YWx1ZTsKLQlmaW5hbCBs
b25nIGxvbmcyID0gKChMb25nKW8pLnZhbHVlOworCWZpbmFsIGxvbmcgbG9uZzIgPSBsLnZhbHVl
OwogCiAJcmV0dXJuIChsb25nMSA9PSBsb25nMikgPyAwIDogKGxvbmcxIDwgbG9uZzIpID8gLTEg
OiAxOworfQorCitwdWJsaWMgaW50IGNvbXBhcmVUbyhPYmplY3QgbykgeworCXJldHVybiBjb21w
YXJlVG8oKExvbmcpIG8pOwogfQogCiBwdWJsaWMgZmxvYXQgZmxvYXRWYWx1ZSgpIHsKZGlmZiAt
dXIga2FmZmUvbGlicmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL1Nob3J0LmphdmEgcGF0Y2hlZC1r
YWZmZS9saWJyYXJpZXMvamF2YWxpYi9qYXZhL2xhbmcvU2hvcnQuamF2YQotLS0ga2FmZmUvbGli
cmFyaWVzL2phdmFsaWIvamF2YS9sYW5nL1Nob3J0LmphdmEJVGh1IEp1bCAgOCAyMDowNToyNiAx
OTk5CisrKyBwYXRjaGVkLWthZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvbGFuZy9TaG9ydC5q
YXZhCVdlZCBNYXIgMjAgMTQ6MjI6MDggMjAwMgpAQCAtNDksNyArNDksMTEgQEAKIH0KIAogcHVi
bGljIGludCBjb21wYXJlVG8oT2JqZWN0IG8pIHsKLQlyZXR1cm4gKGludCl2YWx1ZSAtIChpbnQp
KChTaG9ydClvKS52YWx1ZTsKKwlyZXR1cm4gY29tcGFyZVRvKChTaG9ydCkgbyk7Cit9CisKK3B1
YmxpYyBpbnQgY29tcGFyZVRvKFNob3J0IHMpIHsKKwlyZXR1cm4gKGludCl2YWx1ZSAtIChpbnQp
cy52YWx1ZTsKIH0KIAogcHVibGljIGZsb2F0IGZsb2F0VmFsdWUoKQo=

--------------Boundary-00=_WJZ9E0KLEULK4XR5DLWC--



_________________________________________________________
Do You Yahoo!?
Get your free @yahoo.com address at http://mail.yahoo.com