Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:55395 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 60458 invoked from network); 13 Sep 2011 07:16:43 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 13 Sep 2011 07:16:43 -0000 Authentication-Results: pb1.pair.com header.from=nikita.ppv@googlemail.com; sender-id=pass Authentication-Results: pb1.pair.com smtp.mail=nikita.ppv@googlemail.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain googlemail.com designates 209.85.215.45 as permitted sender) X-PHP-List-Original-Sender: nikita.ppv@googlemail.com X-Host-Fingerprint: 209.85.215.45 mail-ew0-f45.google.com Received: from [209.85.215.45] ([209.85.215.45:61930] helo=mail-ew0-f45.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id BF/40-57954-9530F6E4 for ; Tue, 13 Sep 2011 03:16:42 -0400 Received: by ewy24 with SMTP id 24so93606ewy.18 for ; Tue, 13 Sep 2011 00:16:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=6420ShscAGADaPb+L8qkDGDVBi319WptgzMR/gNE9go=; b=boQQo7wMqBjCZsNqGKEaTLPbWQBmgtE8H+/l/1pdIHsX++30MkcWv4baMoouCLLuKW LzY+SKBijjYwf5M4slocXd69nqHnUtoZsmszsXh2L7WGvByYSd/sWoetgWlFaxndud7e hvU1TeNCv4qDcbKcAOoCFSpYRC4kedskGpoJQ= MIME-Version: 1.0 Received: by 10.14.31.228 with SMTP id m76mr519318eea.142.1315898198273; Tue, 13 Sep 2011 00:16:38 -0700 (PDT) Received: by 10.14.99.205 with HTTP; Tue, 13 Sep 2011 00:16:38 -0700 (PDT) In-Reply-To: References: Date: Tue, 13 Sep 2011 09:16:38 +0200 Message-ID: To: Nicolas Grekas Cc: Ferenc Kovacs , PHP internals Content-Type: multipart/mixed; boundary=0016e6563a1aab2f4404accd6cc3 Subject: Re: [PHP-DEV] Revert Tokenizer behavior for 5.4 From: nikita.ppv@googlemail.com (Nikita Popov) --0016e6563a1aab2f4404accd6cc3 Content-Type: text/plain; charset=ISO-8859-1 I just set up an PHP environment and wrote a proper patch (including test changes) to make it collect the next three tokens. It's a git patch and I'm not sure whether it's compatible with SVN patches. I would love it if this would go into 5.4 before beta. I didn't know how one could fetch the rest into T_INLINE_HTML, so I'm hoping on help here from someone who actually knowns C there :) Thanks, Nikita --0016e6563a1aab2f4404accd6cc3 Content-Type: text/plain; charset=US-ASCII; name="tokenizer_patch.txt" Content-Disposition: attachment; filename="tokenizer_patch.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gsijs7t70 RnJvbSBkNjk0MWZhZDhjMGQ5MWEyZmZhY2IwYzk2NWI2NTRkMTcxMTc1M2I0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWtpdGEgUG9wb3YgPG5pa2ljQGNoaWNrZW4uKG5vbmUpPgpE YXRlOiBUdWUsIDEzIFNlcCAyMDExIDA5OjA3OjIxICswMjAwClN1YmplY3Q6IFtQQVRDSF0gTWFr ZSB0b2tlbl9nZXRfYWxsIHJldHVybiBuZXh0IHRocmVlIHRva2VucyBhZnRlciBfX2hhbHRfY29t cGlsZXIKCi0tLQogZXh0L3Rva2VuaXplci90ZXN0cy9idWc1NDA4OS5waHB0ICAgICAgICAgICAg ICAgICAgfCAgIDEwICsrKystCiBleHQvdG9rZW5pemVyL3Rlc3RzL3Rva2VuX2dldF9hbGxfdmFy aWF0aW9uMTYucGhwdCB8ICAgNDUgKysrKysrKysrKysrKysrKysrLS0KIGV4dC90b2tlbml6ZXIv dG9rZW5pemVyLmMgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxMCArKysrLQogMyBmaWxl cyBjaGFuZ2VkLCA1NyBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2V4dC90b2tlbml6ZXIvdGVzdHMvYnVnNTQwODkucGhwdCBiL2V4dC90b2tlbml6ZXIvdGVzdHMv YnVnNTQwODkucGhwdAppbmRleCBlMWY2ZDc5Li4yZjQwNTEwIDEwMDY0NAotLS0gYS9leHQvdG9r ZW5pemVyL3Rlc3RzL2J1ZzU0MDg5LnBocHQKKysrIGIvZXh0L3Rva2VuaXplci90ZXN0cy9idWc1 NDA4OS5waHB0CkBAIC0xNyw3ICsxNyw3IEBAIGZvcmVhY2ggKCR0b2tlbnMgYXMgJHQpCiB2YXJf ZHVtcCgkY29kZSk7CiA/PgogLS1FWFBFQ1RGLS0KLWFycmF5KDIpIHsKK2FycmF5KDUpIHsKICAg WzBdPT4KICAgYXJyYXkoMykgewogICAgIFswXT0+CkBAIC0zNiw1ICszNiwxMSBAQCBhcnJheSgy KSB7CiAgICAgWzJdPT4KICAgICBpbnQoMSkKICAgfQorICBbMl09PgorICBzdHJpbmcoMSkgIigi CisgIFszXT0+CisgIHN0cmluZygxKSAiKSIKKyAgWzRdPT4KKyAgc3RyaW5nKDEpICI7IgogfQot c3RyaW5nKDIxKSAiPD9waHAgX19oYWx0X2NvbXBpbGVyIgorc3RyaW5nKDI0KSAiPD9waHAgX19o YWx0X2NvbXBpbGVyKCk7IgpkaWZmIC0tZ2l0IGEvZXh0L3Rva2VuaXplci90ZXN0cy90b2tlbl9n ZXRfYWxsX3ZhcmlhdGlvbjE2LnBocHQgYi9leHQvdG9rZW5pemVyL3Rlc3RzL3Rva2VuX2dldF9h bGxfdmFyaWF0aW9uMTYucGhwdAppbmRleCAzOTU1MGJkLi5kYjliZGUxIDEwMDY0NAotLS0gYS9l eHQvdG9rZW5pemVyL3Rlc3RzL3Rva2VuX2dldF9hbGxfdmFyaWF0aW9uMTYucGhwdAorKysgYi9l eHQvdG9rZW5pemVyL3Rlc3RzL3Rva2VuX2dldF9hbGxfdmFyaWF0aW9uMTYucGhwdApAQCAtNDcs MTcgKzQ3LDE3IEBAIGVsc2UKIAogbGlzdCgkdmFsdWUxLCR2YWx1ZTIpID0gJGM7CiBpZihlbXB0 eSgkdmFsdWUxKSAmJiAhaXNzZXQoJHZhbHVlMSkpIHsKLSAgX19oYWx0X2NvbXBpbGVyKCk7Cisg IG15RnVuY3Rpb24oKTsKIH0KID8+JzsKICR0b2tlbnMgPSAgdG9rZW5fZ2V0X2FsbCgkc291cmNl KTsKIHZhcl9kdW1wKCR0b2tlbnMpOwogCi1lY2hvICJEb25lIgorZWNobyAiRG9uZSI7CiA/Pgog LS1FWFBFQ1RGLS0KICoqKiBUZXN0aW5nIHRva2VuX2dldF9hbGwoKSA6IHdpdGggZGlmZmVyZW50 IGZ1bmN0aW9uIGNvbnN0cnVjdHMgKioqCi1hcnJheSgxMzUpIHsKK2FycmF5KDE0MikgewogICBb MF09PgogICBhcnJheSgzKSB7CiAgICAgWzBdPT4KQEAgLTk1OCw5ICs5NTgsNDYgQEAgYXJyYXko MTM1KSB7CiAgICAgWzBdPT4KICAgICBpbnQoJWQpCiAgICAgWzFdPT4KLSAgICBzdHJpbmcoMTUp ICJfX2hhbHRfY29tcGlsZXIiCisgICAgc3RyaW5nKDEwKSAibXlGdW5jdGlvbiIKKyAgICBbMl09 PgorICAgIGludCgyNikKKyAgfQorICBbMTM1XT0+CisgIHN0cmluZygxKSAiKCIKKyAgWzEzNl09 PgorICBzdHJpbmcoMSkgIikiCisgIFsxMzddPT4KKyAgc3RyaW5nKDEpICI7IgorICBbMTM4XT0+ CisgIGFycmF5KDMpIHsKKyAgICBbMF09PgorICAgIGludCglZCkKKyAgICBbMV09PgorICAgIHN0 cmluZygxKSAiCisiCiAgICAgWzJdPT4KICAgICBpbnQoMjYpCiAgIH0KKyAgWzEzOV09PgorICBz dHJpbmcoMSkgIn0iCisgIFsxNDBdPT4KKyAgYXJyYXkoMykgeworICAgIFswXT0+CisgICAgaW50 KCVkKQorICAgIFsxXT0+CisgICAgc3RyaW5nKDEpICIKKyIKKyAgICBbMl09PgorICAgIGludCgy NykKKyAgfQorICBbMTQxXT0+CisgIGFycmF5KDMpIHsKKyAgICBbMF09PgorICAgIGludCglZCkK KyAgICBbMV09PgorICAgIHN0cmluZygyKSAiPz4iCisgICAgWzJdPT4KKyAgICBpbnQoMjgpCisg IH0KIH0KIERvbmUKZGlmZiAtLWdpdCBhL2V4dC90b2tlbml6ZXIvdG9rZW5pemVyLmMgYi9leHQv dG9rZW5pemVyL3Rva2VuaXplci5jCmluZGV4IGM2YzkwMWYuLmQ1MDJmOWEgMTAwNjQ0Ci0tLSBh L2V4dC90b2tlbml6ZXIvdG9rZW5pemVyLmMKKysrIGIvZXh0L3Rva2VuaXplci90b2tlbml6ZXIu YwpAQCAtMTA2LDYgKzEwNiw3IEBAIHN0YXRpYyB2b2lkIHRva2VuaXplKHp2YWwgKnJldHVybl92 YWx1ZSBUU1JNTFNfREMpCiAJaW50IHRva2VuX3R5cGU7CiAJemVuZF9ib29sIGRlc3Ryb3k7CiAJ aW50IHRva2VuX2xpbmUgPSAxOworCWludCBuZWVkX3Rva2VucyA9IC0xOyAvLyBmb3IgX19oYWx0 X2NvbXBpbGVyIGxleGluZy4gLTEgPSBkaXNhYmxlZAogCiAJYXJyYXlfaW5pdChyZXR1cm5fdmFs dWUpOwogCkBAIC0xNTIsOCArMTUzLDEzIEBAIHN0YXRpYyB2b2lkIHRva2VuaXplKHp2YWwgKnJl dHVybl92YWx1ZSBUU1JNTFNfREMpCiAKIAkJdG9rZW5fbGluZSA9IENHKHplbmRfbGluZW5vKTsK IAotCQlpZiAodG9rZW5fdHlwZSA9PSBUX0hBTFRfQ09NUElMRVIpIHsKLQkJCWJyZWFrOworCQkv LyBhZnRlciBUX0hBTFRfQ09NUElMRVIgY29sbGVjdCB0aGUgbmV4dCB0aHJlZSBub24tZHJvcHBl ZCB0b2tlbnMKKwkJaWYgKG5lZWRfdG9rZW5zICE9IC0xKSB7CisJCQlpZiAoZGVzdHJveSAmJiAt LW5lZWRfdG9rZW5zID09IDApIHsKKwkJCQlicmVhazsKKwkJCX0KKwkJfSBlbHNlIGlmICh0b2tl bl90eXBlID09IFRfSEFMVF9DT01QSUxFUikgeworCQkJbmVlZF90b2tlbnMgPSAzOwogCQl9CiAJ fQogfQotLSAKMS43LjQuMQoK --0016e6563a1aab2f4404accd6cc3--