From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 22 19:03:30 2014 Received: (at submit) by debbugs.gnu.org; 22 Oct 2014 23:03:30 +0000 Received: from localhost ([127.0.0.1]:60290 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xh4wD-0005nV-TN for submit@debbugs.gnu.org; Wed, 22 Oct 2014 19:03:30 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46444) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xh4wA-0005nD-4c for submit@debbugs.gnu.org; Wed, 22 Oct 2014 19:03:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xh4vv-0006II-RJ for submit@debbugs.gnu.org; Wed, 22 Oct 2014 19:03:20 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42201) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xh4vv-0006IE-Nu for submit@debbugs.gnu.org; Wed, 22 Oct 2014 19:03:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xh4vn-0004ID-Mb for bug-grep@gnu.org; Wed, 22 Oct 2014 19:03:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xh4vg-0006DU-2b for bug-grep@gnu.org; Wed, 22 Oct 2014 19:03:03 -0400 Received: from mailgw05.kcn.ne.jp ([61.86.7.212]:56283) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xh4vf-0006D0-DK for bug-grep@gnu.org; Wed, 22 Oct 2014 19:02:56 -0400 Received: from imp02 (mailgw6.kcn.ne.jp [61.86.15.232]) by mailgw05.kcn.ne.jp (Postfix) with ESMTP id 4D9DC67DFD for ; Thu, 23 Oct 2014 08:02:51 +0900 (JST) Received: from mail03.kcn.ne.jp ([61.86.6.182]) by imp02 with bizsmtp id 6P2r1p00H3veGq501P2rQR; Thu, 23 Oct 2014 08:02:51 +0900 X-OrgRCPT: bug-grep@gnu.org Received: from [10.120.1.60] (i118-21-128-66.s30.a048.ap.plala.or.jp [118.21.128.66]) by mail03.kcn.ne.jp (Postfix) with ESMTPA id 1CB7314100BE for ; Thu, 23 Oct 2014 08:02:51 +0900 (JST) Date: Thu, 23 Oct 2014 08:02:49 +0900 From: Norihiro Tanaka To: bug-grep@gnu.org Subject: [PATCH 1/2] dfa: prefer bool at DFA interfaces Message-Id: <20141023080248.A423.27F6AC2D@kcn.ne.jp> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------_5448366500000000A41B_MULTIPART_MIXED_" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.65.07 [ja] X-detected-operating-system: by eggs.gnu.org: Mac OS X 10.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) --------_5448366500000000A41B_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit This change is use bool for booleans at DFA interfaces. Callers in Gawk have already used bool instead of int for them. Second patch changes caller with change in first patch. --------_5448366500000000A41B_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII"; name="0001-dfa-prefer-bool-at-DFA-externals.patch" Content-Disposition: attachment; filename="0001-dfa-prefer-bool-at-DFA-externals.patch" Content-Transfer-Encoding: base64 RnJvbSA0MzI5N2E2NDlmZjQyNDA0MjYxYWIxZTE2ZDRkMDQxMDFhZjhmZGU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOb3JpaGlybyBUYW5ha2EgPG5vcml0bmtAa2NuLm5lLmpwPgpE YXRlOiBTYXQsIDE4IE9jdCAyMDE0IDIzOjU3OjMzICswOTAwClN1YmplY3Q6IFtQQVRDSCAxLzJd IGRmYTogcHJlZmVyIGJvb2wgYXQgREZBIGludGVyZmFjZXMKCiogKHNyYy9kZmEuYykgZGZhc3lu dGF4OiBVc2UgYm9vbCBmb3IgYGZvbGQnLgpkZmFhbmFseXplLCBkZmFjb21wOiBVc2UgYm9vbCBm b3IgYHNlYXJjaGZsYWcnLgpkZmFleGVjX21haW4sIGRmYWV4ZWNfbWIsIGRmYWV4ZWNfc2IsIGRm YWV4ZWM6IElVc2UgYm9vbCBmb3IgYGFsbG93X25sJy4KKiAoc3JjL2RmYS5oKTogVXBkYXRlIHBy b3RvdHlwZS4KLS0tCiBzcmMvZGZhLmMgfCAxOCArKysrKysrKystLS0tLS0tLS0KIHNyYy9kZmEu aCB8ICA4ICsrKystLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDEzIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3NyYy9kZmEuYyBiL3NyYy9kZmEuYwppbmRleCA1OGE0 YjgzLi5mMGRjNzRjIDEwMDY0NAotLS0gYS9zcmMvZGZhLmMKKysrIGIvc3JjL2RmYS5jCkBAIC03 MjAsMTMgKzcyMCwxMyBAQCB3Y2hhcl9jb250ZXh0ICh3aW50X3Qgd2MpCiAKIC8qIEVudHJ5IHBv aW50IHRvIHNldCBzeW50YXggb3B0aW9ucy4gICovCiB2b2lkCi1kZmFzeW50YXggKHJlZ19zeW50 YXhfdCBiaXRzLCBpbnQgZm9sZCwgdW5zaWduZWQgY2hhciBlb2wpCitkZmFzeW50YXggKHJlZ19z eW50YXhfdCBiaXRzLCBib29sIGZvbGQsIHVuc2lnbmVkIGNoYXIgZW9sKQogewogICB1bnNpZ25l ZCBpbnQgaTsKIAogICBzeW50YXhfYml0c19zZXQgPSAxOwogICBzeW50YXhfYml0cyA9IGJpdHM7 Ci0gIGNhc2VfZm9sZCA9IGZvbGQgIT0gMDsKKyAgY2FzZV9mb2xkID0gZm9sZDsKICAgZW9sYnl0 ZSA9IGVvbDsKIAogICBmb3IgKGkgPSAwOyBpIDwgTk9UQ0hBUjsgKytpKQpAQCAtMjMyMCw3ICsy MzIwLDcgQEAgc3RhdGVfc2VwYXJhdGVfY29udGV4dHMgKHBvc2l0aW9uX3NldCBjb25zdCAqcykK ICAgIHNjaGVtZTsgdGhlIG51bWJlciBvZiBlbGVtZW50cyBpbiBlYWNoIHNldCBkZWVwZXIgaW4g dGhlIHN0YWNrIGNhbiBiZQogICAgdXNlZCB0byBkZXRlcm1pbmUgdGhlIGFkZHJlc3Mgb2YgYSBw YXJ0aWN1bGFyIHNldCdzIGFycmF5LiAgKi8KIHZvaWQKLWRmYWFuYWx5emUgKHN0cnVjdCBkZmEg KmQsIGludCBzZWFyY2hmbGFnKQorZGZhYW5hbHl6ZSAoc3RydWN0IGRmYSAqZCwgYm9vbCBzZWFy Y2hmbGFnKQogewogICAvKiBBcnJheSBhbGxvY2F0ZWQgdG8gaG9sZCBwb3NpdGlvbiBzZXRzLiAg Ki8KICAgcG9zaXRpb24gKnBvc2FsbG9jID0geG5tYWxsb2MgKGQtPm5sZWF2ZXMsIDIgKiBzaXpl b2YgKnBvc2FsbG9jKTsKQEAgLTIzNTYsNyArMjM1Niw3IEBAIGRmYWFuYWx5emUgKHN0cnVjdCBk ZmEgKmQsIGludCBzZWFyY2hmbGFnKQogICBwdXRjICgnXG4nLCBzdGRlcnIpOwogI2VuZGlmCiAK LSAgZC0+c2VhcmNoZmxhZyA9IHNlYXJjaGZsYWcgIT0gMDsKKyAgZC0+c2VhcmNoZmxhZyA9IHNl YXJjaGZsYWc7CiAgIGFsbG9jX3Bvc2l0aW9uX3NldCAoJm1lcmdlZCwgZC0+bmxlYXZlcyk7CiAg IGQtPmZvbGxvd3MgPSB4Y2FsbG9jIChkLT50aW5kZXgsIHNpemVvZiAqZC0+Zm9sbG93cyk7CiAK QEAgLTMyNzYsNyArMzI3Niw3IEBAIHNraXBfcmVtYWluc19tYiAoc3RydWN0IGRmYSAqZCwgdW5z aWduZWQgY2hhciBjb25zdCAqcCwKICAgIGNoYXJhY3RlcnMuICAqLwogc3RhdGljIGlubGluZSBj aGFyICoKIGRmYWV4ZWNfbWFpbiAoc3RydWN0IGRmYSAqZCwgY2hhciBjb25zdCAqYmVnaW4sIGNo YXIgKmVuZCwKLSAgICAgICAgICAgICBpbnQgYWxsb3dfbmwsIHNpemVfdCAqY291bnQsIGludCAq YmFja3JlZiwgYm9vbCBtdWx0aWJ5dGUpCisgICAgICAgICAgICAgYm9vbCBhbGxvd19ubCwgc2l6 ZV90ICpjb3VudCwgaW50ICpiYWNrcmVmLCBib29sIG11bHRpYnl0ZSkKIHsKICAgc3RhdGVfbnVt IHMsIHMxOyAgICAgICAgICAgICAgLyogQ3VycmVudCBzdGF0ZS4gICovCiAgIHVuc2lnbmVkIGNo YXIgY29uc3QgKnAsICptYnA7IC8qIEN1cnJlbnQgaW5wdXQgY2hhcmFjdGVyLiAgKi8KQEAgLTM0 NjYsMTQgKzM0NjYsMTQgQEAgZGZhZXhlY19tYWluIChzdHJ1Y3QgZGZhICpkLCBjaGFyIGNvbnN0 ICpiZWdpbiwgY2hhciAqZW5kLAogCiBzdGF0aWMgY2hhciAqCiBkZmFleGVjX21iIChzdHJ1Y3Qg ZGZhICpkLCBjaGFyIGNvbnN0ICpiZWdpbiwgY2hhciAqZW5kLAotICAgICAgICAgICAgaW50IGFs bG93X25sLCBzaXplX3QgKmNvdW50LCBpbnQgKmJhY2tyZWYpCisgICAgICAgICAgICBib29sIGFs bG93X25sLCBzaXplX3QgKmNvdW50LCBpbnQgKmJhY2tyZWYpCiB7CiAgIHJldHVybiBkZmFleGVj X21haW4gKGQsIGJlZ2luLCBlbmQsIGFsbG93X25sLCBjb3VudCwgYmFja3JlZiwgdHJ1ZSk7CiB9 CiAKIHN0YXRpYyBjaGFyICoKIGRmYWV4ZWNfc2IgKHN0cnVjdCBkZmEgKmQsIGNoYXIgY29uc3Qg KmJlZ2luLCBjaGFyICplbmQsCi0gICAgICAgICAgICBpbnQgYWxsb3dfbmwsIHNpemVfdCAqY291 bnQsIGludCAqYmFja3JlZikKKyAgICAgICAgICAgIGJvb2wgYWxsb3dfbmwsIHNpemVfdCAqY291 bnQsIGludCAqYmFja3JlZikKIHsKICAgcmV0dXJuIGRmYWV4ZWNfbWFpbiAoZCwgYmVnaW4sIGVu ZCwgYWxsb3dfbmwsIGNvdW50LCBiYWNrcmVmLCBmYWxzZSk7CiB9CkBAIC0zNDgzLDcgKzM0ODMs NyBAQCBkZmFleGVjX3NiIChzdHJ1Y3QgZGZhICpkLCBjaGFyIGNvbnN0ICpiZWdpbiwgY2hhciAq ZW5kLAogCiBjaGFyICoKIGRmYWV4ZWMgKHN0cnVjdCBkZmEgKmQsIGNoYXIgY29uc3QgKmJlZ2lu LCBjaGFyICplbmQsCi0gICAgICAgICBpbnQgYWxsb3dfbmwsIHNpemVfdCAqY291bnQsIGludCAq YmFja3JlZikKKyAgICAgICAgIGJvb2wgYWxsb3dfbmwsIHNpemVfdCAqY291bnQsIGludCAqYmFj a3JlZikKIHsKICAgcmV0dXJuIGQtPmRmYWV4ZWMgKGQsIGJlZ2luLCBlbmQsIGFsbG93X25sLCBj b3VudCwgYmFja3JlZik7CiB9CkBAIC0zNjYzLDcgKzM2NjMsNyBAQCBkZmFzc2J1aWxkIChzdHJ1 Y3QgZGZhICpkKQogCiAvKiBQYXJzZSBhbmQgYW5hbHl6ZSBhIHNpbmdsZSBzdHJpbmcgb2YgdGhl IGdpdmVuIGxlbmd0aC4gICovCiB2b2lkCi1kZmFjb21wIChjaGFyIGNvbnN0ICpzLCBzaXplX3Qg bGVuLCBzdHJ1Y3QgZGZhICpkLCBpbnQgc2VhcmNoZmxhZykKK2RmYWNvbXAgKGNoYXIgY29uc3Qg KnMsIHNpemVfdCBsZW4sIHN0cnVjdCBkZmEgKmQsIGJvb2wgc2VhcmNoZmxhZykKIHsKICAgZGZh aW5pdCAoZCk7CiAgIGRmYW1iY2FjaGUgKGQpOwpkaWZmIC0tZ2l0IGEvc3JjL2RmYS5oIGIvc3Jj L2RmYS5oCmluZGV4IGYzMGMzY2IuLmFiMmU4ZWEgMTAwNjQ0Ci0tLSBhL3NyYy9kZmEuaAorKysg Yi9zcmMvZGZhLmgKQEAgLTQ5LDEyICs0OSwxMiBAQCBleHRlcm4gc3RydWN0IGRmYW11c3QgKmRm YW11c3RzIChzdHJ1Y3QgZGZhIGNvbnN0ICopOwogLyogZGZhc3ludGF4KCkgdGFrZXMgdGhyZWUg YXJndW1lbnRzOyB0aGUgZmlyc3Qgc2V0cyB0aGUgc3ludGF4IGJpdHMgZGVzY3JpYmVkCiAgICBl YXJsaWVyIGluIHRoaXMgZmlsZSwgdGhlIHNlY29uZCBzZXRzIHRoZSBjYXNlLWZvbGRpbmcgZmxh ZywgYW5kIHRoZQogICAgdGhpcmQgc3BlY2lmaWVzIHRoZSBsaW5lIHRlcm1pbmF0b3IuICovCi1l eHRlcm4gdm9pZCBkZmFzeW50YXggKHJlZ19zeW50YXhfdCwgaW50LCB1bnNpZ25lZCBjaGFyKTsK K2V4dGVybiB2b2lkIGRmYXN5bnRheCAocmVnX3N5bnRheF90LCBib29sLCB1bnNpZ25lZCBjaGFy KTsKIAogLyogQ29tcGlsZSB0aGUgZ2l2ZW4gc3RyaW5nIG9mIHRoZSBnaXZlbiBsZW5ndGggaW50 byB0aGUgZ2l2ZW4gc3RydWN0IGRmYS4KICAgIEZpbmFsIGFyZ3VtZW50IGlzIGEgZmxhZyBzcGVj aWZ5aW5nIHdoZXRoZXIgdG8gYnVpbGQgYSBzZWFyY2hpbmcgb3IgYW4KICAgIGV4YWN0IG1hdGNo ZXIuICovCi1leHRlcm4gdm9pZCBkZmFjb21wIChjaGFyIGNvbnN0ICosIHNpemVfdCwgc3RydWN0 IGRmYSAqLCBpbnQpOworZXh0ZXJuIHZvaWQgZGZhY29tcCAoY2hhciBjb25zdCAqLCBzaXplX3Qs IHN0cnVjdCBkZmEgKiwgYm9vbCk7CiAKIC8qIFNlYXJjaCB0aHJvdWdoIGEgYnVmZmVyIGxvb2tp bmcgZm9yIGEgbWF0Y2ggdG8gdGhlIGdpdmVuIHN0cnVjdCBkZmEuCiAgICBGaW5kIHRoZSBmaXJz dCBvY2N1cnJlbmNlIG9mIGEgc3RyaW5nIG1hdGNoaW5nIHRoZSByZWdleHAgaW4gdGhlCkBAIC02 MywxMyArNjMsMTMgQEAgZXh0ZXJuIHZvaWQgZGZhY29tcCAoY2hhciBjb25zdCAqLCBzaXplX3Qs IHN0cnVjdCBkZmEgKiwgaW50KTsKICAgIHBvaW50cyB0byB0aGUgYmVnaW5uaW5nIG9mIHRoZSBi dWZmZXIsIGFuZCBFTkQgcG9pbnRzIHRvIHRoZSBmaXJzdCBieXRlCiAgICBhZnRlciBpdHMgZW5k LiAgTm90ZSBob3dldmVyIHRoYXQgd2Ugc3RvcmUgYSBzZW50aW5lbCBieXRlICh1c3VhbGx5CiAg ICBuZXdsaW5lKSBpbiAqRU5ELCBzbyB0aGUgYWN0dWFsIGJ1ZmZlciBtdXN0IGJlIG9uZSBieXRl IGxvbmdlci4KLSAgIFdoZW4gTkVXTElORSBpcyBub256ZXJvLCBuZXdsaW5lcyBtYXkgYXBwZWFy IGluIHRoZSBtYXRjaGluZyBzdHJpbmcuCisgICBXaGVuIEFMTE9XX05MIGlzIHRydWUsIG5ld2xp bmVzIG1heSBhcHBlYXIgaW4gdGhlIG1hdGNoaW5nIHN0cmluZy4KICAgIElmIENPVU5UIGlzIG5v bi1OVUxMLCBpbmNyZW1lbnQgKkNPVU5UIG9uY2UgZm9yIGVhY2ggbmV3bGluZSBwcm9jZXNzZWQu CiAgICBGaW5hbGx5LCBpZiBCQUNLUkVGIGlzIG5vbi1OVUxMIHNldCAqQkFDS1JFRiB0byBpbmRp Y2F0ZSB3aGV0aGVyIHdlCiAgICBlbmNvdW50ZXJlZCBhIGJhY2stcmVmZXJlbmNlICgxKSBvciBu b3QgKDApLiAgVGhlIGNhbGxlciBtYXkgdXNlIHRoaXMKICAgIHRvIGRlY2lkZSB3aGV0aGVyIHRv IGZhbGwgYmFjayBvbiBhIGJhY2t0cmFja2luZyBtYXRjaGVyLiAqLwogZXh0ZXJuIGNoYXIgKmRm YWV4ZWMgKHN0cnVjdCBkZmEgKmQsIGNoYXIgY29uc3QgKmJlZ2luLCBjaGFyICplbmQsCi0gICAg ICAgICAgICAgICAgICAgICAgaW50IG5ld2xpbmUsIHNpemVfdCAqY291bnQsIGludCAqYmFja3Jl Zik7CisgICAgICAgICAgICAgICAgICAgICAgYm9vbCBhbGxvd19ubCwgc2l6ZV90ICpjb3VudCwg aW50ICpiYWNrcmVmKTsKIAogLyogUmV0dXJuIGEgc3VwZXJzZXQgZm9yIEQuICBUaGUgc3VwZXJz ZXQgbWF0Y2hlcyBldmVyeXRoaW5nIHRoYXQgRAogICAgbWF0Y2hlcywgYWxvbmcgd2l0aCBzb21l IG90aGVyIHN0cmluZ3MgKHRob3VnaCB0aGUgbGF0dGVyIHNob3VsZCBiZQotLSAKMi4xLjEKCg== --------_5448366500000000A41B_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII"; name="0002-grep-change-caller-for-previous-change.patch" Content-Disposition: attachment; filename="0002-grep-change-caller-for-previous-change.patch" Content-Transfer-Encoding: base64 RnJvbSA4ZGI4NmQ4NjQ2MTYzMTZhYzUzNGQ0N2MwYTg3NmM0NWMxYWFlZWJkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOb3JpaGlybyBUYW5ha2EgPG5vcml0bmtAa2NuLm5lLmpwPgpE YXRlOiBUaHUsIDIzIE9jdCAyMDE0IDA3OjUwOjE1ICswOTAwClN1YmplY3Q6IFtQQVRDSCAyLzJd IGdyZXA6IGNoYW5nZSBjYWxsZXIgZm9yIHByZXZpb3VzIGNoYW5nZQoKKiAoc3JjL2RmYXNlYXJj aC5jKSBHRUFjb21waWxlOiBVc2UgYm9vbCBmb3IgYm9vbGVhbi4KLS0tCiBzcmMvZGZhc2VhcmNo LmMgfCA5ICsrKysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgNCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvZGZhc2VhcmNoLmMgYi9zcmMvZGZhc2VhcmNoLmMK aW5kZXggNzdiNGUzZS4uZDY2NzQ3MCAxMDA2NDQKLS0tIGEvc3JjL2RmYXNlYXJjaC5jCisrKyBi L3NyYy9kZmFzZWFyY2guYwpAQCAtMTk5LDcgKzE5OSw3IEBAIEdFQWNvbXBpbGUgKGNoYXIgY29u c3QgKnBhdHRlcm4sIHNpemVfdCBzaXplLCByZWdfc3ludGF4X3Qgc3ludGF4X2JpdHMpCiAgICAg bW90aWYgPSBOVUxMOwogCiAgIGRmYSA9IGRmYWFsbG9jICgpOwotICBkZmFjb21wIChwYXR0ZXJu LCBzaXplLCBkZmEsIDEpOworICBkZmFjb21wIChwYXR0ZXJuLCBzaXplLCBkZmEsIHRydWUpOwog ICBrd3NtdXN0cyAoKTsKIAogICBmcmVlKG1vdGlmKTsKQEAgLTI4Nyw4ICsyODcsOCBAQCBFR2V4 ZWN1dGUgKGNoYXIgY29uc3QgKmJ1Ziwgc2l6ZV90IHNpemUsIHNpemVfdCAqbWF0Y2hfc2l6ZSwK ICAgICAgICAgICAgICAgLyogS2VlcCB1c2luZyB0aGUgc3VwZXJzZXQgd2hpbGUgaXQgcmVwb3J0 cyBtdWx0aWxpbmUKICAgICAgICAgICAgICAgICAgcG90ZW50aWFsIG1hdGNoZXM7IHRoaXMgaXMg bW9yZSBsaWtlbHkgdG8gYmUgZmFzdAogICAgICAgICAgICAgICAgICB0aGFuIGZhbGxpbmcgYmFj ayB0byBLV3NldCB3b3VsZCBiZS4gICovCi0gICAgICAgICAgICAgIHdoaWxlICgobmV4dF9iZWcg PSBkZmFleGVjIChzdXBlcnNldCwgZGZhX2JlZywgKGNoYXIgKikgZW5kLCAxLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmNvdW50LCBOVUxMKSkKKyAgICAgICAg ICAgICAgd2hpbGUgKChuZXh0X2JlZyA9IGRmYWV4ZWMgKHN1cGVyc2V0LCBkZmFfYmVnLCAoY2hh ciAqKSBlbmQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0cnVl LCAmY291bnQsIE5VTEwpKQogICAgICAgICAgICAgICAgICAgICAgJiYgbmV4dF9iZWcgIT0gZW5k CiAgICAgICAgICAgICAgICAgICAgICAmJiBjb3VudCAhPSAwKQogICAgICAgICAgICAgICAgIHsK QEAgLTMwNyw3ICszMDcsOCBAQCBFR2V4ZWN1dGUgKGNoYXIgY29uc3QgKmJ1Ziwgc2l6ZV90IHNp emUsIHNpemVfdCAqbWF0Y2hfc2l6ZSwKICAgICAgICAgICAgIH0KIAogICAgICAgICAgIC8qIFRy eSBtYXRjaGluZyB3aXRoIERGQS4gICovCi0gICAgICAgICAgbmV4dF9iZWcgPSBkZmFleGVjIChk ZmEsIGRmYV9iZWcsIChjaGFyICopIGVuZCwgMCwgJmNvdW50LCAmYmFja3JlZik7CisgICAgICAg ICAgbmV4dF9iZWcgPSBkZmFleGVjIChkZmEsIGRmYV9iZWcsIChjaGFyICopIGVuZCwgZmFsc2Us ICZjb3VudCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZiYWNrcmVmKTsKIAogICAg ICAgICAgIC8qIElmIHRoZXJlJ3Mgbm8gbWF0Y2gsIG9yIGlmIHdlJ3ZlIG1hdGNoZWQgdGhlIHNl bnRpbmVsLAogICAgICAgICAgICAgIHdlJ3JlIGRvbmUuICAqLwotLSAKMi4xLjEKCg== --------_5448366500000000A41B_MULTIPART_MIXED_-- From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 22 19:25:46 2014 Received: (at 18800) by debbugs.gnu.org; 22 Oct 2014 23:25:46 +0000 Received: from localhost ([127.0.0.1]:60300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xh5Hl-0006Mc-8B for submit@debbugs.gnu.org; Wed, 22 Oct 2014 19:25:46 -0400 Received: from mailgw06.kcn.ne.jp ([61.86.7.213]:48514) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xh5Hh-0006MJ-My for 18800@debbugs.gnu.org; Wed, 22 Oct 2014 19:25:43 -0400 Received: from imp01 (mailgw5.kcn.ne.jp [61.86.15.231]) by mailgw06.kcn.ne.jp (Postfix) with ESMTP id 51E62C8011 for <18800@debbugs.gnu.org>; Thu, 23 Oct 2014 08:25:34 +0900 (JST) Received: from mail03.kcn.ne.jp ([61.86.6.182]) by imp01 with bizsmtp id 6PRa1p0073veGq501PRaUY; Thu, 23 Oct 2014 08:25:34 +0900 X-OrgRCPT: 18800@debbugs.gnu.org Received: from [10.120.1.60] (i118-21-128-66.s30.a048.ap.plala.or.jp [118.21.128.66]) by mail03.kcn.ne.jp (Postfix) with ESMTPA id 13715141009C for <18800@debbugs.gnu.org>; Thu, 23 Oct 2014 08:25:34 +0900 (JST) Date: Thu, 23 Oct 2014 08:25:32 +0900 From: Norihiro Tanaka To: 18800@debbugs.gnu.org Subject: Re: bug#18800: [PATCH 1/2] dfa: prefer bool at DFA interfaces In-Reply-To: <20141023080248.A423.27F6AC2D@kcn.ne.jp> References: <20141023080248.A423.27F6AC2D@kcn.ne.jp> Message-Id: <20141023082532.A42B.27F6AC2D@kcn.ne.jp> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------_54483C3800000000A429_MULTIPART_MIXED_" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.65.07 [ja] X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: 18800 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.4 (-) --------_54483C3800000000A429_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Norihiro Tanaka wrote: > This change is use bool for booleans at DFA interfaces. Callers in Gawk > have already used bool instead of int for them. Second patch changes > caller with change in first patch. Sorry, Previous change was imcomplete. I fixed it, and added a third patch. --------_54483C3800000000A429_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII"; name="0001-dfa-prefer-bool-at-DFA-interfaces.patch" Content-Disposition: attachment; filename="0001-dfa-prefer-bool-at-DFA-interfaces.patch" Content-Transfer-Encoding: base64 RnJvbSBlNGUxM2Y4ZWQ0M2I3MGZjODc0ZTBiOGQ4NGFmYjNjNjM4MmQ3NzIyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOb3JpaGlybyBUYW5ha2EgPG5vcml0bmtAa2NuLm5lLmpwPgpE YXRlOiBTYXQsIDE4IE9jdCAyMDE0IDIzOjU3OjMzICswOTAwClN1YmplY3Q6IFtQQVRDSCAxLzNd IGRmYTogcHJlZmVyIGJvb2wgYXQgREZBIGludGVyZmFjZXMKCiogKHNyYy9kZmEuYykgZGZhc3lu dGF4OiBVc2UgYm9vbCBmb3IgYGZvbGQnLgpkZmFhbmFseXplLCBkZmFjb21wOiBVc2UgYm9vbCBm b3IgYHNlYXJjaGZsYWcnLgpkZmFleGVjX21haW4sIGRmYWV4ZWNfbWIsIGRmYWV4ZWNfc2IsIGRm YWV4ZWM6IElVc2UgYm9vbCBmb3IgYGFsbG93X25sJy4KKiAoc3JjL2RmYS5oKTogVXBkYXRlIHBy b3RvdHlwZS4KLS0tCiBzcmMvZGZhLmMgfCAyMCArKysrKysrKysrLS0tLS0tLS0tLQogc3JjL2Rm YS5oIHwgIDggKysrKy0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTQgaW5zZXJ0aW9ucygrKSwgMTQg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2RmYS5jIGIvc3JjL2RmYS5jCmluZGV4IDgw NTEwYTguLmIwYjBjNDcgMTAwNjQ0Ci0tLSBhL3NyYy9kZmEuYworKysgYi9zcmMvZGZhLmMKQEAg LTM0Myw3ICszNDMsNyBAQCBzdHJ1Y3QgZGZhCiAgIG1ic3RhdGVfdCBtYnM7CQkvKiBNdWx0aWJ5 dGUgY29udmVyc2lvbiBzdGF0ZS4gICovCiAKICAgLyogZGZhZXhlYyBpbXBsZW1lbnRhdGlvbi4g ICovCi0gIGNoYXIgKigqZGZhZXhlYykgKHN0cnVjdCBkZmEgKiwgY2hhciBjb25zdCAqLCBjaGFy ICosIGludCwgc2l6ZV90ICosIGludCAqKTsKKyAgY2hhciAqKCpkZmFleGVjKSAoc3RydWN0IGRm YSAqLCBjaGFyIGNvbnN0ICosIGNoYXIgKiwgYm9vbCwgc2l6ZV90ICosIGludCAqKTsKIAogICAv KiBUaGUgZm9sbG93aW5nIGFyZSB2YWxpZCBvbmx5IGlmIE1CX0NVUl9NQVggPiAxLiAgKi8KIApA QCAtNzIwLDEzICs3MjAsMTMgQEAgd2NoYXJfY29udGV4dCAod2ludF90IHdjKQogCiAvKiBFbnRy eSBwb2ludCB0byBzZXQgc3ludGF4IG9wdGlvbnMuICAqLwogdm9pZAotZGZhc3ludGF4IChyZWdf c3ludGF4X3QgYml0cywgaW50IGZvbGQsIHVuc2lnbmVkIGNoYXIgZW9sKQorZGZhc3ludGF4IChy ZWdfc3ludGF4X3QgYml0cywgYm9vbCBmb2xkLCB1bnNpZ25lZCBjaGFyIGVvbCkKIHsKICAgdW5z aWduZWQgaW50IGk7CiAKICAgc3ludGF4X2JpdHNfc2V0ID0gMTsKICAgc3ludGF4X2JpdHMgPSBi aXRzOwotICBjYXNlX2ZvbGQgPSBmb2xkICE9IDA7CisgIGNhc2VfZm9sZCA9IGZvbGQ7CiAgIGVv bGJ5dGUgPSBlb2w7CiAKICAgZm9yIChpID0gMDsgaSA8IE5PVENIQVI7ICsraSkKQEAgLTIzMjAs NyArMjMyMCw3IEBAIHN0YXRlX3NlcGFyYXRlX2NvbnRleHRzIChwb3NpdGlvbl9zZXQgY29uc3Qg KnMpCiAgICBzY2hlbWU7IHRoZSBudW1iZXIgb2YgZWxlbWVudHMgaW4gZWFjaCBzZXQgZGVlcGVy IGluIHRoZSBzdGFjayBjYW4gYmUKICAgIHVzZWQgdG8gZGV0ZXJtaW5lIHRoZSBhZGRyZXNzIG9m IGEgcGFydGljdWxhciBzZXQncyBhcnJheS4gICovCiB2b2lkCi1kZmFhbmFseXplIChzdHJ1Y3Qg ZGZhICpkLCBpbnQgc2VhcmNoZmxhZykKK2RmYWFuYWx5emUgKHN0cnVjdCBkZmEgKmQsIGJvb2wg c2VhcmNoZmxhZykKIHsKICAgLyogQXJyYXkgYWxsb2NhdGVkIHRvIGhvbGQgcG9zaXRpb24gc2V0 cy4gICovCiAgIHBvc2l0aW9uICpwb3NhbGxvYyA9IHhubWFsbG9jIChkLT5ubGVhdmVzLCAyICog c2l6ZW9mICpwb3NhbGxvYyk7CkBAIC0yMzU2LDcgKzIzNTYsNyBAQCBkZmFhbmFseXplIChzdHJ1 Y3QgZGZhICpkLCBpbnQgc2VhcmNoZmxhZykKICAgcHV0YyAoJ1xuJywgc3RkZXJyKTsKICNlbmRp ZgogCi0gIGQtPnNlYXJjaGZsYWcgPSBzZWFyY2hmbGFnICE9IDA7CisgIGQtPnNlYXJjaGZsYWcg PSBzZWFyY2hmbGFnOwogICBhbGxvY19wb3NpdGlvbl9zZXQgKCZtZXJnZWQsIGQtPm5sZWF2ZXMp OwogICBkLT5mb2xsb3dzID0geGNhbGxvYyAoZC0+dGluZGV4LCBzaXplb2YgKmQtPmZvbGxvd3Mp OwogCkBAIC0zMjY2LDcgKzMyNjYsNyBAQCBza2lwX3JlbWFpbnNfbWIgKHN0cnVjdCBkZmEgKmQs IHVuc2lnbmVkIGNoYXIgY29uc3QgKnAsCiAgICBjaGFyYWN0ZXJzLiAgKi8KIHN0YXRpYyBpbmxp bmUgY2hhciAqCiBkZmFleGVjX21haW4gKHN0cnVjdCBkZmEgKmQsIGNoYXIgY29uc3QgKmJlZ2lu LCBjaGFyICplbmQsCi0gICAgICAgICAgICAgaW50IGFsbG93X25sLCBzaXplX3QgKmNvdW50LCBp bnQgKmJhY2tyZWYsIGJvb2wgbXVsdGlieXRlKQorICAgICAgICAgICAgIGJvb2wgYWxsb3dfbmws IHNpemVfdCAqY291bnQsIGludCAqYmFja3JlZiwgYm9vbCBtdWx0aWJ5dGUpCiB7CiAgIHN0YXRl X251bSBzLCBzMTsgICAgICAgICAgICAgIC8qIEN1cnJlbnQgc3RhdGUuICAqLwogICB1bnNpZ25l ZCBjaGFyIGNvbnN0ICpwLCAqbWJwOyAvKiBDdXJyZW50IGlucHV0IGNoYXJhY3Rlci4gICovCkBA IC0zNDU2LDE0ICszNDU2LDE0IEBAIGRmYWV4ZWNfbWFpbiAoc3RydWN0IGRmYSAqZCwgY2hhciBj b25zdCAqYmVnaW4sIGNoYXIgKmVuZCwKIAogc3RhdGljIGNoYXIgKgogZGZhZXhlY19tYiAoc3Ry dWN0IGRmYSAqZCwgY2hhciBjb25zdCAqYmVnaW4sIGNoYXIgKmVuZCwKLSAgICAgICAgICAgIGlu dCBhbGxvd19ubCwgc2l6ZV90ICpjb3VudCwgaW50ICpiYWNrcmVmKQorICAgICAgICAgICAgYm9v bCBhbGxvd19ubCwgc2l6ZV90ICpjb3VudCwgaW50ICpiYWNrcmVmKQogewogICByZXR1cm4gZGZh ZXhlY19tYWluIChkLCBiZWdpbiwgZW5kLCBhbGxvd19ubCwgY291bnQsIGJhY2tyZWYsIHRydWUp OwogfQogCiBzdGF0aWMgY2hhciAqCiBkZmFleGVjX3NiIChzdHJ1Y3QgZGZhICpkLCBjaGFyIGNv bnN0ICpiZWdpbiwgY2hhciAqZW5kLAotICAgICAgICAgICAgaW50IGFsbG93X25sLCBzaXplX3Qg KmNvdW50LCBpbnQgKmJhY2tyZWYpCisgICAgICAgICAgICBib29sIGFsbG93X25sLCBzaXplX3Qg KmNvdW50LCBpbnQgKmJhY2tyZWYpCiB7CiAgIHJldHVybiBkZmFleGVjX21haW4gKGQsIGJlZ2lu LCBlbmQsIGFsbG93X25sLCBjb3VudCwgYmFja3JlZiwgZmFsc2UpOwogfQpAQCAtMzQ3Myw3ICsz NDczLDcgQEAgZGZhZXhlY19zYiAoc3RydWN0IGRmYSAqZCwgY2hhciBjb25zdCAqYmVnaW4sIGNo YXIgKmVuZCwKIAogY2hhciAqCiBkZmFleGVjIChzdHJ1Y3QgZGZhICpkLCBjaGFyIGNvbnN0ICpi ZWdpbiwgY2hhciAqZW5kLAotICAgICAgICAgaW50IGFsbG93X25sLCBzaXplX3QgKmNvdW50LCBp bnQgKmJhY2tyZWYpCisgICAgICAgICBib29sIGFsbG93X25sLCBzaXplX3QgKmNvdW50LCBpbnQg KmJhY2tyZWYpCiB7CiAgIHJldHVybiBkLT5kZmFleGVjIChkLCBiZWdpbiwgZW5kLCBhbGxvd19u bCwgY291bnQsIGJhY2tyZWYpOwogfQpAQCAtMzY1Myw3ICszNjUzLDcgQEAgZGZhc3NidWlsZCAo c3RydWN0IGRmYSAqZCkKIAogLyogUGFyc2UgYW5kIGFuYWx5emUgYSBzaW5nbGUgc3RyaW5nIG9m IHRoZSBnaXZlbiBsZW5ndGguICAqLwogdm9pZAotZGZhY29tcCAoY2hhciBjb25zdCAqcywgc2l6 ZV90IGxlbiwgc3RydWN0IGRmYSAqZCwgaW50IHNlYXJjaGZsYWcpCitkZmFjb21wIChjaGFyIGNv bnN0ICpzLCBzaXplX3QgbGVuLCBzdHJ1Y3QgZGZhICpkLCBib29sIHNlYXJjaGZsYWcpCiB7CiAg IGRmYWluaXQgKGQpOwogICBkZmFtYmNhY2hlIChkKTsKZGlmZiAtLWdpdCBhL3NyYy9kZmEuaCBi L3NyYy9kZmEuaAppbmRleCBmMzBjM2NiLi5hYjJlOGVhIDEwMDY0NAotLS0gYS9zcmMvZGZhLmgK KysrIGIvc3JjL2RmYS5oCkBAIC00OSwxMiArNDksMTIgQEAgZXh0ZXJuIHN0cnVjdCBkZmFtdXN0 ICpkZmFtdXN0cyAoc3RydWN0IGRmYSBjb25zdCAqKTsKIC8qIGRmYXN5bnRheCgpIHRha2VzIHRo cmVlIGFyZ3VtZW50czsgdGhlIGZpcnN0IHNldHMgdGhlIHN5bnRheCBiaXRzIGRlc2NyaWJlZAog ICAgZWFybGllciBpbiB0aGlzIGZpbGUsIHRoZSBzZWNvbmQgc2V0cyB0aGUgY2FzZS1mb2xkaW5n IGZsYWcsIGFuZCB0aGUKICAgIHRoaXJkIHNwZWNpZmllcyB0aGUgbGluZSB0ZXJtaW5hdG9yLiAq LwotZXh0ZXJuIHZvaWQgZGZhc3ludGF4IChyZWdfc3ludGF4X3QsIGludCwgdW5zaWduZWQgY2hh cik7CitleHRlcm4gdm9pZCBkZmFzeW50YXggKHJlZ19zeW50YXhfdCwgYm9vbCwgdW5zaWduZWQg Y2hhcik7CiAKIC8qIENvbXBpbGUgdGhlIGdpdmVuIHN0cmluZyBvZiB0aGUgZ2l2ZW4gbGVuZ3Ro IGludG8gdGhlIGdpdmVuIHN0cnVjdCBkZmEuCiAgICBGaW5hbCBhcmd1bWVudCBpcyBhIGZsYWcg c3BlY2lmeWluZyB3aGV0aGVyIHRvIGJ1aWxkIGEgc2VhcmNoaW5nIG9yIGFuCiAgICBleGFjdCBt YXRjaGVyLiAqLwotZXh0ZXJuIHZvaWQgZGZhY29tcCAoY2hhciBjb25zdCAqLCBzaXplX3QsIHN0 cnVjdCBkZmEgKiwgaW50KTsKK2V4dGVybiB2b2lkIGRmYWNvbXAgKGNoYXIgY29uc3QgKiwgc2l6 ZV90LCBzdHJ1Y3QgZGZhICosIGJvb2wpOwogCiAvKiBTZWFyY2ggdGhyb3VnaCBhIGJ1ZmZlciBs b29raW5nIGZvciBhIG1hdGNoIHRvIHRoZSBnaXZlbiBzdHJ1Y3QgZGZhLgogICAgRmluZCB0aGUg Zmlyc3Qgb2NjdXJyZW5jZSBvZiBhIHN0cmluZyBtYXRjaGluZyB0aGUgcmVnZXhwIGluIHRoZQpA QCAtNjMsMTMgKzYzLDEzIEBAIGV4dGVybiB2b2lkIGRmYWNvbXAgKGNoYXIgY29uc3QgKiwgc2l6 ZV90LCBzdHJ1Y3QgZGZhICosIGludCk7CiAgICBwb2ludHMgdG8gdGhlIGJlZ2lubmluZyBvZiB0 aGUgYnVmZmVyLCBhbmQgRU5EIHBvaW50cyB0byB0aGUgZmlyc3QgYnl0ZQogICAgYWZ0ZXIgaXRz IGVuZC4gIE5vdGUgaG93ZXZlciB0aGF0IHdlIHN0b3JlIGEgc2VudGluZWwgYnl0ZSAodXN1YWxs eQogICAgbmV3bGluZSkgaW4gKkVORCwgc28gdGhlIGFjdHVhbCBidWZmZXIgbXVzdCBiZSBvbmUg Ynl0ZSBsb25nZXIuCi0gICBXaGVuIE5FV0xJTkUgaXMgbm9uemVybywgbmV3bGluZXMgbWF5IGFw cGVhciBpbiB0aGUgbWF0Y2hpbmcgc3RyaW5nLgorICAgV2hlbiBBTExPV19OTCBpcyB0cnVlLCBu ZXdsaW5lcyBtYXkgYXBwZWFyIGluIHRoZSBtYXRjaGluZyBzdHJpbmcuCiAgICBJZiBDT1VOVCBp cyBub24tTlVMTCwgaW5jcmVtZW50ICpDT1VOVCBvbmNlIGZvciBlYWNoIG5ld2xpbmUgcHJvY2Vz c2VkLgogICAgRmluYWxseSwgaWYgQkFDS1JFRiBpcyBub24tTlVMTCBzZXQgKkJBQ0tSRUYgdG8g aW5kaWNhdGUgd2hldGhlciB3ZQogICAgZW5jb3VudGVyZWQgYSBiYWNrLXJlZmVyZW5jZSAoMSkg b3Igbm90ICgwKS4gIFRoZSBjYWxsZXIgbWF5IHVzZSB0aGlzCiAgICB0byBkZWNpZGUgd2hldGhl ciB0byBmYWxsIGJhY2sgb24gYSBiYWNrdHJhY2tpbmcgbWF0Y2hlci4gKi8KIGV4dGVybiBjaGFy ICpkZmFleGVjIChzdHJ1Y3QgZGZhICpkLCBjaGFyIGNvbnN0ICpiZWdpbiwgY2hhciAqZW5kLAot ICAgICAgICAgICAgICAgICAgICAgIGludCBuZXdsaW5lLCBzaXplX3QgKmNvdW50LCBpbnQgKmJh Y2tyZWYpOworICAgICAgICAgICAgICAgICAgICAgIGJvb2wgYWxsb3dfbmwsIHNpemVfdCAqY291 bnQsIGludCAqYmFja3JlZik7CiAKIC8qIFJldHVybiBhIHN1cGVyc2V0IGZvciBELiAgVGhlIHN1 cGVyc2V0IG1hdGNoZXMgZXZlcnl0aGluZyB0aGF0IEQKICAgIG1hdGNoZXMsIGFsb25nIHdpdGgg c29tZSBvdGhlciBzdHJpbmdzICh0aG91Z2ggdGhlIGxhdHRlciBzaG91bGQgYmUKLS0gCjIuMS4x Cgo= --------_54483C3800000000A429_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII"; name="0002-grep-change-caller-for-previous-change.patch" Content-Disposition: attachment; filename="0002-grep-change-caller-for-previous-change.patch" Content-Transfer-Encoding: base64 RnJvbSA4YTk5OGE1YWZiZDhkM2IwZDA5ZGI2NDkzOTk1N2NjY2U3YjdkZTRiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOb3JpaGlybyBUYW5ha2EgPG5vcml0bmtAa2NuLm5lLmpwPgpE YXRlOiBUaHUsIDIzIE9jdCAyMDE0IDA3OjUwOjE1ICswOTAwClN1YmplY3Q6IFtQQVRDSCAyLzNd IGdyZXA6IGNoYW5nZSBjYWxsZXIgZm9yIHByZXZpb3VzIGNoYW5nZQoKKiAoc3JjL2RmYXNlYXJj aC5jKSBHRUFjb21waWxlOiBVc2UgYm9vbCBmb3IgYm9vbGVhbi4KLS0tCiBzcmMvZGZhc2VhcmNo LmMgfCA5ICsrKysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgNCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9zcmMvZGZhc2VhcmNoLmMgYi9zcmMvZGZhc2VhcmNoLmMK aW5kZXggNzdiNGUzZS4uZDY2NzQ3MCAxMDA2NDQKLS0tIGEvc3JjL2RmYXNlYXJjaC5jCisrKyBi L3NyYy9kZmFzZWFyY2guYwpAQCAtMTk5LDcgKzE5OSw3IEBAIEdFQWNvbXBpbGUgKGNoYXIgY29u c3QgKnBhdHRlcm4sIHNpemVfdCBzaXplLCByZWdfc3ludGF4X3Qgc3ludGF4X2JpdHMpCiAgICAg bW90aWYgPSBOVUxMOwogCiAgIGRmYSA9IGRmYWFsbG9jICgpOwotICBkZmFjb21wIChwYXR0ZXJu LCBzaXplLCBkZmEsIDEpOworICBkZmFjb21wIChwYXR0ZXJuLCBzaXplLCBkZmEsIHRydWUpOwog ICBrd3NtdXN0cyAoKTsKIAogICBmcmVlKG1vdGlmKTsKQEAgLTI4Nyw4ICsyODcsOCBAQCBFR2V4 ZWN1dGUgKGNoYXIgY29uc3QgKmJ1Ziwgc2l6ZV90IHNpemUsIHNpemVfdCAqbWF0Y2hfc2l6ZSwK ICAgICAgICAgICAgICAgLyogS2VlcCB1c2luZyB0aGUgc3VwZXJzZXQgd2hpbGUgaXQgcmVwb3J0 cyBtdWx0aWxpbmUKICAgICAgICAgICAgICAgICAgcG90ZW50aWFsIG1hdGNoZXM7IHRoaXMgaXMg bW9yZSBsaWtlbHkgdG8gYmUgZmFzdAogICAgICAgICAgICAgICAgICB0aGFuIGZhbGxpbmcgYmFj ayB0byBLV3NldCB3b3VsZCBiZS4gICovCi0gICAgICAgICAgICAgIHdoaWxlICgobmV4dF9iZWcg PSBkZmFleGVjIChzdXBlcnNldCwgZGZhX2JlZywgKGNoYXIgKikgZW5kLCAxLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmNvdW50LCBOVUxMKSkKKyAgICAgICAg ICAgICAgd2hpbGUgKChuZXh0X2JlZyA9IGRmYWV4ZWMgKHN1cGVyc2V0LCBkZmFfYmVnLCAoY2hh ciAqKSBlbmQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0cnVl LCAmY291bnQsIE5VTEwpKQogICAgICAgICAgICAgICAgICAgICAgJiYgbmV4dF9iZWcgIT0gZW5k CiAgICAgICAgICAgICAgICAgICAgICAmJiBjb3VudCAhPSAwKQogICAgICAgICAgICAgICAgIHsK QEAgLTMwNyw3ICszMDcsOCBAQCBFR2V4ZWN1dGUgKGNoYXIgY29uc3QgKmJ1Ziwgc2l6ZV90IHNp emUsIHNpemVfdCAqbWF0Y2hfc2l6ZSwKICAgICAgICAgICAgIH0KIAogICAgICAgICAgIC8qIFRy eSBtYXRjaGluZyB3aXRoIERGQS4gICovCi0gICAgICAgICAgbmV4dF9iZWcgPSBkZmFleGVjIChk ZmEsIGRmYV9iZWcsIChjaGFyICopIGVuZCwgMCwgJmNvdW50LCAmYmFja3JlZik7CisgICAgICAg ICAgbmV4dF9iZWcgPSBkZmFleGVjIChkZmEsIGRmYV9iZWcsIChjaGFyICopIGVuZCwgZmFsc2Us ICZjb3VudCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZiYWNrcmVmKTsKIAogICAg ICAgICAgIC8qIElmIHRoZXJlJ3Mgbm8gbWF0Y2gsIG9yIGlmIHdlJ3ZlIG1hdGNoZWQgdGhlIHNl bnRpbmVsLAogICAgICAgICAgICAgIHdlJ3JlIGRvbmUuICAqLwotLSAKMi4xLjEKCg== --------_54483C3800000000A429_MULTIPART_MIXED_ Content-Type: text/plain; charset="US-ASCII"; name="0003-dfa-change-internal-functions-into-static.patch" Content-Disposition: attachment; filename="0003-dfa-change-internal-functions-into-static.patch" Content-Transfer-Encoding: base64 RnJvbSBhMDc3ZTNkMjgyMTM3YmIwNDI2N2Q0ODk3ZTE2NWIwNTc3YmUwZGFmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOb3JpaGlybyBUYW5ha2EgPG5vcml0bmtAa2NuLm5lLmpwPgpE YXRlOiBUaHUsIDIzIE9jdCAyMDE0IDA4OjA4OjQ1ICswOTAwClN1YmplY3Q6IFtQQVRDSCAzLzNd IGRmYTogY2hhbmdlIGludGVybmFsIGZ1bmN0aW9ucyBpbnRvIHN0YXRpYwoKKiBzcmMvZGZhLmMg KGRmYXBhcnNlLCBkZmFhbmFseXplIGRmYXN0YXRlLCBkZmFpbml0KSBjaGFuZ2UgdGhlbSBpbnRv CnN0YXRpYy4KKiBzcmMvZGZhLmg6IFJlbW92ZSBwcm90b3R5cGUgZm9yIGNoYW5nZWQgaW50byBz dGF0aWMuCi0tLQogc3JjL2RmYS5jIHwgIDggKysrKy0tLS0KIHNyYy9kZmEuaCB8IDE0IC0tLS0t LS0tLS0tLS0tCiAyIGZpbGVzIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgMTggZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvc3JjL2RmYS5jIGIvc3JjL2RmYS5jCmluZGV4IGIwYjBjNDcuLjU3 MjM1OTcgMTAwNjQ0Ci0tLSBhL3NyYy9kZmEuYworKysgYi9zcmMvZGZhLmMKQEAgLTE5NTcsNyAr MTk1Nyw3IEBAIHJlZ2V4cCAodm9pZCkKIC8qIE1haW4gZW50cnkgcG9pbnQgZm9yIHRoZSBwYXJz ZXIuICBTIGlzIGEgc3RyaW5nIHRvIGJlIHBhcnNlZCwgbGVuIGlzIHRoZQogICAgbGVuZ3RoIG9m IHRoZSBzdHJpbmcsIHNvIHMgY2FuIGluY2x1ZGUgTlVMIGNoYXJhY3RlcnMuICBEIGlzIGEgcG9p bnRlciB0bwogICAgdGhlIHN0cnVjdCBkZmEgdG8gcGFyc2UgaW50by4gICovCi12b2lkCitzdGF0 aWMgdm9pZAogZGZhcGFyc2UgKGNoYXIgY29uc3QgKnMsIHNpemVfdCBsZW4sIHN0cnVjdCBkZmEg KmQpCiB7CiAgIGRmYSA9IGQ7CkBAIC0yMzE5LDcgKzIzMTksNyBAQCBzdGF0ZV9zZXBhcmF0ZV9j b250ZXh0cyAocG9zaXRpb25fc2V0IGNvbnN0ICpzKQogICAgU2V0cyBhcmUgc3RvcmVkIGFzIGFy cmF5cyBvZiB0aGUgZWxlbWVudHMsIG9iZXlpbmcgYSBzdGFjay1saWtlIGFsbG9jYXRpb24KICAg IHNjaGVtZTsgdGhlIG51bWJlciBvZiBlbGVtZW50cyBpbiBlYWNoIHNldCBkZWVwZXIgaW4gdGhl IHN0YWNrIGNhbiBiZQogICAgdXNlZCB0byBkZXRlcm1pbmUgdGhlIGFkZHJlc3Mgb2YgYSBwYXJ0 aWN1bGFyIHNldCdzIGFycmF5LiAgKi8KLXZvaWQKK3N0YXRpYyB2b2lkCiBkZmFhbmFseXplIChz dHJ1Y3QgZGZhICpkLCBib29sIHNlYXJjaGZsYWcpCiB7CiAgIC8qIEFycmF5IGFsbG9jYXRlZCB0 byBob2xkIHBvc2l0aW9uIHNldHMuICAqLwpAQCAtMjU1OCw3ICsyNTU4LDcgQEAgZGZhYW5hbHl6 ZSAoc3RydWN0IGRmYSAqZCwgYm9vbCBzZWFyY2hmbGFnKQogICAgSWYgYWZ0ZXIgY29tcGFyaW5n IHdpdGggZXZlcnkgZ3JvdXAgdGhlcmUgYXJlIGNoYXJhY3RlcnMgcmVtYWluaW5nIGluIEMsCiAg ICBjcmVhdGUgYSBuZXcgZ3JvdXAgbGFiZWxlZCB3aXRoIHRoZSBjaGFyYWN0ZXJzIG9mIEMgYW5k IGluc2VydCB0aGlzCiAgICBwb3NpdGlvbiBpbiB0aGF0IGdyb3VwLiAgKi8KLXZvaWQKK3N0YXRp YyB2b2lkCiBkZmFzdGF0ZSAoc3RhdGVfbnVtIHMsIHN0cnVjdCBkZmEgKmQsIHN0YXRlX251bSB0 cmFuc1tdKQogewogICBsZWFmX3NldCBncnBzW05PVENIQVJdOyAgICAgICAvKiBBcyBtYW55IGFz IHdpbGwgZXZlciBiZSBuZWVkZWQuICAqLwpAQCAtMzUyMiw3ICszNTIyLDcgQEAgZnJlZV9tYmRh dGEgKHN0cnVjdCBkZmEgKmQpCiAKIC8qIEluaXRpYWxpemUgdGhlIGNvbXBvbmVudHMgb2YgYSBk ZmEgdGhhdCB0aGUgb3RoZXIgcm91dGluZXMgZG9uJ3QKICAgIGluaXRpYWxpemUgZm9yIHRoZW1z ZWx2ZXMuICAqLwotdm9pZAorc3RhdGljIHZvaWQKIGRmYWluaXQgKHN0cnVjdCBkZmEgKmQpCiB7 CiAgIG1lbXNldCAoZCwgMCwgc2l6ZW9mICpkKTsKZGlmZiAtLWdpdCBhL3NyYy9kZmEuaCBiL3Ny Yy9kZmEuaAppbmRleCBhYjJlOGVhLi41OTgzZjY0IDEwMDY0NAotLS0gYS9zcmMvZGZhLmgKKysr IGIvc3JjL2RmYS5oCkBAIC04NSwyMCArODUsNiBAQCBleHRlcm4gdm9pZCBkZmFmcmVlIChzdHJ1 Y3QgZGZhICopOwogCiAvKiBFbnRyeSBwb2ludHMgZm9yIHBlb3BsZSB3aG8ga25vdyB3aGF0IHRo ZXkncmUgZG9pbmcuICovCiAKLS8qIEluaXRpYWxpemUgdGhlIGNvbXBvbmVudHMgb2YgYSBzdHJ1 Y3QgZGZhLiAqLwotZXh0ZXJuIHZvaWQgZGZhaW5pdCAoc3RydWN0IGRmYSAqKTsKLQotLyogSW5j cmVtZW50YWxseSBwYXJzZSBhIHN0cmluZyBvZiBnaXZlbiBsZW5ndGggaW50byBhIHN0cnVjdCBk ZmEuICovCi1leHRlcm4gdm9pZCBkZmFwYXJzZSAoY2hhciBjb25zdCAqLCBzaXplX3QsIHN0cnVj dCBkZmEgKik7Ci0KLS8qIEFuYWx5emUgYSBwYXJzZWQgcmVnZXhwOyBzZWNvbmQgYXJndW1lbnQg dGVsbHMgd2hldGhlciB0byBidWlsZCBhIHNlYXJjaGluZwotICAgb3IgYW4gZXhhY3QgbWF0Y2hl ci4gKi8KLWV4dGVybiB2b2lkIGRmYWFuYWx5emUgKHN0cnVjdCBkZmEgKiwgaW50KTsKLQotLyog Q29tcHV0ZSwgZm9yIGVhY2ggcG9zc2libGUgY2hhcmFjdGVyLCB0aGUgdHJhbnNpdGlvbnMgb3V0 IG9mIGEgZ2l2ZW4KLSAgIHN0YXRlLCBzdG9yaW5nIHRoZW0gaW4gYW4gYXJyYXkgb2YgaW50ZWdl cnMuICovCi1leHRlcm4gdm9pZCBkZmFzdGF0ZSAocHRyZGlmZl90LCBzdHJ1Y3QgZGZhICosIHB0 cmRpZmZfdCBbXSk7Ci0KIC8qIEVycm9yIGhhbmRsaW5nLiAqLwogCiAvKiBkZmF3YXJuKCkgaXMg Y2FsbGVkIGJ5IHRoZSByZWdleHAgcm91dGluZXMgd2hlbmV2ZXIgYSByZWdleCBpcyBjb21waWxl ZAotLSAKMi4xLjEKCg== --------_54483C3800000000A429_MULTIPART_MIXED_-- From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 21 02:57:56 2016 Received: (at 18800) by debbugs.gnu.org; 21 Apr 2016 06:57:56 +0000 Received: from localhost ([127.0.0.1]:41906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1at8Ym-0004oi-7D for submit@debbugs.gnu.org; Thu, 21 Apr 2016 02:57:56 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:50242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1at8Yj-0004oV-S4 for 18800@debbugs.gnu.org; Thu, 21 Apr 2016 02:57:54 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 73CED161254; Wed, 20 Apr 2016 23:57:48 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id ROxJqRog-Od3; Wed, 20 Apr 2016 23:57:46 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id DCA741609A8; Wed, 20 Apr 2016 23:57:46 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id e-5ogk6tGt-K; Wed, 20 Apr 2016 23:57:46 -0700 (PDT) Received: from [192.168.1.9] (unknown [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id B564F16126B; Wed, 20 Apr 2016 23:57:46 -0700 (PDT) To: Norihiro Tanaka From: Paul Eggert Organization: UCLA Computer Science Department Subject: Re: bug#18800: dfa: prefer bool at DFA interfaces Message-ID: <571879EA.6040804@cs.ucla.edu> Date: Wed, 20 Apr 2016 23:57:46 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------070106030108030906030605" X-Spam-Score: -1.0 (-) X-Debbugs-Envelope-To: 18800 Cc: 18800@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------070106030108030906030605 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit In updating Bug#18000's patches to the current grep source, I couldn't build with just the first patch installed, so I squashed the first two patches into one. Also, I changed a few more 'int's into 'bool's and fixed a comment or two. The result is attached. Again, I'm not installing this yet, as we're expecting a new release soon. --------------070106030108030906030605 Content-Type: text/x-diff; name="0001-dfa-prefer-bool-at-DFA-interfaces.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-dfa-prefer-bool-at-DFA-interfaces.patch" >From 24cfee9b9923db293e977742f2792eec39b0f0dc Mon Sep 17 00:00:00 2001 From: Norihiro Tanaka Date: Wed, 20 Apr 2016 23:38:43 -0700 Subject: [PATCH 1/2] dfa: prefer bool at DFA interfaces * src/dfa.c (struct dfa, dfasyntax, dfaanalyze, dfaexec_main) (dfaexec_mb, dfaexec_sb, dfaexec_noop, dfaexec, dfacomp): * src/dfa.h (dfasyntax, dfacomp, dfaexec, dfaanalyze): * src/dfasearch.c (EGexecute): Use bool for boolean. --- src/dfa.c | 25 +++++++++++++------------ src/dfa.h | 14 +++++++------- src/dfasearch.c | 2 +- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/dfa.c b/src/dfa.c index e609801..ee5fe88 100644 --- a/src/dfa.c +++ b/src/dfa.c @@ -327,7 +327,8 @@ struct dfa mbstate_t mbs; /* Multibyte conversion state. */ /* dfaexec implementation. */ - char *(*dfaexec) (struct dfa *, char const *, char *, int, size_t *, int *); + char *(*dfaexec) (struct dfa *, char const *, char *, + bool, size_t *, bool *); /* The following are valid only if MB_CUR_MAX > 1. */ @@ -689,12 +690,12 @@ wchar_context (wint_t wc) /* Entry point to set syntax options. */ void -dfasyntax (reg_syntax_t bits, int fold, unsigned char eol) +dfasyntax (reg_syntax_t bits, bool fold, unsigned char eol) { int i; syntax_bits_set = 1; syntax_bits = bits; - case_fold = fold != 0; + case_fold = fold; eolbyte = eol; for (i = CHAR_MIN; i <= CHAR_MAX; ++i) @@ -2292,7 +2293,7 @@ state_separate_contexts (position_set const *s) scheme; the number of elements in each set deeper in the stack can be used to determine the address of a particular set's array. */ void -dfaanalyze (struct dfa *d, int searchflag) +dfaanalyze (struct dfa *d, bool searchflag) { /* Array allocated to hold position sets. */ position *posalloc = xnmalloc (d->nleaves, 2 * sizeof *posalloc); @@ -2328,7 +2329,7 @@ dfaanalyze (struct dfa *d, int searchflag) putc ('\n', stderr); #endif - d->searchflag = searchflag != 0; + d->searchflag = searchflag; alloc_position_set (&merged, d->nleaves); d->follows = xcalloc (d->tindex, sizeof *d->follows); @@ -3210,7 +3211,7 @@ skip_remains_mb (struct dfa *d, unsigned char const *p, - word-delimiter-in-MB-locale: \<, \>, \b */ static inline char * -dfaexec_main (struct dfa *d, char const *begin, char *end, int allow_nl, +dfaexec_main (struct dfa *d, char const *begin, char *end, bool allow_nl, size_t *count, bool multibyte) { state_num s, s1; /* Current state. */ @@ -3402,14 +3403,14 @@ dfaexec_main (struct dfa *d, char const *begin, char *end, int allow_nl, static char * dfaexec_mb (struct dfa *d, char const *begin, char *end, - int allow_nl, size_t *count, int *backref) + bool allow_nl, size_t *count, bool *backref) { return dfaexec_main (d, begin, end, allow_nl, count, true); } static char * dfaexec_sb (struct dfa *d, char const *begin, char *end, - int allow_nl, size_t *count, int *backref) + bool allow_nl, size_t *count, bool *backref) { return dfaexec_main (d, begin, end, allow_nl, count, false); } @@ -3418,9 +3419,9 @@ dfaexec_sb (struct dfa *d, char const *begin, char *end, any regexp that uses a construct not supported by this code. */ static char * dfaexec_noop (struct dfa *d, char const *begin, char *end, - int allow_nl, size_t *count, int *backref) + bool allow_nl, size_t *count, bool *backref) { - *backref = 1; + *backref = true; return (char *) begin; } @@ -3429,7 +3430,7 @@ dfaexec_noop (struct dfa *d, char const *begin, char *end, char * dfaexec (struct dfa *d, char const *begin, char *end, - int allow_nl, size_t *count, int *backref) + bool allow_nl, size_t *count, bool *backref) { return d->dfaexec (d, begin, end, allow_nl, count, backref); } @@ -3622,7 +3623,7 @@ dfassbuild (struct dfa *d) /* Parse and analyze a single string of the given length. */ void -dfacomp (char const *s, size_t len, struct dfa *d, int searchflag) +dfacomp (char const *s, size_t len, struct dfa *d, bool searchflag) { dfainit (d); dfaparse (s, len, d); diff --git a/src/dfa.h b/src/dfa.h index fb9ac9a..23b8783 100644 --- a/src/dfa.h +++ b/src/dfa.h @@ -53,12 +53,12 @@ extern void dfamustfree (struct dfamust *); /* dfasyntax() takes three arguments; the first sets the syntax bits described earlier in this file, the second sets the case-folding flag, and the third specifies the line terminator. */ -extern void dfasyntax (reg_syntax_t, int, unsigned char); +extern void dfasyntax (reg_syntax_t, bool, unsigned char); /* Compile the given string of the given length into the given struct dfa. Final argument is a flag specifying whether to build a searching or an exact matcher. */ -extern void dfacomp (char const *, size_t, struct dfa *, int); +extern void dfacomp (char const *, size_t, struct dfa *, bool); /* Search through a buffer looking for a match to the given struct dfa. Find the first occurrence of a string matching the regexp in the @@ -67,13 +67,13 @@ extern void dfacomp (char const *, size_t, struct dfa *, int); points to the beginning of the buffer, and END points to the first byte after its end. Note however that we store a sentinel byte (usually newline) in *END, so the actual buffer must be one byte longer. - When NEWLINE is nonzero, newlines may appear in the matching string. + When ALLOW_NL is true, newlines may appear in the matching string. If COUNT is non-NULL, increment *COUNT once for each newline processed. Finally, if BACKREF is non-NULL set *BACKREF to indicate whether we - encountered a back-reference (1) or not (0). The caller may use this - to decide whether to fall back on a backtracking matcher. */ + encountered a back-reference. The caller can use this to decide + whether to fall back on a backtracking matcher. */ extern char *dfaexec (struct dfa *d, char const *begin, char *end, - int newline, size_t *count, int *backref); + bool allow_nl, size_t *count, bool *backref); /* Return a superset for D. The superset matches everything that D matches, along with some other strings (though the latter should be @@ -97,7 +97,7 @@ extern void dfaparse (char const *, size_t, struct dfa *); /* Analyze a parsed regexp; second argument tells whether to build a searching or an exact matcher. */ -extern void dfaanalyze (struct dfa *, int); +extern void dfaanalyze (struct dfa *, bool); /* Compute, for each possible character, the transitions out of a given state, storing them in an array of integers. */ diff --git a/src/dfasearch.c b/src/dfasearch.c index d348d44..d966e7e 100644 --- a/src/dfasearch.c +++ b/src/dfasearch.c @@ -226,7 +226,7 @@ EGexecute (char *buf, size_t size, size_t *match_size, char const *next_beg, *dfa_beg = beg; size_t count = 0; bool exact_kwset_match = false; - int backref = 0; + bool backref = false; /* Try matching with KWset, if it's defined. */ if (kwset) -- 2.5.5 --------------070106030108030906030605 Content-Type: text/x-diff; name="0002-dfa-stop-exporting-internal-functions.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-dfa-stop-exporting-internal-functions.patch" >From e1ae97cb4b6e75b8815a71e0f1c21cb6ad0df208 Mon Sep 17 00:00:00 2001 From: Norihiro Tanaka Date: Wed, 20 Apr 2016 23:44:03 -0700 Subject: [PATCH 2/2] dfa: stop exporting internal functions * src/dfa.c, src/dfa.h (dfaparse, dfaanalyze, dfastate, dfainit): Now static. --- src/dfa.c | 8 ++++---- src/dfa.h | 16 ---------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/dfa.c b/src/dfa.c index ee5fe88..a2aee29 100644 --- a/src/dfa.c +++ b/src/dfa.c @@ -1913,7 +1913,7 @@ regexp (void) /* Main entry point for the parser. S is a string to be parsed, len is the length of the string, so s can include NUL characters. D is a pointer to the struct dfa to parse into. */ -void +static void dfaparse (char const *s, size_t len, struct dfa *d) { dfa = d; @@ -2292,7 +2292,7 @@ state_separate_contexts (position_set const *s) Sets are stored as arrays of the elements, obeying a stack-like allocation scheme; the number of elements in each set deeper in the stack can be used to determine the address of a particular set's array. */ -void +static void dfaanalyze (struct dfa *d, bool searchflag) { /* Array allocated to hold position sets. */ @@ -2538,7 +2538,7 @@ dfaanalyze (struct dfa *d, bool searchflag) If after comparing with every group there are characters remaining in C, create a new group labeled with the characters of C and insert this position in that group. */ -void +static void dfastate (state_num s, struct dfa *d, state_num trans[]) { leaf_set grps[NOTCHAR]; /* As many as will ever be needed. */ @@ -3468,7 +3468,7 @@ free_mbdata (struct dfa *d) /* Initialize the components of a dfa that the other routines don't initialize for themselves. */ -void +static void dfainit (struct dfa *d) { memset (d, 0, sizeof *d); diff --git a/src/dfa.h b/src/dfa.h index 23b8783..ce267ec 100644 --- a/src/dfa.h +++ b/src/dfa.h @@ -87,22 +87,6 @@ extern bool dfaisfast (struct dfa const *) _GL_ATTRIBUTE_PURE; /* Free the storage held by the components of a struct dfa. */ extern void dfafree (struct dfa *); -/* Entry points for people who know what they're doing. */ - -/* Initialize the components of a struct dfa. */ -extern void dfainit (struct dfa *); - -/* Incrementally parse a string of given length into a struct dfa. */ -extern void dfaparse (char const *, size_t, struct dfa *); - -/* Analyze a parsed regexp; second argument tells whether to build a searching - or an exact matcher. */ -extern void dfaanalyze (struct dfa *, bool); - -/* Compute, for each possible character, the transitions out of a given - state, storing them in an array of integers. */ -extern void dfastate (ptrdiff_t, struct dfa *, ptrdiff_t []); - /* Error handling. */ /* dfawarn() is called by the regexp routines whenever a regex is compiled -- 2.5.5 --------------070106030108030906030605-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 24 09:15:24 2016 Received: (at 18800) by debbugs.gnu.org; 24 Apr 2016 13:15:24 +0000 Received: from localhost ([127.0.0.1]:44622 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1auJsh-00017m-W6 for submit@debbugs.gnu.org; Sun, 24 Apr 2016 09:15:24 -0400 Received: from mailgw01.kcn.ne.jp ([61.86.7.208]:43651) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1auJsf-00017X-CF for 18800@debbugs.gnu.org; Sun, 24 Apr 2016 09:15:22 -0400 Received: from mxs01-s (mailgw1.kcn.ne.jp [61.86.15.233]) by mailgw01.kcn.ne.jp (Postfix) with ESMTP id 2ECF44A07EF for <18800@debbugs.gnu.org>; Sun, 24 Apr 2016 22:15:14 +0900 (JST) X-matriXscan-loop-detect: ff8fbe0ad482bdce8289aaa28194378cbfc637c6 Received: from mail03.kcn.ne.jp ([61.86.6.182]) by mxs01-s with ESMTP; Sun, 24 Apr 2016 22:15:11 +0900 (JST) Received: from [10.120.1.65] (i118-21-128-66.s30.a048.ap.plala.or.jp [118.21.128.66]) by mail03.kcn.ne.jp (Postfix) with ESMTPA id A55681410099; Sun, 24 Apr 2016 22:15:11 +0900 (JST) Date: Sun, 24 Apr 2016 22:15:08 +0900 From: Norihiro Tanaka To: Paul Eggert Subject: Re: bug#18800: dfa: prefer bool at DFA interfaces In-Reply-To: <571879EA.6040804@cs.ucla.edu> References: <571879EA.6040804@cs.ucla.edu> Message-Id: <20160424221508.8B37.27F6AC2D@kcn.ne.jp> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.65.07 [ja] X-matriXscan-Sophos-AV: Clean X-matriXscan-Action: Approve X-matriXscan: Uncategorized X-Spam-Score: -1.0 (-) X-Debbugs-Envelope-To: 18800 Cc: 18800@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Wed, 20 Apr 2016 23:57:46 -0700 Paul Eggert wrote: > In updating Bug#18000's patches to the current grep source, I couldn't build with just the first patch installed, so I squashed the first two patches into one. Also, I changed a few more 'int's into 'bool's and fixed a comment or two. The result is attached. Again, I'm not installing this yet, as we're expecting a new release soon. Thanks for updating, and I'm glad about release of grep-2.25. From debbugs-submit-bounces@debbugs.gnu.org Mon May 02 02:02:09 2016 Received: (at 18800-done) by debbugs.gnu.org; 2 May 2016 06:02:09 +0000 Received: from localhost ([127.0.0.1]:32951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ax6vo-000174-U8 for submit@debbugs.gnu.org; Mon, 02 May 2016 02:02:09 -0400 Received: from zimbra.cs.ucla.edu ([131.179.128.68]:36964) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ax6vn-00016h-Cb for 18800-done@debbugs.gnu.org; Mon, 02 May 2016 02:02:07 -0400 Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 0CE7D1601AA for <18800-done@debbugs.gnu.org>; Sun, 1 May 2016 23:02:02 -0700 (PDT) Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id q9iO6lUAgQIA for <18800-done@debbugs.gnu.org>; Sun, 1 May 2016 23:02:01 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 35F25161257 for <18800-done@debbugs.gnu.org>; Sun, 1 May 2016 23:02:01 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id T1HAW2Kpm8TD for <18800-done@debbugs.gnu.org>; Sun, 1 May 2016 23:02:01 -0700 (PDT) Received: from [192.168.1.9] (unknown [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 190641601AA for <18800-done@debbugs.gnu.org>; Sun, 1 May 2016 23:02:01 -0700 (PDT) To: 18800-done@debbugs.gnu.org From: Paul Eggert Subject: Re: [PATCH 1/2] dfa: prefer bool at DFA interfaces Organization: UCLA Computer Science Department Message-ID: <5726ED58.4090007@cs.ucla.edu> Date: Sun, 1 May 2016 23:02:00 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060400080405060206030601" X-Spam-Score: -1.0 (-) X-Debbugs-Envelope-To: 18800-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is a multi-part message in MIME format. --------------060400080405060206030601 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit I installed these patches, along with the attached further patch along the same lines. --------------060400080405060206030601 Content-Type: text/x-diff; name="0001-dfa-prefer-bool-for-boolean.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-dfa-prefer-bool-for-boolean.patch" >From e5654c5e82a9d412ea3a43c18dd647dce7f96c4d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 1 May 2016 22:55:18 -0700 Subject: [PATCH] dfa: prefer bool for boolean * src/dfa.c (syntax_bits_set, dfasyntax, using_utf8, FETCH_WC) (POP_LEX_STATE, State_transition): * src/dfa.h (using_utf_8): Use bool for boolean. --- src/dfa.c | 13 +++++++------ src/dfa.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/dfa.c b/src/dfa.c index a2aee29..c57b33a 100644 --- a/src/dfa.c +++ b/src/dfa.c @@ -641,7 +641,8 @@ charclass_index (charclass const s) } /* Syntax bits controlling the behavior of the lexical analyzer. */ -static reg_syntax_t syntax_bits, syntax_bits_set; +static reg_syntax_t syntax_bits; +static bool syntax_bits_set; /* Flag for case-folding letters into sets. */ static bool case_fold; @@ -693,7 +694,7 @@ void dfasyntax (reg_syntax_t bits, bool fold, unsigned char eol) { int i; - syntax_bits_set = 1; + syntax_bits_set = true; syntax_bits = bits; case_fold = fold; eolbyte = eol; @@ -757,7 +758,7 @@ setbit_case_fold_c (int b, charclass c) /* UTF-8 encoding allows some optimizations that we can't otherwise assume in a multibyte encoding. */ -int +bool using_utf8 (void) { static int utf8 = -1; @@ -858,7 +859,7 @@ static wint_t wctok; /* Wide character representation of the current lexptr += nbytes; \ lexleft -= nbytes; \ } \ - } while (0) + } while (false) #ifndef MIN # define MIN(a,b) ((a) < (b) ? (a) : (b)) @@ -1211,7 +1212,7 @@ parse_bracket_exp (void) lexptr = lexptr_saved; \ lexleft = lexleft_saved; \ } \ - while (0) + while (false) static token lex (void) @@ -3327,7 +3328,7 @@ dfaexec_main (struct dfa *d, char const *begin, char *end, bool allow_nl, \ mbp = p; \ trans = d->trans; \ - } while (0) + } while (false) State_transition(); } diff --git a/src/dfa.h b/src/dfa.h index ce267ec..60da0e4 100644 --- a/src/dfa.h +++ b/src/dfa.h @@ -100,4 +100,4 @@ extern void dfawarn (const char *); The user must supply a dfaerror. */ extern _Noreturn void dfaerror (const char *); -extern int using_utf8 (void); +extern bool using_utf8 (void); -- 2.5.5 --------------060400080405060206030601-- From unknown Tue Jun 24 01:40:49 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 30 May 2016 11:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator