7345 2006-02-18 14:46:30 -0800 add insert and remove functions to KXMLCore::Vector 2006-02-18 15:45:59 -0800 1 1 1 Unclassified WebKit WebKit Misc. 420+ Mac OS X 10.4 RESOLVED FIXED P2 Enhancement --- 7331 1 darin darin oldest_to_newest 33295 0 darin 2006-02-18 14:46:30 -0800 I came across yet another place where I needed insert and remove in a vector, so I wrote them as discussed with Maciej previously. 33296 1 6591 darin 2006-02-18 14:48:21 -0800 Created attachment 6591 implementation of insert and remove 33298 2 6591 mjs 2006-02-18 15:02:58 -0800 Comment on attachment 6591 implementation of insert and remove The ASSERT in remove() should be <, not <=. Other than that, r=me. 6591 2006-02-18 14:48:21 -0800 2006-02-18 15:02:58 -0800 implementation of insert and remove InsertRemovePatch.txt text/plain 4638 darin SW5kZXg6IGt4bWxjb3JlL1ZlY3Rvci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGt4bWxjb3JlL1ZlY3Rvci5o CShyZXZpc2lvbiAxMjg4MSkKKysrIGt4bWxjb3JlL1ZlY3Rvci5oCSh3b3JraW5nIGNvcHkpCkBA IC04Niw3ICs4Niw3IEBACiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4KICAgICBzdHJ1Y3QgVmVj dG9yTW92ZXI8ZmFsc2UsIFQ+CiAgICAgewotICAgICAgICBzdGF0aWMgdm9pZCBtb3ZlKGNvbnN0 IFQqIHNyYywgY29uc3QgVCogc3JjRW5kLCBUKiBkc3QpIAorICAgICAgICBzdGF0aWMgdm9pZCBt b3ZlKGNvbnN0IFQqIHNyYywgY29uc3QgVCogc3JjRW5kLCBUKiBkc3QpCiAgICAgICAgIHsKICAg ICAgICAgICAgIHdoaWxlIChzcmMgIT0gc3JjRW5kKSB7CiAgICAgICAgICAgICAgICAgbmV3IChk c3QpIFQoKnNyYyk7CkBAIC05NSw2ICs5NSwyMCBAQAogICAgICAgICAgICAgICAgICsrc3JjOwog ICAgICAgICAgICAgfQogICAgICAgICB9CisgICAgICAgIHN0YXRpYyB2b2lkIG1vdmVPdmVybGFw cGluZyhjb25zdCBUKiBzcmMsIGNvbnN0IFQqIHNyY0VuZCwgVCogZHN0KQorICAgICAgICB7Cisg ICAgICAgICAgICBpZiAoc3JjID4gZHN0KQorICAgICAgICAgICAgICAgIG1vdmUoc3JjLCBzcmNF bmQsIGRzdCk7CisgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICBUKiBkc3RFbmQg PSBkc3QgKyAoc3JjRW5kIC0gc3JjKTsKKyAgICAgICAgICAgICAgICB3aGlsZSAoc3JjICE9IHNy Y0VuZCkgeworICAgICAgICAgICAgICAgICAgICAtLXNyY0VuZDsKKyAgICAgICAgICAgICAgICAg ICAgLS1kc3RFbmQ7CisgICAgICAgICAgICAgICAgICAgIG5ldyAoZHN0RW5kKSBUKCpzcmNFbmQp OworICAgICAgICAgICAgICAgICAgICBzcmNFbmQtPn5UKCk7CisgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgfTsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1l IFQ+CkBAIC0xMDQsNiArMTE4LDEwIEBACiAgICAgICAgIHsKICAgICAgICAgICAgIG1lbWNweShk c3QsIHNyYywgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyICo+KHNyY0VuZCkgLSByZWludGVy cHJldF9jYXN0PGNvbnN0IGNoYXIgKj4oc3JjKSk7CiAgICAgICAgIH0KKyAgICAgICAgc3RhdGlj IHZvaWQgbW92ZU92ZXJsYXBwaW5nKGNvbnN0IFQqIHNyYywgY29uc3QgVCogc3JjRW5kLCBUKiBk c3QpIAorICAgICAgICB7CisgICAgICAgICAgICBtZW1tb3ZlKGRzdCwgc3JjLCByZWludGVycHJl dF9jYXN0PGNvbnN0IGNoYXIgKj4oc3JjRW5kKSAtIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hh ciAqPihzcmMpKTsKKyAgICAgICAgfQogICAgIH07CiAKICAgICB0ZW1wbGF0ZSA8Ym9vbCBjYW5D b3B5V2l0aE1lbWNweSwgdHlwZW5hbWUgVD4KQEAgLTE3NCw2ICsxOTIsMTEgQEAKICAgICAgICAg ICAgIFZlY3Rvck1vdmVyPFZlY3RvclRyYWl0czxUPjo6Y2FuTW92ZVdpdGhNZW1jcHksIFQ+Ojpt b3ZlKHNyYywgc3JjRW5kLCBkc3QpOwogICAgICAgICB9CiAKKyAgICAgICAgc3RhdGljIHZvaWQg bW92ZU92ZXJsYXBwaW5nKGNvbnN0IFQqIHNyYywgY29uc3QgVCogc3JjRW5kLCBUKiBkc3QpCisg ICAgICAgIHsKKyAgICAgICAgICAgIFZlY3Rvck1vdmVyPFZlY3RvclRyYWl0czxUPjo6Y2FuTW92 ZVdpdGhNZW1jcHksIFQ+Ojptb3ZlT3ZlcmxhcHBpbmcoc3JjLCBzcmNFbmQsIGRzdCk7CisgICAg ICAgIH0KKwogICAgICAgICBzdGF0aWMgdm9pZCB1bmluaXRpYWxpemVkQ29weShjb25zdCBUKiBz cmMsIGNvbnN0IFQqIHNyY0VuZCwgVCogZHN0KQogICAgICAgICB7CiAgICAgICAgICAgICBWZWN0 b3JDb3BpZXI8VmVjdG9yVHJhaXRzPFQ+OjpjYW5Db3B5V2l0aE1lbWNweSwgVD46OnVuaW5pdGlh bGl6ZWRDb3B5KHNyYywgc3JjRW5kLCBkc3QpOwpAQCAtMzQ3LDggKzM3MCw5IEBACiAKICAgICAg ICAgdm9pZCBjbGVhcigpIHsgcmVzaXplKDApOyB9CiAKLSAgICAgICAgdGVtcGxhdGU8dHlwZW5h bWUgVT4KLSAgICAgICAgdm9pZCBhcHBlbmQoY29uc3QgVSYgdSk7CisgICAgICAgIHRlbXBsYXRl PHR5cGVuYW1lIFU+IHZvaWQgYXBwZW5kKGNvbnN0IFUmKTsKKyAgICAgICAgdGVtcGxhdGU8dHlw ZW5hbWUgVT4gdm9pZCBpbnNlcnQoc2l6ZV90IHBvc2l0aW9uLCBjb25zdCBVJik7CisgICAgICAg IHZvaWQgcmVtb3ZlKHNpemVfdCBwb3NpdGlvbik7CiAKICAgICAgICAgdm9pZCByZW1vdmVMYXN0 KCkgCiAgICAgICAgIHsKQEAgLTQ3OCwxMSArNTAyLDExIEBACiAgICAgICAgIG1faW1wbC5kZWFs bG9jYXRlQnVmZmVyKG9sZEJ1ZmZlcik7CiAgICAgfQogCi0gICAgLy8gdGVtcGxhdGl6aW5nIHRo aXMgaXMgYmV0dGVyIHRoYW4ganVzdCBsZXR0aW5nIHRoZSBjb252ZXJzaW9uIGhhcHBlbiBpbXBs aWNpdGx5LAorICAgIC8vIHRlbXBsYXRpemluZyB0aGVzZSBpcyBiZXR0ZXIgdGhhbiBqdXN0IGxl dHRpbmcgdGhlIGNvbnZlcnNpb24gaGFwcGVuIGltcGxpY2l0bHksCiAgICAgLy8gYmVjYXVzZSBm b3IgaW5zdGFuY2UgaXQgYWxsb3dzIGEgUGFzc1JlZlB0ciB0byBiZSBhcHBlbmRlZCB0byBhIFJl ZlB0ciB2ZWN0b3IKICAgICAvLyB3aXRob3V0IHJlZmNvdW50IHRocmFzaC4KLSAgICB0ZW1wbGF0 ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNpdHk+Ci0gICAgdGVtcGxhdGU8dHlwZW5h bWUgVT4KKworICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eT4g dGVtcGxhdGU8dHlwZW5hbWUgVT4KICAgICBpbmxpbmUgdm9pZCBWZWN0b3I8VCwgaW5saW5lQ2Fw YWNpdHk+OjphcHBlbmQoY29uc3QgVSYgdmFsKQogICAgIHsKICAgICAgICAgaWYgKHNpemUoKSA9 PSBjYXBhY2l0eSgpKQpAQCAtNDkxLDggKzUxNSwzNCBAQAogICAgICAgICBuZXcgKGVuZCgpKSBU KHZhbCk7CiAgICAgICAgICsrbV9zaXplOwogICAgIH0KLSAgICAKKworICAgIHRlbXBsYXRlPHR5 cGVuYW1lIFQsIHNpemVfdCBpbmxpbmVDYXBhY2l0eT4gdGVtcGxhdGU8dHlwZW5hbWUgVT4KKyAg ICBpbmxpbmUgdm9pZCBWZWN0b3I8VCwgaW5saW5lQ2FwYWNpdHk+OjppbnNlcnQoc2l6ZV90IHBv c2l0aW9uLCBjb25zdCBVJiB2YWwpCisgICAgeworICAgICAgICBBU1NFUlQocG9zaXRpb24gPD0g c2l6ZSgpKTsKKyAgICAgICAgaWYgKHNpemUoKSA9PSBjYXBhY2l0eSgpKQorICAgICAgICAgICAg ZXhwYW5kQ2FwYWNpdHkoc2l6ZSgpICsgMSk7CisKKyAgICAgICAgVCogc3BvdCA9IGJlZ2luKCkg KyBwb3NpdGlvbjsKKyAgICAgICAgVHlwZU9wZXJhdGlvbnM6Om1vdmVPdmVybGFwcGluZyhzcG90 LCBlbmQoKSwgc3BvdCArIDEpOworICAgICAgICBuZXcgKHNwb3QpIFQodmFsKTsKKyAgICAgICAg KyttX3NpemU7CisgICAgfQorCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgc2l6ZV90IGlubGlu ZUNhcGFjaXR5PgorICAgIGlubGluZSB2b2lkIFZlY3RvcjxULCBpbmxpbmVDYXBhY2l0eT46OnJl bW92ZShzaXplX3QgcG9zaXRpb24pCisgICAgeworICAgICAgICBBU1NFUlQocG9zaXRpb24gPD0g c2l6ZSgpKTsKKyAgICAgICAgaWYgKHNpemUoKSA9PSBjYXBhY2l0eSgpKQorICAgICAgICAgICAg ZXhwYW5kQ2FwYWNpdHkoc2l6ZSgpICsgMSk7CisKKyAgICAgICAgVCogc3BvdCA9IGJlZ2luKCkg KyBwb3NpdGlvbjsKKyAgICAgICAgc3BvdC0+flQoKTsKKyAgICAgICAgVHlwZU9wZXJhdGlvbnM6 Om1vdmVPdmVybGFwcGluZyhzcG90ICsgMSwgZW5kKCksIHNwb3QpOworICAgICAgICAtLW1fc2l6 ZTsKKyAgICB9CisKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCBzaXplX3QgaW5saW5lQ2FwYWNp dHk+CiAgICAgdm9pZCBkZWxldGVBbGxWYWx1ZXMoVmVjdG9yPFQsIGlubGluZUNhcGFjaXR5PiYg Y29sbGVjdGlvbikKICAgICB7CiAgICAgICAgIHR5cGVkZWYgVmVjdG9yPFQsIGlubGluZUNhcGFj aXR5PiBWZWM7CkluZGV4OiBDaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gQ2hhbmdlTG9nCShyZXZp c2lvbiAxMjg4NSkKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDA2LTAyLTE4ICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIGh0dHA6Ly9idWd6aWxsYS5v cGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM0NQorICAgICAgICAgIGFkZCBpbnNlcnQg YW5kIHJlbW92ZSB0byBLWE1MQ29yZTo6VmVjdG9yCisKKyAgICAgICAgKiBreG1sY29yZS9WZWN0 b3IuaDogQWRkZWQgIm1vdmVPdmVybGFwcGluZyIsIHdoaWNoIGlzIHVzZWQgaW4gYm90aAorICAg ICAgICBpbnNlcnQgYW5kIHJlbW92ZSB0byBzbGlkZSBlbGVtZW50cyB3aXRoaW4gdGhlIHZlY3Rv ci4gQWxzbyBhZGRlZAorICAgICAgICAiaW5zZXJ0IiBhbmQgInJlbW92ZSIgZnVuY3Rpb25zLgor CiAyMDA2LTAyLTE2ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgSm9obi4K