fnmain/jotdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add block parser in addition to block tree parser

Browse source
This commit is contained in:
Noah Hellman 2022-12-10 10:57:15 +01:00
parent 3a70cd8255
commit c4e4be7bce
2 changed files with 132 additions and 226 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

336
src/block.rs
View file

@ -11,7 +11,7 @@ pub type Tree = tree::Tree<Block, Atom>;
#[must_use] #[must_use]
pub fn parse(src: &str) -> Tree { pub fn parse(src: &str) -> Tree {
Parser::new(src).parse() TreeParser::new(src).parse()
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@ -49,7 +49,7 @@ pub enum Leaf {
/// Span is `#` characters. /// Span is `#` characters.
/// Each inline is a line. /// Each inline is a line.
Heading { level: u8 }, Heading,
/// Span is first `|` character. /// Span is first `|` character.
/// Each inline is a line (row). /// Each inline is a line (row).
@ -61,7 +61,7 @@ pub enum Leaf {
/// Span is language specifier. /// Span is language specifier.
/// Each inline is a line. /// Each inline is a line.
CodeBlock { fence_length: u8, c: u8 }, CodeBlock,
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@ -70,21 +70,22 @@ pub enum Container {
Blockquote, Blockquote,
/// Span is class specifier. /// Span is class specifier.
Div { fence_length: u8 }, Div,
/// Span is the list marker. /// Span is the list marker.
ListItem { indent: u8 }, ListItem,
/// Span is first `[^` instance. /// Span is first `[^` instance.
Footnote { indent: u8 }, Footnote,
} }
struct Parser<'s> { /// Parser for block-level tree structure of entire document.
struct TreeParser<'s> {
src: &'s str, src: &'s str,
tree: tree::Builder<Block, Atom>, tree: tree::Builder<Block, Atom>,
} }
impl<'s> Parser<'s> { impl<'s> TreeParser<'s> {
#[must_use] #[must_use]
pub fn new(src: &'s str) -> Self { pub fn new(src: &'s str) -> Self {
Self { Self {
@ -109,9 +110,9 @@ impl<'s> Parser<'s> {
/// Recursively parse a block and all of its children. Return number of lines the block uses. /// Recursively parse a block and all of its children. Return number of lines the block uses.
fn parse_block(&mut self, lines: &mut [Span]) -> usize { fn parse_block(&mut self, lines: &mut [Span]) -> usize {
Block::parse(lines.iter().map(|sp| sp.of(self.src))).map_or( BlockParser::parse(lines.iter().map(|sp| sp.of(self.src))).map_or(
0, 0,
|(kind, span, line_count)| { |(indent, kind, span, line_count)| {
let lines = { let lines = {
let l = lines.len().min(line_count); let l = lines.len().min(line_count);
&mut lines[..l] &mut lines[..l]
@ -133,10 +134,8 @@ impl<'s> Parser<'s> {
// skip closing fence of code blocks / divs // skip closing fence of code blocks / divs
let lines = if !truncated let lines = if !truncated
&& matches!( && matches!(kind, Block::Leaf(CodeBlock) | Block::Container(Div))
kind, {
Block::Leaf(CodeBlock { .. }) | Block::Container(Div { .. })
) {
let l = lines.len(); let l = lines.len();
&mut lines[..l - 1] &mut lines[..l - 1]
} else { } else {
@ -162,7 +161,7 @@ impl<'s> Parser<'s> {
}; };
// trim ending whitespace of block if not verbatim // trim ending whitespace of block if not verbatim
if !matches!(l, Leaf::CodeBlock { .. }) { if !matches!(l, Leaf::CodeBlock) {
let l = lines.len(); let l = lines.len();
if l > 0 { if l > 0 {
let last = &mut lines[l - 1]; let last = &mut lines[l - 1];
@ -174,10 +173,10 @@ impl<'s> Parser<'s> {
self.tree.exit(); self.tree.exit();
} }
Block::Container(c) => { Block::Container(c) => {
let (skip_chars, skip_lines_suffix) = match &c { let (skip_chars, skip_lines_suffix) = match c {
Blockquote => (2, 0), Blockquote => (2, 0),
ListItem { indent } | Footnote { indent } => (*indent, 0), ListItem | Footnote => (indent, 0),
Div { .. } => (0, 1), Div => (0, 1),
}; };
let line_count_inner = lines.len() - skip_lines_suffix; let line_count_inner = lines.len() - skip_lines_suffix;
@ -192,8 +191,8 @@ impl<'s> Parser<'s> {
.chars() .chars()
.take_while(|c| c.is_whitespace()) .take_while(|c| c.is_whitespace())
.count() .count()
+ usize::from(skip_chars)) + skip_chars)
.min(sp.len() - usize::from(sp.of(self.src).ends_with('\n'))); .min(sp.len() - usize::from(sp.of(self.src).ends_with('\n')));
*sp = sp.skip(skip); *sp = sp.skip(skip);
}); });
@ -212,23 +211,28 @@ impl<'s> Parser<'s> {
} }
} }
impl Block { /// Parser for a single block.
struct BlockParser {
indent: usize,
kind: Block,
span: Span,
fence: Option<(char, usize)>,
}
impl BlockParser {
/// Parse a single block. Return number of lines the block uses. /// Parse a single block. Return number of lines the block uses.
fn parse<'b, I: Iterator<Item = &'b str>>(mut lines: I) -> Option<(Block, Span, usize)> { fn parse<'s, I: Iterator<Item = &'s str>>(mut lines: I) -> Option<(usize, Block, Span, usize)> {
lines.next().map(|l| { lines.next().map(|l| {
let (kind, sp) = Block::start(l); let mut p = BlockParser::new(l);
let has_end_delimiter = matches!( let has_end_delimiter =
kind, matches!(p.kind, Block::Leaf(CodeBlock) | Block::Container(Div));
Self::Leaf(CodeBlock { .. }) | Self::Container(Div { .. }) let line_count_match = lines.take_while(|l| p.continues(l)).count();
);
let line_count_match = lines.take_while(|l| kind.continues(l)).count();
let line_count = 1 + line_count_match + usize::from(has_end_delimiter); let line_count = 1 + line_count_match + usize::from(has_end_delimiter);
(kind, sp, line_count) (p.indent, p.kind, p.span, line_count)
}) })
} }
/// Determine what type of block a line can start. fn new(line: &str) -> Self {
fn start(line: &str) -> (Self, Span) {
let start = line let start = line
.chars() .chars()
.take_while(|c| *c != '\n' && c.is_whitespace()) .take_while(|c| *c != '\n' && c.is_whitespace())
@ -236,41 +240,37 @@ impl Block {
let line_t = &line[start..]; let line_t = &line[start..];
let mut chars = line_t.chars(); let mut chars = line_t.chars();
match chars.next().unwrap_or(EOF) { let mut fence = None;
EOF => Some((Self::Atom(Blankline), Span::empty_at(start))), let (kind, span) = match chars.next().unwrap_or(EOF) {
'\n' => Some((Self::Atom(Blankline), Span::by_len(start, 1))), EOF => Some((Block::Atom(Blankline), Span::empty_at(start))),
'\n' => Some((Block::Atom(Blankline), Span::by_len(start, 1))),
'#' => chars '#' => chars
.find(|c| *c != '#') .find(|c| *c != '#')
.map_or(true, char::is_whitespace) .map_or(true, char::is_whitespace)
.then(|| { .then(|| {
u8::try_from(line_t.len() - chars.as_str().len() - 1) (
.ok() Block::Leaf(Heading),
.map(|level| { Span::by_len(start, line_t.len() - chars.as_str().len() - 1),
( )
Self::Leaf(Heading { level }), }),
Span::by_len(start, level.into()),
)
})
})
.flatten(),
'>' => { '>' => {
if let Some(c) = chars.next() { if let Some(c) = chars.next() {
c.is_whitespace().then(|| { c.is_whitespace().then(|| {
( (
Self::Container(Blockquote), Block::Container(Blockquote),
Span::by_len(start, line_t.len() - chars.as_str().len() - 1), Span::by_len(start, line_t.len() - chars.as_str().len() - 1),
) )
}) })
} else { } else {
Some(( Some((
Self::Container(Blockquote), Block::Container(Blockquote),
Span::by_len(start, line_t.len() - chars.as_str().len()), Span::by_len(start, line_t.len() - chars.as_str().len()),
)) ))
} }
} }
'|' => (&line_t[line_t.len() - 1..] == "|" '|' => (&line_t[line_t.len() - 1..] == "|"
&& &line_t[line_t.len() - 2..line_t.len() - 1] != "\\") && &line_t[line_t.len() - 2..line_t.len() - 1] != "\\")
.then(|| (Self::Leaf(Table), Span::by_len(start, 1))), .then(|| (Block::Leaf(Table), Span::by_len(start, 1))),
'[' => chars.as_str().find("]:").map(|l| { '[' => chars.as_str().find("]:").map(|l| {
let tag = &chars.as_str()[0..l]; let tag = &chars.as_str()[0..l];
let (tag, is_footnote) = if let Some(tag) = tag.strip_prefix('^') { let (tag, is_footnote) = if let Some(tag) = tag.strip_prefix('^') {
@ -281,17 +281,15 @@ impl Block {
dbg!(line, line_t, tag); dbg!(line, line_t, tag);
( (
if is_footnote { if is_footnote {
Self::Container(Footnote { Block::Container(Footnote)
indent: u8::try_from(start).unwrap(),
})
} else { } else {
Self::Leaf(LinkDefinition) Block::Leaf(LinkDefinition)
}, },
Span::from_slice(line, tag), Span::from_slice(line, tag),
) )
}), }),
'-' | '*' if Self::is_thematic_break(chars.clone()) => Some(( '-' | '*' if Self::is_thematic_break(chars.clone()) => Some((
Self::Atom(ThematicBreak), Block::Atom(ThematicBreak),
Span::from_slice(line, line_t.trim()), Span::from_slice(line, line_t.trim()),
)), )),
'-' => chars.next().map_or(true, char::is_whitespace).then(|| { '-' => chars.next().map_or(true, char::is_whitespace).then(|| {
@ -300,43 +298,39 @@ impl Block {
&& chars.next() == Some(']') && chars.next() == Some(']')
&& chars.next().map_or(true, char::is_whitespace); && chars.next().map_or(true, char::is_whitespace);
( (
Self::Container(ListItem { Block::Container(ListItem),
indent: u8::try_from(start).unwrap(),
}),
Span::by_len(start, if task_list { 3 } else { 1 }), Span::by_len(start, if task_list { 3 } else { 1 }),
) )
}), }),
'+' | '*' | ':' if chars.next().map_or(true, char::is_whitespace) => Some(( '+' | '*' | ':' if chars.next().map_or(true, char::is_whitespace) => {
Self::Container(ListItem { Some((Block::Container(ListItem), Span::by_len(start, 1)))
indent: u8::try_from(start).unwrap(), }
}),
Span::by_len(start, 1),
)),
f @ ('`' | ':' | '~') => { f @ ('`' | ':' | '~') => {
let fence_length = (&mut chars).take_while(|c| *c == f).count() + 1; let fence_length = (&mut chars).take_while(|c| *c == f).count() + 1;
fence = Some((f, fence_length));
let lang = line_t[fence_length..].trim(); let lang = line_t[fence_length..].trim();
let valid_spec = let valid_spec =
!lang.chars().any(char::is_whitespace) && !lang.chars().any(|c| c == '`'); !lang.chars().any(char::is_whitespace) && !lang.chars().any(|c| c == '`');
(valid_spec && fence_length >= 3) (valid_spec && fence_length >= 3).then(|| {
.then(|| { (
u8::try_from(fence_length).ok().map(|fence_length| { match f {
( ':' => Block::Container(Div),
match f { _ => Block::Leaf(CodeBlock),
':' => Self::Container(Div { fence_length }), },
_ => Self::Leaf(CodeBlock { Span::from_slice(line, lang),
fence_length, )
c: f as u8, })
}),
},
Span::from_slice(line, lang),
)
})
})
.flatten()
} }
_ => None, _ => None,
} }
.unwrap_or((Self::Leaf(Paragraph), Span::new(0, 0))) .unwrap_or((Block::Leaf(Paragraph), Span::new(0, 0)));
Self {
indent: start,
kind,
span,
fence,
}
} }
fn is_thematic_break(chars: std::str::Chars) -> bool { fn is_thematic_break(chars: std::str::Chars) -> bool {
@ -351,26 +345,21 @@ impl Block {
n >= 3 n >= 3
} }
/// Determine if this line continues a block of a certain type. /// Determine if this line continues the block.
fn continues(self, line: &str) -> bool { fn continues(&mut self, line: &str) -> bool {
//let start = Self::start(line); // TODO allow starting new block without blank line match self.kind {
match self { Block::Atom(..) => false,
Self::Atom(..) => false, Block::Leaf(Paragraph | Heading | Table) => !line.trim().is_empty(),
Self::Leaf(Paragraph | Heading { .. } | Table) => !line.trim().is_empty(), Block::Leaf(LinkDefinition) => line.starts_with(' ') && !line.trim().is_empty(),
Self::Leaf(LinkDefinition) => line.starts_with(' ') && !line.trim().is_empty(), Block::Container(Blockquote) => line.trim().starts_with('>'),
Self::Container(Blockquote) => line.trim().starts_with('>'), Block::Container(Footnote | ListItem) => {
Self::Container(Footnote { indent } | ListItem { indent }) => {
let spaces = line.chars().take_while(|c| c.is_whitespace()).count(); let spaces = line.chars().take_while(|c| c.is_whitespace()).count();
!line.trim().is_empty() && spaces >= (indent).into() line.trim().is_empty() || spaces > self.indent
} }
Self::Container(Div { fence_length }) | Self::Leaf(CodeBlock { fence_length, .. }) => { Block::Container(Div) | Block::Leaf(CodeBlock) => {
let fence = match self { let (fence, fence_length) = self.fence.unwrap();
Self::Container(..) => ':',
Self::Leaf(CodeBlock { c, .. }) => c as char,
Self::Leaf(..) | Self::Atom(..) => unreachable!(),
};
let mut c = line.chars(); let mut c = line.chars();
!((&mut c).take((fence_length).into()).all(|c| c == fence) !((&mut c).take(fence_length).all(|c| c == fence)
&& c.next().map_or(true, char::is_whitespace)) && c.next().map_or(true, char::is_whitespace))
} }
} }
@ -425,7 +414,7 @@ mod test {
macro_rules! test_parse { macro_rules! test_parse {
($src:expr $(,$($event:expr),* $(,)?)?) => { ($src:expr $(,$($event:expr),* $(,)?)?) => {
let t = super::Parser::new($src).parse(); let t = super::TreeParser::new($src).parse();
let actual = t.map(|ev| (ev.kind, ev.span.of($src))).collect::<Vec<_>>(); let actual = t.map(|ev| (ev.kind, ev.span.of($src))).collect::<Vec<_>>();
let expected = &[$($($event),*,)?]; let expected = &[$($($event),*,)?];
assert_eq!(actual, expected, "\n\n{}\n\n", $src); assert_eq!(actual, expected, "\n\n{}\n\n", $src);
@ -463,42 +452,40 @@ mod test {
" 12\n", " 12\n",
"15\n", // "15\n", //
), ),
(Enter(Leaf(Heading { level: 1 })), "#"), (Enter(Leaf(Heading)), "#"),
(EventKind::Atom(Inline), "2"), (EventKind::Atom(Inline), "2"),
(Exit(Leaf(Heading { level: 1 })), "#"), (Exit(Leaf(Heading)), "#"),
(EventKind::Atom(Blankline), "\n"), (EventKind::Atom(Blankline), "\n"),
(Enter(Leaf(Heading { level: 1 })), "#"), (Enter(Leaf(Heading)), "#"),
(EventKind::Atom(Inline), "8\n"), (EventKind::Atom(Inline), "8\n"),
(EventKind::Atom(Inline), " 12\n"), (EventKind::Atom(Inline), " 12\n"),
(EventKind::Atom(Inline), "15"), (EventKind::Atom(Inline), "15"),
(Exit(Leaf(Heading { level: 1 })), "#"), (Exit(Leaf(Heading)), "#"),
); );
} }
#[test] #[test]
fn parse_blockquote() { fn parse_blockquote() {
/*
test_parse!( test_parse!(
"> a\n", "> a\n",
(Enter, Container(Blockquote), ">"), (Enter(Container(Blockquote)), ">"),
(Enter, Leaf(Paragraph), ""), (Enter(Leaf(Paragraph)), ""),
(Element, Atom(Inline), "a"), (EventKind::Atom(Inline), "a"),
(Exit, Leaf(Paragraph), ""), (Exit(Leaf(Paragraph)), ""),
(Exit, Container(Blockquote), ">"), (Exit(Container(Blockquote)), ">"),
); );
test_parse!( test_parse!(
"> \n", "> \n",
(Enter, Container(Blockquote), ">"), (Enter(Container(Blockquote)), ">"),
(Element, Atom(Blankline), "\n"), (EventKind::Atom(Blankline), "\n"),
(Exit, Container(Blockquote), ">"), (Exit(Container(Blockquote)), ">"),
); );
test_parse!( test_parse!(
">", ">",
(Enter, Container(Blockquote), ">"), (Enter(Container(Blockquote)), ">"),
(Element, Atom(Blankline), ""), (EventKind::Atom(Blankline), ""),
(Exit, Container(Blockquote), ">"), (Exit(Container(Blockquote)), ">"),
); );
*/
test_parse!( test_parse!(
concat!( concat!(
"> a\n", "> a\n",
@ -512,9 +499,9 @@ mod test {
(EventKind::Atom(Inline), "a"), (EventKind::Atom(Inline), "a"),
(Exit(Leaf(Paragraph)), ""), (Exit(Leaf(Paragraph)), ""),
(EventKind::Atom(Blankline), "\n"), (EventKind::Atom(Blankline), "\n"),
(Enter(Leaf(Heading { level: 2 })), "##"), (Enter(Leaf(Heading)), "##"),
(EventKind::Atom(Inline), "hl"), (EventKind::Atom(Inline), "hl"),
(Exit(Leaf(Heading { level: 2 })), "##"), (Exit(Leaf(Heading)), "##"),
(EventKind::Atom(Blankline), "\n"), (EventKind::Atom(Blankline), "\n"),
(Enter(Leaf(Paragraph)), ""), (Enter(Leaf(Paragraph)), ""),
(EventKind::Atom(Inline), "para"), (EventKind::Atom(Inline), "para"),
@ -543,21 +530,9 @@ mod test {
fn parse_code_block() { fn parse_code_block() {
test_parse!( test_parse!(
concat!("```\n", "l0\n"), concat!("```\n", "l0\n"),
( (Enter(Leaf(CodeBlock)), "",),
Enter(Leaf(CodeBlock {
fence_length: 3,
c: b'`'
})),
"",
),
(EventKind::Atom(Inline), "l0\n"), (EventKind::Atom(Inline), "l0\n"),
( (Exit(Leaf(CodeBlock)), "",),
Exit(Leaf(CodeBlock {
fence_length: 3,
c: b'`'
})),
"",
),
); );
test_parse!( test_parse!(
concat!( concat!(
@ -567,21 +542,9 @@ mod test {
"\n", "\n",
"para\n", // "para\n", //
), ),
( (Enter(Leaf(CodeBlock)), ""),
Enter(Leaf(CodeBlock {
fence_length: 3,
c: b'`'
})),
""
),
(EventKind::Atom(Inline), "l0\n"), (EventKind::Atom(Inline), "l0\n"),
( (Exit(Leaf(CodeBlock)), ""),
Exit(Leaf(CodeBlock {
fence_length: 3,
c: b'`'
})),
""
),
(EventKind::Atom(Blankline), "\n"), (EventKind::Atom(Blankline), "\n"),
(Enter(Leaf(Paragraph)), ""), (Enter(Leaf(Paragraph)), ""),
(EventKind::Atom(Inline), "para"), (EventKind::Atom(Inline), "para"),
@ -595,23 +558,11 @@ mod test {
" l1\n", " l1\n",
"````", // "````", //
), ),
( (Enter(Leaf(CodeBlock)), "lang"),
Enter(Leaf(CodeBlock {
fence_length: 4,
c: b'`'
})),
"lang"
),
(EventKind::Atom(Inline), "l0\n"), (EventKind::Atom(Inline), "l0\n"),
(EventKind::Atom(Inline), "```\n"), (EventKind::Atom(Inline), "```\n"),
(EventKind::Atom(Inline), " l1\n"), (EventKind::Atom(Inline), " l1\n"),
( (Exit(Leaf(CodeBlock)), "lang"),
Exit(Leaf(CodeBlock {
fence_length: 4,
c: b'`'
})),
"lang"
),
); );
test_parse!( test_parse!(
concat!( concat!(
@ -622,36 +573,12 @@ mod test {
"bbb\n", // "bbb\n", //
"```\n", // "```\n", //
), ),
( (Enter(Leaf(CodeBlock)), ""),
Enter(Leaf(CodeBlock {
fence_length: 3,
c: b'`'
})),
""
),
(EventKind::Atom(Inline), "a\n"), (EventKind::Atom(Inline), "a\n"),
( (Exit(Leaf(CodeBlock)), ""),
Exit(Leaf(CodeBlock { (Enter(Leaf(CodeBlock)), ""),
fence_length: 3,
c: b'`'
})),
""
),
(
Enter(Leaf(CodeBlock {
fence_length: 3,
c: b'`'
})),
""
),
(EventKind::Atom(Inline), "bbb\n"), (EventKind::Atom(Inline), "bbb\n"),
( (Exit(Leaf(CodeBlock)), ""),
Exit(Leaf(CodeBlock {
fence_length: 3,
c: b'`'
})),
""
),
); );
test_parse!( test_parse!(
concat!( concat!(
@ -660,22 +587,10 @@ mod test {
" block\n", " block\n",
"~~~\n", // "~~~\n", //
), ),
( (Enter(Leaf(CodeBlock)), "",),
Enter(Leaf(CodeBlock {
fence_length: 3,
c: b'~'
})),
"",
),
(EventKind::Atom(Inline), "code\n"), (EventKind::Atom(Inline), "code\n"),
(EventKind::Atom(Inline), " block\n"), (EventKind::Atom(Inline), " block\n"),
( (Exit(Leaf(CodeBlock)), "",),
Exit(Leaf(CodeBlock {
fence_length: 3,
c: b'~'
})),
"",
),
); );
} }
@ -693,18 +608,18 @@ mod test {
fn parse_footnote() { fn parse_footnote() {
test_parse!( test_parse!(
"[^tag]: description\n", "[^tag]: description\n",
(Enter(Container(Footnote { indent: 0 })), "tag"), (Enter(Container(Footnote)), "tag"),
(Enter(Leaf(Paragraph)), ""), (Enter(Leaf(Paragraph)), ""),
(EventKind::Atom(Inline), "description"), (EventKind::Atom(Inline), "description"),
(Exit(Leaf(Paragraph)), ""), (Exit(Leaf(Paragraph)), ""),
(Exit(Container(Footnote { indent: 0 })), "tag"), (Exit(Container(Footnote)), "tag"),
); );
} }
macro_rules! test_block { macro_rules! test_block {
($src:expr, $kind:expr, $str:expr, $len:expr $(,)?) => { ($src:expr, $kind:expr, $str:expr, $len:expr $(,)?) => {
let lines = super::lines($src).map(|sp| sp.of($src)); let lines = super::lines($src).map(|sp| sp.of($src));
let (kind, sp, len) = Block::parse(lines).unwrap(); let (_indent, kind, sp, len) = super::BlockParser::parse(lines).unwrap();
assert_eq!( assert_eq!(
(kind, sp.of($src), len), (kind, sp.of($src), len),
($kind, $str, $len), ($kind, $str, $len),
@ -722,12 +637,7 @@ mod test {
#[test] #[test]
fn block_multiline() { fn block_multiline() {
test_block!( test_block!("# heading\n spanning two lines\n", Leaf(Heading), "#", 2);
"# heading\n spanning two lines\n",
Leaf(Heading { level: 1 }),
"#",
2
);
} }
#[test] #[test]
@ -771,10 +681,7 @@ mod test {
" l1\n", " l1\n",
"````", // "````", //
), ),
Leaf(CodeBlock { Leaf(CodeBlock),
fence_length: 4,
c: b'`'
}),
"lang", "lang",
5, 5,
); );
@ -787,10 +694,7 @@ mod test {
"bbb\n", // "bbb\n", //
"```\n", // "```\n", //
), ),
Leaf(CodeBlock { Leaf(CodeBlock),
fence_length: 3,
c: b'`'
}),
"", "",
3, 3,
); );

22
src/lib.rs
View file

@ -47,7 +47,7 @@ pub enum Container<'s> {
/// A paragraph. /// A paragraph.
Paragraph, Paragraph,
/// A heading. /// A heading.
Heading { level: u8 }, Heading { level: usize },
/// A cell element of row within a table. /// A cell element of row within a table.
TableCell, TableCell,
/// A term within a description list. /// A term within a description list.
@ -267,20 +267,22 @@ impl<'s> Event<'s> {
} }
impl<'s> Container<'s> { impl<'s> Container<'s> {
fn from_block(src: &'s str, block: block::Block) -> Self { fn from_block(content: &'s str, block: block::Block) -> Self {
match block { match block {
block::Block::Atom(a) => todo!(), block::Block::Atom(a) => todo!(),
block::Block::Leaf(l) => match l { block::Block::Leaf(l) => match l {
block::Leaf::Paragraph => Self::Paragraph, block::Leaf::Paragraph => Self::Paragraph,
block::Leaf::Heading { level } => Self::Heading { level }, block::Leaf::Heading => Self::Heading {
block::Leaf::CodeBlock { .. } => Self::CodeBlock { lang: None }, level: content.len(),
},
block::Leaf::CodeBlock => Self::CodeBlock { lang: None },
_ => todo!(), _ => todo!(),
}, },
block::Block::Container(c) => match c { block::Block::Container(c) => match c {
block::Container::Blockquote => Self::Blockquote, block::Container::Blockquote => Self::Blockquote,
block::Container::Div { .. } => Self::Div { class: None }, block::Container::Div => Self::Div { class: None },
block::Container::Footnote { .. } => Self::Footnote { tag: todo!() }, block::Container::Footnote => Self::Footnote { tag: content },
_ => todo!(), block::Container::ListItem => todo!(),
}, },
} }
} }
@ -350,7 +352,7 @@ impl<'s> Iterator for Parser<'s> {
} }
tree::EventKind::Exit(c) => { tree::EventKind::Exit(c) => {
self.parser = None; self.parser = None;
return Some(Event::End(Container::from_block(self.src, c))); return Some(Event::End(Container::from_block(ev.span.of(self.src), c)));
} }
tree::EventKind::Enter(..) => unreachable!(), tree::EventKind::Enter(..) => unreachable!(),
} }
@ -384,11 +386,11 @@ impl<'s> Iterator for Parser<'s> {
block::Block::Container(block::Container::Div { .. }) => Container::Div { block::Block::Container(block::Container::Div { .. }) => Container::Div {
class: (!ev.span.is_empty()).then(|| ev.span.of(self.src)), class: (!ev.span.is_empty()).then(|| ev.span.of(self.src)),
}, },
b => Container::from_block(self.src, b), b => Container::from_block(content, b),
}; };
Event::Start(container, self.block_attributes.take()) Event::Start(container, self.block_attributes.take())
} }
tree::EventKind::Exit(c) => Event::End(Container::from_block(self.src, c)), tree::EventKind::Exit(c) => Event::End(Container::from_block(content, c)),
}; };
return Some(event); return Some(event);
} }