Added test for removal of trailing parantheses with 0-ary predicates.

tests/TestSASParser.cpp

@@ -13,7 +13,8 @@ class SASParserTests : public ::testing::Test
 {
 	protected:
 		SASParserTests()
-		:	m_philosophersTestFile(readFile("data/philosophers.sas"))
+		:	m_blocksworldTestFile(readFile("data/blocksworld.sas")),
+			m_philosophersTestFile(readFile("data/philosophers.sas"))
 		{
 		}
 
@@ -31,6 +32,7 @@ class SASParserTests : public ::testing::Test
 			return outputStream;
 		}
 
+		std::stringstream m_blocksworldTestFile;
 		std::stringstream m_philosophersTestFile;
 };
 
@@ -109,6 +111,23 @@ TEST_F(SASParserTests, ParseValidSASFile)
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
+TEST_F(SASParserTests, RemoveTrailingParentheses)
+{
+	try
+	{
+		const auto description = plasp::sas::Description::fromStream(m_blocksworldTestFile);
+
+		ASSERT_EQ(description.variables()[4].values()[0].name(), "handempty");
+		ASSERT_EQ(description.variables()[5].values()[0].name(), "holding(a)");
+	}
+	catch (const std::exception &e)
+	{
+		FAIL () << e.what();
+	}
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
 int main(int argc, char **argv)
 {
 	::testing::InitGoogleTest(&argc, argv);

tests/data/blocksworld.sas

@@ -0,0 +1,486 @@
+begin_version
+3
+end_version
+begin_metric
+0
+end_metric
+9
+begin_variable
+var0
+-1
+2
+Atom clear(a)
+NegatedAtom clear(a)
+end_variable
+begin_variable
+var1
+-1
+2
+Atom clear(b)
+NegatedAtom clear(b)
+end_variable
+begin_variable
+var2
+-1
+2
+Atom clear(c)
+NegatedAtom clear(c)
+end_variable
+begin_variable
+var3
+-1
+2
+Atom clear(d)
+NegatedAtom clear(d)
+end_variable
+begin_variable
+var4
+-1
+2
+Atom handempty()
+NegatedAtom handempty()
+end_variable
+begin_variable
+var5
+-1
+5
+Atom holding(a)
+Atom on(a, b)
+Atom on(a, c)
+Atom on(a, d)
+Atom ontable(a)
+end_variable
+begin_variable
+var6
+-1
+5
+Atom holding(b)
+Atom on(b, a)
+Atom on(b, c)
+Atom on(b, d)
+Atom ontable(b)
+end_variable
+begin_variable
+var7
+-1
+5
+Atom holding(c)
+Atom on(c, a)
+Atom on(c, b)
+Atom on(c, d)
+Atom ontable(c)
+end_variable
+begin_variable
+var8
+-1
+5
+Atom holding(d)
+Atom on(d, a)
+Atom on(d, b)
+Atom on(d, c)
+Atom ontable(d)
+end_variable
+9
+begin_mutex_group
+5
+0 0
+5 0
+6 1
+7 1
+8 1
+end_mutex_group
+begin_mutex_group
+5
+1 0
+5 1
+6 0
+7 2
+8 2
+end_mutex_group
+begin_mutex_group
+5
+2 0
+5 2
+6 2
+7 0
+8 3
+end_mutex_group
+begin_mutex_group
+5
+3 0
+5 3
+6 3
+7 3
+8 0
+end_mutex_group
+begin_mutex_group
+5
+4 0
+5 0
+6 0
+7 0
+8 0
+end_mutex_group
+begin_mutex_group
+5
+5 0
+5 1
+5 2
+5 3
+5 4
+end_mutex_group
+begin_mutex_group
+5
+6 0
+6 1
+6 2
+6 3
+6 4
+end_mutex_group
+begin_mutex_group
+5
+7 0
+7 1
+7 2
+7 3
+7 4
+end_mutex_group
+begin_mutex_group
+5
+8 0
+8 1
+8 2
+8 3
+8 4
+end_mutex_group
+begin_state
+0
+0
+0
+0
+0
+4
+4
+4
+4
+end_state
+begin_goal
+3
+6 1
+7 2
+8 3
+end_goal
+32
+begin_operator
+pick-up a
+0
+3
+0 0 0 1
+0 4 0 1
+0 5 4 0
+1
+end_operator
+begin_operator
+pick-up b
+0
+3
+0 1 0 1
+0 4 0 1
+0 6 4 0
+1
+end_operator
+begin_operator
+pick-up c
+0
+3
+0 2 0 1
+0 4 0 1
+0 7 4 0
+1
+end_operator
+begin_operator
+pick-up d
+0
+3
+0 3 0 1
+0 4 0 1
+0 8 4 0
+1
+end_operator
+begin_operator
+put-down a
+0
+3
+0 0 -1 0
+0 4 -1 0
+0 5 0 4
+1
+end_operator
+begin_operator
+put-down b
+0
+3
+0 1 -1 0
+0 4 -1 0
+0 6 0 4
+1
+end_operator
+begin_operator
+put-down c
+0
+3
+0 2 -1 0
+0 4 -1 0
+0 7 0 4
+1
+end_operator
+begin_operator
+put-down d
+0
+3
+0 3 -1 0
+0 4 -1 0
+0 8 0 4
+1
+end_operator
+begin_operator
+stack a b
+0
+4
+0 0 -1 0
+0 1 0 1
+0 4 -1 0
+0 5 0 1
+1
+end_operator
+begin_operator
+stack a c
+0
+4
+0 0 -1 0
+0 2 0 1
+0 4 -1 0
+0 5 0 2
+1
+end_operator
+begin_operator
+stack a d
+0
+4
+0 0 -1 0
+0 3 0 1
+0 4 -1 0
+0 5 0 3
+1
+end_operator
+begin_operator
+stack b a
+0
+4
+0 0 0 1
+0 1 -1 0
+0 4 -1 0
+0 6 0 1
+1
+end_operator
+begin_operator
+stack b c
+0
+4
+0 1 -1 0
+0 2 0 1
+0 4 -1 0
+0 6 0 2
+1
+end_operator
+begin_operator
+stack b d
+0
+4
+0 1 -1 0
+0 3 0 1
+0 4 -1 0
+0 6 0 3
+1
+end_operator
+begin_operator
+stack c a
+0
+4
+0 0 0 1
+0 2 -1 0
+0 4 -1 0
+0 7 0 1
+1
+end_operator
+begin_operator
+stack c b
+0
+4
+0 1 0 1
+0 2 -1 0
+0 4 -1 0
+0 7 0 2
+1
+end_operator
+begin_operator
+stack c d
+0
+4
+0 2 -1 0
+0 3 0 1
+0 4 -1 0
+0 7 0 3
+1
+end_operator
+begin_operator
+stack d a
+0
+4
+0 0 0 1
+0 3 -1 0
+0 4 -1 0
+0 8 0 1
+1
+end_operator
+begin_operator
+stack d b
+0
+4
+0 1 0 1
+0 3 -1 0
+0 4 -1 0
+0 8 0 2
+1
+end_operator
+begin_operator
+stack d c
+0
+4
+0 2 0 1
+0 3 -1 0
+0 4 -1 0
+0 8 0 3
+1
+end_operator
+begin_operator
+unstack a b
+0
+4
+0 0 0 1
+0 1 -1 0
+0 4 0 1
+0 5 1 0
+1
+end_operator
+begin_operator
+unstack a c
+0
+4
+0 0 0 1
+0 2 -1 0
+0 4 0 1
+0 5 2 0
+1
+end_operator
+begin_operator
+unstack a d
+0
+4
+0 0 0 1
+0 3 -1 0
+0 4 0 1
+0 5 3 0
+1
+end_operator
+begin_operator
+unstack b a
+0
+4
+0 0 -1 0
+0 1 0 1
+0 4 0 1
+0 6 1 0
+1
+end_operator
+begin_operator
+unstack b c
+0
+4
+0 1 0 1
+0 2 -1 0
+0 4 0 1
+0 6 2 0
+1
+end_operator
+begin_operator
+unstack b d
+0
+4
+0 1 0 1
+0 3 -1 0
+0 4 0 1
+0 6 3 0
+1
+end_operator
+begin_operator
+unstack c a
+0
+4
+0 0 -1 0
+0 2 0 1
+0 4 0 1
+0 7 1 0
+1
+end_operator
+begin_operator
+unstack c b
+0
+4
+0 1 -1 0
+0 2 0 1
+0 4 0 1
+0 7 2 0
+1
+end_operator
+begin_operator
+unstack c d
+0
+4
+0 2 0 1
+0 3 -1 0
+0 4 0 1
+0 7 3 0
+1
+end_operator
+begin_operator
+unstack d a
+0
+4
+0 0 -1 0
+0 3 0 1
+0 4 0 1
+0 8 1 0
+1
+end_operator
+begin_operator
+unstack d b
+0
+4
+0 1 -1 0
+0 3 0 1
+0 4 0 1
+0 8 2 0
+1
+end_operator
+begin_operator
+unstack d c
+0
+4
+0 2 -1 0
+0 3 0 1
+0 4 0 1
+0 8 3 0
+1
+end_operator
+0