cleanup

3 files changed, 35 insertions, 42 deletions

diff --git a/src/dateparse.rs b/src/dateparse.rs
index ac5dab1..cf579a6 100644
--- a/src/dateparse.rs
+++ b/src/dateparse.rs
@@ -1,59 +1,50 @@
 use std::simd::{
     cmp::{SimdPartialEq, SimdPartialOrd},
-    simd_swizzle, u8x16,
+    simd_swizzle, u8x16 as V,
 };
 
+macro_rules! A {
+    [$a: ident; $($b: expr),+] => {
+        const $a: V = V::from_array(*concat_bytes!($($b),+));
+    };
+}
+
 #[must_use]
 pub fn dateparse(s: &str) -> Option<(usize, usize, usize)> {
     // inf and sup for indiv. values
-    const LO: u8x16 = u8x16::from_array([
-        b'0', b'0', b'/', b'0', b'0', b'/', b'0', b'0', //
-        0, 0, 0, 0, 0, 0, 0, 0, // load_or_default isnt const
-    ]);
-    const HI: u8x16 = u8x16::from_array([
-        b'1', b'9', b'/', b'3', b'9', b'/', b'9', b'9', //
-        0xFF, 0xFF, 0xFF, 0xFF, //
-        0xFF, 0xFF, 0xFF, 0xFF, //
-    ]);
-    const INTMSK: u8x16 = u8x16::from_array([b'0'; 16]);
-    const SLHMSK: u8x16 = u8x16::from_array([b'/'; 16]);
-    const NUMMSK: u8x16 = u8x16::from_array([
-        10, 1, 0, // [m_10, m_1] -> m_10 * 10 + m_1 (0 is slash)
-        10, 1, 0, // dd ..
-        10, 1, 0, // yy ..
-        0, 0, 0, 0, 0, 0, 0,
-    ]);
+    A![LO; b"00/00/00", [0; 8]];
+    A![HI; b"19/39/99", [0xFF; 8]];
+    A![INTMSK; [b'0'; 16]];
+    A![SLHMSK; [b'/'; 16]];
+    // as_flattened wont work with concat_bytes!()
+    //           m  m  /     d  d  /     y  y
+    A![NUMMSK; [10, 1, 0], [10, 1, 0], [10, 1], [0; 8]];
     let b = s.as_bytes();
-    let v = u8x16::load_or_default(b);
+    let v = V::load_or_default(b);
     let mut valid = true;
     // index 16 for swizzles with INTMSK is b'0'
-    // index 15 is 0
+    // index 15 is \0
     // this will compile to a shuffle, but a relaxed_laneselect would be cool
+    const Z: usize = 16;
+    const N: usize = 15;
+    macro_rules! X { [$($b: expr),+] => {
+        simd_swizzle!(v, INTMSK, [$($b),+, N, N, N, N, N, N, N, N])
+        //                                 we need better syntax for this
+    }; }
+    // normalize values by filling blanks, find through indexes of slashes
     let mut v = match (b.len(), v.simd_eq(SLHMSK).to_bitmask()) {
-        // m/d/yy
-        (6, 0b1010) => simd_swizzle!(
-            v,
-            INTMSK,
-            [16, 0, 1, 16, 2, 3, 4, 5, 15, 15, 15, 15, 15, 15, 15, 15]
-        ),
-        // m/dd/yy
-        (7, 0b10010) => simd_swizzle!(
-            v,
-            INTMSK,
-            [16, 0, 1, 2, 3, 4, 5, 6, 15, 15, 15, 15, 15, 15, 15, 15]
-        ),
-        // mm/d/yy
-        (7, 0b10100) => simd_swizzle!(
-            v,
-            INTMSK,
-            [0, 1, 2, 16, 3, 4, 5, 6, 15, 15, 15, 15, 15, 15, 15, 15]
-        ),
-        // mm/dd/yy
+        //    yy/d/m  ->   '0' m  / '0' d  /  y  y
+        (6, 0b001010) => X![Z, 0, 1, Z, 2, 3, 4, 5],
+        //   yy/dd/m  ->   '0' m  /  d  d  /  y  y
+        (7, 0b010010) => X![Z, 0, 1, 2, 3, 4, 5, 6],
+        //   yy/d/mm  ->    m  m  / '0' d  /  y  y
+        (7, 0b010100) => X![0, 1, 2, Z, 3, 4, 5, 6],
+        //  yy/dd/mm
         (8, 0b100100) => v,
         _ => {
             valid = false;
             v
-        }
+        },
     };
 
     // est-ce numerique?
@@ -73,6 +64,7 @@ pub fn dateparse(s: &str) -> Option<(usize, usize, usize)> {
     v -= INTMSK;
     v *= NUMMSK;
     v += v.rotate_elements_left::<1>();
+
     let n = v.to_array();
     let (m, d, y) = (n[0], n[3], n[6]);
 
diff --git a/src/lib.rs b/src/lib.rs
index 6322e6d..1ad7a38 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,9 +2,10 @@
 #![feature(freeze)]
 #![feature(freeze_impls)]
 #![feature(portable_simd)]
+#![feature(concat_bytes)]
 #![allow(internal_features)]
 #![allow(mutable_transmutes)]
-use maud::{html, Markup, PreEscaped, DOCTYPE};
+use maud::{DOCTYPE, Markup, PreEscaped, html};
 use worker::*;
 
 pub mod dateparse;
diff --git a/src/solar.rs b/src/solar.rs
index 1266a23..37bf32b 100644
--- a/src/solar.rs
+++ b/src/solar.rs
@@ -7,7 +7,7 @@
 use num::cast;
 use std::{
     marker::Freeze,
-    mem::{transmute, MaybeUninit},
+    mem::{MaybeUninit, transmute},
     ops::{Div, Index, IndexMut, Rem},
     sync::LazyLock,
 };