diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2014-10-29 14:56:55 -0700 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-10-29 14:56:55 -0700 |
commit | 1a00fe4ea75924bfe594c4d92073cc95eaa2f32d (patch) | |
tree | a6e8992e0821a998236a4dfb5d6f6194a0b7ce97 /src/sexpr/lexer_test.cpp | |
parent | 469991120bcf550b6e2124203103876b6b7be918 (diff) | |
download | tmwa-1a00fe4ea75924bfe594c4d92073cc95eaa2f32d.tar.gz tmwa-1a00fe4ea75924bfe594c4d92073cc95eaa2f32d.tar.bz2 tmwa-1a00fe4ea75924bfe594c4d92073cc95eaa2f32d.tar.xz tmwa-1a00fe4ea75924bfe594c4d92073cc95eaa2f32d.zip |
Item AST
Diffstat (limited to 'src/sexpr/lexer_test.cpp')
-rw-r--r-- | src/sexpr/lexer_test.cpp | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/sexpr/lexer_test.cpp b/src/sexpr/lexer_test.cpp index 5904894..d84312e 100644 --- a/src/sexpr/lexer_test.cpp +++ b/src/sexpr/lexer_test.cpp @@ -29,22 +29,6 @@ namespace tmwa { -static -io::FD string_pipe(ZString sz) -{ - io::FD rfd, wfd; - if (-1 == io::FD::pipe(rfd, wfd)) - return io::FD(); - if (sz.size() != wfd.write(sz.c_str(), sz.size())) - { - rfd.close(); - wfd.close(); - return io::FD(); - } - wfd.close(); - return rfd; -} - TEST(sexpr, escape) { EXPECT_EQ(sexpr::escape('\0'), "\\x00"_s); @@ -73,7 +57,7 @@ TEST(sexpr, escape) TEST(sexpr, lexer) { io::LineSpan span; - sexpr::Lexer lexer("<lexer-test1>"_s, string_pipe(" foo( ) 123\"\" \n"_s)); + sexpr::Lexer lexer(io::from_string, "<lexer-test1>"_s, " foo( ) 123\"\" \n"_s); EXPECT_EQ(lexer.peek(), sexpr::TOK_TOKEN); EXPECT_EQ(lexer.val_string(), "foo"_s); EXPECT_EQ(lexer.span().error_str("test"_s), @@ -120,7 +104,7 @@ TEST(sexpr, lexbad) QuietFd q; { io::LineSpan span; - sexpr::Lexer lexer("<lexer-bad>"_s, string_pipe("(\n"_s)); + sexpr::Lexer lexer(io::from_string, "<lexer-bad>"_s, "(\n"_s); EXPECT_EQ(lexer.peek(), sexpr::TOK_OPEN); lexer.adv(); EXPECT_EQ(lexer.peek(), sexpr::TOK_ERROR); @@ -135,7 +119,7 @@ TEST(sexpr, lexbad) }) { io::LineSpan span; - sexpr::Lexer lexer("<lexer-bad>"_s, string_pipe(bad)); + sexpr::Lexer lexer(io::from_string, "<lexer-bad>"_s, bad); EXPECT_EQ(lexer.peek(), sexpr::TOK_ERROR); } } |