alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/parser -> lib/query

Browse Source 
And update the names to follow the mu- convention.
This commit is contained in:
Dirk-Jan C. Binnema
2020-02-20 21:53:24 +02:00
parent a132f5c21f
commit 20ce7b7066
17 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -256,7 +256,7 @@ mu/mu-memcheck
lib/Makefile lib/Makefile
lib/doxyfile lib/doxyfile
lib/utils/Makefile lib/utils/Makefile
lib/parser/Makefile lib/query/Makefile
mu4e/Makefile mu4e/Makefile
mu4e/mu4e-meta.el mu4e/mu4e-meta.el
guile/Makefile guile/Makefile

4
lib/Makefile.am
View File

@ -18,7 +18,7 @@
# before decending into tests/ # before decending into tests/
include $(top_srcdir)/gtest.mk include $(top_srcdir)/gtest.mk
SUBDIRS= utils parser SUBDIRS= utils query
if HAVE_JSON_GLIB if HAVE_JSON_GLIB
json_srcs= \ json_srcs= \
@ -122,7 +122,7 @@ libmu_la_LIBADD= \
$(GUILE_LIBS) \ $(GUILE_LIBS) \
$(JSON_GLIB_LIBS) \ $(JSON_GLIB_LIBS) \
${builddir}/utils/libmu-utils.la \ ${builddir}/utils/libmu-utils.la \
${builddir}/parser/libmu-parser.la \ ${builddir}/query/libmu-query.la \
$(CODE_COVERAGE_LIBS) $(CODE_COVERAGE_LIBS)
libmu_la_LDFLAGS= \ libmu_la_LDFLAGS= \

4
lib/mu-query.cc
View File

@ -36,8 +36,8 @@
#include "utils/mu-date.h" #include "utils/mu-date.h"
#include <utils/mu-utils.hh> #include <utils/mu-utils.hh>
#include <parser/proc-iface.hh> #include <query/mu-proc-iface.hh>
#include <parser/xapian.hh> #include <query/mu-xapian.hh>
using namespace Mu; using namespace Mu;

32
lib/parser/Makefile.am → lib/query/Makefile.am
View File

@ -41,20 +41,20 @@ noinst_PROGRAMS= \
parse parse
noinst_LTLIBRARIES= \ noinst_LTLIBRARIES= \
libmu-parser.la libmu-query.la
libmu_parser_la_SOURCES= \ libmu_query_la_SOURCES= \
data.hh \ mu-data.hh \
parser.cc \ mu-parser.cc \
parser.hh \ mu-parser.hh \
proc-iface.hh \ mu-proc-iface.hh \
tokenizer.cc \ mu-tokenizer.cc \
tokenizer.hh \ mu-tokenizer.hh \
tree.hh \ mu-tree.hh \
xapian.cc \ mu-xapian.cc \
xapian.hh mu-xapian.hh
libmu_parser_la_LIBADD= \ libmu_query_la_LIBADD= \
$(WARN_LDFLAGS) \ $(WARN_LDFLAGS) \
$(GLIB_LIBS) \ $(GLIB_LIBS) \
$(XAPIAN_LIBS) \ $(XAPIAN_LIBS) \
@ -69,14 +69,14 @@ tokenize_SOURCES= \
tokenize_LDADD= \ tokenize_LDADD= \
$(WARN_LDFLAGS) \ $(WARN_LDFLAGS) \
libmu-parser.la libmu-query.la
parse_SOURCES= \ parse_SOURCES= \
parse.cc parse.cc
parse_LDADD= \ parse_LDADD= \
$(WARN_LDFLAGS) \ $(WARN_LDFLAGS) \
libmu-parser.la libmu-query.la
noinst_PROGRAMS+=$(TEST_PROGS) noinst_PROGRAMS+=$(TEST_PROGS)
@ -85,14 +85,14 @@ TEST_PROGS+= \
test_tokenizer_SOURCES= \ test_tokenizer_SOURCES= \
test-tokenizer.cc test-tokenizer.cc
test_tokenizer_LDADD= \ test_tokenizer_LDADD= \
libmu-parser.la libmu-query.la
TEST_PROGS+= \ TEST_PROGS+= \
test-parser test-parser
test_parser_SOURCES= \ test_parser_SOURCES= \
test-parser.cc test-parser.cc
test_parser_LDADD= \ test_parser_LDADD= \
libmu-parser.la libmu-query.la
TESTS=$(TEST_PROGS) TESTS=$(TEST_PROGS)

0
lib/parser/data.hh → lib/query/mu-data.hh
View File

6
lib/parser/parser.cc → lib/query/mu-parser.cc
View File

@ -1,5 +1,5 @@
/* /*
** Copyright (C) 2017 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ** Copyright (C) 2020 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** **
** This library is free software; you can redistribute it and/or ** This library is free software; you can redistribute it and/or
** modify it under the terms of the GNU Lesser General Public License ** modify it under the terms of the GNU Lesser General Public License
@ -16,8 +16,8 @@
** Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA ** Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
** 02110-1301, USA. ** 02110-1301, USA.
*/ */
#include "parser.hh" #include "mu-parser.hh"
#include "tokenizer.hh" #include "mu-tokenizer.hh"
#include "utils/mu-utils.hh" #include "utils/mu-utils.hh"
#include "utils/mu-error.hh" #include "utils/mu-error.hh"

6
lib/parser/parser.hh → lib/query/mu-parser.hh
View File

@ -25,9 +25,9 @@
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <parser/data.hh> #include <query/mu-data.hh>
#include <parser/tree.hh> #include <query/mu-tree.hh>
#include <parser/proc-iface.hh> #include <query/mu-proc-iface.hh>
// A simple recursive-descent parser for queries. Follows the Xapian syntax, // A simple recursive-descent parser for queries. Follows the Xapian syntax,
// but better handles non-alphanum; also implements regexp // but better handles non-alphanum; also implements regexp

0
lib/parser/proc-iface.hh → lib/query/mu-proc-iface.hh
View File

4
lib/parser/tokenizer.cc → lib/query/mu-tokenizer.cc
View File

@ -1,5 +1,5 @@
/* /*
** Copyright (C) 2017 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ** Copyright (C) 2020 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** **
** This library is free software; you can redistribute it and/or ** This library is free software; you can redistribute it and/or
** modify it under the terms of the GNU Lesser General Public License ** modify it under the terms of the GNU Lesser General Public License
@ -17,7 +17,7 @@
** 02110-1301, USA. ** 02110-1301, USA.
*/ */
#include "tokenizer.hh" #include "mu-tokenizer.hh"
#include "utils/mu-utils.hh" #include "utils/mu-utils.hh"
#include <cctype> #include <cctype>

0
lib/parser/tokenizer.hh → lib/query/mu-tokenizer.hh
View File

2
lib/parser/tree.hh → lib/query/mu-tree.hh
View File

@ -24,7 +24,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <parser/data.hh> #include <query/mu-data.hh>
#include <utils/mu-error.hh> #include <utils/mu-error.hh>
namespace Mu { namespace Mu {

2
lib/parser/xapian.cc → lib/query/mu-xapian.cc
View File

@ -22,7 +22,7 @@
#endif /*HAVE_CONFIG_H*/ #endif /*HAVE_CONFIG_H*/
#include <xapian.h> #include <xapian.h>
#include "parser/xapian.hh" #include "mu-xapian.hh"
#include <utils/mu-error.hh> #include <utils/mu-error.hh>
using namespace Mu; using namespace Mu;

4
lib/parser/xapian.hh → lib/query/mu-xapian.hh
View File

@ -1,5 +1,5 @@
/* /*
** Copyright (C) 2017 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ** Copyright (C) 2020 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** **
** This library is free software; you can redistribute it and/or ** This library is free software; you can redistribute it and/or
** modify it under the terms of the GNU Lesser General Public License ** modify it under the terms of the GNU Lesser General Public License
@ -22,7 +22,7 @@
#define __XAPIAN_HH__ #define __XAPIAN_HH__
#include <xapian.h> #include <xapian.h>
#include <parser/parser.hh> #include <query/mu-parser.hh>
namespace Mu { namespace Mu {

4
lib/parser/parse.cc → lib/query/parse.cc
View File

@ -1,5 +1,5 @@
/* /*
** Copyright (C) 2017 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ** Copyright (C) 2020 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** **
** This library is free software; you can redistribute it and/or ** This library is free software; you can redistribute it and/or
** modify it under the terms of the GNU Lesser General Public License ** modify it under the terms of the GNU Lesser General Public License
@ -19,7 +19,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include "parser.hh" #include "mu-parser.hh"
int int
main (int argc, char *argv[]) main (int argc, char *argv[])

2
lib/parser/test-parser.cc → lib/query/test-parser.cc
View File

@ -23,7 +23,7 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include "parser.hh" #include "mu-parser.hh"
using namespace Mu; using namespace Mu;
struct Case { struct Case {

2
lib/parser/test-tokenizer.cc → lib/query/test-tokenizer.cc
View File

@ -22,7 +22,7 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
#include "tokenizer.hh" #include "mu-tokenizer.hh"
struct Case { struct Case {
const char *str; const char *str;

4
lib/parser/tokenize.cc → lib/query/tokenize.cc
View File

@ -1,5 +1,5 @@
/* /*
** Copyright (C) 2017 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ** Copyright (C) 2017-2020 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** **
** This library is free software; you can redistribute it and/or ** This library is free software; you can redistribute it and/or
** modify it under the terms of the GNU Lesser General Public License ** modify it under the terms of the GNU Lesser General Public License
@ -20,7 +20,7 @@
#include <string> #include <string>
#include <iostream> #include <iostream>
#include "tokenizer.hh" #include "mu-tokenizer.hh"
int int
main (int argc, char *argv[]) main (int argc, char *argv[])