Overhaul Dates

benches/jomini_bench.rs

@@ -214,13 +214,16 @@ pub fn text_parse_benchmark(c: &mut Criterion) {
 pub fn date_benchmark(c: &mut Criterion) {
     let mut group = c.benchmark_group("eu4date-parse");
     group.bench_function("valid-date", |b| {
-        b.iter(|| Date::parse_from_str("1444.11.11").unwrap())
+        b.iter(|| Date::parse("1444.11.11").unwrap())
+    });
+    group.bench_function("binary-date", |b| {
+        b.iter(|| Date::from_binary(56379360).unwrap())
     });
     group.bench_function("invalid-date", |b| {
-        b.iter(|| Date::parse_from_str("marketplace").is_none())
+        b.iter(|| Date::parse("marketplace").is_err())
     });
     group.bench_function("long-invalid-date", |b| {
-        b.iter(|| Date::parse_from_str("incidents_bur_inheritance.5").is_none())
+        b.iter(|| Date::parse("incidents_bur_inheritance.5").is_err())
     });
     group.finish();
 }

fuzz/fuzz_targets/fuzz_date.rs

@@ -1,16 +1,16 @@
 #![no_main]
 use libfuzzer_sys::fuzz_target;
+use jomini::common::PdsDate;
 
 fuzz_target!(|data: &[u8]| {
     if data.len() < 4 {
         return;
     }
 
     let num = i32::from_le_bytes([data[0], data[1], data[2], data[3]]);
-    let txt = jomini::Windows1252Encoding::decode(&data[4..]);
     let _ = jomini::common::Date::from_binary(num);
-    if let Some(d) = jomini::common::Date::parse_from_str(txt) {
-        match d.game_fmt().as_str() {
+    if let Ok(d) = jomini::common::Date::parse(&data[4..]) {
+        match d.game_fmt().to_string().as_str() {
             // I'm not sure how math works when we go across the border
             // as I'm not familiar that EU4 recognizes the zeroth year
             "1.1.1" | "-1.1.1" => {}

fuzz/fuzz_targets/fuzz_text.rs

@@ -49,7 +49,7 @@ where
             let _ = x.is_ascii();
             let _ = x.to_bool();
             let stringed = value.read_str().unwrap();
-            let _ = jomini::common::Date::parse_from_str(stringed);
+            let _ = jomini::common::Date::parse(stringed.as_ref());
         }
     }
 }

src/binary/de.rs

@@ -620,6 +620,8 @@ fn array_len(tokens: &[BinaryToken], mut val_ind: usize) -> usize {
 
 #[cfg(test)]
 mod tests {
+    use crate::common::{Date, DateHour};
+
     use super::*;
     use jomini_derive::JominiDeserialize;
     use serde::{de::Deserializer, Deserialize};
@@ -850,6 +852,48 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_date_field() {
+        let data = [0x82, 0x2d, 0x01, 0x00, 0x0c, 0x00, 0xe0, 0x47, 0x5c, 0x03];
+
+        #[derive(Deserialize, PartialEq, Eq, Debug)]
+        struct MyStruct {
+            field1: Date,
+        }
+
+        let mut map = HashMap::new();
+        map.insert(0x2d82, String::from("field1"));
+
+        let actual: MyStruct = from_slice(&data[..], &map).unwrap();
+        assert_eq!(
+            actual,
+            MyStruct {
+                field1: Date::from_ymd(1436, 1, 1)
+            }
+        );
+    }
+
+    #[test]
+    fn test_datehour_field() {
+        let data = [0x82, 0x2d, 0x01, 0x00, 0x0c, 0x00, 0x4b, 0x1d, 0x9f, 0x03];
+
+        #[derive(Deserialize, PartialEq, Eq, Debug)]
+        struct MyStruct {
+            field1: DateHour,
+        }
+
+        let mut map = HashMap::new();
+        map.insert(0x2d82, String::from("field1"));
+
+        let actual: MyStruct = from_slice(&data[..], &map).unwrap();
+        assert_eq!(
+            actual,
+            MyStruct {
+                field1: DateHour::from_ymdh(1936, 1, 1, 12)
+            }
+        );
+    }
+
     #[test]
     fn test_multiple_top_level_events() {
         let data = [