major changes to parser, irgen, output

Co-authored-by: Sasial <[email protected]>

cli/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+codespan-reporting = "0.11.0"
 anyhow = "1.0"
 clap = { version = "4.4.11", features = ["derive"] }
 zap = { path = "../zap" }

cli/src/main.rs

@@ -2,6 +2,13 @@ use std::path::PathBuf;
 
 use anyhow::Result;
 use clap::Parser;
+use codespan_reporting::{
+	files::SimpleFile,
+	term::{
+		self,
+		termcolor::{ColorChoice, StandardStream},
+	},
+};
 use zap::run;
 
 #[derive(Parser, Debug)]
@@ -16,26 +23,41 @@ fn main() -> Result<()> {
 
 	let config_path = args.config.unwrap();
 
-	let config = std::fs::read_to_string(config_path)?;
+	let config = std::fs::read_to_string(&config_path)?;
 
-	let code = run(config.as_str())?;
+	let (code, diagnostics) = run(config.as_str());
 
-	if let Some(definitions) = code.server.definitions {
-		let mut path = code.server.path.clone();
-		path.set_extension("d.ts");
+	if let Some(code) = code {
+		if let Some(definitions) = code.server.definitions {
+			let mut path = code.server.path.clone();
+			path.set_extension("d.ts");
 
-		std::fs::write(path, definitions)?
-	}
+			std::fs::write(path, definitions)?
+		}
+
+		if let Some(definitions) = code.client.definitions {
+			let mut path = code.client.path.clone();
+			path.set_extension("d.ts");
 
-	if let Some(definitions) = code.client.definitions {
-		let mut path = code.client.path.clone();
-		path.set_extension("d.ts");
+			std::fs::write(path, definitions)?
+		}
+
+		std::fs::write(code.server.path, code.server.contents)?;
+		std::fs::write(code.client.path, code.client.contents)?;
+	}
 
-		std::fs::write(path, definitions)?
+	if diagnostics.is_empty() {
+		return Ok(());
 	}
 
-	std::fs::write(code.server.path, code.server.contents)?;
-	std::fs::write(code.client.path, code.client.contents)?;
+	let file = SimpleFile::new(config_path.to_str().unwrap(), config);
+
+	let writer = StandardStream::stderr(ColorChoice::Always);
+	let config_term = codespan_reporting::term::Config::default();
+
+	for diagnostic in diagnostics {
+		term::emit(&mut writer.lock(), &config_term, &file, &diagnostic)?;
+	}
 
-	Ok(())
+	todo!()
 }

zap/Cargo.toml

@@ -15,8 +15,7 @@ lalrpop = "0.20.0"
 
 [dependencies]
 lalrpop-util = "0.20.0"
-ariadne = "0.3.0"
+codespan-reporting = "0.11.0"
 logos = "0.13.0"
 num-traits = "0.2.17"
-thiserror = "1.0"
 wasm-bindgen = "0.2"

zap/build.rs

@@ -0,0 +1,6 @@
+fn main() {
+	lalrpop::Configuration::new()
+		.set_in_dir("src/parser")
+		.process()
+		.unwrap();
+}