Cleanup

src/entry/unix/unix.rs

@@ -30,24 +30,39 @@ fn do_expression(
 	#[cfg(debug_assertions)]
 	RawTerminal::activate_raw_mode(&stdout)?;
 
-	match g {
+	// Check for parse errors
-		Ok(g) => {
+	if let Err((l, e)) = g {
-			#[cfg(debug_assertions)]
+		write!(
-			RawTerminal::suspend_raw_mode(&stdout)?;
+			stdout, "{}{}{} {}{}\r\n",
-			let out_str = g.to_string();
+			color::Fg(color::Red),
-			let g = g.evaluate();
+			" ".repeat(l.pos + 4),
-			#[cfg(debug_assertions)]
+			"^".repeat(l.len),
-			RawTerminal::activate_raw_mode(&stdout)?;
+			e.to_message(),
+			color::Fg(color::Reset),
+		)?;
+		return Ok(());
+	}
 
+	let Ok(g) = g else {panic!()};
+
+
+	// Display parsed string
 	write!(
 		stdout, " {}{}=>{}{} {}\r\n",
 		style::Bold, color::Fg(color::Magenta),
 		style::Reset, color::Fg(color::Reset),
-				out_str
+		g.to_string()
 	)?;
 
-			match g {
+	// Evaluate expression
-				Ok(q) => {
+	#[cfg(debug_assertions)]
+	RawTerminal::suspend_raw_mode(&stdout)?;
+	let g = g.evaluate();
+	#[cfg(debug_assertions)]
+	RawTerminal::activate_raw_mode(&stdout)?;
+
+	// Show output
+	if let Ok(q) = g {
 		write!(
 			stdout, "\n  {}{}={} {}{}\r\n\n",
 			style::Bold,
@@ -56,7 +71,9 @@ fn do_expression(
 			q.to_string_outer(),
 			color::Fg(color::Reset)
 		)?;
-				},
+	} else {
+		match g {
+			Ok(_) => panic!(),
 
 			Err(EvalError::TooBig) => {
 				write!(
@@ -98,20 +115,8 @@ fn do_expression(
 				)?;
 			}
 		}
-		},
-
-		// Show parse error
-		Err((l, e)) => {
-			write!(
-				stdout, "{}{}{} {}{}\r\n",
-				color::Fg(color::Red),
-				" ".repeat(l.pos + 4),
-				"^".repeat(l.len),
-				e.to_message(),
-				color::Fg(color::Reset),
-			)?;
 	}
-	};
+
 
 	return Ok(());
 }