From 6800761863dd45b6055768febc6ace6a20120dc7 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sun, 19 Oct 2014 22:22:08 -0700 Subject: New ast module for for npc parsing Will eventually put most/all parsers there. --- src/sexpr/lexer_test.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/sexpr/lexer_test.cpp') 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(""_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), ":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), ":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), ":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), ":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), ":1:12: error: test\n" " foo( ) 123\"\" \n" " ^~\n"_s -- cgit v1.2.3-60-g2f50