1 files changed, 22 insertions, 18 deletions

diff --git a/src/sexpr/parser_test.cpp b/src/sexpr/parser_test.cpp
index d67d041..846d425 100644
--- a/src/sexpr/parser_test.cpp
+++ b/src/sexpr/parser_test.cpp
@@ -22,6 +22,9 @@
 
 #include "../poison.hpp"
 
+
+namespace tmwa
+{
 static
 io::FD string_pipe(ZString sz)
 {
@@ -42,11 +45,11 @@ TEST(sexpr, parser)
 {
     sexpr::SExpr s;
     io::LineSpan span;
-    sexpr::Lexer lexer("<parser-test1>", string_pipe(" foo( ) 123\"\" \n"));
+    sexpr::Lexer lexer("<parser-test1>"_s, string_pipe(" foo( ) 123\"\" \n"_s));
 
     EXPECT_TRUE(sexpr::parse(lexer, s));
     EXPECT_EQ(s._type, sexpr::TOKEN);
-    EXPECT_EQ(s._str, "foo");
+    EXPECT_EQ(s._str, "foo"_s);
 
     EXPECT_TRUE(sexpr::parse(lexer, s));
     EXPECT_EQ(s._type, sexpr::LIST);
@@ -58,7 +61,7 @@ TEST(sexpr, parser)
 
     EXPECT_TRUE(sexpr::parse(lexer, s));
     EXPECT_EQ(s._type, sexpr::STRING);
-    EXPECT_EQ(s._str, "");
+    EXPECT_EQ(s._str, ""_s);
 
     EXPECT_FALSE(sexpr::parse(lexer, s));
     EXPECT_EQ(lexer.peek(), sexpr::TOK_EOF);
@@ -67,19 +70,19 @@ TEST(sexpr, parser)
 TEST(sexpr, parselist)
 {
     sexpr::SExpr s;
-    sexpr::Lexer lexer("<parser-test1>", string_pipe("(foo)(bar)\n"));
+    sexpr::Lexer lexer("<parser-test1>"_s, string_pipe("(foo)(bar)\n"_s));
 
     EXPECT_TRUE(sexpr::parse(lexer, s));
     EXPECT_EQ(s._type, sexpr::LIST);
     EXPECT_EQ(s._list.size(), 1);
     EXPECT_EQ(s._list[0]._type, sexpr::TOKEN);
-    EXPECT_EQ(s._list[0]._str, "foo");
+    EXPECT_EQ(s._list[0]._str, "foo"_s);
 
     EXPECT_TRUE(sexpr::parse(lexer, s));
     EXPECT_EQ(s._type, sexpr::LIST);
     EXPECT_EQ(s._list.size(), 1);
     EXPECT_EQ(s._list[0]._type, sexpr::TOKEN);
-    EXPECT_EQ(s._list[0]._str, "bar");
+    EXPECT_EQ(s._list[0]._str, "bar"_s);
 
     EXPECT_FALSE(sexpr::parse(lexer, s));
     EXPECT_EQ(lexer.peek(), sexpr::TOK_EOF);
@@ -87,23 +90,24 @@ TEST(sexpr, parselist)
 
 TEST(sexpr, parsebad)
 {
-    for (ZString bad : {
-            ZString("(\n"),
-            ZString(")\n"),
-            ZString("\"\n"),
-            ZString("'\n"),
-            ZString("\\\n"),
-            ZString("\"\\"),
-            ZString("\"\\z\""),
-            ZString("(()\n"),
-            ZString("((\n"),
-            ZString("((\"\n"),
+    for (LString bad : {
+            "(\n"_s,
+            ")\n"_s,
+            "\"_s\n"_s,
+            "'\n"_s,
+            "\\\n"_s,
+            "\"_s\\"_s,
+            "\"_s\\z\""_s,
+            "(()\n"_s,
+            "((\n"_s,
+            "((\"\n"_s,
     })
     {
         sexpr::SExpr s;
         io::LineSpan span;
-        sexpr::Lexer lexer("<parse-bad>", string_pipe(bad));
+        sexpr::Lexer lexer("<parse-bad>"_s, string_pipe(bad));
         EXPECT_FALSE(sexpr::parse(lexer, s));
         EXPECT_EQ(lexer.peek(), sexpr::TOK_ERROR);
     }
 }
+} // namespace tmwa