From 3952091018786fe516e11a0552c0571de76fa6a6 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Sat, 18 Nov 2023 19:46:41 +0100 Subject: [PATCH] added basic method to check syntax command input --- Cargo.lock | 179 ++++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 1 + src/args.rs | 11 +++ src/main.rs | 57 +++++++++++++- src/syntax/check.rs | 8 +- src/syntax/mod.rs | 2 +- 6 files changed, 251 insertions(+), 7 deletions(-) create mode 100644 src/args.rs diff --git a/Cargo.lock b/Cargo.lock index cfc1d5b..ee349ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,12 +2,100 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "anstream" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys", +] + [[package]] name = "beef" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" +[[package]] +name = "clap" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + [[package]] name = "codespan-reporting" version = "0.11.1" @@ -18,12 +106,24 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + [[package]] name = "logos" version = "0.13.0" @@ -60,6 +160,7 @@ dependencies = [ name = "pipeline-lang" version = "0.1.0" dependencies = [ + "clap", "codespan-reporting", "logos", ] @@ -88,6 +189,12 @@ version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + [[package]] name = "syn" version = "2.0.39" @@ -120,6 +227,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "winapi" version = "0.3.9" @@ -150,3 +263,69 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/Cargo.toml b/Cargo.toml index ac06269..d2a5caf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,3 +8,4 @@ edition = "2021" [dependencies] logos = "0.13" codespan-reporting = "0.11" +clap = { version = "4.4.8", features = [ "derive" ] } diff --git a/src/args.rs b/src/args.rs new file mode 100644 index 0000000..336be67 --- /dev/null +++ b/src/args.rs @@ -0,0 +1,11 @@ +use std::path::PathBuf; + +use clap::Parser; + +#[derive(Parser, Debug)] +#[command(author, version, about, long_about = None)] +pub struct Args { + pub text: String, + #[arg(long)] + pub debug_tokens: bool, +} diff --git a/src/main.rs b/src/main.rs index 59fa176..a8abacf 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,61 @@ +use args::Args; +use clap::Parser; +use codespan_reporting::{ + files::{SimpleFile, SimpleFiles}, + term::{ + self, + termcolor::{ColorChoice, StandardStream}, + }, +}; +use syntax::{ + check::{self, check}, + error::SyntaxError, + parse_syntax, PipelineElement, +}; + +mod args; mod builtins; mod lexer; mod namespace; mod syntax; -fn main() {} +fn main() { + let args = dbg!(Args::parse()); + + let syntax = parse_syntax(&args.text); + + if args.debug_tokens { + println!("Tokens: {syntax:#?}"); + } + + let mut files = SimpleFiles::new(); + + let input_id = files.add("input", args.text); + + let writer = StandardStream::stderr(ColorChoice::Always); + let config = term::Config::default(); + + if let Err(errs) = syntax { + let writer = &mut writer.lock(); + + term::emit( + writer, + &config, + &files, + &SyntaxError::InvalidToken(errs).to_diagnostic(input_id), + ) + .unwrap(); + } else { + let check_res = check(&syntax.unwrap()); + + if let Err(errs) = check_res { + let writer = &mut writer.lock(); + + let diags = errs.into_iter().map(|err| err.to_diagnostic(input_id)); + + for diag in diags { + term::emit(writer, &config, &files, &diag); + } + } + } +} diff --git a/src/syntax/check.rs b/src/syntax/check.rs index d689650..c69f950 100644 --- a/src/syntax/check.rs +++ b/src/syntax/check.rs @@ -4,10 +4,8 @@ use super::{ }; pub fn check( - syntax: Vec, - raw_source: &str, - file_id: FileId, -) -> Result, Vec> { + syntax: &Vec, +) -> Result<(), Vec> { let mut errs = Vec::new(); if let Err(e_span) = check_missing_streamer(&syntax) { @@ -23,7 +21,7 @@ pub fn check( } if errs.is_empty() { - Ok(syntax) + Ok(()) } else { Err(errs) } diff --git a/src/syntax/mod.rs b/src/syntax/mod.rs index 8a22b69..883db1f 100644 --- a/src/syntax/mod.rs +++ b/src/syntax/mod.rs @@ -6,7 +6,7 @@ use logos::Span; use crate::lexer::Token; pub mod check; -mod error; +pub mod error; #[derive(Debug, Clone, PartialEq)] pub struct PipelineElement {