[Patch v3 10/11] lib: make a global constant for query parser flags

Tomi Ollila tomi.ollila at iki.fi
Sat May 7 10:59:15 PDT 2016


On Sun, May 01 2016, David Bremner <david at tethera.net> wrote:

> It's already kindof gross that this is hardcoded in two different
> places. We will also need these later in field processors calling back
> into the query parser.
> ---
>  lib/database-private.h |  4 ++++
>  lib/query.cc           | 16 ++--------------
>  2 files changed, 6 insertions(+), 14 deletions(-)
>
> diff --git a/lib/database-private.h b/lib/database-private.h
> index e1962f4..b5c1f90 100644
> --- a/lib/database-private.h
> +++ b/lib/database-private.h
> @@ -144,6 +144,10 @@ operator&=(_notmuch_features &a, _notmuch_features b)
>      return a;
>  }
>  
> +#define NOTMUCH_QUERY_PARSER_FLAGS (Xapian::QueryParser::FLAG_BOOLEAN | Xapian::QueryParser::FLAG_PHRASE | \
> +				    Xapian::QueryParser::FLAG_LOVEHATE | Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE | \
> +				    Xapian::QueryParser::FLAG_WILDCARD | Xapian::QueryParser::FLAG_PURE_NOT)

#define NOTMUCH_QUERY_PARSER_FLAGS (Xapian::QueryParser::FLAG_BOOLEAN | \
				    Xapian::QueryParser::FLAG_PHRASE | \
				    Xapian::QueryParser::FLAG_LOVEHATE | \
				    Xapian::QueryParser::FLAG_BOOLEAN_ANY_CASE | \
				    Xapian::QueryParser::FLAG_WILDCARD | \
				    Xapian::QueryParser::FLAG_PURE_NOT)

Instead, one line goes up to column 82, but..

No other nits in this file.

Some previous ones had more of spacing around = and
opening brace in the same line as function definition.

There were also more notmuch_options_sanitize () calls (I wonder how did
your tests pass before you sent this series :O)

The next one, id:1462065879-29860-12-git-send-email-david at tethera.net
has inconsistent spacing:

 	$(dir)/query.cc		\
+	$(dir)/query-fp.cc \
 	$(dir)/config.cc	\


Other than these I don't have more comments on the implementation (I may
have not look deep enough, remembering all these nits disturbs me ;). I have
not tested these (as CXXLAGS do not apply >;) and I will not run configure
w/o set -u anymore :D)


Tomi


More information about the notmuch mailing list