zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-09-18 18:41:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add table definition acceptor

Browse Source
This commit is contained in:
ToruNiina
2017-05-05 19:33:45 +09:00
parent ae127e6000
commit 864840d11c
2 changed files with 103 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/test_acceptor.cpp
View File

@@ -408,7 +408,7 @@ BOOST_AUTO_TEST_CASE(test_array)
{ {
const std::string arr1("[1,\n2,#comment\n3]"); const std::string arr1("[1,\n2,#comment\n3]");
BOOST_CHECK(is_valid::invoke(arr1.cbegin()) == arr1.cend()); BOOST_CHECK(is_valid::invoke(arr1.cbegin()) == arr1.cend());
const std::string arr2("[1,\n2,#comment\r\n3]"); const std::string arr2("[#c\n1,\n2,#comment\r\n3]");
BOOST_CHECK(is_valid::invoke(arr2.cbegin()) == arr2.cend()); BOOST_CHECK(is_valid::invoke(arr2.cbegin()) == arr2.cend());
} }
} }
@@ -446,7 +446,36 @@ BOOST_AUTO_TEST_CASE(test_inline_table)
} }
} }
BOOST_AUTO_TEST_CASE(test_table_definition)
{
using is_valid = toml::is_table_definition<char>;
{
const std::string simple("[hoge]");
BOOST_CHECK(is_valid::invoke(simple.cbegin()) == simple.cend());
const std::string dotted("[hoge.piyo.fuga]");
BOOST_CHECK(is_valid::invoke(dotted.cbegin()) == dotted.cend());
const std::string spaced_dotted("[hoge . piyo .fuga. foo]");
BOOST_CHECK(is_valid::invoke(spaced_dotted.cbegin()) == spaced_dotted.cend());
const std::string quoted("[\"hoge\"]");
BOOST_CHECK(is_valid::invoke(quoted.cbegin()) == quoted.cend());
const std::string quoted_dot("[\"hoge\".'piyo'.fuga]");
BOOST_CHECK(is_valid::invoke(quoted_dot.cbegin()) == quoted_dot.cend());
}
}
BOOST_AUTO_TEST_CASE(test_array_of_table_definition)
{
using is_valid = toml::is_array_of_table_definition<char>;
{
const std::string simple("[[hoge]]");
BOOST_CHECK(is_valid::invoke(simple.cbegin()) == simple.cend());
const std::string dotted("[[hoge.piyo.fuga]]");
BOOST_CHECK(is_valid::invoke(dotted.cbegin()) == dotted.cend());
const std::string spaced_dotted("[[hoge . piyo .fuga. foo]]");
BOOST_CHECK(is_valid::invoke(spaced_dotted.cbegin()) == spaced_dotted.cend());
const std::string quoted("[[\"hoge\"]]");
BOOST_CHECK(is_valid::invoke(quoted.cbegin()) == quoted.cend());
const std::string quoted_dot("[[\"hoge\".'piyo'.fuga]]");
BOOST_CHECK(is_valid::invoke(quoted_dot.cbegin()) == quoted_dot.cend());
}
}

87
toml/acceptor.hpp
View File

@@ -255,6 +255,10 @@ using is_hex = is_one_of<is_number<charT>, is_in_range<charT, 'a', 'f'>,
is_in_range<charT, 'A', 'F'>>; is_in_range<charT, 'A', 'F'>>;
template<typename charT> template<typename charT>
using is_whitespace = is_one_of<is_space<charT>, is_tab<charT>>; using is_whitespace = is_one_of<is_space<charT>, is_tab<charT>>;
template<typename charT>
using is_any_num_of_ws =
is_ignorable<is_repeat_of<is_whitespace<charT>, repeat_infinite()>>;
template<typename charT> template<typename charT>
using is_newline = is_one_of<is_charactor<charT, '\n'>, using is_newline = is_one_of<is_charactor<charT, '\n'>,
is_chain_of<is_charactor<charT, '\r'>, is_charactor<charT, '\n'>>>; is_chain_of<is_charactor<charT, '\r'>, is_charactor<charT, '\n'>>>;
@@ -524,11 +528,6 @@ using is_key =
is_literal_inline_string<charT> is_literal_inline_string<charT>
>; >;
template<typename charT>
using is_skippable_in_inline_table =
is_repeat_of<is_whitespace<charT>, repeat_infinite()>;
template<typename charT> template<typename charT>
struct is_array struct is_array
{ {
@@ -583,13 +582,13 @@ struct is_inline_table
typedef is_one_of<is_fundamental_type<charT>, typedef is_one_of<is_fundamental_type<charT>,
is_array<charT>, is_inline_table<charT>> is_component; is_array<charT>, is_inline_table<charT>> is_component;
typedef is_chain_of< typedef is_chain_of<
is_ignorable<is_skippable_in_inline_table<charT>>, is_any_num_of_ws<charT>,
is_key<charT>, is_key<charT>,
is_ignorable<is_skippable_in_inline_table<charT>>, is_any_num_of_ws<charT>,
is_charactor<charT, '='>, is_charactor<charT, '='>,
is_ignorable<is_skippable_in_inline_table<charT>>, is_any_num_of_ws<charT>,
is_component, is_component,
is_ignorable<is_skippable_in_inline_table<charT>> is_any_num_of_ws<charT>
> is_inline_key_value_pair; > is_inline_key_value_pair;
typedef is_chain_of< typedef is_chain_of<
@@ -597,9 +596,9 @@ struct is_inline_table
is_ignorable< is_ignorable<
is_repeat_of< is_repeat_of<
is_chain_of< is_chain_of<
is_ignorable<is_skippable_in_inline_table<charT>>, is_any_num_of_ws<charT>,
is_inline_key_value_pair, is_inline_key_value_pair,
is_ignorable<is_skippable_in_inline_table<charT>>, is_any_num_of_ws<charT>,
is_charactor<charT, ','> is_charactor<charT, ','>
>, >,
repeat_infinite() repeat_infinite()
@@ -607,25 +606,79 @@ struct is_inline_table
>, >,
is_ignorable< is_ignorable<
is_chain_of< is_chain_of<
is_ignorable<is_skippable_in_inline_table<charT>>, is_any_num_of_ws<charT>,
is_inline_key_value_pair, is_inline_key_value_pair,
is_ignorable<is_skippable_in_inline_table<charT>>, is_any_num_of_ws<charT>,
is_ignorable<is_charactor<charT, ','>> is_ignorable<is_charactor<charT, ','>>
> >
>, >,
is_ignorable<is_skippable_in_inline_table<charT>>, is_any_num_of_ws<charT>,
is_charactor<charT, '}'> is_charactor<charT, '}'>
> entity; > entity;
return entity::invoke(iter); return entity::invoke(iter);
} }
}; };
template<typename charT>
using is_value =
is_one_of<is_fundamental_type<charT>, is_array<charT>, is_inline_table<charT>>;
// []
template<typename charT>
using is_table_definition =
is_chain_of<
is_any_num_of_ws<charT>,
is_charactor<charT, '['>,
is_any_num_of_ws<charT>,
is_ignorable<
is_repeat_of<
is_chain_of<
is_any_num_of_ws<charT>,
is_key<charT>,
is_any_num_of_ws<charT>,
is_charactor<charT, '.'>,
is_any_num_of_ws<charT>
>,
repeat_infinite()>
>,
is_key<charT>,
is_charactor<charT, ']'>
>;
template<typename charT>
using is_array_of_table_definition =
is_chain_of<
is_any_num_of_ws<charT>,
is_repeat_of<is_charactor<charT, '['>, 2>,
is_ignorable<
is_repeat_of<
is_chain_of<
is_any_num_of_ws<charT>,
is_key<charT>,
is_any_num_of_ws<charT>,
is_charactor<charT, '.'>,
is_any_num_of_ws<charT>
>,
repeat_infinite()>
>,
is_key<charT>,
is_repeat_of<is_charactor<charT, ']'>, 2>
>;
template<typename charT>
using is_key_value_pair =
is_chain_of<
is_any_num_of_ws<charT>,
is_key<charT>,
is_any_num_of_ws<charT>,
is_charactor<charT, '='>,
is_any_num_of_ws<charT>,
is_value<charT>,
is_any_num_of_ws<charT>,
is_ignorable<is_comment<charT>>,
is_any_num_of_ws<charT>,
is_newline<charT>
>;
}//toml }//toml
#endif// TOML11_ACCEPTOR #endif// TOML11_ACCEPTOR