Don't autodetect stuff with warnings

Author: Kyuuhachi

calmare-cli/src/main.rs

@@ -168,14 +168,16 @@ fn write_scena(game: Option<CliGame>, buf: &[u8], lookup: Option<&dyn Lookup>) -
 				Game::FcEvo, Game::ScEvo, Game::TcEvo, Game::ZeroEvo, Game::AoEvo, // Evo
 				Game::Zero, Game::Ao, // Geofront
 			] {
+				let mut ctx = calmare::Context::new(game, lookup);
 				if game.is_ed7() {
-					if let Ok(scena) = ED7Scena::read(game, buf) {
-						return Ok(calmare::to_string(game, &calmare::Content::ED7Scena(scena), lookup))
-					}
+					let Ok(scena) = ED7Scena::read(game, buf) else { continue };
+					calmare::ed7::write(&mut ctx, &scena);
 				} else {
-					if let Ok(scena) = ED6Scena::read(game, buf) {
-						return Ok(calmare::to_string(game, &calmare::Content::ED6Scena(scena), lookup))
-					}
+					let Ok(scena) = ED6Scena::read(game, buf) else { continue };
+					calmare::ed6::write(&mut ctx, &scena);
+				}
+				if !ctx.has_warn {
+					return Ok(ctx.finish());
 				}
 			}
 			eyre::bail!("could not parse script; specify --game for more details")

calmare/src/common.rs

@@ -34,6 +34,7 @@ pub fn func(f: &mut Context, func: &Code) {
 		Err(err) => {
 			f.kw("flat").suf(":");
 			if let Some(err) = err {
+				f.warn();
 				write!(f, " // {err}");
 			}
 			f.line();
@@ -523,6 +524,7 @@ fn expr(f: &mut Context, e: &Expr) {
 		for (i, e) in stack.into_iter().enumerate() {
 			if i != 0 {
 				f.kw("¤");
+				f.warn();
 			}
 			expr_prio(f, e, 0);
 		}

calmare/src/writer.rs

@@ -11,6 +11,7 @@ enum Space {
 pub struct Context<'a> {
 	pub game: Game,
 	pub decompile: bool,
+	pub has_warn: bool,
 	indent: usize,
 	space: Space,
 	pub lookup: &'a dyn Lookup,
@@ -22,6 +23,7 @@ impl<'a> Context<'a> {
 		Self {
 			game,
 			decompile: true,
+			has_warn: false,
 			indent: 0,
 			space: Space::None,
 			lookup: lookup.unwrap_or_else(|| themelios::lookup::default_for(game)),
@@ -34,6 +36,10 @@ impl<'a> Context<'a> {
 		self
 	}
 
+	pub fn warn(&mut self) {
+		self.has_warn = true;
+	}
+
 	pub fn finish(self) -> String {
 		self.out
 	}