robin/comma-separated
1
0
Fork 0
mirror of https://codeberg.org/icewind/comma-separated.git synced 2026-06-03 10:14:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplify

Browse source
This commit is contained in:
Robin Appelman 2024-11-28 20:47:38 +01:00
commit c2c37a194e
1 changed files with 46 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

132
src/lib.rs
View file

@ -3,9 +3,9 @@
//! # Example
//!
//! ```rust
//! # fn main() {
//! # use comma_separated::CommaSeparatedIterator;
//! let input = r#"foo, "bar", 'quoted, part'"#;
//! # fn main() {
//! let input = r#"foo,"bar",'quoted, part'"#;
//! let iterator = CommaSeparatedIterator::new(input);
//! assert_eq!(vec!["foo", "\"bar\"", "'quoted, part'"], iterator.collect::<Vec<_>>());
//! # }
@ -13,16 +13,12 @@
#[derive(Copy, Clone)]
enum CommaSeparatedIteratorState {
/// Start of string or after a ',' (including whitespace)
/// Non quoted part
Default,
/// Inside a quote
Quoted(Quote),
/// After escape character inside quote
QuotedPair(Quote),
/// Non quoted part
Token,
/// After closing quote
PostAmbleForQuoted,
QuotedEscape(Quote),
}
#[derive(Copy, Clone)]
@ -32,25 +28,13 @@ enum Quote {
}
pub struct CommaSeparatedIterator<'a> {
/// target
target: &'a str,
/// iterator
char_indices: std::str::CharIndices<'a>,
/// current scanner state
state: CommaSeparatedIteratorState,
/// start position of the last token found
s: usize,
remaining: &'a str,
}
impl<'a> CommaSeparatedIterator<'a> {
/// Create a new iterator, splitting the input into comma-seperated parts with handling of quoted segments
pub fn new(target: &'a str) -> Self {
Self {
target,
char_indices: target.char_indices(),
state: CommaSeparatedIteratorState::Default,
s: 0,
}
pub fn new(text: &'a str) -> Self {
Self { remaining: text }
}
}
@ -58,62 +42,45 @@ impl<'a> Iterator for CommaSeparatedIterator<'a> {
type Item = &'a str;
fn next(&mut self) -> Option<Self::Item> {
for (i, c) in &mut self.char_indices {
let (next, next_state) = match (self.state, c) {
if self.remaining.is_empty() {
return None;
}
let mut state = CommaSeparatedIteratorState::Default;
let mut char_indices = self.remaining.char_indices();
for (i, c) in &mut char_indices {
state = match (state, c) {
(CommaSeparatedIteratorState::Default, '"') => {
self.s = i;
(None, CommaSeparatedIteratorState::Quoted(Quote::Double))
CommaSeparatedIteratorState::Quoted(Quote::Double)
}
(CommaSeparatedIteratorState::Default, '\'') => {
self.s = i;
(None, CommaSeparatedIteratorState::Quoted(Quote::Single))
}
(CommaSeparatedIteratorState::Default, ' ' | '\t') => {
(None, CommaSeparatedIteratorState::Default)
}
(CommaSeparatedIteratorState::Default, ',') => (
Some(Some(&self.target[i..i])),
CommaSeparatedIteratorState::Default,
),
(CommaSeparatedIteratorState::Default, _) => {
self.s = i;
(None, CommaSeparatedIteratorState::Token)
CommaSeparatedIteratorState::Quoted(Quote::Single)
}
(CommaSeparatedIteratorState::Quoted(Quote::Double), '"')
| (CommaSeparatedIteratorState::Quoted(Quote::Single), '\'') => (
Some(Some(&self.target[self.s..i + 1])),
CommaSeparatedIteratorState::PostAmbleForQuoted,
),
(CommaSeparatedIteratorState::Quoted(quote), '\\') => {
(None, CommaSeparatedIteratorState::QuotedPair(quote))
}
(CommaSeparatedIteratorState::QuotedPair(quote), _) => {
(None, CommaSeparatedIteratorState::Quoted(quote))
}
(CommaSeparatedIteratorState::Token, ',') => (
Some(Some(&self.target[self.s..i])),
CommaSeparatedIteratorState::Default,
),
(CommaSeparatedIteratorState::PostAmbleForQuoted, ',') => {
(None, CommaSeparatedIteratorState::Default)
}
(current_state, _) => (None, current_state),
};
self.state = next_state;
if let Some(next) = next {
return next;
}
}
match self.state {
| (CommaSeparatedIteratorState::Quoted(Quote::Single), '\'') => {
CommaSeparatedIteratorState::Default
| CommaSeparatedIteratorState::PostAmbleForQuoted => None,
CommaSeparatedIteratorState::Quoted(_)
| CommaSeparatedIteratorState::QuotedPair(_)
| CommaSeparatedIteratorState::Token => {
self.state = CommaSeparatedIteratorState::Default;
Some(&self.target[self.s..])
}
(CommaSeparatedIteratorState::Quoted(quote), '\\') => {
CommaSeparatedIteratorState::QuotedEscape(quote)
}
(CommaSeparatedIteratorState::Quoted(quote), _) => {
CommaSeparatedIteratorState::Quoted(quote)
}
(CommaSeparatedIteratorState::QuotedEscape(quote), _) => {
CommaSeparatedIteratorState::Quoted(quote)
}
(CommaSeparatedIteratorState::Default, ',') => {
let result = &self.remaining[0..i];
self.remaining = &self.remaining[i + 1..];
return Some(result);
}
(CommaSeparatedIteratorState::Default, _) => CommaSeparatedIteratorState::Default,
};
}
let result = self.remaining;
self.remaining = "";
Some(result)
}
}
@ -124,25 +91,24 @@ mod tests {
#[test]
fn test_comma_separated_iterator() {
assert_eq!(
vec!["abc", "def", "ghi", "jkl ", "mno", "pqr"],
vec!["abc", "def", " ghi", "\tjkl ", " mno", "\tpqr"],
CommaSeparatedIterator::new("abc,def, ghi,\tjkl , mno,\tpqr").collect::<Vec<&str>>()
);
assert_eq!(
vec![
"abc",
"\"def\"",
"\"ghi\"",
"\"jkl\"",
"\"mno\"",
r#""abc,def""#,
" \"ghi\"",
"\"jkl\" ",
" \"mno\"",
"pqr",
"\"abc, def\"",
"foo",
"\" foo\"",
"',foo'",
"\"fo'o\"",
" \"abc, def\"",
" foo",
" \" foo\"",
" ',foo'",
" \"fo'o\"",
],
CommaSeparatedIterator::new(
"abc,\"def\", \"ghi\",\t\"jkl\" , \"mno\",\tpqr, \"abc, def\", foo, \" foo\", ',foo', \"fo'o\""
r#""abc,def", "ghi","jkl" , "mno",pqr, "abc, def", foo, " foo", ',foo', "fo'o""#
)
.collect::<Vec<&str>>()
);