diff --git a/lib/glob2regex/src/glob_ast.cpp b/lib/glob2regex/src/glob_ast.cpp index 55d7f02..5b4ce4e 100644 --- a/lib/glob2regex/src/glob_ast.cpp +++ b/lib/glob2regex/src/glob_ast.cpp @@ -44,12 +44,12 @@ namespace qi = boost::spirit::qi; namespace g2r { namespace { template - struct GlobGrammar : qi::grammar { + struct GlobGrammar : qi::grammar { GlobGrammar ( void ); ~GlobGrammar ( void ) = default; - qi::rule start; - qi::rule alternation_list; + qi::rule start; + qi::rule alternation_list; qi::rule alternation; qi::rule group; qi::rule literal; @@ -92,11 +92,11 @@ namespace g2r { } } //unnamed namespace - AstType make_ast (const std::string& parGlob) { + GlobExpression make_ast (const std::string& parGlob) { GlobGrammar gramm; auto glob_beg = parGlob.cbegin(); - AstType glob_ast; + GlobExpression glob_ast; const bool parse_ret = boost::spirit::qi::parse( glob_beg, parGlob.end(), diff --git a/lib/glob2regex/src/glob_ast.hpp b/lib/glob2regex/src/glob_ast.hpp index 7e49f8c..b6d766d 100644 --- a/lib/glob2regex/src/glob_ast.hpp +++ b/lib/glob2regex/src/glob_ast.hpp @@ -23,7 +23,7 @@ #include namespace g2r { - AstType make_ast ( const std::string& parGlob ); + GlobExpression make_ast ( const std::string& parGlob ); } //namespace g2r #endif diff --git a/lib/glob2regex/src/glob_node_structs.hpp b/lib/glob2regex/src/glob_node_structs.hpp index f9f58a4..7dd9421 100644 --- a/lib/glob2regex/src/glob_node_structs.hpp +++ b/lib/glob2regex/src/glob_node_structs.hpp @@ -82,16 +82,16 @@ namespace g2r { GlobJolly >; - struct GlobAlternation { - std::vector> alternatives; - }; + using GlobExpression = std::vector; - using AstType = std::vector; + struct GlobAlternation { + std::vector alternatives; + }; } //namespace g2r BOOST_FUSION_ADAPT_STRUCT( g2r::GlobAlternation, - (std::vector>, alternatives) + (std::vector, alternatives) ); static_assert(g2r::GlobJolly(1, 2, false) < g2r::GlobJolly(0, 0, true), "Wrong less than"); diff --git a/lib/glob2regex/src/render_ast.cpp b/lib/glob2regex/src/render_ast.cpp index a80df3c..d04b423 100644 --- a/lib/glob2regex/src/render_ast.cpp +++ b/lib/glob2regex/src/render_ast.cpp @@ -25,10 +25,10 @@ namespace ka = boost::spirit::karma; namespace g2r { namespace { template - struct RegexGen : ka::grammar { + struct RegexGen : ka::grammar { RegexGen ( void ); - boost::spirit::karma::rule start; + boost::spirit::karma::rule start; boost::spirit::karma::rule alternation; boost::spirit::karma::rule group; boost::spirit::karma::rule literal; @@ -63,7 +63,7 @@ namespace g2r { } } //unnamed namespace - std::string render_ast (const AstType& parAst) { + std::string render_ast (const GlobExpression& parAst) { RegexGen gramm; std::ostringstream oss; oss << ka::format(gramm, parAst); diff --git a/lib/glob2regex/src/render_ast.hpp b/lib/glob2regex/src/render_ast.hpp index 1cf1def..118694b 100644 --- a/lib/glob2regex/src/render_ast.hpp +++ b/lib/glob2regex/src/render_ast.hpp @@ -23,7 +23,7 @@ #include namespace g2r { - std::string render_ast ( const AstType& parAst ); + std::string render_ast ( const GlobExpression& parAst ); } //namespace g2r #endif