q

Signed-off-by: Roman Lebedev <lebedev.ri@gmail.com>

Author: LebedevRI

Cargo.toml

@@ -16,6 +16,9 @@ members = [
     "src/memory/fixed_length_load",
     "src/memory/variable_length_load",
     "src/metadata/camerasxml_parser",
+    "src/metadata/xmltokendesparsifier",
+    "src/metadata/xmltokenizer",
+    "src/metadata/xmlparser",
     "src/misc/md5",
     "src/std",
     "src/std/ndslice",

src/metadata/camerasxml_parser/Cargo.toml

@@ -13,8 +13,7 @@ license.workspace = true
 workspace = true
 
 [dependencies]
-proc-macro2 = { version = "1.0", default-features = false, features = [] }
-syn = { version = "2.0", default-features = false, features = ["parsing", "extra-traits"] }
+rawspeed-metadata-xmlparser = { path = "../xmlparser" }
 
 [dev-dependencies]
 

src/metadata/camerasxml_parser/camerasxml_parser/alias/mod.rs

@@ -1,53 +1,13 @@
-use super::*;
-
-#[derive(Debug, PartialEq, Eq)]
-struct MaybeId {
-    pub value: Option<id_attr::Id>,
-}
-
-impl syn::parse::Parse for MaybeId {
-    fn parse(input: syn::parse::ParseStream<'_>) -> syn::parse::Result<Self> {
-        if input.peek(kw::id) {
-            return Ok(Self {
-                value: Some(input.parse()?),
-            });
-        }
-        Ok(Self { value: None })
-    }
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub(crate) struct Alias {
-    pub start_lt_token: syn::Token![<],
-    pub start_token: kw::Alias,
-    pub id: MaybeId,
-    pub start_gt_token: syn::Token![>],
-    pub value: VerbatimStr,
-    pub end_lt_token: syn::Token![<],
-    pub end_slash_token: syn::Token![/],
-    pub end_token: kw::Alias,
-    pub end_gt_token: syn::Token![>],
-}
-
-impl syn::parse::Parse for Alias {
-    fn parse(input: syn::parse::ParseStream<'_>) -> syn::parse::Result<Self> {
-        let lookahead = input.lookahead1();
-        if !lookahead.peek(syn::Token![<]) {
-            return Err(lookahead.error());
-        }
-        Ok(Self {
-            start_lt_token: input.parse()?,
-            start_token: input.parse()?,
-            id: input.parse()?,
-            start_gt_token: input.parse()?,
-            value: input.parse()?,
-            end_lt_token: input.parse()?,
-            end_slash_token: input.parse()?,
-            end_token: input.parse()?,
-            end_gt_token: input.parse()?,
-        })
+use super::BodyStr;
+use super::id_attr;
+use super::xmlparser;
+
+impl_elt_with_body_matcher!(
+    struct Alias<'a> {
+        id: Option<id_attr::Id<'a>>,
+        value: BodyStr<'a>,
     }
-}
+);
 
 #[cfg(test)]
 mod tests;