unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: David Bremner <david@tethera.net>, erik colson <eco@ecocode.net>,
	notmuch@notmuchmail.org
Subject: [PATCH 2/2] lib/sexp: add parameter expansion for regex and wildcard
Date: Tue, 14 Jun 2022 08:22:17 -0300	[thread overview]
Message-ID: <20220614112217.1094083-2-david@tethera.net> (raw)
In-Reply-To: <20220614112217.1094083-1-david@tethera.net>

Fix the bug reported at [1].

The parameter expansion for regex and wildcard modifiers has to be
done a bit differently, because their arguments are not s-expressions
defining complete Xapian queries.

[1]: id:87o7yxqxy6.fsf@code.pm
---
 lib/parse-sexp.cc         | 55 ++++++++++++++++++++++++++++++++++-----
 test/T081-sexpr-search.sh |  6 -----
 2 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/lib/parse-sexp.cc b/lib/parse-sexp.cc
index 08fd7037..d0c9f145 100644
--- a/lib/parse-sexp.cc
+++ b/lib/parse-sexp.cc
@@ -187,6 +187,37 @@ _sexp_parse_phrase (std::string term_prefix, const char *phrase, Xapian::Query &
     return NOTMUCH_STATUS_SUCCESS;
 }
 
+notmuch_status_t
+_sexp_expand_term (notmuch_database_t *notmuch,
+		   const _sexp_prefix_t *prefix,
+		   const _sexp_binding_t *env,
+		   const sexp_t *sx,
+		   const char **out)
+{
+    if (! out)
+	return NOTMUCH_STATUS_NULL_POINTER;
+
+    while (sx->ty == SEXP_VALUE && sx->aty == SEXP_BASIC && sx->val[0] == ',') {
+	const char *name = sx->val + 1;
+	for (; env; env = env->next) {
+	    if (strcmp (name, env->name) == 0) {
+		sx = env->sx;
+		env = env->context;
+		break;
+	    }
+	}
+    }
+    if (sx->ty != SEXP_VALUE) {
+	_notmuch_database_log (notmuch, "'%s' expects single atom as argument\n",
+			       prefix->name);
+	return NOTMUCH_STATUS_BAD_QUERY_SYNTAX;
+    }
+
+    *out = sx->val;
+
+    return NOTMUCH_STATUS_SUCCESS;
+}
+
 static notmuch_status_t
 _sexp_parse_wildcard (notmuch_database_t *notmuch,
 		      const _sexp_prefix_t *parent,
@@ -227,8 +258,8 @@ _sexp_parse_one_term (notmuch_database_t *notmuch, std::string term_prefix, cons
 notmuch_status_t
 _sexp_parse_regex (notmuch_database_t *notmuch,
 		   const _sexp_prefix_t *prefix, const _sexp_prefix_t *parent,
-		   unused(const _sexp_binding_t *env),
-		   std::string val, Xapian::Query &output)
+		   const _sexp_binding_t *env,
+		   const sexp_t *term, Xapian::Query &output)
 {
     if (! parent) {
 	_notmuch_database_log (notmuch, "illegal '%s' outside field\n",
@@ -243,9 +274,15 @@ _sexp_parse_regex (notmuch_database_t *notmuch,
     }
 
     std::string msg; /* ignored */
+    const char *str;
+    notmuch_status_t status;
+
+    status = _sexp_expand_term (notmuch, prefix, env, term, &str);
+    if (status)
+	return status;
 
     return _notmuch_regexp_to_query (notmuch, Xapian::BAD_VALUENO, parent->name,
-				     val, output, msg);
+				     str, output, msg);
 }
 
 
@@ -638,11 +675,17 @@ _sexp_to_xapian_query (notmuch_database_t *notmuch, const _sexp_prefix_t *parent
 		return _notmuch_query_name_to_query (notmuch, sx->list->next->val, output);
 	    }
 
-	    if (prefix->xapian_op == Xapian::Query::OP_WILDCARD)
-		return _sexp_parse_wildcard (notmuch, parent, env, sx->list->next->val, output);
+	    if (prefix->xapian_op == Xapian::Query::OP_WILDCARD) {
+		const char *str;
+		status = _sexp_expand_term (notmuch, prefix, env, sx->list->next, &str);
+		if (status)
+		    return status;
+
+		return _sexp_parse_wildcard (notmuch, parent, env, str, output);
+	    }
 
 	    if (prefix->flags & SEXP_FLAG_DO_REGEX) {
-		return _sexp_parse_regex (notmuch, prefix, parent, env, sx->list->next->val, output);
+		return _sexp_parse_regex (notmuch, prefix, parent, env, sx->list->next, output);
 	    }
 
 	    if (prefix->flags & SEXP_FLAG_DO_EXPAND) {
diff --git a/test/T081-sexpr-search.sh b/test/T081-sexpr-search.sh
index d28e5b76..de9cbe7b 100755
--- a/test/T081-sexpr-search.sh
+++ b/test/T081-sexpr-search.sh
@@ -1116,7 +1116,6 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Saved Search: bad parameter syntax 5"
-test_subtest_known_broken
 notmuch config set squery.Bad5 '(macro (thing) (tag (rx ,thing)))'
 notmuch search --query=sexp '(Bad5 (1 2))' >OUTPUT 2>&1
 cat <<EOF > EXPECTED
@@ -1126,7 +1125,6 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "Saved Search: bad parameter syntax 6"
-test_subtest_known_broken
 notmuch config set squery.Bad6 '(macro (thing) (tag (starts-with ,thing)))'
 notmuch search --query=sexp '(Bad6 (1 2))' >OUTPUT 2>&1
 cat <<EOF > EXPECTED
@@ -1187,14 +1185,12 @@ notmuch search --query=sexp '(TagSubject2 inbox maildir)' | notmuch_search_sanit
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "macro in regex"
-test_subtest_known_broken
 notmuch search tag:inbox and date:2009-11-17 | notmuch_search_sanitize > EXPECTED
 notmuch config set squery.D  '(macro (tagname)  (and (date 2009-11-17) (tag (rx ,tagname))))'
 notmuch search --query=sexp '(D inbo)' | notmuch_search_sanitize > OUTPUT
 test_expect_equal_file_nonempty EXPECTED OUTPUT
 
 test_begin_subtest "macro in wildcard"
-test_subtest_known_broken
 notmuch search tag:inbox and date:2009-11-17 | notmuch_search_sanitize > EXPECTED
 notmuch config set squery.W  '(macro (tagname)  (and (date 2009-11-17) (tag (starts-with ,tagname))))'
 notmuch search --query=sexp '(W inbo)' | notmuch_search_sanitize > OUTPUT
@@ -1218,7 +1214,6 @@ EOF
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest "nested macros (shadowing, regex)"
-test_subtest_known_broken
 notmuch search tag:/inbo/ and subject:/Maildi/ | notmuch_search_sanitize > EXPECTED
 notmuch config set squery.Inner3 '(macro (x) (subject (rx ,x)))'
 notmuch config set squery.Outer3  '(macro (x y) (and (tag (rx ,x)) (Inner3 ,y)))'
@@ -1226,7 +1221,6 @@ notmuch search --query=sexp '(Outer3 inbo Maildi)' | notmuch_search_sanitize > O
 test_expect_equal_file_nonempty EXPECTED OUTPUT
 
 test_begin_subtest "nested macros (shadowing, wildcard)"
-test_subtest_known_broken
 notmuch search tag:inbox and subject:maildir | notmuch_search_sanitize > EXPECTED
 notmuch config set squery.Inner4 '(macro (x) (subject (starts-with ,x)))'
 notmuch config set squery.Outer4  '(macro (x y) (and (tag (starts-with ,x)) (Inner4 ,y)))'
-- 
2.35.2

  reply	other threads:[~2022-06-14 11:22 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-12 23:11 sexp and strings erik colson
2022-06-13  9:12 ` Michael J Gruber
2022-06-13  9:31   ` erik colson
2022-06-13 10:11     ` Michael J Gruber
2022-06-13 15:10       ` erik colson
2022-06-13 18:39 ` David Bremner
2022-06-14 11:22   ` [PATCH 1/2] test/sexp: add known broken tests for macro param inside rx/wildcard David Bremner
2022-06-14 11:22     ` David Bremner [this message]
2022-07-01 11:41   ` sexp and strings David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220614112217.1094083-2-david@tethera.net \
    --to=david@tethera.net \
    --cc=eco@ecocode.net \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).