[#121] fix(ModelScript): allow parentheses in strings

Author: lmichaelis

src/ModelScriptDsl.cc

@@ -82,7 +82,16 @@ namespace zenkit {
 				chr = static_cast<unsigned char>(_m_buffer->read_char());
 				_m_column += 1;
 
-				while (chr != '"' && chr != '\n' && chr != ')') {
+				// Modded. Some mods may include `(` and/or `)` in their strings. For this reason we need to handle
+				// all of these cases:
+				//			registerMesh ("Some_File Name(WithBrackets).ASC")
+				//			registerMesh ("Some_File Name.ASC")
+				//			registerMesh ("Some_File Name.ASC"
+				//			registerMesh ("Some_File Name.ASC)
+				//			registerMesh ("Some_File Name.ASC
+				unsigned char prev = '\0';
+				while (chr != '"' && chr != '\n') {
+					if (!std::isspace(chr)) prev = chr;
 					_m_value.push_back(static_cast<char>(chr));
 					chr = static_cast<unsigned char>(_m_buffer->read_char());
 					_m_column += 1;
@@ -94,6 +103,7 @@ namespace zenkit {
 					_m_column -= 1;
 				}
 
+				if (prev == ')') _m_value.pop_back();
 				return MdsToken::STRING;
 			}
 

tests/TestModelScript.cc

@@ -15,6 +15,13 @@ TEST_SUITE("ModelScript") {
 		CHECK_EQ(script.skeleton.disable_mesh, true);
 		CHECK_EQ(script.skeleton.name, "TestModelMesh.asc");
 
+		CHECK_EQ(script.meshes[0], "AnotherTestModelMesh1.asc");
+		CHECK_EQ(script.meshes[1], "AnotherTestModelMesh2.asc");
+		CHECK_EQ(script.meshes[2], "AnotherTestModelMesh3.asc");
+		CHECK_EQ(script.meshes[3], "AnotherTestModelMesh4.asc");
+		CHECK_EQ(script.meshes[4], "AnotherTestModelMesh5.asc");
+		CHECK_EQ(script.meshes[5], "AnotherTestModelMesh(6).asc");
+
 		CHECK_EQ(script.animations.size(), 2);
 		CHECK_EQ(script.animations[0].name, "aniName1");
 		CHECK_EQ(script.animations[0].layer, 111);

tests/samples/waran.mds

@@ -2,6 +2,10 @@ Model("TestModel") {
 	meshAndTree("TestModelMesh.asc" 	DONT_USE_MESH)
 	registerMesh("AnotherTestModelMesh1.asc")
 	registerMesh("AnotherTestModelMesh2.asc")
+	registerMesh("AnotherTestModelMesh3.asc"
+	registerMesh("AnotherTestModelMesh4.asc
+	registerMesh("AnotherTestModelMesh5.asc)
+	registerMesh("AnotherTestModelMesh(6).asc")
 
 	// A comment.