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

refactor: remove push_back from scanners

Browse Source
This commit is contained in:
ToruNiina
2025-02-05 00:28:14 +09:00
parent 5d78fc832d
commit 63e4e6fdab
2 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/toml11/fwd/scanner_fwd.hpp
View File

@@ -200,12 +200,6 @@ class sequence final: public scanner_base
scanner_base* clone() const override;
template<typename Scanner>
void push_back(Scanner&& other_scanner)
{
this->others_.emplace_back(std::forward<Scanner>(other_scanner));
}
std::string name() const override;
private:
@@ -252,12 +246,6 @@ class either final: public scanner_base
scanner_base* clone() const override;
template<typename Scanner>
void push_back(Scanner&& other_scanner)
{
this->others_.emplace_back(std::forward<Scanner>(other_scanner));
}
std::string name() const override;
private:

80
include/toml11/impl/syntax_impl.hpp
View File

@@ -343,15 +343,13 @@ TOML11_INLINE sequence local_date(const spec& s)
}
TOML11_INLINE sequence local_time(const spec& s)
{
auto time = sequence(
repeat_exact(2, digit(s)),
character(':'),
repeat_exact(2, digit(s))
);
if(s.v1_1_0_make_seconds_optional)
{
time.push_back(maybe(sequence(
return sequence(
repeat_exact(2, digit(s)),
character(':'),
repeat_exact(2, digit(s)),
maybe(sequence(
character(':'),
repeat_exact(2, digit(s)),
maybe(sequence(character('.'), repeat_at_least(1, digit(s))))
@@ -359,14 +357,15 @@ TOML11_INLINE sequence local_time(const spec& s)
}
else
{
time.push_back(character(':'));
time.push_back(repeat_exact(2, digit(s)));
time.push_back(
return sequence(
repeat_exact(2, digit(s)),
character(':'),
repeat_exact(2, digit(s)),
character(':'),
repeat_exact(2, digit(s)),
maybe(sequence(character('.'), repeat_at_least(1, digit(s))))
);
}
return time;
}
TOML11_INLINE either time_offset(const spec& s)
{
@@ -412,23 +411,27 @@ TOML11_INLINE sequence escaped(const spec& s)
}
};
either escape_seq(
escape_char(),
sequence(character('u'), repeat_exact(4, hexdig(s))),
sequence(character('U'), repeat_exact(8, hexdig(s)))
);
const auto escape_seq = [&s, &escape_char] {
if(s.v1_1_0_add_escape_sequence_x)
{
return either(
escape_char(),
sequence(character('u'), repeat_exact(4, hexdig(s))),
sequence(character('U'), repeat_exact(8, hexdig(s))),
sequence(character('x'), repeat_exact(2, hexdig(s)))
);
}
else
{
return either(
escape_char(),
sequence(character('u'), repeat_exact(4, hexdig(s))),
sequence(character('U'), repeat_exact(8, hexdig(s)))
);
}
};
if(s.v1_1_0_add_escape_sequence_x)
{
escape_seq.push_back(
sequence(character('x'), repeat_exact(2, hexdig(s)))
);
}
return sequence(
character('\\'),
std::move(escape_seq)
);
return sequence(character('\\'), escape_seq());
}
TOML11_INLINE either basic_char(const spec& s)
@@ -664,16 +667,19 @@ TOML11_INLINE region non_ascii_key_char::scan(location& loc) const
TOML11_INLINE repeat_at_least unquoted_key(const spec& s)
{
auto keychar = either(
alpha(s), digit(s), character{0x2D}, character{0x5F}
);
const auto keychar = [&s] {
if(s.v1_1_0_allow_non_english_in_bare_keys)
{
return either(alpha(s), digit(s), character{0x2D}, character{0x5F},
non_ascii_key_char(s));
}
else
{
return either(alpha(s), digit(s), character{0x2D}, character{0x5F});
}
};
if(s.v1_1_0_allow_non_english_in_bare_keys)
{
keychar.push_back(non_ascii_key_char(s));
}
return repeat_at_least(1, std::move(keychar));
return repeat_at_least(1, keychar());
}
TOML11_INLINE either quoted_key(const spec& s)