patrick/plasp
Archived
1
0
Fork 0
Code Issues 12 Releases 8 Activity

Major refactoring of underlying Parser class.

Browse Source
This commit is contained in:
Patrick Lühne
2016-08-02 19:58:54 +02:00
parent 73c9d6c1f3
commit 544d4e0635
63 changed files with 1498 additions and 1021 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/TestUtils.cpp
View File

@@ -9,9 +9,10 @@
TEST(UtilsTests, ParseSimple)
{
std::stringstream s("identifier 5 \n-51\t 0 1 expected unexpected");
plasp::utils::Parser p("input", s);
plasp::utils::Parser<> p("input", s);
ASSERT_TRUE(p.isCaseSensitive());
// TODO: reimplement
//ASSERT_TRUE(p.isCaseSensitive());
ASSERT_EQ(p.parse<std::string>(), "identifier");
ASSERT_EQ(p.parse<size_t>(), 5u);
@@ -31,7 +32,7 @@ TEST(UtilsTests, ParseSimple)
TEST(UtilsTests, ParseUnsignedNumbers)
{
std::stringstream s("100 200 -300 -400");
plasp::utils::Parser p("input", s);
plasp::utils::Parser<> p("input", s);
ASSERT_EQ(p.parse<int>(), 100);
ASSERT_EQ(p.parse<size_t>(), 200u);
@@ -44,13 +45,13 @@ TEST(UtilsTests, ParseUnsignedNumbers)
TEST(UtilsTests, ParseEndOfFile)
{
std::stringstream s1("test");
plasp::utils::Parser p1("input", s1);
plasp::utils::Parser<> p1("input", s1);
ASSERT_NO_THROW(p1.expect<std::string>("test"));
ASSERT_THROW(p1.parse<std::string>(), plasp::utils::ParserException);
std::stringstream s2("test1 test2 test3");
plasp::utils::Parser p2("input", s2);
plasp::utils::Parser<> p2("input", s2);
ASSERT_NO_THROW(p2.expect<std::string>("test1"));
ASSERT_NO_THROW(p2.expect<std::string>("test2"));
@@ -58,13 +59,13 @@ TEST(UtilsTests, ParseEndOfFile)
ASSERT_THROW(p2.parse<std::string>(), plasp::utils::ParserException);
std::stringstream s3("-127");
plasp::utils::Parser p3("input", s3);
plasp::utils::Parser<> p3("input", s3);
p3.expect<int>(-127);
ASSERT_THROW(p3.parse<int>(), plasp::utils::ParserException);
std::stringstream s4("128 -1023 -4095");
plasp::utils::Parser p4("input", s4);
plasp::utils::Parser<> p4("input", s4);
ASSERT_NO_THROW(p4.expect<size_t>(128));
ASSERT_NO_THROW(p4.expect<int>(-1023));
@@ -72,13 +73,13 @@ TEST(UtilsTests, ParseEndOfFile)
ASSERT_THROW(p4.parse<int>(), plasp::utils::ParserException);
std::stringstream s5("0");
plasp::utils::Parser p5("input", s5);
plasp::utils::Parser<> p5("input", s5);
p5.expect<bool>(false);
ASSERT_THROW(p5.parse<bool>(), plasp::utils::ParserException);
std::stringstream s6("0 1 0");
plasp::utils::Parser p6("input", s6);
plasp::utils::Parser<> p6("input", s6);
ASSERT_NO_THROW(p6.expect<bool>(false));
ASSERT_NO_THROW(p6.expect<bool>(true));
@@ -91,11 +92,11 @@ TEST(UtilsTests, ParseEndOfFile)
TEST(UtilsTests, ParserPosition)
{
std::stringstream s("123 \n4\ntest1\n test2\ntest3 \ntest4\n\n\n\n");
plasp::utils::Parser p("input", s);
plasp::utils::Parser<> p("input", s);
const auto startPosition = p.position();
plasp::utils::Parser::Coordinate c;
plasp::utils::StreamCoordinate c;
c = p.coordinate();
ASSERT_EQ(c.row, 1u);
@@ -174,11 +175,11 @@ TEST(UtilsTests, ParserPosition)
c = p.coordinate();
ASSERT_EQ(c.row, 10u);
ASSERT_EQ(c.column, 1u);
ASSERT_TRUE(p.atEndOfStream());
ASSERT_TRUE(p.atEnd());
p.reset();
ASSERT_EQ(p.position(), startPosition);
ASSERT_FALSE(p.atEndOfStream());
ASSERT_FALSE(p.atEnd());
for (size_t i = 0; i < 5; i++)
p.advance();
@@ -199,11 +200,11 @@ TEST(UtilsTests, ParserPosition)
TEST(UtilsTests, ParserRemoveComments)
{
std::stringstream s1("; comment at beginning\ntest1; comment in between\ntest2; comment at end");
plasp::utils::Parser p1("input", s1);
plasp::utils::Parser<> p1("input", s1);
p1.removeComments(";", "\n", false);
plasp::utils::Parser::Coordinate c;
plasp::utils::StreamCoordinate c;
ASSERT_NO_THROW(p1.expect<std::string>("test1"));
@@ -219,10 +220,10 @@ TEST(UtilsTests, ParserRemoveComments)
p1.skipWhiteSpace();
ASSERT_TRUE(p1.atEndOfStream());
ASSERT_TRUE(p1.atEnd());
std::stringstream s2("test;");
plasp::utils::Parser p2("input", s2);
plasp::utils::Parser<> p2("input", s2);
p2.removeComments(";", "\n", false);
@@ -230,10 +231,10 @@ TEST(UtilsTests, ParserRemoveComments)
p2.skipWhiteSpace();
ASSERT_TRUE(p2.atEndOfStream());
ASSERT_TRUE(p2.atEnd());
std::stringstream s3("/* comment at start */ test1 /* comment in between */ test2 /*");
plasp::utils::Parser p3("input", s3);
plasp::utils::Parser<> p3("input", s3);
p3.removeComments("/*", "*/", true);
@@ -242,7 +243,7 @@ TEST(UtilsTests, ParserRemoveComments)
p3.skipWhiteSpace();
ASSERT_TRUE(p3.atEndOfStream());
ASSERT_TRUE(p3.atEnd());
}
////////////////////////////////////////////////////////////////////////////////////////////////////