[#122] fix(ModelScript): make curly braces around ani events optional

Author: lmichaelis

src/ModelScriptDsl.cc

@@ -401,9 +401,10 @@ namespace zenkit {
 			} else if (iequals(kw, "*eventCamTremor")) {
 				ani.tremors.push_back(this->parse_eventCamTremor());
 			} else {
-				auto const loc = _m_stream.format_location();
-				ZKLOGW("ModelScript", "Syntax error (%s): invalid keyword in `aniEnum` block: %s", loc.c_str(), kw.c_str());
-				this->_m_stream.next_line();
+				// Note: Due to #122 we need to also not crash when there is no terminating curly brace.
+				//       To do this, we simply exit when we don't know the event.
+				_m_stream.backtrack();
+				break;
 			}
 		}
 	}
@@ -506,9 +507,9 @@ namespace zenkit {
 		ani.collision_volume_scale = this->maybe_named("CVS").value_or(1);
 
 		// Optional events block.
-		if (this->maybe<MdsToken::LBRACE>()) {
-			this->parse_events(ani);
-		}
+		// Note: Due to #122 the curly parens are actually optional
+		this->maybe<MdsToken::LBRACE>();
+		this->parse_events(ani);
 
 		return ani;
 	}

tests/TestModelScript.cc

@@ -22,7 +22,7 @@ TEST_SUITE("ModelScript") {
 		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.size(), 3);
 		CHECK_EQ(script.animations[0].name, "aniName1");
 		CHECK_EQ(script.animations[0].layer, 111);
 		CHECK_EQ(script.animations[0].next, "aniNext1");
@@ -122,6 +122,32 @@ TEST_SUITE("ModelScript") {
 		CHECK_EQ(script.animations[1].tremors[0].field3, 883);
 		CHECK_EQ(script.animations[1].tremors[0].field4, 884);
 
+		CHECK_EQ(script.animations[2].name, "aniName3");
+		CHECK_EQ(script.animations[2].layer, 113);
+		CHECK_EQ(script.animations[2].next, "aniNext3");
+		CHECK_EQ(script.animations[2].blend_in, 8.0f);
+		CHECK_EQ(script.animations[2].blend_out, 0.0f);
+		CHECK_EQ(script.animations[2].flags, zenkit::AnimationFlags::MOVE);
+		CHECK_EQ(script.animations[2].model, "aniModel3");
+		CHECK_EQ(script.animations[2].direction, zenkit::AnimationDirection::FORWARD);
+		CHECK_EQ(script.animations[2].first_frame, 223);
+		CHECK_EQ(script.animations[2].last_frame, 333);
+		CHECK_EQ(script.animations[2].fps, 25.0f);
+		CHECK_EQ(script.animations[2].speed, 0.0f);
+		CHECK_EQ(script.animations[2].collision_volume_scale, 1.0f);
+
+		CHECK_EQ(script.animations[2].events.size(), 1);
+		CHECK_EQ(script.animations[2].events[0].type, zenkit::MdsEventType::ITEM_CREATE);
+		CHECK_EQ(script.animations[2].events[0].slot, "eventSlot");
+		CHECK_EQ(script.animations[2].events[0].item, "eventItem");
+		CHECK_EQ(script.animations[2].events[0].attached, false);
+
+		CHECK_EQ(script.animations[2].sfx_ground.size(), 1);
+		CHECK_EQ(script.animations[2].sfx_ground[0].frame, 5);
+		CHECK_EQ(script.animations[2].sfx_ground[0].name, "sfxGrndName");
+		CHECK_EQ(script.animations[2].sfx_ground[0].empty_slot, false);
+
+
 		CHECK_EQ(script.blends.size(), 3);
 		CHECK_EQ(script.blends[0].name, "blendName1");
 		CHECK_EQ(script.blends[0].next, "blendNext1");

tests/samples/waran.mds

@@ -39,6 +39,10 @@ Model("TestModel") {
 		aniBlend(  ("blendName1" "blendNext1")
 		aniBlend("blendName2" 113 "blendNext2")
 
+		ani("aniName3" 113 "aniNext3" 8.0 0 M. "aniModel3" F 223 333)
+			*eventTag("DEF_CREATE_ITEM" "eventSlot" "eventItem")
+			*eventSFXGrnd(5 "sfxGrndName")
+
 		aniBlend("blendName3" "blendNext3" 223.1 333.1) {
 			*eventSFX(4 "sfxName2" R:67.4)
 		}