aboutsummaryrefslogtreecommitdiffstats
path: root/src/reader.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/reader.rs')
-rw-r--r--src/reader.rs121
1 files changed, 82 insertions, 39 deletions
diff --git a/src/reader.rs b/src/reader.rs
index 64a0ed8..654ca2a 100644
--- a/src/reader.rs
+++ b/src/reader.rs
@@ -13,7 +13,7 @@ use tokio::io::{AsyncBufRead, AsyncBufReadExt, AsyncRead, AsyncReadExt};
static MAX_STANZA_SIZE: usize = 65536;
use crate::{
- element::{Content, Element, Name, Namespace},
+ element::{Content, Element, Name, NamespaceDeclaration},
error::Error,
xml::{self, parsers::Parser},
Result,
@@ -26,7 +26,7 @@ pub struct Reader<R> {
// holds which tags we are in atm over depth
// to have names reference namespaces could
depth: Vec<Name>,
- namespaces: Vec<HashSet<Namespace>>,
+ namespace_declarations: Vec<HashSet<NamespaceDeclaration>>,
}
impl<R> Reader<R> {
@@ -35,7 +35,7 @@ impl<R> Reader<R> {
inner: reader,
buffer: Buffer::with_capacity(MAX_STANZA_SIZE),
depth: Vec::new(),
- namespaces: Vec::new(),
+ namespace_declarations: Vec::new(),
}
}
}
@@ -75,8 +75,11 @@ where
match xml::STag::parse(input) {
Ok((rest, e)) => {
let len = self.buffer.available_data() - rest.as_bytes().len();
- let element =
- Reader::<R>::start_tag_from_xml(&mut self.depth, &mut self.namespaces, e)?;
+ let element = Reader::<R>::start_tag_from_xml(
+ &mut self.depth,
+ &mut self.namespace_declarations,
+ e,
+ )?;
self.buffer.consume(len);
return Ok(element);
}
@@ -97,7 +100,11 @@ where
match xml::ETag::parse(input) {
Ok((rest, e)) => {
let len = self.buffer.available_data() - rest.as_bytes().len();
- Reader::<R>::end_tag_from_xml(&mut self.depth, &mut self.namespaces, e)?;
+ Reader::<R>::end_tag_from_xml(
+ &mut self.depth,
+ &mut self.namespace_declarations,
+ e,
+ )?;
self.buffer.consume(len);
return Ok(());
}
@@ -118,7 +125,8 @@ where
match xml::Element::parse(input) {
Ok((rest, e)) => {
let len = self.buffer.available_data() - rest.as_bytes().len();
- let element = Reader::<R>::element_from_xml(&mut self.namespaces, e)?;
+ let element =
+ Reader::<R>::element_from_xml(&mut self.namespace_declarations, e)?;
self.buffer.consume(len);
return Ok(element);
}
@@ -156,8 +164,10 @@ where
} else {
let len =
self.buffer.available_data() - rest.as_bytes().len();
- let element =
- Self::element_from_xml(&mut self.namespaces, element)?;
+ let element = Self::element_from_xml(
+ &mut self.namespace_declarations,
+ element,
+ )?;
self.buffer.consume(len);
return Ok(Content::Element(element));
}
@@ -209,12 +219,15 @@ where
match xml::ContentItem::parse(input) {
Ok((rest, content_item)) => match content_item {
xml::ContentItem::Element(element) => {
+ // text can still be empty
if !text.is_empty() {
return Ok(Content::Text(text));
} else {
let len = self.buffer.available_data() - rest.as_bytes().len();
- let element =
- Self::element_from_xml(&mut self.namespaces, element)?;
+ let element = Self::element_from_xml(
+ &mut self.namespace_declarations,
+ element,
+ )?;
self.buffer.consume(len);
return Ok(Content::Element(element));
}
@@ -264,7 +277,7 @@ where
impl<R> Reader<R> {
fn start_tag_from_xml(
depth: &mut Vec<Name>,
- namespaces: &mut Vec<HashSet<Namespace>>,
+ namespaces: &mut Vec<HashSet<NamespaceDeclaration>>,
s_tag: xml::STag,
) -> Result<Element> {
let mut namespace_declarations = HashSet::new();
@@ -281,17 +294,17 @@ impl<R> Reader<R> {
}
xml::NSAttName::DefaultAttName => None,
};
- let namespace = Namespace {
+ let namespace = NamespaceDeclaration {
prefix,
namespace: namespace.process()?,
};
if !namespace_declarations.insert(namespace.clone()) {
- return Err(Error::DuplicateNameSpace(namespace));
+ return Err(Error::DuplicateNameSpaceDeclaration(namespace));
}
}
// all namespaces available to the element (from both parent elements and element itself)
- let namespace_stack: Vec<&Namespace> = namespaces
+ let namespace_stack: Vec<&NamespaceDeclaration> = namespaces
.iter()
.flatten()
.chain(namespace_declarations.iter())
@@ -322,10 +335,9 @@ impl<R> Reader<R> {
attribute_name = unprefixed_name.to_string();
}
}
- if let Some(namespace) = namespace {
- let namespace = (*namespace).clone();
+ if let Some(namespace_declaration) = namespace {
let name = Name {
- namespace,
+ namespace: namespace_declaration.namespace.clone(),
name: attribute_name,
};
let value = value.process()?;
@@ -354,11 +366,14 @@ impl<R> Reader<R> {
}
}
- let namespace = (*namespace
+ let namespace_declaration = (*namespace
.ok_or_else(|| Error::UnqualifiedNamespace(s_tag.name.to_string()))?)
.clone();
- let name = Name { namespace, name };
+ let name = Name {
+ namespace: namespace_declaration.namespace,
+ name,
+ };
depth.push(name.clone());
@@ -366,7 +381,6 @@ impl<R> Reader<R> {
return Ok(Element {
name,
- namespace_decl: namespace_declarations,
attributes,
content: Vec::new(),
});
@@ -374,13 +388,38 @@ impl<R> Reader<R> {
fn end_tag_from_xml(
depth: &mut Vec<Name>,
- namespaces: &mut Vec<HashSet<Namespace>>,
+ namespaces: &mut Vec<HashSet<NamespaceDeclaration>>,
e_tag: xml::ETag,
) -> Result<()> {
if let Some(s_tag_name) = depth.pop() {
- if s_tag_name.namespace.prefix.as_deref() == e_tag.name.prefix()
- && s_tag_name.name == e_tag.name.local_part()
- {
+ let (namespace, name);
+ let namespace_declarations: Vec<_> = namespaces.iter().flatten().collect();
+ match e_tag.name {
+ xml::QName::PrefixedName(ref prefixed_name) => {
+ namespace = namespace_declarations
+ .iter()
+ .rfind(|namespace| {
+ namespace.prefix.as_deref() == Some(**prefixed_name.prefix)
+ })
+ .map(|namespace_decl| namespace_decl.namespace.clone())
+ .ok_or_else(|| {
+ return Error::UnqualifiedNamespace((&e_tag.name).to_string());
+ })?;
+ name = prefixed_name.local_part.to_string();
+ }
+ xml::QName::UnprefixedName(ref unprefixed_name) => {
+ namespace = namespace_declarations
+ .iter()
+ .rfind(|namespace| namespace.prefix.as_deref() == None)
+ .map(|namespace_decl| namespace_decl.namespace.clone())
+ .ok_or_else(|| {
+ return Error::UnqualifiedNamespace(e_tag.name.to_string());
+ })?;
+ name = unprefixed_name.to_string();
+ }
+ }
+ let e_tag_name = Name { namespace, name };
+ if s_tag_name == e_tag_name {
namespaces.pop();
return Ok(());
} else {
@@ -395,7 +434,7 @@ impl<R> Reader<R> {
}
fn element_from_xml(
- namespaces: &mut Vec<HashSet<Namespace>>,
+ namespaces: &mut Vec<HashSet<NamespaceDeclaration>>,
element: xml::Element,
) -> Result<Element> {
match element {
@@ -416,17 +455,17 @@ impl<R> Reader<R> {
}
xml::NSAttName::DefaultAttName => None,
};
- let namespace = Namespace {
+ let namespace = NamespaceDeclaration {
prefix,
namespace: namespace.process()?,
};
if !namespace_declarations.insert(namespace.clone()) {
- return Err(Error::DuplicateNameSpace(namespace));
+ return Err(Error::DuplicateNameSpaceDeclaration(namespace));
}
}
// all namespaces available to the element (from both parent elements and element itself)
- let namespace_stack: Vec<&Namespace> = namespaces
+ let namespace_stack: Vec<&NamespaceDeclaration> = namespaces
.iter()
.flatten()
.chain(namespace_declarations.iter())
@@ -460,7 +499,7 @@ impl<R> Reader<R> {
if let Some(namespace) = namespace {
let namespace = (*namespace).clone();
let name = Name {
- namespace,
+ namespace: namespace.namespace,
name: attribute_name,
};
let value = value.process()?;
@@ -493,11 +532,13 @@ impl<R> Reader<R> {
.ok_or_else(|| Error::UnqualifiedNamespace(empty_elem_tag.name.to_string()))?)
.clone();
- let name = Name { namespace, name };
+ let name = Name {
+ namespace: namespace.namespace,
+ name,
+ };
return Ok(Element {
name,
- namespace_decl: namespace_declarations,
attributes,
content: Vec::new(),
});
@@ -523,17 +564,17 @@ impl<R> Reader<R> {
}
xml::NSAttName::DefaultAttName => None,
};
- let namespace = Namespace {
+ let namespace = NamespaceDeclaration {
prefix,
namespace: namespace.process()?,
};
if !namespace_declarations.insert(namespace.clone()) {
- return Err(Error::DuplicateNameSpace(namespace));
+ return Err(Error::DuplicateNameSpaceDeclaration(namespace));
}
}
// all namespaces available to the element (from both parent elements and element itself)
- let namespace_stack: Vec<&Namespace> = namespaces
+ let namespace_stack: Vec<&NamespaceDeclaration> = namespaces
.iter()
.flatten()
.chain(namespace_declarations.iter())
@@ -567,7 +608,7 @@ impl<R> Reader<R> {
if let Some(namespace) = namespace {
let namespace = (*namespace).clone();
let name = Name {
- namespace,
+ namespace: namespace.namespace,
name: attribute_name,
};
let value = value.process()?;
@@ -600,7 +641,10 @@ impl<R> Reader<R> {
.ok_or_else(|| Error::UnqualifiedNamespace(s_tag.name.to_string()))?)
.clone();
- let name = Name { namespace, name };
+ let name = Name {
+ namespace: namespace.namespace,
+ name,
+ };
namespaces.push(namespace_declarations.clone());
@@ -610,7 +654,6 @@ impl<R> Reader<R> {
return Ok(Element {
name,
- namespace_decl: namespace_declarations,
attributes,
content,
});
@@ -619,7 +662,7 @@ impl<R> Reader<R> {
}
fn content_from_xml(
- namespaces: &mut Vec<HashSet<Namespace>>,
+ namespaces: &mut Vec<HashSet<NamespaceDeclaration>>,
element: xml::Content,
) -> Result<Vec<Content>> {
let mut content = Vec::new();
generated by cgit (git 2.34.1) at 2025-04-04 16:45:01 +0000