From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Chris Gregory Newsgroups: gmane.emacs.devel Subject: Simplify internal_catch() Date: Tue, 27 Dec 2016 19:54:39 -0600 Message-ID: <87k2aku8bk.fsf@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1482890130 8512 195.159.176.226 (28 Dec 2016 01:55:30 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 28 Dec 2016 01:55:30 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 28 02:55:23 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cM3SU-0000Bd-Bp for ged-emacs-devel@m.gmane.org; Wed, 28 Dec 2016 02:55:14 +0100 Original-Received: from localhost ([::1]:56980 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cM3SY-0002n8-Uh for ged-emacs-devel@m.gmane.org; Tue, 27 Dec 2016 20:55:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36230) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cM3Rz-0002mo-Fb for emacs-devel@gnu.org; Tue, 27 Dec 2016 20:54:44 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cM3Ry-0006t7-IS for emacs-devel@gnu.org; Tue, 27 Dec 2016 20:54:43 -0500 Original-Received: from mail-it0-x22d.google.com ([2607:f8b0:4001:c0b::22d]:36650) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cM3Ry-0006t3-D9 for emacs-devel@gnu.org; Tue, 27 Dec 2016 20:54:42 -0500 Original-Received: by mail-it0-x22d.google.com with SMTP id 75so175962029ite.1 for ; Tue, 27 Dec 2016 17:54:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=8ftcTwFK/xFe/cc6ytmAk4j0s1csIpHUNDmmVNL3XwE=; b=DoLhADbh1jvqRKj5J1C4U6etqHB1Jg1nUTKV72bR//eCtkFRF3qv6wDQxkdmwggsEc aRzlk5d+9EgpqMOwAznMmLZe6joFpd3iayzFyBMEmvm5PqJxyN92cHVorW7tg/IXOLcF /G6QJwgBXd+6w+ZHRfXBC7WkD0vz4BvsgL5IiHUz4ns3hvKNEQqDJajX13SMJDBe1JXZ D4lj1ZIjjRW1ansUojb0I76f1nemrjT/4gKe/1TmEfPepIjH+KTmIHr7eeyM2Bj6t0hr tSqoWS0LeOcIXoTQZZXwP5FmzeH5w6Wf5kWedkQUoEqphKsWny/X7kG1vF3Xj/a3bN1M b02g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=8ftcTwFK/xFe/cc6ytmAk4j0s1csIpHUNDmmVNL3XwE=; b=ivdhCzhJpt81NifoGgRMhjBIlaATbzsRPkOw97CaPndcRXZMs4fZcjKfKhMsd3ETYF vvt9Ai4pcLvX81KSHsmTWUV/Zw7O/NTlAzN6YvXs1fYq6aKEE2DLUY4LmuKj8HtQOddt LCPcq5cEJsKXHybq++LCNoCTKdOBrB2PsfxzUtaCIx1lwedfb3+3rPwuMj/gBZKFAo42 FjfHJZmH8r4+5aYZH+JKyi6RyfEOIP7tLWSPeM4dnvnJ0WEUfxzYF+nah37Usmu+ZCLx ZlMUBSKzuMN97t8c54iXheYdmFLbrmcAl1dO2NFISOeA2YU+/RlHzuMSSjVT6jg7tBFm kzpQ== X-Gm-Message-State: AIkVDXIoKy8xiTfzJNOI9be7WMAahkFHvnQ5BirBZ81F5weU4e+KlVFEut51wYKv+Xww/g== X-Received: by 10.36.11.65 with SMTP id 62mr26845522itd.118.1482890081319; Tue, 27 Dec 2016 17:54:41 -0800 (PST) Original-Received: from CzipperZag ([2604:2d80:8039:81de:a0b5:3d06:3bb2:d546]) by smtp.gmail.com with ESMTPSA id g130sm13659792ita.10.2016.12.27.17.54.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Dec 2016 17:54:40 -0800 (PST) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:4001:c0b::22d X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:210857 Archived-At: --=-=-= Content-Type: text/plain This patch simplifies the structure of the internal_catch function. If my change to prog_ignore is accepted (shown below), use the diff_with. Otherwise use diff_without. THIS IS NOT THE DIFF FOR THIS PATCH! diff --git a/src/eval.c b/src/eval.c index e50e26a..abd4028 100644 --- a/src/eval.c +++ b/src/eval.c @@ -458,7 +458,11 @@ usage: (progn BODY...) */) void prog_ignore (Lisp_Object body) { - Fprogn (body); + while (CONSP (body)) + { + eval_sub (XCAR (body)); + body = XCDR (body); + } } THE DIFF FOR THIS PATCH is in the attachments. -- Chris Gregory --=-=-= Content-Type: application/octet-stream Content-Disposition: attachment; filename=diff_with Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3NyYy9ldmFsLmMgYi9zcmMvZXZhbC5jCmluZGV4IGFiZDQwMjguLjUzZTFm NTkgMTAwNjQ0Ci0tLSBhL3NyYy9ldmFsLmMKKysrIGIvc3JjL2V2YWwuYwpAQCAtMTA4NywyMyAr MTA4NywyMCBAQCBpbnRlcm5hbF9jYXRjaCAoTGlzcF9PYmplY3QgdGFnLAogCQlMaXNwX09iamVj dCAoKmZ1bmMpIChMaXNwX09iamVjdCksIExpc3BfT2JqZWN0IGFyZykKIHsKICAgLyogVGhpcyBz dHJ1Y3R1cmUgaXMgbWFkZSBwYXJ0IG9mIHRoZSBjaGFpbiBgY2F0Y2hsaXN0Jy4gICovCi0gIHN0 cnVjdCBoYW5kbGVyICpjID0gcHVzaF9oYW5kbGVyICh0YWcsIENBVENIRVIpOworICBzdHJ1Y3Qg aGFuZGxlciAqYzsKKyAgTGlzcF9PYmplY3QgdmFsOworCisgIGMgPSBwdXNoX2hhbmRsZXIgKHRh ZywgQ0FUQ0hFUik7CiAKLSAgLyogQ2FsbCBGVU5DLiAgKi8KICAgaWYgKCEgc3lzX3NldGptcCAo Yy0+am1wKSkKLSAgICB7Ci0gICAgICBMaXNwX09iamVjdCB2YWwgPSBmdW5jIChhcmcpOwotICAg ICAgY2xvYmJlcmVkX2Vhc3NlcnQgKGhhbmRsZXJsaXN0ID09IGMpOwotICAgICAgaGFuZGxlcmxp c3QgPSBoYW5kbGVybGlzdC0+bmV4dDsKLSAgICAgIHJldHVybiB2YWw7Ci0gICAgfQorICAgIC8q IENhbGwgRlVOQy4gICovCisgICAgdmFsID0gZnVuYyAoYXJnKTsKICAgZWxzZQotICAgIHsgLyog VGhyb3cgd29ya3MgYnkgYSBsb25nam1wIHRoYXQgY29tZXMgcmlnaHQgaGVyZS4gICovCi0gICAg ICBMaXNwX09iamVjdCB2YWwgPSBoYW5kbGVybGlzdC0+dmFsOwotICAgICAgY2xvYmJlcmVkX2Vh c3NlcnQgKGhhbmRsZXJsaXN0ID09IGMpOwotICAgICAgaGFuZGxlcmxpc3QgPSBoYW5kbGVybGlz dC0+bmV4dDsKLSAgICAgIHJldHVybiB2YWw7Ci0gICAgfQorICAgIC8qIFRocm93IHdvcmtzIGJ5 IGEgbG9uZ2ptcCB0aGF0IGNvbWVzIHJpZ2h0IGhlcmUuICAqLworICAgIHZhbCA9IGhhbmRsZXJs aXN0LT52YWw7CisgIGNsb2JiZXJlZF9lYXNzZXJ0IChoYW5kbGVybGlzdCA9PSBjKTsKKyAgaGFu ZGxlcmxpc3QgPSBoYW5kbGVybGlzdC0+bmV4dDsKKyAgcmV0dXJuIHZhbDsKIH0KIAogLyogVW53 aW5kIHRoZSBzcGVjYmluZCwgY2F0Y2gsIGFuZCBoYW5kbGVyIHN0YWNrcyBiYWNrIHRvIENBVENI LCBhbmQK --=-=-= Content-Type: application/octet-stream Content-Disposition: attachment; filename=diff_without Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL3NyYy9ldmFsLmMgYi9zcmMvZXZhbC5jCmluZGV4IGU1MGUyNmEuLjI5YTQ3 OWEgMTAwNjQ0Ci0tLSBhL3NyYy9ldmFsLmMKKysrIGIvc3JjL2V2YWwuYwpAQCAtMTA4MywyMyAr MTA4MywyMCBAQCBpbnRlcm5hbF9jYXRjaCAoTGlzcF9PYmplY3QgdGFnLAogCQlMaXNwX09iamVj dCAoKmZ1bmMpIChMaXNwX09iamVjdCksIExpc3BfT2JqZWN0IGFyZykKIHsKICAgLyogVGhpcyBz dHJ1Y3R1cmUgaXMgbWFkZSBwYXJ0IG9mIHRoZSBjaGFpbiBgY2F0Y2hsaXN0Jy4gICovCi0gIHN0 cnVjdCBoYW5kbGVyICpjID0gcHVzaF9oYW5kbGVyICh0YWcsIENBVENIRVIpOworICBzdHJ1Y3Qg aGFuZGxlciAqYzsKKyAgTGlzcF9PYmplY3QgdmFsOworCisgIGMgPSBwdXNoX2hhbmRsZXIgKHRh ZywgQ0FUQ0hFUik7CiAKLSAgLyogQ2FsbCBGVU5DLiAgKi8KICAgaWYgKCEgc3lzX3NldGptcCAo Yy0+am1wKSkKLSAgICB7Ci0gICAgICBMaXNwX09iamVjdCB2YWwgPSBmdW5jIChhcmcpOwotICAg ICAgY2xvYmJlcmVkX2Vhc3NlcnQgKGhhbmRsZXJsaXN0ID09IGMpOwotICAgICAgaGFuZGxlcmxp c3QgPSBoYW5kbGVybGlzdC0+bmV4dDsKLSAgICAgIHJldHVybiB2YWw7Ci0gICAgfQorICAgIC8q IENhbGwgRlVOQy4gICovCisgICAgdmFsID0gZnVuYyAoYXJnKTsKICAgZWxzZQotICAgIHsgLyog VGhyb3cgd29ya3MgYnkgYSBsb25nam1wIHRoYXQgY29tZXMgcmlnaHQgaGVyZS4gICovCi0gICAg ICBMaXNwX09iamVjdCB2YWwgPSBoYW5kbGVybGlzdC0+dmFsOwotICAgICAgY2xvYmJlcmVkX2Vh c3NlcnQgKGhhbmRsZXJsaXN0ID09IGMpOwotICAgICAgaGFuZGxlcmxpc3QgPSBoYW5kbGVybGlz dC0+bmV4dDsKLSAgICAgIHJldHVybiB2YWw7Ci0gICAgfQorICAgIC8qIFRocm93IHdvcmtzIGJ5 IGEgbG9uZ2ptcCB0aGF0IGNvbWVzIHJpZ2h0IGhlcmUuICAqLworICAgIHZhbCA9IGhhbmRsZXJs aXN0LT52YWw7CisgIGNsb2JiZXJlZF9lYXNzZXJ0IChoYW5kbGVybGlzdCA9PSBjKTsKKyAgaGFu ZGxlcmxpc3QgPSBoYW5kbGVybGlzdC0+bmV4dDsKKyAgcmV0dXJuIHZhbDsKIH0KIAogLyogVW53 aW5kIHRoZSBzcGVjYmluZCwgY2F0Y2gsIGFuZCBoYW5kbGVyIHN0YWNrcyBiYWNrIHRvIENBVENI LCBhbmQK --=-=-=--