Commit a887399c authored by Dominik Charousset's avatar Dominik Charousset

Support unquoted strings in read_string

parent 3283051e
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "caf/config.hpp" #include "caf/config.hpp"
#include "caf/detail/parser/chars.hpp" #include "caf/detail/parser/chars.hpp"
#include "caf/detail/parser/is_char.hpp"
#include "caf/detail/parser/state.hpp" #include "caf/detail/parser/state.hpp"
#include "caf/detail/scope_guard.hpp" #include "caf/detail/scope_guard.hpp"
#include "caf/pec.hpp" #include "caf/pec.hpp"
...@@ -36,8 +35,8 @@ namespace caf { ...@@ -36,8 +35,8 @@ namespace caf {
namespace detail { namespace detail {
namespace parser { namespace parser {
/// Reads a number, i.e., on success produces either an `int64_t` or a /// Reads a quoted or unquoted string. Quoted strings allow escaping, while
/// `double`. /// unquoted strings may only include alphanumeric characters.
template <class Iterator, class Sentinel, class Consumer> template <class Iterator, class Sentinel, class Consumer>
void read_string(state<Iterator, Sentinel>& ps, Consumer& consumer) { void read_string(state<Iterator, Sentinel>& ps, Consumer& consumer) {
std::string res; std::string res;
...@@ -49,6 +48,7 @@ void read_string(state<Iterator, Sentinel>& ps, Consumer& consumer) { ...@@ -49,6 +48,7 @@ void read_string(state<Iterator, Sentinel>& ps, Consumer& consumer) {
state(init) { state(init) {
transition(init, " \t") transition(init, " \t")
transition(read_chars, '"') transition(read_chars, '"')
transition(read_unquoted_chars, alphanumeric_chars, res += ch)
} }
state(read_chars) { state(read_chars) {
transition(escape, '\\') transition(escape, '\\')
...@@ -64,6 +64,10 @@ void read_string(state<Iterator, Sentinel>& ps, Consumer& consumer) { ...@@ -64,6 +64,10 @@ void read_string(state<Iterator, Sentinel>& ps, Consumer& consumer) {
transition(read_chars, '"', res += '"') transition(read_chars, '"', res += '"')
error_transition(pec::illegal_escape_sequence) error_transition(pec::illegal_escape_sequence)
} }
term_state(read_unquoted_chars) {
transition(read_unquoted_chars, alphanumeric_chars, res += ch)
epsilon(done)
}
term_state(done) { term_state(done) {
transition(done, " \t") transition(done, " \t")
} }
......
...@@ -77,25 +77,29 @@ CAF_TEST(empty string) { ...@@ -77,25 +77,29 @@ CAF_TEST(empty string) {
CAF_CHECK_EQUAL(p("\t \"\" \t\t\t "), ""_s); CAF_CHECK_EQUAL(p("\t \"\" \t\t\t "), ""_s);
} }
CAF_TEST(non-empty string) { CAF_TEST(non-empty quoted string) {
CAF_CHECK_EQUAL(p(R"("abc")"), "abc"_s); CAF_CHECK_EQUAL(p(R"("abc")"), "abc"_s);
CAF_CHECK_EQUAL(p(R"("a b c")"), "a b c"_s); CAF_CHECK_EQUAL(p(R"("a b c")"), "a b c"_s);
CAF_CHECK_EQUAL(p(R"( "abcdefABCDEF" )"), "abcdefABCDEF"_s); CAF_CHECK_EQUAL(p(R"( "abcdefABCDEF" )"), "abcdefABCDEF"_s);
} }
CAF_TEST(string with escaped characters) { CAF_TEST(quoted string with escaped characters) {
CAF_CHECK_EQUAL(p(R"("a\tb\tc")"), "a\tb\tc"_s); CAF_CHECK_EQUAL(p(R"("a\tb\tc")"), "a\tb\tc"_s);
CAF_CHECK_EQUAL(p(R"("a\nb\r\nc")"), "a\nb\r\nc"_s); CAF_CHECK_EQUAL(p(R"("a\nb\r\nc")"), "a\nb\r\nc"_s);
CAF_CHECK_EQUAL(p(R"("a\\b")"), "a\\b"_s); CAF_CHECK_EQUAL(p(R"("a\\b")"), "a\\b"_s);
//CAF_CHECK_EQUAL(p(R"("foo = \"bar\"")"), "foo = \"bar\""_s); }
CAF_TEST(unquoted strings) {
CAF_CHECK_EQUAL(p(R"(foo)"), "foo"_s);
CAF_CHECK_EQUAL(p(R"( foo )"), "foo"_s);
CAF_CHECK_EQUAL(p(R"( 123 )"), "123"_s);
} }
CAF_TEST(invalid strings) { CAF_TEST(invalid strings) {
CAF_CHECK_EQUAL(p(R"("abc)"), pec::unexpected_eof); CAF_CHECK_EQUAL(p(R"("abc)"), pec::unexpected_eof);
CAF_CHECK_EQUAL(p("\"ab\nc\""), pec::unexpected_newline); CAF_CHECK_EQUAL(p("\"ab\nc\""), pec::unexpected_newline);
CAF_CHECK_EQUAL(p(R"("foo \i bar")"), pec::illegal_escape_sequence);
CAF_CHECK_EQUAL(p(R"(foo)"), pec::unexpected_character);
CAF_CHECK_EQUAL(p(R"("abc" def)"), pec::trailing_character); CAF_CHECK_EQUAL(p(R"("abc" def)"), pec::trailing_character);
CAF_CHECK_EQUAL(p(R"( 123, )"), pec::trailing_character);
} }
CAF_TEST_FIXTURE_SCOPE_END() CAF_TEST_FIXTURE_SCOPE_END()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment