Parse null labels

Author: Kyuuhachi

calmare/src/ed7.rs

@@ -168,6 +168,13 @@ pub fn write(f: &mut Context, scena: &Scena) {
 	}
 
 	if let Some(labels) = labels {
+		if labels.is_empty() {
+			// need to keep this for roundtripping
+			write!(f, "// NB: this line is meaningless, it's just here for roundtripping.");
+			f.line();
+			write!(f, "label blank");
+			f.line().line();
+		}
 		for (i, lb) in labels.iter().enumerate() {
 			f.val(&LabelId(i as u16)).suf(":").line().indent(|f| {
 				f.kw("name").val(&lb.name).line();
@@ -181,9 +188,6 @@ pub fn write(f: &mut Context, scena: &Scena) {
 			});
 			f.line();
 		}
-	} else {
-		// need to keep this for roundtripping
-		f.kw("labels").kw("null").line().line();
 	}
 
 	for (i, anim) in animations.iter().enumerate() {

calmare/src/parse/lower/scena/ed7.rs

@@ -37,6 +37,7 @@ struct ScenaBuild {
 	chars: Many<CharDefId, NpcOrMonster<Npc, Monster>>,
 	triggers: Many<TriggerId, Trigger>,
 	look_points: Many<LookPointId, LookPoint>,
+	no_labels: bool,
 	labels: Many<LabelId, Label>,
 	animations: Many<AnimId, Animation>,
 	sepith: Many<SepithId, [u8; 8]>,
@@ -58,7 +59,7 @@ pub fn parse(lines: &[Line], ctx: &Context) -> Result<Scena> {
 
 	let chip = scena.chip.get(|a| a.0 as usize);
 	let (npcs, monsters) = chars(scena.chars);
-	let labels = Some(scena.labels.get(|a| a.0 as usize));
+	let labels = scena.labels.get(|a| a.0 as usize);
 	let triggers = scena.triggers.get(|a| a.0 as usize);
 	let look_points = scena.look_points.get(|a| a.0 as usize);
 	let animations = scena.animations.get(|a| a.0 as usize);
@@ -69,6 +70,14 @@ pub fn parse(lines: &[Line], ctx: &Context) -> Result<Scena> {
 	let placements = scena.placements.get(|a| a.0 as usize);
 	let battles = scena.battles.get(|a| a.0 as usize);
 
+	let labels = if scena.no_labels {
+		Some(Vec::new())
+	} else if labels.is_empty() {
+		None
+	} else {
+		Some(labels)
+	};
+
 	let h = scena.header.get().ok_or(Error)?;
 
 	Ok(Scena {
@@ -261,6 +270,11 @@ fn parse_line(scena: &mut ScenaBuild, p: &mut Parse) -> Result<()> {
 			});
 		}
 		"label" => {
+			if test!(p, Token::Ident("blank")) {
+				scena.labels.mark(p.tokens[0].0 | p.prev_span(), LabelId(0));
+				scena.no_labels = true;
+				return Ok(())
+			}
 			let S(s, n) = Val::parse(p)?;
 			scena.labels.mark(p.tokens[0].0 | s, n);
 			parse_data!(p => {