arch/orgize
1
0
Fork 0
Code Issues Pull requests 1 Packages Projects Releases Wiki Activity

fix(elements): TableCell can now have no children

Browse source
This commit is contained in:
PoiScript 2019-09-13 19:57:01 +08:00
parent bc49d35481
commit 14de34bc88
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/error.rs
View file

@ -26,6 +26,20 @@ pub enum OrgizeError {
}, },
} }
impl OrgizeError {
pub fn element<'a, 'b>(&self, org: &'a Org<'b>) -> &'a Element<'b> {
match &self {
OrgizeError::Children { at }
| OrgizeError::NoChildren { at }
| OrgizeError::HeadlineOrSection { at }
| OrgizeError::Title { at }
| OrgizeError::Headline { at }
| OrgizeError::Detached { at }
| OrgizeError::HeadlineLevel { at, .. } => org.arena[*at].get(),
}
}
}
impl Org<'_> { impl Org<'_> {
/// Validate an `Org` struct. /// Validate an `Org` struct.
pub fn validate(&self) -> Result<(), OrgizeError> { pub fn validate(&self) -> Result<(), OrgizeError> {
@ -107,7 +121,6 @@ impl Org<'_> {
| Element::Section | Element::Section
| Element::Table(Table::Org { .. }) | Element::Table(Table::Org { .. })
| Element::TableRow(TableRow::Standard) | Element::TableRow(TableRow::Standard)
| Element::TableCell
| Element::Bold | Element::Bold
| Element::Italic | Element::Italic
| Element::Underline | Element::Underline
@ -119,6 +132,9 @@ impl Org<'_> {
return Err(OrgizeError::Children { at: node_id }); return Err(OrgizeError::Children { at: node_id });
} }
} }
// TableCell is a container but it might
// not contains anything, e.g. `||||||`
Element::TableCell => ()
} }
} }
Ok(()) Ok(())

11
src/parsers.rs
View file

@ -1,6 +1,7 @@
// parser related functions // parser related functions
use std::borrow::Cow; use std::borrow::Cow;
use std::iter::once;
use std::marker::PhantomData; use std::marker::PhantomData;
use indextree::{Arena, NodeId}; use indextree::{Arena, NodeId};
@ -168,7 +169,7 @@ pub fn parse_section_and_headlines<'a, T: ElementArena<'a>>(
} }
let mut last_end = 0; let mut last_end = 0;
for i in memchr_iter(b'\n', content.as_bytes()) { for i in memchr_iter(b'\n', content.as_bytes()).chain(once(content.len())) {
if let Ok((mut tail, (headline_content, level))) = parse_headline(&content[last_end..]) { if let Ok((mut tail, (headline_content, level))) = parse_headline(&content[last_end..]) {
if last_end != 0 { if last_end != 0 {
let node = arena.push_element(Element::Section, parent); let node = arena.push_element(Element::Section, parent);
@ -668,7 +669,7 @@ pub fn parse_table<'a, T: ElementArena<'a>>(
let table_node = arena.push_element(Table::Org { tblfm: None }, parent); let table_node = arena.push_element(Table::Org { tblfm: None }, parent);
let mut last_end = 0; let mut last_end = 0;
for start in memchr_iter(b'\n', contents.as_bytes()) { for start in memchr_iter(b'\n', contents.as_bytes()).chain(once(contents.len())) {
let line = contents[last_end..start].trim(); let line = contents[last_end..start].trim();
match TableRow::parse(line) { match TableRow::parse(line) {
Some(TableRow::Standard) => { Some(TableRow::Standard) => {
@ -727,10 +728,8 @@ pub fn take_lines_while(predicate: impl Fn(&str) -> bool) -> impl Fn(&str) -> IR
if !predicate(&input[last_end..i - 1]) { if !predicate(&input[last_end..i - 1]) {
return Ok((&input[last_end..], &input[0..last_end])); return Ok((&input[last_end..], &input[0..last_end]));
} }
} else { } else if !predicate(&input[last_end..i]) {
if !predicate(&input[last_end..i]) { return Ok((&input[last_end..], &input[0..last_end]));
return Ok((&input[last_end..], &input[0..last_end]));
}
} }
last_end = i + 1; last_end = i + 1;
} }