Rework

Author: Porges

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "sarif-viewer.connectToGithubCodeScanning": "off"
+}

Cargo.lock

@@ -118,7 +118,7 @@ impl<'e> From<&'e dyn Errful> for PrettyDisplay<'e> {
 struct Styles {
     base: owo_colors::Style,
     base_dim: owo_colors::Style,
-    bold: owo_colors::Style,
+    _bold: owo_colors::Style,
     only_bold: owo_colors::Style,
     main_sev: owo_colors::Style,
 }
@@ -128,7 +128,7 @@ impl Styles {
         Self {
             base: owo_colors::Style::new(),
             base_dim: owo_colors::Style::new(),
-            bold: owo_colors::Style::new(),
+            _bold: owo_colors::Style::new(),
             only_bold: owo_colors::Style::new(),
             main_sev: owo_colors::Style::new(),
         }
@@ -139,7 +139,7 @@ impl Styles {
         Self {
             base,
             base_dim: base.dimmed(),
-            bold: base.bold(),
+            _bold: base.bold(),
             only_bold: owo_colors::Style::new().bold(),
             main_sev: base.bold().underline(),
         }

errful/src/formatting/pretty.rs

@@ -4,8 +4,9 @@ use std::{path::PathBuf, time::Instant};
 
 use errful::ExitResult;
 use gedcomesque::entities::individual::{ActiveModel as IndividualActive, Entity as Individual};
-use gedcomfy::parser::{
-    encodings::SupportedEncoding, lines::LineValue, options::ParseOptions, Parser,
+use gedcomfy::reader::{
+    encodings::SupportedEncoding, input::FileLoadError, lines::LineValue, options::ParseOptions,
+    Reader, ReaderError,
 };
 use sea_orm::{
     sea_query::TableCreateStatement, ActiveValue, ConnectionTrait, Database, DatabaseConnection,
@@ -24,9 +25,8 @@ enum Error {
         source: sea_orm::DbErr,
     },
 
-    Parse(gedcomfy::parser::ParserError<'static>),
-
-    FileLoad(gedcomfy::parser::FileLoadError),
+    Loading(#[from] FileLoadError),
+    Parsing(#[from] gedcomfy::reader::WithSourceCode<'static, ReaderError>),
 }
 
 #[tokio::main(flavor = "current_thread")]
@@ -37,8 +37,9 @@ async fn main() -> ExitResult<Error> {
     let opts = ParseOptions::default().force_encoding(SupportedEncoding::Windows1252);
     let file_size = { std::fs::File::open(&path)?.metadata()?.len() };
     let start_time = Instant::now();
-    let mut parser = Parser::with_options(opts).load_file(&path)?;
-    let records = parser.raw_records().map_err(|e| e.to_static())?;
+    let reader = Reader::with_options(opts);
+    let input = reader.decode_file(path)?;
+    let records = reader.raw_records(&input)?;
     let elapsed = start_time.elapsed().as_secs_f64();
     println!(
         "parsed {filename} in {}s: ({} bytes, {} records, {} records/s)",
@@ -65,14 +66,14 @@ async fn main() -> ExitResult<Error> {
     let to_insert = Vec::from_iter(
         records
             .iter()
-            .filter(|r| r.value.line.tag.value == "INDI")
+            .filter(|r| r.sourced_value.line.tag.sourced_value == "INDI")
             .map(|r| IndividualActive {
                 name: ActiveValue::Set(
                     r.records
                         .iter()
                         .find_map(|r| {
-                            if r.value.line.tag.value == "NAME" {
-                                match r.value.line.line_value.value {
+                            if r.sourced_value.line.tag.sourced_value == "NAME" {
+                                match r.sourced_value.line.value.sourced_value {
                                     LineValue::None | LineValue::Ptr(_) => todo!("unhandled"),
                                     LineValue::Str(s) => Some(s),
                                 }

gedcomesque/examples/gogogo.rs

@@ -14,7 +14,7 @@ kdl = ["dep:kdl"]
 [dependencies]
 ascii = "1.1.0"
 complex-indifference = { path = "../complex-indifference" }
-derive_more = { version = "1.0.0", features = ["from", "display", "error"] }
+derive_more = { version = "2.0.1", features = ["from", "display"] }
 errful = { path = "../errful" }
 encoding_rs = "0.8.34"
 kdl = { version = "4.6.0", optional = true }
@@ -28,6 +28,7 @@ yoke = { version = "0.7.4", features = ["derive"] }
 itertools = "0.14.0"
 memmap2 = "0.9.5"
 dunce = "1.0.5"
+thiserror = "2.0.12"
 
 
 [dev-dependencies]

gedcomfy/Cargo.toml

@@ -3,7 +3,7 @@ use std::fmt::Display;
 use itertools::Itertools;
 use miette::Diagnostic;
 
-use crate::parser::{encodings::SupportedEncoding, GEDCOMSource};
+use crate::reader::{encodings::SupportedEncoding, GEDCOMSource};
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub enum GEDCOMEncoding {
@@ -26,7 +26,7 @@ impl Display for GEDCOMEncoding {
     }
 }
 
-#[derive(derive_more::Error, derive_more::Display, Diagnostic, Debug)]
+#[derive(thiserror::Error, derive_more::Display, Diagnostic, Debug)]
 #[display("GEDCOM encoding {encoding} is ambiguous")]
 #[diagnostic(help("This value could imply any of the following encodings: {}",
     .possibilities.iter().join(", ")))]
@@ -67,7 +67,7 @@ impl From<SupportedEncoding> for GEDCOMEncoding {
         }
     }
 }
-#[derive(derive_more::Error, derive_more::Display, Diagnostic, Debug)]
+#[derive(thiserror::Error, derive_more::Display, Diagnostic, Debug)]
 #[display("invalid GEDCOM encoding")]
 pub struct InvalidGEDCOMEncoding {}
 

gedcomfy/src/encodings.rs

@@ -2,24 +2,21 @@
 
 use core::str;
 
-use miette::{Context, IntoDiagnostic, SourceSpan};
-use parser::{
-    decoding::DecodingError, lines::LineSyntaxError, options::ParseOptions, records::RawRecord,
-    GEDCOMSource, Sourced,
+use miette::SourceSpan;
+use reader::{
+    decoding::DecodingError, lines::LineSyntaxError, records::RawRecord, GEDCOMSource, Sourced,
 };
 use vec1::Vec1;
 
 pub mod encodings;
 pub mod highlighting;
-pub mod parser;
+pub mod reader;
 pub mod schemas;
 pub mod versions;
 
-pub use parser::Parser;
+pub use reader::Reader;
 
-#[derive(
-    derive_more::Error, derive_more::Display, derive_more::From, Debug, miette::Diagnostic,
-)]
+#[derive(thiserror::Error, derive_more::Display, Debug, miette::Diagnostic)]
 pub enum ValidationError {
     #[display("{} syntax error{} detected", errors.len(), if errors.len() > 1 { "s" } else { "" })]
     SyntaxErrorsDetected {
@@ -29,7 +26,6 @@ pub enum ValidationError {
     #[display("Encoding error detected: further validation errors will not be found")]
     #[diagnostic(transparent)]
     EncodingErrorDetected {
-        #[error(source)]
         #[from]
         error: DecodingError,
     },
@@ -39,11 +35,11 @@ impl<S: GEDCOMSource + ?Sized> RawRecord<'_, S> {
     pub(crate) fn subrecord_optional(&self, subrecord_tag: &str) -> Option<&Sourced<RawRecord<S>>> {
         self.records
             .iter()
-            .find(|r| r.value.line.tag.value == subrecord_tag)
+            .find(|r| r.sourced_value.line.tag.sourced_value == subrecord_tag)
     }
 }
 
-#[derive(derive_more::Error, derive_more::Display, Debug, miette::Diagnostic)]
+#[derive(thiserror::Error, derive_more::Display, Debug, miette::Diagnostic)]
 pub enum FileStructureError {
     #[display("Missing HEAD record")]
     #[diagnostic(code(gedcom::schema_error::missing_head_record))]