[kaffe] java.util.regex patch

[Mark Wielaard]

--=-fkKhJ0WoFw6OpVwfHiSi
Content-Type: multipart/mixed; boundary="=-106XG9QxvTgpgVBZVOOu"


--=-106XG9QxvTgpgVBZVOOu
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

I am preparing for inclusion of java.util.regex and gnu.regexp in GNU
Classpath. I just added some test cases to Mauve. I need the following
patches to make them work correctly with kaffe. Hope they make sense.

2004-01-08  Mark Wielaard  <mark@klomp.org>

        * java/util/regex/Matcher.java (find): Check whether or not we are
	stuck at the same position after a successful match and bump position
        of possible.
        * java/util/regex/Pattern.java (split(CharSequence, int)): Use
        ArrayList, not Vector. Make sure we match at most limit -1 times, w=
hen
        limit > 0. Check whether or not to add emtpty strings.

They are only against the java.util.regex wrappers, I haven't looked at
gnu.regexp proper yet. I have some more Mauve tests that I will check in
later, but gnu.regexp doesn't seem to support octal, hex and unicode
escapes yet so most of them fail.

Cheers,

Mark

--=-106XG9QxvTgpgVBZVOOu
Content-Disposition: inline; filename=regex.patch
Content-Type: text/x-patch; name=regex.patch; charset=ISO-8859-1
Content-Transfer-Encoding: base64

SW5kZXg6IGxpYnJhcmllcy9qYXZhbGliL2phdmEvdXRpbC9yZWdleC9NYXRjaGVyLmphdmENCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0NClJDUyBmaWxlOiAvY3ZzL2thZmZlL2thZmZlL2xpYnJhcmllcy9qYXZhbGliL2ph
dmEvdXRpbC9yZWdleC9NYXRjaGVyLmphdmEsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjMNCmRp
ZmYgLXUgLXIxLjMgTWF0Y2hlci5qYXZhDQotLS0gbGlicmFyaWVzL2phdmFsaWIvamF2YS91dGls
L3JlZ2V4L01hdGNoZXIuamF2YQkxMyBPY3QgMjAwMyAwMzoxMDowNCAtMDAwMAkxLjMNCisrKyBs
aWJyYXJpZXMvamF2YWxpYi9qYXZhL3V0aWwvcmVnZXgvTWF0Y2hlci5qYXZhCTggSmFuIDIwMDQg
MTE6MTc6NTAgLTAwMDANCkBAIC0zNCw3ICszNCwyNSBAQA0KICAgICB9DQogDQogICAgIHB1Ymxp
YyBib29sZWFuIGZpbmQoKSB7DQotCXJldHVybiBmaW5kKHBvc2l0aW9uKTsNCisJYm9vbGVhbiBm
aXJzdCA9IChtYXRjaCA9PSBudWxsKTsNCisJbWF0Y2ggPSBwYXR0ZXJuLmdldFJFKCkuZ2V0TWF0
Y2goaW5wdXQsIHBvc2l0aW9uKTsNCisJaWYgKG1hdGNoICE9IG51bGwpIHsNCisJICAgIGludCBl
bmRJbmRleCA9IG1hdGNoLmdldEVuZEluZGV4KCk7DQorCSAgICAvLyBBcmUgd2Ugc3R1Y2sgYXQg
dGhlIHNhbWUgcG9zaXRpb24/DQorCSAgICBpZiAoIWZpcnN0ICYmIGVuZEluZGV4ID09IHBvc2l0
aW9uKSB7DQorCQltYXRjaCA9IG51bGw7DQorCQkvLyBOb3QgYXQgdGhlIGVuZCBvZiB0aGUgaW5w
dXQgeWV0Pw0KKwkJaWYgKHBvc2l0aW9uIDwgaW5wdXQubGVuZ3RoKCkgLSAxKSB7DQorCQkgICAg
cG9zaXRpb24rKzsNCisJCSAgICByZXR1cm4gZmluZChwb3NpdGlvbik7DQorCQl9IGVsc2Ugew0K
KwkJICAgIHJldHVybiBmYWxzZTsNCisJCX0NCisJICAgIH0NCisJICAgIHBvc2l0aW9uID0gZW5k
SW5kZXg7DQorCSAgICByZXR1cm4gdHJ1ZTsNCisJfQ0KKwlyZXR1cm4gZmFsc2U7DQogICAgIH0N
CiANCiAgICAgcHVibGljIGJvb2xlYW4gZmluZChpbnQgc3RhcnQpIHsNCkluZGV4OiBsaWJyYXJp
ZXMvamF2YWxpYi9qYXZhL3V0aWwvcmVnZXgvUGF0dGVybi5qYXZhDQo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1Mg
ZmlsZTogL2N2cy9rYWZmZS9rYWZmZS9saWJyYXJpZXMvamF2YWxpYi9qYXZhL3V0aWwvcmVnZXgv
UGF0dGVybi5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4zDQpkaWZmIC11IC1yMS4zIFBh
dHRlcm4uamF2YQ0KLS0tIGxpYnJhcmllcy9qYXZhbGliL2phdmEvdXRpbC9yZWdleC9QYXR0ZXJu
LmphdmEJMTMgT2N0IDIwMDMgMDM6MTA6MDQgLTAwMDAJMS4zDQorKysgbGlicmFyaWVzL2phdmFs
aWIvamF2YS91dGlsL3JlZ2V4L1BhdHRlcm4uamF2YQk4IEphbiAyMDA0IDExOjE3OjUwIC0wMDAw
DQpAQCAtMyw3ICszLDcgQEANCiBpbXBvcnQgZ251LnJlZ2V4cC5SRTsNCiBpbXBvcnQgZ251LnJl
Z2V4cC5SRVN5bnRheDsNCiBpbXBvcnQgZ251LnJlZ2V4cC5SRUV4Y2VwdGlvbjsNCi1pbXBvcnQg
amF2YS51dGlsLlZlY3RvcjsNCitpbXBvcnQgamF2YS51dGlsLkFycmF5TGlzdDsNCiANCiBwdWJs
aWMgZmluYWwgY2xhc3MgUGF0dGVybiBpbXBsZW1lbnRzIFNlcmlhbGl6YWJsZSB7DQogDQpAQCAt
ODUsMzYgKzg1LDU4IEBADQogDQogICAgIHB1YmxpYyBTdHJpbmdbXSBzcGxpdChDaGFyU2VxdWVu
Y2UgaW5wdXQsIGludCBsaW1pdCkgew0KIAlNYXRjaGVyIG1hdGNoZXIgPSBuZXcgTWF0Y2hlcih0
aGlzLCBpbnB1dCk7DQotCVZlY3RvciBsaXN0ID0gbmV3IFZlY3RvcigpOw0KKwlBcnJheUxpc3Qg
bGlzdCA9IG5ldyBBcnJheUxpc3QoKTsNCisJaW50IGVtcHRpZXMgPSAwOw0KIAlpbnQgY291bnQg
PSAwOw0KIAlpbnQgc3RhcnQgPSAwOw0KIAlpbnQgZW5kOw0KLQl3aGlsZSAobWF0Y2hlci5maW5k
KCkpIHsNCisJYm9vbGVhbiBtYXRjaGVkOw0KKwl3aGlsZSAobWF0Y2hlZCA9IG1hdGNoZXIuZmlu
ZCgpICYmIChsaW1pdCA8PSAwIHx8IGNvdW50IDwgbGltaXQgLSAxKSkgew0KIAkgICAgKytjb3Vu
dDsNCiAJICAgIGVuZCA9IG1hdGNoZXIuc3RhcnQoKTsNCiAJICAgIGlmIChzdGFydCA9PSBlbmQp
IHsNCi0JCWlmIChsaW1pdCAhPSAwKSB7DQotCQkgICAgbGlzdC5hZGRFbGVtZW50KCIiKTsNCi0J
CX0NCisJCWVtcHRpZXMrKzsNCiAJICAgIH0gZWxzZSB7DQorCQl3aGlsZSAoZW1wdGllcy0tID4g
MCkgew0KKwkJICAgIGxpc3QuYWRkKCIiKTsNCisJCX0NCiAJCVN0cmluZyB0ZXh0ID0gaW5wdXQu
c3ViU2VxdWVuY2Uoc3RhcnQsIGVuZCkudG9TdHJpbmcoKTsNCi0JCWxpc3QuYWRkRWxlbWVudCh0
ZXh0KTsNCisJCWxpc3QuYWRkKHRleHQpOw0KIAkgICAgfQ0KIAkgICAgc3RhcnQgPSBtYXRjaGVy
LmVuZCgpOw0KLQkgICAgaWYgKGNvdW50ID09IGxpbWl0KSBicmVhazsNCiAJfQ0KLQkvLyBsYXN0
IHRva2VuIGF0IGVuZA0KLQlpZiAoY291bnQgIT0gbGltaXQpIHsNCi0JICAgIFN0cmluZyB0ZXh0
ID0gaW5wdXQuc3ViU2VxdWVuY2Uoc3RhcnQsIGlucHV0Lmxlbmd0aCgpKS50b1N0cmluZygpOw0K
LQkgICAgaWYgKCEoIiIuZXF1YWxzKHRleHQpICYmIChsaW1pdCA9PSAwKSkpIHsNCi0JCWxpc3Qu
YWRkRWxlbWVudCh0ZXh0KTsNCisNCisJLy8gV2UgbWF0Y2hlZCBub3RoaW5nLg0KKwlpZiAoIW1h
dGNoZWQgJiYgY291bnQgPT0gMCkgew0KKwkJcmV0dXJuIG5ldyBTdHJpbmdbXSB7IGlucHV0LnRv
U3RyaW5nKCkgfTsNCisJfQ0KKw0KKwkvLyBJcyB0aGUgbGFzdCB0b2tlbiBlbXB0eT8NCisJYm9v
bGVhbiBlbXB0eUxhc3QgPSAoc3RhcnQgPT0gaW5wdXQubGVuZ3RoKCkpOw0KKw0KKwkvLyBDYW4v
TXVzdCB3ZSBhZGQgZW1wdGllcyBvciBhbiBleHRyYSBsYXN0IHRva2VuIGF0IHRoZSBlbmQ/DQor
CWlmIChsaXN0LnNpemUoKSA8IGxpbWl0IHx8IGxpbWl0IDwgMCB8fCAobGltaXQgPT0gMCAmJiAh
ZW1wdHlMYXN0KSkgew0KKwkgICAgaWYgKGxpbWl0ID4gbGlzdC5zaXplKCkpIHsNCisJCWludCBt
YXggPSBsaW1pdCAtIGxpc3Quc2l6ZSgpOw0KKwkJZW1wdGllcyA9IChlbXB0aWVzID4gbWF4KSA/
IG1heCA6IGVtcHRpZXM7DQorCSAgICB9DQorCSAgICB3aGlsZSAoZW1wdGllcy0tID4gMCkgew0K
KwkJbGlzdC5hZGQoIiIpOw0KIAkgICAgfQ0KIAl9DQotCWlmIChsaXN0LnNpemUoKSA9PSAwKSB7
DQotCQlsaXN0LmFkZEVsZW1lbnQoaW5wdXQudG9TdHJpbmcoKSk7DQorDQorCS8vIGxhc3QgdG9r
ZW4gYXQgZW5kDQorCWlmIChsaW1pdCAhPSAwIHx8IChsaW1pdCA9PSAwICYmICFlbXB0eUxhc3Qp
KSB7DQorCSAgICBTdHJpbmcgdCA9IGlucHV0LnN1YlNlcXVlbmNlKHN0YXJ0LCBpbnB1dC5sZW5n
dGgoKSkudG9TdHJpbmcoKTsNCisJICAgIGlmICgiIi5lcXVhbHModCkgJiYgbGltaXQgPT0gMCkg
ew0KKwkJLy8gRG9uJ3QgYWRkLg0KKwkgICAgfSBlbHNlIHsNCisJCWxpc3QuYWRkKHQpOw0KKwkg
ICAgfQ0KIAl9DQorDQogCVN0cmluZ1tdIG91dHB1dCA9IG5ldyBTdHJpbmcgW2xpc3Quc2l6ZSgp
XTsNCi0JbGlzdC5jb3B5SW50byhvdXRwdXQpOw0KKwlsaXN0LnRvQXJyYXkob3V0cHV0KTsNCiAJ
cmV0dXJuIG91dHB1dDsNCiAgICAgfQ0KIH0NCg==

--=-106XG9QxvTgpgVBZVOOu--

--=-fkKhJ0WoFw6OpVwfHiSi
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQA//Ty5xVhZCJWr9QwRAg83AJ9BlHBEM00KEDIIbbh0jH12LXIe7ACgoBAd
bptgRFRimf2xUjguqhH7ZUs=
=A6xk
-----END PGP SIGNATURE-----

--=-fkKhJ0WoFw6OpVwfHiSi--