From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uNI1A48OJWHb4wAAgWs5BA (envelope-from ) for ; Tue, 24 Aug 2021 17:21:51 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id kAaTOo4OJWHcGgAA1q6Kng (envelope-from ) for ; Tue, 24 Aug 2021 15:21:50 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 92A6184C5 for ; Tue, 24 Aug 2021 17:21:50 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id CE36920570; Tue, 24 Aug 2021 11:20:54 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 24A4D2055D for ; Tue, 24 Aug 2021 11:20:45 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id 129535FD5C; Tue, 24 Aug 2021 11:20:45 -0400 (EDT) Received: (nullmailer pid 2942863 invoked by uid 1000); Tue, 24 Aug 2021 15:17:51 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 17/36] lib/parse-sexp: handle unprefixed terms. Date: Tue, 24 Aug 2021 08:17:26 -0700 Message-Id: <20210824151745.2941868-18-david@tethera.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210824151745.2941868-1-david@tethera.net> References: <20210824151745.2941868-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: KQHVLLYPIRFJEE4C3NIFHGOG5DTVUKVY X-Message-ID-Hash: KQHVLLYPIRFJEE4C3NIFHGOG5DTVUKVY X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629818510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Ih4VLD9g9D2IoHYenOwUMOAvtJYh2J7K9DTWBt/rf8s=; b=S4Gujkc561PbvC/ecEfY2+XiTcs5xaVOmTAl33Xt3fffnA7ut8xp9ncOjDpFAXGDpg0++y x8fEcJ9gs2RwgxNAd/tRXXoS3C0Jtf9443uof3cY2iIWmNZEv9yJVJWsc+V5tjsTRHIMiN 1XFAerPJIC8AjhsAu/kjJ/x9RQQG2zl9Xl8iCRGc2BjaY4aF7iZ6dmqa/JInfeCuJZ/Oj1 2V3V9m46QEo5HQl7nkiY+7QrjPHw0DWuNzM787fiMkaTW8tLOAfLhiHqx6ojCdlyiA9Zvk M1bAPuXJ88cWAh4J3I6DLWGCOu34yqZPHYMAgilI0Dm8kwu6ak3WBdSyC5XkRg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629818510; a=rsa-sha256; cv=none; b=U1MgOqcX5N1HI2B1hq9FE4BmCIPJB17mYaHudxyeq+SV/d/RUtBmxfF9ecUZiNBK7ORe5H 8PRVOoNke48+7wuAceT/UMwUFMrTUG4VwEMWkGZupqN7QIUxb3EcZxu6yR6UbDKQZe4jMa pRZRfpeK5peGN1KN5hj67zc9Pa3crI8tBLrUy3BCOgK3YacsESiSwkQA6fWHQB1mRELiN/ zyOzy1fsiopzEa3psu6ImkfcPO3i+Hs0OlELa4LyyYNgN5UDrAVpZ9qapwo9wqKj3L8++Y jDKt8NyA+5k/x6zYMyJbX6pOJtoKbLvU09gtbMFK2shthaRL+rlhonQUExjFtQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.83 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 92A6184C5 X-Spam-Score: -0.83 X-Migadu-Scanner: scn0.migadu.com X-TUID: YVrKaJDSK9+5 VGhpcyBpcyBlcXVpdmFsZW50IHRvIGFkZGluZyB0aGUgc2FtZSBmaWVsZCBuYW1lICIiIGZvciBt dWx0aXBsZQ0KcHJlZml4ZXMgaW4gdGhlIFhhcGlhbiBxdWVyeSBwYXJzZXIsIGJ1dCB3ZSBoYXZl IHRvIGV4cGxpY2l0ZWx5DQpjb25zdHJ1Y3QgdGhlIHJlc3VsdGluZyBxdWVyeS4NCi0tLQ0KIGxp Yi9wYXJzZS1zZXhwLmNjICAgICAgICAgfCAzNiArKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKy0tLS0NCiB0ZXN0L1QwODEtc2V4cHItc2VhcmNoLnNoIHwgMzEgKysrKysrKysrKysrKysr KysrKysrKysrKysrLS0tLQ0KIDIgZmlsZXMgY2hhbmdlZCwgNTkgaW5zZXJ0aW9ucygrKSwgOCBk ZWxldGlvbnMoLSkNCg0KZGlmZiAtLWdpdCBhL2xpYi9wYXJzZS1zZXhwLmNjIGIvbGliL3BhcnNl LXNleHAuY2MNCmluZGV4IGZmYjAwMTQ4Li4wMTkyYmRhOSAxMDA2NDQNCi0tLSBhL2xpYi9wYXJz ZS1zZXhwLmNjDQorKysgYi9saWIvcGFyc2Utc2V4cC5jYw0KQEAgLTE2NCw2ICsxNjQsMjIgQEAg X3NleHBfcGFyc2Vfd2lsZGNhcmQgKG5vdG11Y2hfZGF0YWJhc2VfdCAqbm90bXVjaCwNCiAgICAg cmV0dXJuIE5PVE1VQ0hfU1RBVFVTX1NVQ0NFU1M7DQogfQ0KIA0KK3N0YXRpYyBub3RtdWNoX3N0 YXR1c190DQorX3NleHBfcGFyc2Vfb25lX3Rlcm0gKG5vdG11Y2hfZGF0YWJhc2VfdCAqbm90bXVj aCwgc3RkOjpzdHJpbmcgdGVybV9wcmVmaXgsIGNvbnN0IHNleHBfdCAqc3gsDQorCQkgICAgICBY YXBpYW46OlF1ZXJ5ICZvdXRwdXQpDQorew0KKyAgICBYYXBpYW46OlN0ZW0gc3RlbSA9ICoobm90 bXVjaC0+c3RlbW1lcik7DQorDQorICAgIGlmIChzeC0+YXR5ID09IFNFWFBfQkFTSUMgJiYgdW5p Y29kZV93b3JkX3V0ZjggKHN4LT52YWwpKSB7DQorCXN0ZDo6c3RyaW5nIHRlcm0gPSBYYXBpYW46 OlVuaWNvZGU6OnRvbG93ZXIgKHN4LT52YWwpOw0KKw0KKwlvdXRwdXQgPSBYYXBpYW46OlF1ZXJ5 ICgiWiIgKyB0ZXJtX3ByZWZpeCArIHN0ZW0gKHRlcm0pKTsNCisJcmV0dXJuIE5PVE1VQ0hfU1RB VFVTX1NVQ0NFU1M7DQorICAgIH0gZWxzZSB7DQorCXJldHVybiBfc2V4cF9wYXJzZV9waHJhc2Ug KHRlcm1fcHJlZml4LCBzeC0+dmFsLCBvdXRwdXQpOw0KKyAgICB9DQorDQorfQ0KIC8qIEhlcmUg d2UgZXhwZWN0IHRoZSBzLWV4cHJlc3Npb24gdG8gYmUgYSBwcm9wZXIgbGlzdCwgd2l0aCBmaXJz dA0KICAqIGVsZW1lbnQgZGVmaW5pbmcgYW5kIG9wZXJhdGlvbiwgb3IgYXMgYSBzcGVjaWFsIGNh c2UgdGhlIGVtcHR5DQogICogbGlzdCAqLw0KQEAgLTE4NSwxMSArMjAxLDIzIEBAIF9zZXhwX3Rv X3hhcGlhbl9xdWVyeSAobm90bXVjaF9kYXRhYmFzZV90ICpub3RtdWNoLCBjb25zdCBfc2V4cF9w cmVmaXhfdCAqcGFyZW50DQogCSAgICBvdXRwdXQgPSBYYXBpYW46OlF1ZXJ5ICh0ZXJtX3ByZWZp eCArIHN4LT52YWwpOw0KIAkgICAgcmV0dXJuIE5PVE1VQ0hfU1RBVFVTX1NVQ0NFU1M7DQogCX0N Ci0JaWYgKHN4LT5hdHkgPT0gU0VYUF9CQVNJQyAmJiB1bmljb2RlX3dvcmRfdXRmOCAoc3gtPnZh bCkpIHsNCi0JICAgIG91dHB1dCA9IFhhcGlhbjo6UXVlcnkgKCJaIiArIHRlcm1fcHJlZml4ICsg c3RlbSAodGVybSkpOw0KLQkgICAgcmV0dXJuIE5PVE1VQ0hfU1RBVFVTX1NVQ0NFU1M7DQorCWlm IChwYXJlbnQpIHsNCisJICAgIHJldHVybiBfc2V4cF9wYXJzZV9vbmVfdGVybSAobm90bXVjaCwg dGVybV9wcmVmaXgsIHN4LCBvdXRwdXQpOw0KIAl9IGVsc2Ugew0KLQkgICAgcmV0dXJuIF9zZXhw X3BhcnNlX3BocmFzZSAodGVybV9wcmVmaXgsIHN4LT52YWwsIG91dHB1dCk7DQorCSAgICBYYXBp YW46OlF1ZXJ5IGFjY3VtdWxhdG9yOw0KKwkgICAgZm9yIChfc2V4cF9wcmVmaXhfdCAqcHJlZml4 ID0gcHJlZml4ZXM7IHByZWZpeC0+bmFtZTsgcHJlZml4KyspIHsNCisJCWlmIChwcmVmaXgtPmZs YWdzICYgU0VYUF9GTEFHX0ZJRUxEKSB7DQorCQkgICAgbm90bXVjaF9zdGF0dXNfdCBzdGF0dXM7 DQorCQkgICAgWGFwaWFuOjpRdWVyeSBzdWJxdWVyeTsNCisJCSAgICB0ZXJtX3ByZWZpeCA9IF9m aW5kX3ByZWZpeCAocHJlZml4LT5uYW1lKTsNCisJCSAgICBzdGF0dXMgPSBfc2V4cF9wYXJzZV9v bmVfdGVybSAobm90bXVjaCwgdGVybV9wcmVmaXgsIHN4LCBzdWJxdWVyeSk7DQorCQkgICAgaWYg KHN0YXR1cykNCisJCQlyZXR1cm4gc3RhdHVzOw0KKwkJICAgIGFjY3VtdWxhdG9yID0gWGFwaWFu OjpRdWVyeSAoWGFwaWFuOjpRdWVyeTo6T1BfT1IsIGFjY3VtdWxhdG9yLCBzdWJxdWVyeSk7DQor CQl9DQorCSAgICB9DQorCSAgICBvdXRwdXQgPSBhY2N1bXVsYXRvcjsNCisJICAgIHJldHVybiBO T1RNVUNIX1NUQVRVU19TVUNDRVNTOw0KIAl9DQogICAgIH0NCiANCmRpZmYgLS1naXQgYS90ZXN0 L1QwODEtc2V4cHItc2VhcmNoLnNoIGIvdGVzdC9UMDgxLXNleHByLXNlYXJjaC5zaA0KaW5kZXgg ZGY1MDJkYzUuLjQ0Y2I2ODFmIDEwMDc1NQ0KLS0tIGEvdGVzdC9UMDgxLXNleHByLXNlYXJjaC5z aA0KKysrIGIvdGVzdC9UMDgxLXNleHByLXNlYXJjaC5zaA0KQEAgLTEyMiw2ICsxMjIsMjkgQEAg YWRkX21lc3NhZ2UgJ1tzdWJqZWN0XT0idXRmOC1tZXNzYWdlLWJvZHktc3ViamVjdCInICdbZGF0 ZV09IlNhdCwgMDEgSmFuIDIwMDAgMTINCiBvdXRwdXQ9JChub3RtdWNoIHNlYXJjaCAtLXF1ZXJ5 PXNleHAgJyhib2R5IGLDtmTDvSknIHwgbm90bXVjaF9zZWFyY2hfc2FuaXRpemUpDQogdGVzdF9l eHBlY3RfZXF1YWwgIiRvdXRwdXQiICJ0aHJlYWQ6WFhYICAgMjAwMC0wMS0wMSBbMS8xXSBOb3Rt dWNoIFRlc3QgU3VpdGU7IHV0ZjgtbWVzc2FnZS1ib2R5LXN1YmplY3QgKGluYm94IHVucmVhZCki DQogDQorYWRkX21lc3NhZ2UgIltib2R5XT10aGVib2R5LTEiICJbc3ViamVjdF09a3J5cHRvbml0 ZS0xIg0KK2FkZF9tZXNzYWdlICJbYm9keV09bm90aGluZy10by1zZWUtaGVyZS0xIiAiW3N1Ympl Y3RdPXRoZWJvZHktMSINCisNCit0ZXN0X2JlZ2luX3N1YnRlc3QgJ3NlYXJjaCB3aXRob3V0IGJv ZHk6IHByZWZpeCcNCitub3RtdWNoIHNlYXJjaCB0aGVib2R5ID4gRVhQRUNURUQNCitub3RtdWNo IHNlYXJjaCAtLXF1ZXJ5PXNleHAgJyhhbmQgdGhlYm9keSknID4gT1VUUFVUDQordGVzdF9leHBl Y3RfZXF1YWxfZmlsZSBFWFBFQ1RFRCBPVVRQVVQNCisNCit0ZXN0X2JlZ2luX3N1YnRlc3QgJ25l Z2F0ZWQgYm9keTogcHJlZml4Jw0KK25vdG11Y2ggc2VhcmNoIHRoZWJvZHkgYW5kIG5vdCBib2R5 OnRoZWJvZHkgPiBFWFBFQ1RFRA0KK25vdG11Y2ggc2VhcmNoIC0tcXVlcnk9c2V4cCAnKGFuZCAo bm90IChib2R5IHRoZWJvZHkpKSB0aGVib2R5KScgPiBPVVRQVVQNCit0ZXN0X2V4cGVjdF9lcXVh bF9maWxlIEVYUEVDVEVEIE9VVFBVVA0KKw0KK3Rlc3RfYmVnaW5fc3VidGVzdCAnc2VhcmNoIHVu cHJlZml4ZWQgZm9yIHByZWZpeGVkIHRlcm0nDQorbm90bXVjaCBzZWFyY2gga3J5cHRvbml0ZSA+ IEVYUEVDVEVEDQorbm90bXVjaCBzZWFyY2ggLS1xdWVyeT1zZXhwICcoYW5kIGtyeXB0b25pdGUp JyA+IE9VVFBVVA0KK3Rlc3RfZXhwZWN0X2VxdWFsX2ZpbGUgRVhQRUNURUQgT1VUUFVUDQorDQor dGVzdF9iZWdpbl9zdWJ0ZXN0ICdzZWFyY2ggd2l0aCBib2R5OiBwcmVmaXggZm9yIHRlcm0gb25s eSBpbiBzdWJqZWN0Jw0KK25vdG11Y2ggc2VhcmNoIGJvZHk6a3J5cHRvbml0ZSA+IEVYUEVDVEVE DQorbm90bXVjaCBzZWFyY2ggLS1xdWVyeT1zZXhwICcoYm9keSBrcnlwdG9uaXRlKScgPiBPVVRQ VVQNCit0ZXN0X2V4cGVjdF9lcXVhbF9maWxlIEVYUEVDVEVEIE9VVFBVVA0KKw0KIHRlc3RfYmVn aW5fc3VidGVzdCAiU2VhcmNoIGJ5ICdmcm9tJyINCiBhZGRfbWVzc2FnZSAnW3N1YmplY3RdPSJz ZWFyY2ggYnkgZnJvbSInICdbZGF0ZV09IlNhdCwgMDEgSmFuIDIwMDAgMTI6MDA6MDAgLTAwMDAi JyBbZnJvbV09c2VhcmNoYnlmcm9tDQogb3V0cHV0PSQobm90bXVjaCBzZWFyY2ggLS1xdWVyeT1z ZXhwICcoZnJvbSBzZWFyY2hieWZyb20pJyB8IG5vdG11Y2hfc2VhcmNoX3Nhbml0aXplKQ0KQEAg LTI4NywxMSArMzEwLDExIEBAIG91dHB1dD0kKG5vdG11Y2ggc2VhcmNoIC0tcXVlcnk9c2V4cCAn KGF0dGFjaG1lbnQgKHN0YXJ0cy13aXRoIG5vdCkpJyB8IG5vdG11Y2hfDQogdGVzdF9leHBlY3Rf ZXF1YWwgIiRvdXRwdXQiICd0aHJlYWQ6WFhYICAgMjAwOS0xMS0xOCBbMi8yXSBMYXJzIEtlbGxv Z2ctU3RlZG1hbjsgW25vdG11Y2hdICJub3RtdWNoIGhlbHAiIG91dHB1dHMgdG8gc3RkZXJyPyAo YXR0YWNobWVudCBpbmJveCBzaWduZWQgdW5yZWFkKScNCiANCiB0ZXN0X2JlZ2luX3N1YnRlc3Qg InN0YXJ0cy13aXRoLCBmb2xkZXIiDQotbm90bXVjaCBzZWFyY2ggLS1vdXRwdXQ9ZmlsZXMgLS1x dWVyeT1zZXhwICcoZm9sZGVyIChzdGFydHMtd2l0aCBiYWQpKScgfCBub3RtdWNoX2Rpcl9zYW5p dGl6ZSA+IE9VVFBVVA0KK25vdG11Y2ggc2VhcmNoIC0tb3V0cHV0PWZpbGVzIC0tcXVlcnk9c2V4 cCAnKGZvbGRlciAoc3RhcnRzLXdpdGggYmFkKSknIHwgbm90bXVjaF9kaXJfc2FuaXRpemUgfCBz ZWQgJ3MvWzAtOV0qJC9YWFgvJyA+IE9VVFBVVA0KIGNhdCA8PEVPRiA+IEVYUEVDVEVEDQotTUFJ TF9ESVIvYmFkL21zZy0wMTANCi1NQUlMX0RJUi9iYWQvbmV3cy9tc2ctMDEyDQotTUFJTF9ESVIv ZHVwbGljYXRlL2JhZC9uZXdzL21zZy0wMTINCitNQUlMX0RJUi9iYWQvbXNnLVhYWA0KK01BSUxf RElSL2JhZC9uZXdzL21zZy1YWFgNCitNQUlMX0RJUi9kdXBsaWNhdGUvYmFkL25ld3MvbXNnLVhY WA0KIEVPRg0KIHRlc3RfZXhwZWN0X2VxdWFsX2ZpbGUgRVhQRUNURUQgT1VUUFVUDQogDQotLSAN CjIuMzIuMA0=