Merge pull request #1085 from epage/header

fix(varcon)!: Parse verified/level

crates/varcon-core/src/borrowed.rs

@@ -1,6 +1,8 @@
 #[derive(Copy, Clone, PartialEq, Eq, Hash, Debug)]
 pub struct Cluster {
-    pub header: Option<&'static str>,
+    pub header: &'static str,
+    pub verified: bool,
+    pub level: usize,
     pub entries: &'static [Entry],
     pub notes: &'static [&'static str],
 }
@@ -8,7 +10,9 @@ pub struct Cluster {
 impl Cluster {
     pub fn into_owned(self) -> crate::Cluster {
         crate::Cluster {
-            header: self.header.map(|s| s.to_owned()),
+            header: self.header.to_owned(),
+            verified: self.verified,
+            level: self.level,
             entries: self.entries.iter().map(|s| s.into_owned()).collect(),
             notes: self.notes.iter().map(|s| (*s).to_owned()).collect(),
         }

crates/varcon-core/src/lib.rs

@@ -12,7 +12,9 @@ pub use crate::parser::ClusterIter;
 
 #[derive(Clone, PartialEq, Eq, Hash, Debug)]
 pub struct Cluster {
-    pub header: Option<String>,
+    pub header: String,
+    pub verified: bool,
+    pub level: usize,
     pub entries: Vec<Entry>,
     pub notes: Vec<String>,
 }

crates/varcon-core/src/parser.rs

@@ -54,9 +54,9 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
             str![[r#"
 [
     Cluster {
-        header: Some(
+        header: "acknowledgment ",
-            "acknowledgment <verified> (level 35)",
+        verified: true,
-        ),
+        level: 35,
         entries: [
             Entry {
                 variants: [
@@ -231,9 +231,9 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
             str![[r#"
 [
     Cluster {
-        header: Some(
+        header: "acknowledgment ",
-            "acknowledgment <verified> (level 35)",
+        verified: true,
-        ),
+        level: 35,
         entries: [
             Entry {
                 variants: [
@@ -383,9 +383,9 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
         notes: [],
     },
     Cluster {
-        header: Some(
+        header: "acknowledgment ",
-            "acknowledgment <verified> (level 35)",
+        verified: true,
-        ),
+        level: 35,
         entries: [
             Entry {
                 variants: [
@@ -551,7 +551,11 @@ impl Cluster {
             let header = (
                 "#",
                 winnow::ascii::space0,
-                winnow::ascii::till_line_ending,
+                winnow::token::take_till(1.., ('\r', '\n', '<', '(')),
+                winnow::ascii::space0,
+                opt(("<verified>", winnow::ascii::space0)),
+                delimited("(level ", winnow::ascii::digit1, ')').parse_to::<usize>(),
+                winnow::ascii::space0,
                 winnow::ascii::line_ending,
             );
             let note = preceded(
@@ -559,7 +563,7 @@ impl Cluster {
                 terminated(winnow::ascii::till_line_ending, winnow::ascii::line_ending),
             );
             let mut cluster = (
-                opt(header),
+                header,
                 winnow::combinator::repeat(
                     1..,
                     terminated(Entry::parse_, winnow::ascii::line_ending),
@@ -568,10 +572,14 @@ impl Cluster {
             );
             let (header, entries, notes): (_, _, Vec<_>) = cluster.parse_next(input)?;
 
-            let header = header.map(|s| s.2.to_owned());
+            let verified = header.4.is_some();
+            let level = header.5;
+            let header = header.2.to_owned();
             let notes = notes.into_iter().map(|s| s.to_owned()).collect();
             let c = Self {
                 header,
+                verified,
+                level,
                 entries,
                 notes,
             };
@@ -612,9 +620,9 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
             actual.to_debug(),
             str![[r#"
 Cluster {
-    header: Some(
+    header: "acknowledgment ",
-        "acknowledgment <verified> (level 35)",
+    verified: true,
-    ),
+    level: 35,
     entries: [
         Entry {
             variants: [
@@ -793,9 +801,9 @@ A B C: coloration's / B. Cv: colouration's
             actual.to_debug(),
             str![[r#"
 Cluster {
-    header: Some(
+    header: "coloration ",
-        "coloration <verified> (level 50)",
+    verified: true,
-    ),
+    level: 50,
     entries: [
         Entry {
             variants: [

crates/varcon/tests/codegen.rs

@@ -36,6 +36,8 @@ fn generate<W: std::io::Write>(file: &mut W) {
         cluster.infer();
         writeln!(file, "Cluster {{").unwrap();
         writeln!(file, "  header: {:?},", cluster.header).unwrap();
+        writeln!(file, "  verified: {:?},", cluster.verified).unwrap();
+        writeln!(file, "  level: {:?},", cluster.level).unwrap();
         writeln!(file, "  entries: &[").unwrap();
         for entry in &cluster.entries {
             writeln!(file, "  Entry {{").unwrap();