diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-10-19 22:22:08 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-10-26 14:21:48 -0700 |
| commit | 6800761863dd45b6055768febc6ace6a20120dc7 (patch) | |
| tree | 73b416ca6507d9bb4f950252d55ead8e8cda34b5 /src/sexpr | |
| parent | 0edf563dfc14a2b9db33a92f0eced28950bdf1aa (diff) | |
| download | tmwa-6800761863dd45b6055768febc6ace6a20120dc7.tar.gz tmwa-6800761863dd45b6055768febc6ace6a20120dc7.tar.bz2 tmwa-6800761863dd45b6055768febc6ace6a20120dc7.tar.xz tmwa-6800761863dd45b6055768febc6ace6a20120dc7.zip | |
New ast module for for npc parsing
Will eventually put most/all parsers there.
Diffstat (limited to 'src/sexpr')
| -rw-r--r-- | src/sexpr/lexer_test.cpp | 10 | ||||
| -rw-r--r-- | src/sexpr/parser_test.cpp | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/sexpr/lexer_test.cpp b/src/sexpr/lexer_test.cpp index fdb47f2..5904894 100644 --- a/src/sexpr/lexer_test.cpp +++ b/src/sexpr/lexer_test.cpp @@ -76,21 +76,21 @@ TEST(sexpr, lexer) sexpr::Lexer lexer("<lexer-test1>"_s, string_pipe(" 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 +98,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 +106,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 diff --git a/src/sexpr/parser_test.cpp b/src/sexpr/parser_test.cpp index 846d425..8619c15 100644 --- a/src/sexpr/parser_test.cpp +++ b/src/sexpr/parser_test.cpp @@ -20,6 +20,8 @@ #include <gtest/gtest.h> +#include "../tests/fdhack.hpp" + #include "../poison.hpp" @@ -90,6 +92,7 @@ TEST(sexpr, parselist) TEST(sexpr, parsebad) { + QuietFd q; for (LString bad : { "(\n"_s, ")\n"_s, |