1 files changed, 8 insertions, 24 deletions

diff --git a/src/sexpr/lexer_test.cpp b/src/sexpr/lexer_test.cpp
index fdb47f2..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,24 +57,24 @@ 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().message_str("error"_s, "test"_s),
+    EXPECT_EQ(lexer.span().error_str("test"_s),
             "<lexer-test1>:1:2: error: test\n"
             " foo( ) 123\"\" \n"
             " ^~~\n"_s
     );
     lexer.adv();
     EXPECT_EQ(lexer.peek(), sexpr::TOK_OPEN);
-    EXPECT_EQ(lexer.span().message_str("error"_s, "test"_s),
+    EXPECT_EQ(lexer.span().error_str("test"_s),
             "<lexer-test1>:1:5: error: test\n"
             " foo( ) 123\"\" \n"
             "    ^\n"_s
     );
     lexer.adv();
     EXPECT_EQ(lexer.peek(), sexpr::TOK_CLOSE);
-    EXPECT_EQ(lexer.span().message_str("error"_s, "test"_s),
+    EXPECT_EQ(lexer.span().error_str("test"_s),
             "<lexer-test1>:1:7: error: test\n"
             " foo( ) 123\"\" \n"
             "      ^\n"_s
@@ -98,7 +82,7 @@ TEST(sexpr, lexer)
     lexer.adv();
     EXPECT_EQ(lexer.peek(), sexpr::TOK_TOKEN);
     EXPECT_EQ(lexer.val_string(), "123"_s);
-    EXPECT_EQ(lexer.span().message_str("error"_s, "test"_s),
+    EXPECT_EQ(lexer.span().error_str("test"_s),
             "<lexer-test1>:1:9: error: test\n"
             " foo( ) 123\"\" \n"
             "        ^~~\n"_s
@@ -106,7 +90,7 @@ TEST(sexpr, lexer)
     lexer.adv();
     EXPECT_EQ(lexer.peek(), sexpr::TOK_STRING);
     EXPECT_EQ(lexer.val_string(), ""_s);
-    EXPECT_EQ(lexer.span().message_str("error"_s, "test"_s),
+    EXPECT_EQ(lexer.span().error_str("test"_s),
             "<lexer-test1>:1:12: error: test\n"
             " foo( ) 123\"\" \n"
             "           ^~\n"_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);
     }
 }