King_DuckZ/dindexer
1
0
Fork 0
mirror of https://github.com/KingDuckZ/dindexer.git synced 2025-07-03 14:14:11 +00:00
Code Issues Releases Wiki Activity

Rename AstType to GlobExpression

Browse source
This commit is contained in:
King_DuckZ 2016-05-13 19:22:33 +02:00
parent 94ebfbdfcb
commit 61fa9628a5
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/glob2regex/src/glob_ast.cpp
View file

@ -44,12 +44,12 @@ namespace qi = boost::spirit::qi;
namespace g2r { namespace g2r {
namespace { namespace {
template <typename Iterator> template <typename Iterator>
struct GlobGrammar : qi::grammar<Iterator, AstType()> { struct GlobGrammar : qi::grammar<Iterator, GlobExpression()> {
GlobGrammar ( void ); GlobGrammar ( void );
~GlobGrammar ( void ) = default; ~GlobGrammar ( void ) = default;
qi::rule<Iterator, AstType()> start; qi::rule<Iterator, GlobExpression()> start;
qi::rule<Iterator, AstType()> alternation_list; qi::rule<Iterator, GlobExpression()> alternation_list;
qi::rule<Iterator, GlobAlternation()> alternation; qi::rule<Iterator, GlobAlternation()> alternation;
qi::rule<Iterator, GlobGroup()> group; qi::rule<Iterator, GlobGroup()> group;
qi::rule<Iterator, std::string()> literal; qi::rule<Iterator, std::string()> literal;
@ -92,11 +92,11 @@ namespace g2r {
} }
} //unnamed namespace } //unnamed namespace
AstType make_ast (const std::string& parGlob) { GlobExpression make_ast (const std::string& parGlob) {
GlobGrammar<std::string::const_iterator> gramm; GlobGrammar<std::string::const_iterator> gramm;
auto glob_beg = parGlob.cbegin(); auto glob_beg = parGlob.cbegin();
AstType glob_ast; GlobExpression glob_ast;
const bool parse_ret = boost::spirit::qi::parse( const bool parse_ret = boost::spirit::qi::parse(
glob_beg, glob_beg,
parGlob.end(), parGlob.end(),

2
lib/glob2regex/src/glob_ast.hpp
View file

@ -23,7 +23,7 @@
#include <string> #include <string>
namespace g2r { namespace g2r {
AstType make_ast ( const std::string& parGlob ); GlobExpression make_ast ( const std::string& parGlob );
} //namespace g2r } //namespace g2r
#endif #endif

10
lib/glob2regex/src/glob_node_structs.hpp
View file

@ -82,16 +82,16 @@ namespace g2r {
GlobJolly GlobJolly
>; >;
struct GlobAlternation { using GlobExpression = std::vector<GlobNode>;
std::vector<std::vector<GlobNode>> alternatives;
};
using AstType = std::vector<GlobNode>; struct GlobAlternation {
std::vector<GlobExpression> alternatives;
};
} //namespace g2r } //namespace g2r
BOOST_FUSION_ADAPT_STRUCT( BOOST_FUSION_ADAPT_STRUCT(
g2r::GlobAlternation, g2r::GlobAlternation,
(std::vector<std::vector<g2r::GlobNode>>, alternatives) (std::vector<g2r::GlobExpression>, alternatives)
); );
static_assert(g2r::GlobJolly(1, 2, false) < g2r::GlobJolly(0, 0, true), "Wrong less than"); static_assert(g2r::GlobJolly(1, 2, false) < g2r::GlobJolly(0, 0, true), "Wrong less than");

6
lib/glob2regex/src/render_ast.cpp
View file

@ -25,10 +25,10 @@ namespace ka = boost::spirit::karma;
namespace g2r { namespace g2r {
namespace { namespace {
template <typename Iterator> template <typename Iterator>
struct RegexGen : ka::grammar<Iterator, AstType()> { struct RegexGen : ka::grammar<Iterator, GlobExpression()> {
RegexGen ( void ); RegexGen ( void );
boost::spirit::karma::rule<Iterator, AstType()> start; boost::spirit::karma::rule<Iterator, GlobExpression()> start;
boost::spirit::karma::rule<Iterator, GlobAlternation()> alternation; boost::spirit::karma::rule<Iterator, GlobAlternation()> alternation;
boost::spirit::karma::rule<Iterator, GlobGroup()> group; boost::spirit::karma::rule<Iterator, GlobGroup()> group;
boost::spirit::karma::rule<Iterator, std::string()> literal; boost::spirit::karma::rule<Iterator, std::string()> literal;
@ -63,7 +63,7 @@ namespace g2r {
} }
} //unnamed namespace } //unnamed namespace
std::string render_ast (const AstType& parAst) { std::string render_ast (const GlobExpression& parAst) {
RegexGen<boost::spirit::ostream_iterator> gramm; RegexGen<boost::spirit::ostream_iterator> gramm;
std::ostringstream oss; std::ostringstream oss;
oss << ka::format(gramm, parAst); oss << ka::format(gramm, parAst);

2
lib/glob2regex/src/render_ast.hpp
View file

@ -23,7 +23,7 @@
#include <string> #include <string>
namespace g2r { namespace g2r {
std::string render_ast ( const AstType& parAst ); std::string render_ast ( const GlobExpression& parAst );
} //namespace g2r } //namespace g2r
#endif #endif