mirror of https://github.com/djcb/mu.git
lib/parser -> lib/query
And update the names to follow the mu- convention.
This commit is contained in:
Dirk-Jan C. Binnema
parent
a132f5c21f
commit
20ce7b7066
|
|
@ -256,7 +256,7 @@ mu/mu-memcheck
|
|||
lib/Makefile
|
||||
lib/doxyfile
|
||||
lib/utils/Makefile
|
||||
lib/parser/Makefile
|
||||
lib/query/Makefile
|
||||
mu4e/Makefile
|
||||
mu4e/mu4e-meta.el
|
||||
guile/Makefile
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
# before decending into tests/
|
||||
include $(top_srcdir)/gtest.mk
|
||||
|
||||
SUBDIRS= utils parser
|
||||
SUBDIRS= utils query
|
||||
|
||||
if HAVE_JSON_GLIB
|
||||
json_srcs= \
|
||||
|
|
@ -122,7 +122,7 @@ libmu_la_LIBADD= \
|
|||
$(GUILE_LIBS) \
|
||||
$(JSON_GLIB_LIBS) \
|
||||
${builddir}/utils/libmu-utils.la \
|
||||
${builddir}/parser/libmu-parser.la \
|
||||
${builddir}/query/libmu-query.la \
|
||||
$(CODE_COVERAGE_LIBS)
|
||||
|
||||
libmu_la_LDFLAGS= \
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@
|
|||
#include "utils/mu-date.h"
|
||||
#include <utils/mu-utils.hh>
|
||||
|
||||
#include <parser/proc-iface.hh>
|
||||
#include <parser/xapian.hh>
|
||||
#include <query/mu-proc-iface.hh>
|
||||
#include <query/mu-xapian.hh>
|
||||
|
||||
using namespace Mu;
|
||||
|
||||
|
|
|
|||
|
|
@ -41,20 +41,20 @@ noinst_PROGRAMS= \
|
|||
parse
|
||||
|
||||
noinst_LTLIBRARIES= \
|
||||
libmu-parser.la
|
||||
libmu-query.la
|
||||
|
||||
libmu_parser_la_SOURCES= \
|
||||
data.hh \
|
||||
parser.cc \
|
||||
parser.hh \
|
||||
proc-iface.hh \
|
||||
tokenizer.cc \
|
||||
tokenizer.hh \
|
||||
tree.hh \
|
||||
xapian.cc \
|
||||
xapian.hh
|
||||
libmu_query_la_SOURCES= \
|
||||
mu-data.hh \
|
||||
mu-parser.cc \
|
||||
mu-parser.hh \
|
||||
mu-proc-iface.hh \
|
||||
mu-tokenizer.cc \
|
||||
mu-tokenizer.hh \
|
||||
mu-tree.hh \
|
||||
mu-xapian.cc \
|
||||
mu-xapian.hh
|
||||
|
||||
libmu_parser_la_LIBADD= \
|
||||
libmu_query_la_LIBADD= \
|
||||
$(WARN_LDFLAGS) \
|
||||
$(GLIB_LIBS) \
|
||||
$(XAPIAN_LIBS) \
|
||||
|
|
@ -69,14 +69,14 @@ tokenize_SOURCES= \
|
|||
|
||||
tokenize_LDADD= \
|
||||
$(WARN_LDFLAGS) \
|
||||
libmu-parser.la
|
||||
libmu-query.la
|
||||
|
||||
parse_SOURCES= \
|
||||
parse.cc
|
||||
|
||||
parse_LDADD= \
|
||||
$(WARN_LDFLAGS) \
|
||||
libmu-parser.la
|
||||
libmu-query.la
|
||||
|
||||
noinst_PROGRAMS+=$(TEST_PROGS)
|
||||
|
||||
|
|
@ -85,14 +85,14 @@ TEST_PROGS+= \
|
|||
test_tokenizer_SOURCES= \
|
||||
test-tokenizer.cc
|
||||
test_tokenizer_LDADD= \
|
||||
libmu-parser.la
|
||||
libmu-query.la
|
||||
|
||||
TEST_PROGS+= \
|
||||
test-parser
|
||||
test_parser_SOURCES= \
|
||||
test-parser.cc
|
||||
test_parser_LDADD= \
|
||||
libmu-parser.la
|
||||
libmu-query.la
|
||||
|
||||
TESTS=$(TEST_PROGS)
|
||||
|
||||
|
|
@ -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
|
||||
** 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
|
||||
** 02110-1301, USA.
|
||||
*/
|
||||
#include "parser.hh"
|
||||
#include "tokenizer.hh"
|
||||
#include "mu-parser.hh"
|
||||
#include "mu-tokenizer.hh"
|
||||
#include "utils/mu-utils.hh"
|
||||
#include "utils/mu-error.hh"
|
||||
|
||||
|
|
@ -25,9 +25,9 @@
|
|||
#include <vector>
|
||||
#include <memory>
|
||||
|
||||
#include <parser/data.hh>
|
||||
#include <parser/tree.hh>
|
||||
#include <parser/proc-iface.hh>
|
||||
#include <query/mu-data.hh>
|
||||
#include <query/mu-tree.hh>
|
||||
#include <query/mu-proc-iface.hh>
|
||||
|
||||
// A simple recursive-descent parser for queries. Follows the Xapian syntax,
|
||||
// but better handles non-alphanum; also implements regexp
|
||||
|
|
@ -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
|
||||
** modify it under the terms of the GNU Lesser General Public License
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
** 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include "tokenizer.hh"
|
||||
#include "mu-tokenizer.hh"
|
||||
#include "utils/mu-utils.hh"
|
||||
|
||||
#include <cctype>
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
#include <string>
|
||||
#include <iostream>
|
||||
|
||||
#include <parser/data.hh>
|
||||
#include <query/mu-data.hh>
|
||||
#include <utils/mu-error.hh>
|
||||
|
||||
namespace Mu {
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
#endif /*HAVE_CONFIG_H*/
|
||||
|
||||
#include <xapian.h>
|
||||
#include "parser/xapian.hh"
|
||||
#include "mu-xapian.hh"
|
||||
#include <utils/mu-error.hh>
|
||||
|
||||
using namespace Mu;
|
||||
|
|
@ -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
|
||||
** modify it under the terms of the GNU Lesser General Public License
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
#define __XAPIAN_HH__
|
||||
|
||||
#include <xapian.h>
|
||||
#include <parser/parser.hh>
|
||||
#include <query/mu-parser.hh>
|
||||
|
||||
namespace Mu {
|
||||
|
||||
|
|
@ -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
|
||||
** modify it under the terms of the GNU Lesser General Public License
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include "parser.hh"
|
||||
#include "mu-parser.hh"
|
||||
|
||||
int
|
||||
main (int argc, char *argv[])
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
#include "parser.hh"
|
||||
#include "mu-parser.hh"
|
||||
using namespace Mu;
|
||||
|
||||
struct Case {
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
#include "tokenizer.hh"
|
||||
#include "mu-tokenizer.hh"
|
||||
|
||||
struct Case {
|
||||
const char *str;
|
||||
|
|
@ -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
|
||||
** modify it under the terms of the GNU Lesser General Public License
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
#include <string>
|
||||
#include <iostream>
|
||||
|
||||
#include "tokenizer.hh"
|
||||
#include "mu-tokenizer.hh"
|
||||
|
||||
int
|
||||
main (int argc, char *argv[])
|
||||
Loading…
Reference in New Issue