39349 2010-05-19 00:19:24 -0700 Change the API of nextToken to distinguish between emitting a token and just running out of input 2010-05-19 00:26:36 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 39259 1 abarth webkit-unassigned eric oldest_to_newest 227720 0 abarth 2010-05-19 00:19:24 -0700 Change the API of nextToken to distinguish between emitting a token and just running out of input 227722 1 56469 abarth 2010-05-19 00:20:53 -0700 Created attachment 56469 Patch 227723 2 56469 hyatt 2010-05-19 00:22:43 -0700 Comment on attachment 56469 Patch r=me 227724 3 56469 eric 2010-05-19 00:24:01 -0700 Comment on attachment 56469 Patch Looks fine. Maybe we should call "clear" "reset()". 227725 4 abarth 2010-05-19 00:26:36 -0700 Committed r59750: <http://trac.webkit.org/changeset/59750> 56469 2010-05-19 00:20:53 -0700 2010-05-19 00:24:01 -0700 Patch bug-39349-20100519002051.patch text/plain 7699 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZGVkOTdiN2QyN2U3ZjFjODY4NDNlYmZjZDY4ZDE4NTg5OTZhNWQ3Zi4uMjQ4ODkzZjhmYWFmZThi MGU2MjkxNmMxODljMDczNGE5NzcxMDAwMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxMC0wNS0xOSAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSB0aGUgQVBJIG9mIG5leHRUb2tlbiB0byBkaXN0 aW5ndWlzaCBiZXR3ZWVuIGVtaXR0aW5nIGEgdG9rZW4gYW5kIGp1c3QgcnVubmluZyBvdXQgb2Yg aW5wdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5 MzQ5CisKKyAgICAgICAgSSdtIG5vdCBzdXJlIHRoZXJlJ3MgYSBmdW5jdGlvbmFsIGRpZmZlcmVu Y2Ugd2l0aCB0aGlzIHBhdGNoIHlldCwgYnV0CisgICAgICAgIGFzIGRpc2N1c3NlZCB3aXRoIEVy aWMsIHdlIG5lZWQgdGhpcyB0byBoYW5kbGUgYXR0cmlidXRlcy4KKworICAgICAgICAqIGh0bWwv SFRNTDVMZXhlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNUxleGVyOjpyZXNldCk6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MNUxleGVyOjpuZXh0VG9rZW4pOgorICAgICAgICAqIGh0bWwv SFRNTDVMZXhlci5oOgorICAgICAgICAqIGh0bWwvSFRNTDVUb2tlbi5oOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTDVUb2tlbjo6SFRNTDVUb2tlbik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVRv a2VuOjpjbGVhcik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MNVRva2VuOjpiZWdpblN0YXJ0VGFn KToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1VG9rZW46OmJlZ2luRW5kVGFnKToKKyAgICAgICAg KFdlYkNvcmU6OkhUTUw1VG9rZW46OmJlZ2luQ2hhcmFjdGVyKToKKyAgICAgICAgKiBodG1sL0hU TUw1VG9rZW5pemVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUw1VG9rZW5pemVyOjp3cml0 ZSk6CisKIDIwMTAtMDUtMTggIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9I VE1MNUxleGVyLmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MNUxleGVyLmNwcAppbmRleCA1OTY4ZTYx YjE3NDNhZjA5ZjVmN2Y1ODQ2Y2Y2OWNkZjVjNDFlY2UxLi4wNDY0MzljYzA3Mjc2Y2E3NTM5NzFi YTk3MmUzNmRiODY3YjBiOGM2IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTDVMZXhlci5j cHAKKysrIGIvV2ViQ29yZS9odG1sL0hUTUw1TGV4ZXIuY3BwCkBAIC02NSw4ICs2NSw2IEBAIGlu bGluZSBVQ2hhciB0b0xvd2VyQ2FzZShVQ2hhciBjYykKIH0KIAogSFRNTDVMZXhlcjo6SFRNTDVM ZXhlcigpCi0gICAgOiBtX3Rva2VuKDApCi0gICAgLCBtX2FkZGl0aW9uYWxBbGxvd2VkQ2hhcmFj dGVyKCdcMCcpCiB7CiAgICAgcmVzZXQoKTsKIH0KQEAgLTc4LDcgKzc2LDkgQEAgSFRNTDVMZXhl cjo6fkhUTUw1TGV4ZXIoKQogdm9pZCBIVE1MNUxleGVyOjpyZXNldCgpCiB7CiAgICAgbV9zdGF0 ZSA9IERhdGFTdGF0ZTsKKyAgICBtX3Rva2VuID0gMDsKICAgICBtX2VtaXRQZW5kaW5nID0gZmFs c2U7CisgICAgbV9hZGRpdGlvbmFsQWxsb3dlZENoYXJhY3RlciA9ICdcMCc7CiB9CiAKIHN0YXRp YyBpbmxpbmUgYm9vbCBpc1doaXRlc3BhY2UoVUNoYXIgYykKQEAgLTIxMiw4ICsyMTIsMTEgQEAg b3V0T2ZDaGFyYWN0ZXJzOgogICAgIHJldHVybiAwOwogfQogCi12b2lkIEhUTUw1TGV4ZXI6Om5l eHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgSFRNTDVUb2tlbiYgdG9rZW4pCitib29s IEhUTUw1TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwgSFRNTDVUb2tl biYgdG9rZW4pCiB7CisgICAgLy8gSWYgd2UgaGF2ZSBhIHRva2VuIGluIHByb2dyZXNzLCB0aGVu IHdlJ3JlIHN1cHBvc2VkIHRvIGJlIGNhbGxlZCBiYWNrCisgICAgLy8gd2l0aCB0aGUgc2FtZSB0 b2tlbiBzbyB3ZSBjYW4gZmluaXNoIGl0LgorICAgIEFTU0VSVCghbV90b2tlbiB8fCBtX3Rva2Vu ID09ICZ0b2tlbiB8fCB0b2tlbi50eXBlKCkgPT0gSFRNTDVUb2tlbjo6VW5pbml0aWFsaXplZCk7 CiAgICAgbV90b2tlbiA9ICZ0b2tlbjsKICAgICAvLyBTb3VyY2U6IGh0dHA6Ly93d3cud2hhdHdn Lm9yZy9zcGVjcy93ZWItYXBwcy9jdXJyZW50LXdvcmsvI3Rva2VuaXNhdGlvbjAKICAgICAvLyBG SVhNRTogVGhpcyB3aGlsZSBzaG91bGQgc3RvcCBhcyBzb29uIGFzIHdlIGhhdmUgYSB0b2tlbiB0 byByZXR1cm4uCkBAIC0yMjcsNyArMjMwLDcgQEAgdm9pZCBIVE1MNUxleGVyOjpuZXh0VG9rZW4o U2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIEhUTUw1VG9rZW4mIHRva2VuKQogICAgICAgICAgICAg ICAgIGlmIChtX3Rva2VuLT50eXBlKCkgPT0gSFRNTDVUb2tlbjo6Q2hhcmFjdGVyKSB7CiAgICAg ICAgICAgICAgICAgICAgIC8vIFdlIGhhdmUgYSBidW5jaCBvZiBjaGFyYWN0ZXIgdG9rZW5zIHF1 ZXVlZCB1cCB0aGF0IHdlCiAgICAgICAgICAgICAgICAgICAgIC8vIGFyZSBlbWl0dGluZyBsYXpp bHkgaGVyZS4KLSAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgbV9zdGF0 ZSA9IFRhZ09wZW5TdGF0ZTsKICAgICAgICAgICAgIH0gZWxzZQpAQCAtMTIwNSwxMCArMTIwOCwx MCBAQCB2b2lkIEhUTUw1TGV4ZXI6Om5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmIHNvdXJjZSwg SFRNTDVUb2tlbiYgdG9rZW4pCiAgICAgICAgIHNvdXJjZS5hZHZhbmNlKCk7CiAgICAgICAgIGlm IChtX2VtaXRQZW5kaW5nKSB7CiAgICAgICAgICAgICBtX2VtaXRQZW5kaW5nID0gZmFsc2U7Ci0g ICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQog ICAgIH0KLSAgICBtX3Rva2VuID0gMDsKKyAgICByZXR1cm4gZmFsc2U7CiB9CiAKIGlubGluZSBi b29sIEhUTUw1TGV4ZXI6OnRlbXBvcmFyeUJ1ZmZlcklzKGNvbnN0IGNoYXIqKQpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9odG1sL0hUTUw1TGV4ZXIuaCBiL1dlYkNvcmUvaHRtbC9IVE1MNUxleGVyLmgK aW5kZXggMzg2ZDlkZGYzYzAzMzQ4YzQxMjlmMDg3MmU3OWU5OGFhODk3ZTYwOC4uNTBkNzhmNjg0 Y2U4MDhjZDU3NWE4ZmM3NjhiZGZjNTYyYjhiZGE4NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1s L0hUTUw1TGV4ZXIuaAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTDVMZXhlci5oCkBAIC00Miw3ICs0 MiwxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIH5IVE1MNUxleGVyKCk7CiAKICAg ICAgICAgdm9pZCByZXNldCgpOwotICAgICAgICB2b2lkIG5leHRUb2tlbihTZWdtZW50ZWRTdHJp bmcmLCBIVE1MNVRva2VuJik7CisKKyAgICAgICAgLy8gVGhpcyBmdW5jdGlvbiByZXR1cm5zIHRy dWUgaWYgaXQgZW1pdHMgYSB0b2tlbi4gIE90aGVyd2lzZSwgY2FsbGVycworICAgICAgICAvLyBt dXN0IHByb3ZpZGUgdGhlIHNhbWUgKGluIHByb2dyZXNzKSB0b2tlbiBvbiB0aGUgbmV4dCBjYWxs ICh1bmxlc3MKKyAgICAgICAgLy8gdGhleSBjYWxsIHJlc2V0KCkgZmlyc3QpLgorICAgICAgICBi b29sIG5leHRUb2tlbihTZWdtZW50ZWRTdHJpbmcmLCBIVE1MNVRva2VuJik7CiAKICAgICAgICAg c3RhdGljIHVuc2lnbmVkIGNvbnN1bWVFbnRpdHkoU2VnbWVudGVkU3RyaW5nJiwgYm9vbCYgbm90 RW5vdWdoQ2hhcmFjdGVycyk7CiAKQEAgLTU1LDkgKzU5LDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogCiAgICAgICAgIGlubGluZSBib29sIHRlbXBvcmFyeUJ1ZmZlcklzKGNvbnN0IGNoYXIqKTsK IAotICAgICAgICBTZWdtZW50ZWRTdHJpbmcgbV9zb3VyY2U7Ci0gICAgICAgIEhUTUw1VG9rZW4q IG1fdG9rZW47Ci0KICAgICAgICAgZW51bSBTdGF0ZSB7CiAgICAgICAgICAgICBEYXRhU3RhdGUs CiAgICAgICAgICAgICBDaGFyYWN0ZXJSZWZlcmVuY2VJbkRhdGFTdGF0ZSwKQEAgLTEzMyw2ICsx MzQsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIFN0YXRlIG1fc3RhdGU7CiAK KyAgICAgICAgLy8gbV90b2tlbiBpcyBvd25lZCBieSB0aGUgY2FsbGVyLiAgSWYgbmV4dFRva2Vu IGlzIG5vdCBvbiB0aGUgc3RhY2ssCisgICAgICAgIC8vIHRoaXMgbWVtYmVyIG1pZ2h0IGJlIHBv aW50aW5nIHRvIHVuYWxsb2NhdGVkIG1lbW9yeS4KKyAgICAgICAgSFRNTDVUb2tlbiogbV90b2tl bjsKKwogICAgICAgICBib29sIG1fZW1pdFBlbmRpbmc7CiAKICAgICAgICAgLy8gaHR0cDovL3d3 dy53aGF0d2cub3JnL3NwZWNzL3dlYi1hcHBzL2N1cnJlbnQtd29yay8jdGVtcG9yYXJ5LWJ1ZmZl cgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUw1VG9rZW4uaCBiL1dlYkNvcmUvaHRtbC9I VE1MNVRva2VuLmgKaW5kZXggZDk2YmRhMjkzYTljMDc5NzdjNWIxZDA1ZWE1OTc2ZDY5NDM1YWE3 MC4uZDcyZGU1NDUyOTE3YWEwYTRlY2JkOTgwY2RhMzg4YjJjZThmZTU5ZiAxMDA2NDQKLS0tIGEv V2ViQ29yZS9odG1sL0hUTUw1VG9rZW4uaAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTDVUb2tlbi5o CkBAIC00NCwyOSArNDQsMzUgQEAgcHVibGljOgogICAgICAgICBFbmRPZkZpbGUsCiAgICAgfTsK IAotICAgIGV4cGxpY2l0IEhUTUw1VG9rZW4oVHlwZSB0eXBlID0gVW5pbml0aWFsaXplZCkKLSAg ICAgICAgOiBtX3R5cGUodHlwZSkKLSAgICAgICAgLCBtX2ZvcmNlUXVpcmtzKGZhbHNlKQotICAg ICAgICAsIG1fc2VsZkNsb3NpbmcoZmFsc2UpCi0gICAgewotICAgIH0KKyAgICBIVE1MNVRva2Vu KCkgeyBjbGVhcigpOyB9CisKKyAgICB2b2lkIGNsZWFyKCkgeyBtX3R5cGUgPSBVbmluaXRpYWxp emVkOyB9CiAKICAgICB2b2lkIGJlZ2luU3RhcnRUYWcoVUNoYXIgY2hhcmFjdGVyKQogICAgIHsK KyAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBVbmluaXRpYWxpemVkKTsKICAgICAgICAgbV90eXBl ID0gU3RhcnRUYWc7CiAgICAgICAgIG1fZGF0YS5jbGVhcigpOworICAgICAgICBtX3NlbGZDbG9z aW5nID0gZmFsc2U7CisgICAgICAgIG1fYXR0cnMgPSAwOworCiAgICAgICAgIG1fZGF0YS5hcHBl bmQoY2hhcmFjdGVyKTsKICAgICB9CiAKICAgICB2b2lkIGJlZ2luRW5kVGFnKFVDaGFyIGNoYXJh Y3RlcikKICAgICB7CisgICAgICAgIEFTU0VSVChtX3R5cGUgPT0gVW5pbml0aWFsaXplZCk7CiAg ICAgICAgIG1fdHlwZSA9IEVuZFRhZzsKICAgICAgICAgbV9kYXRhLmNsZWFyKCk7CisgICAgICAg IG1fc2VsZkNsb3NpbmcgPSBmYWxzZTsKKyAgICAgICAgbV9hdHRycyA9IDA7CisKICAgICAgICAg bV9kYXRhLmFwcGVuZChjaGFyYWN0ZXIpOwogICAgIH0KIAogICAgIHZvaWQgYmVnaW5DaGFyYWN0 ZXIoVUNoYXIgY2hhcmFjdGVyKQogICAgIHsKKyAgICAgICAgQVNTRVJUKG1fdHlwZSA9PSBVbmlu aXRpYWxpemVkKTsKICAgICAgICAgbV90eXBlID0gQ2hhcmFjdGVyOwogICAgICAgICBtX2RhdGEu Y2xlYXIoKTsKICAgICAgICAgbV9kYXRhLmFwcGVuZChjaGFyYWN0ZXIpOwpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9odG1sL0hUTUw1VG9rZW5pemVyLmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MNVRva2Vu aXplci5jcHAKaW5kZXggMmYzMjZlM2U3NDExOGNlZDZiNTc0ZThmNmQ2Mjg5Nzk5MWE2OTY1My4u M2EwMjJkMzAyMzBhNDY5NTkyMDhmYTAwZWE2Y2E3N2U1M2I2NGE2MSAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9odG1sL0hUTUw1VG9rZW5pemVyLmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTDVUb2tl bml6ZXIuY3BwCkBAIC03NSwyMyArNzUsMjIgQEAgdm9pZCBIVE1MNVRva2VuaXplcjo6d3JpdGUo Y29uc3QgU2VnbWVudGVkU3RyaW5nJiBzb3VyY2UsIGJvb2wpCiB7CiAgICAgbV9zb3VyY2UuYXBw ZW5kKHNvdXJjZSk7CiAKKyAgICBIVE1MNVRva2VuIHRva2VuOwogICAgIHdoaWxlICghbV9zb3Vy Y2UuaXNFbXB0eSgpKSB7Ci0gICAgICAgIEhUTUw1VG9rZW4gdG9rZW47Ci0gICAgICAgIG1fbGV4 ZXItPm5leHRUb2tlbihtX3NvdXJjZSwgdG9rZW4pOwotICAgICAgICAvLyBodHRwOi8vd3d3Lndo YXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMvY3VycmVudC13b3JrLyN0cmVlLWNvbnN0cnVjdGlvbgot ICAgICAgICAvLyBXZSBuZWVkIHRvIGFkZCBjb2RlIHRvIHRoZSBwYXJzZXIgaW4gb3JkZXIgdG8g dW5kZXJzdGFuZAotICAgICAgICAvLyBIVE1MNVRva2VuIG9iamVjdHMuICBUaGUgb2xkIEhUTUwg Y29kZXBhdGggZG9lcyBub3QgaGF2ZSBhIG5pY2UKLSAgICAgICAgLy8gc2VwYXJhdGlvbiBiZXR3 ZWVuIHRoZSBwYXJzZXIgbG9naWMgYW5kIHRva2VuaXplciBsb2dpYyBsaWtlCi0gICAgICAgIC8v IHRoZSBIVE1MNSBjb2RlcGF0aCBzaG91bGQuICBUaGUgY2FsbCBzaG91bGQgbG9vayBzb21ldGhp bmcgbGlrZToKLSAgICAgICAgLy8gbV9wYXJzZXItPmNvbnN0cnVjdFRyZWVGcm9tVG9rZW4odG9r ZW4pOwotICAgICAgICAvLyBGb3Igbm93LCB3ZSB0cmFuc2xhdGUgaW50byBhbiBvbGQtc3R5bGUg dG9rZW4gZm9yIHRlc3RpbmcuCi0gICAgICAgIGlmICh0b2tlbi50eXBlKCkgPT0gSFRNTDVUb2tl bjo6VW5pbml0aWFsaXplZCkgewotICAgICAgICAgICAgbm90SW1wbGVtZW50ZWQoKTsKLSAgICAg ICAgICAgIGNvbnRpbnVlOworICAgICAgICBpZiAobV9sZXhlci0+bmV4dFRva2VuKG1fc291cmNl LCB0b2tlbikpIHsKKyAgICAgICAgICAgIC8vIGh0dHA6Ly93d3cud2hhdHdnLm9yZy9zcGVjcy93 ZWItYXBwcy9jdXJyZW50LXdvcmsvI3RyZWUtY29uc3RydWN0aW9uCisgICAgICAgICAgICAvLyBX ZSBuZWVkIHRvIGFkZCBjb2RlIHRvIHRoZSBwYXJzZXIgaW4gb3JkZXIgdG8gdW5kZXJzdGFuZAor ICAgICAgICAgICAgLy8gSFRNTDVUb2tlbiBvYmplY3RzLiAgVGhlIG9sZCBIVE1MIGNvZGVwYXRo IGRvZXMgbm90IGhhdmUgYSBuaWNlCisgICAgICAgICAgICAvLyBzZXBhcmF0aW9uIGJldHdlZW4g dGhlIHBhcnNlciBsb2dpYyBhbmQgdG9rZW5pemVyIGxvZ2ljIGxpa2UKKyAgICAgICAgICAgIC8v IHRoZSBIVE1MNSBjb2RlcGF0aCBzaG91bGQuICBUaGUgY2FsbCBzaG91bGQgbG9vayBzb21ldGhp bmcgbGlrZToKKyAgICAgICAgICAgIC8vIG1fcGFyc2VyLT5jb25zdHJ1Y3RUcmVlRnJvbVRva2Vu KHRva2VuKTsKKyAgICAgICAgICAgIC8vIEZvciBub3csIHdlIHRyYW5zbGF0ZSBpbnRvIGFuIG9s ZC1zdHlsZSB0b2tlbiBmb3IgdGVzdGluZy4KKyAgICAgICAgICAgIFRva2VuIG9sZFN0eWxlVG9r ZW47CisgICAgICAgICAgICBjb252ZXJ0VG9PbGRTdHlsZSh0b2tlbiwgb2xkU3R5bGVUb2tlbik7 CisgICAgICAgICAgICBtX3BhcnNlci0+cGFyc2VUb2tlbigmb2xkU3R5bGVUb2tlbik7CisKKyAg ICAgICAgICAgIHRva2VuLmNsZWFyKCk7CiAgICAgICAgIH0KLSAgICAgICAgVG9rZW4gb2xkU3R5 bGVUb2tlbjsKLSAgICAgICAgY29udmVydFRvT2xkU3R5bGUodG9rZW4sIG9sZFN0eWxlVG9rZW4p OwotICAgICAgICBtX3BhcnNlci0+cGFyc2VUb2tlbigmb2xkU3R5bGVUb2tlbik7CiAgICAgfQog fQogCg==