progress on new parser

Cargo.toml

@@ -19,7 +19,7 @@ span = []
 miette = "5.7.0"
 nom = "7.1.1"
 thiserror = "1.0.40"
-winnow = "0.5.40"
+winnow = { version = "0.6.5", features = ["alloc", "unstable-recover"] }
 
 [dev-dependencies]
 miette = { version = "5.7.0", features = ["fancy"] }

src/error.rs

@@ -10,21 +10,12 @@ use {
     std::convert::{TryFrom, TryInto},
 };
 
-#[derive(Debug, Diagnostic, Clone, Eq, PartialEq, Error)]
-#[error("Failed to parse KDL document.")]
-pub struct KdlParseFailure {
-    #[source_code]
-    pub input: String,
-
-    #[related]
-    pub errors: Vec<KdlDiagnostic>,
-}
-
-/// An error that occurs when parsing a KDL document.
+/// The toplevel `Error` type for KDL: this is returned when a KDL document
+/// failed to parse entirely.
 ///
-/// This error implements [`miette::Diagnostic`] and can be used to display
-/// detailed, pretty-printed diagnostic messages when using [`miette::Result`]
-/// and the `"fancy"` feature flag for `miette`:
+/// This diagnostic implements [`miette::Diagnostic`] and can be used to
+/// display detailed, pretty-printed diagnostic messages when using
+/// [`miette::Result`] and the `"fancy"` feature flag for `miette`:
 ///
 /// ```no_run
 /// fn main() -> miette::Result<()> {
@@ -45,6 +36,19 @@ pub struct KdlParseFailure {
 ///   help: Floating point numbers must be base 10, and have numbers after the decimal point.
 /// ```
 #[derive(Debug, Diagnostic, Clone, Eq, PartialEq, Error)]
+#[error("Failed to parse KDL document.")]
+pub struct KdlParseFailure {
+    #[source_code]
+    pub input: String,
+
+    #[related]
+    pub diagnostics: Vec<KdlDiagnostic>,
+}
+
+/// An individual diagnostic message for a KDL parsing issue.
+///
+/// While generally signifying errors, they can also be treated as warnings.
+#[derive(Debug, Diagnostic, Clone, Eq, PartialEq, Error)]
 #[error("{kind}")]
 pub struct KdlDiagnostic {
     /// Source string for the KDL document that failed to parse.
@@ -62,6 +66,10 @@ pub struct KdlDiagnostic {
     #[help]
     pub help: Option<&'static str>,
 
+    /// Severity level for the Diagnostic.
+    #[diagnostic(severity)]
+    pub severity: miette::Severity,
+
     /// Specific error kind for this parser error.
     pub kind: KdlErrorKind,
 }

src/query_parser.rs

@@ -5,6 +5,7 @@ use crate::query::{
 };
 use crate::v1_parser::{value, KdlParser};
 use crate::{KdlDiagnostic, KdlErrorKind, KdlParseError, KdlValue};
+use miette::Severity;
 use nom::branch::alt;
 use nom::bytes::complete::tag;
 use nom::combinator::{all_consuming, cut, map, opt, recognize};
@@ -47,6 +48,7 @@ impl<'a> KdlQueryParser<'a> {
                     } else {
                         KdlErrorKind::Context("a valid KQL query")
                     },
+                    severity: Severity::Error,
                 }
             })
     }

src/v1_parser.rs

@@ -6,7 +6,7 @@
 use std::ops::RangeTo;
 
 use crate::nom_compat::{many0, many1, many_till};
-use miette::SourceSpan;
+use miette::{Severity, SourceSpan};
 use nom::branch::alt;
 use nom::bytes::complete::{tag, take_until, take_while, take_while_m_n};
 use nom::character::complete::{anychar, char, none_of, one_of};
@@ -58,6 +58,7 @@ impl<'a> KdlParser<'a> {
                     } else {
                         KdlErrorKind::Other
                     },
+                    severity: Severity::Error,
                 }
             })
     }