diff options
Diffstat (limited to 'src/parser')
| -rw-r--r-- | src/parser/conversion.rs | 57 | ||||
| -rw-r--r-- | src/parser/tests.rs | 3 |
2 files changed, 52 insertions, 8 deletions
diff --git a/src/parser/conversion.rs b/src/parser/conversion.rs index 22a6ebe..e59098e 100644 --- a/src/parser/conversion.rs +++ b/src/parser/conversion.rs @@ -1,14 +1,14 @@ use url::Url; -use failure::Error; +use failure::{Error,bail}; use failure_derive::Fail; use pest::iterators::{Pairs,Pair}; use crate::document_tree::{ - HasChildren, + Element,HasChildren,ExtraAttributes, elements as e, element_categories as c, attribute_types::ID, - extra_attributes, + extra_attributes as a, }; use super::pest_rst::Rule; @@ -31,10 +31,11 @@ pub fn convert_document(pairs: Pairs<Rule>) -> Result<e::Document, Error> { fn convert_ssubel(pair: Pair<Rule>) -> Result<c::StructuralSubElement, Error> { // TODO: This is just a proof of concep. Keep closely to DTD in final version! match pair.as_rule() { - Rule::title => Ok(convert_title(pair).into()), - Rule::paragraph => Ok(e::Paragraph::with_children(vec![pair.as_str().into()]).into()), - Rule::target => Ok(convert_target(pair)?.into()), - Rule::admonition_gen => Ok(convert_admonition_gen(pair)?.into()), + Rule::title => Ok(convert_title(pair).into()), + Rule::paragraph => Ok(e::Paragraph::with_children(vec![pair.as_str().into()]).into()), + Rule::target => Ok(convert_target(pair)?.into()), + Rule::substitution_def => Ok(convert_substitution_def(pair)?.into()), + Rule::admonition_gen => Ok(convert_admonition_gen(pair)?.into()), rule => Err(ConversionError::UnknownRuleError { rule }.into()), } } @@ -57,7 +58,7 @@ fn convert_title(pair: Pair<Rule>) -> e::Title { } fn convert_target(pair: Pair<Rule>) -> Result<e::Target, Error> { - let mut attrs = extra_attributes::Target { + let mut attrs = a::Target { anonymous: false, ..Default::default() }; @@ -72,6 +73,46 @@ fn convert_target(pair: Pair<Rule>) -> Result<e::Target, Error> { Ok(e::Target::new(Default::default(), attrs)) } +fn convert_substitution_def(pair: Pair<Rule>) -> Result<e::SubstitutionDefinition, Error> { + let mut pairs = pair.into_inner(); + let name = pairs.next().unwrap().as_str(); // Rule::substitution_name + let inner_pair = pairs.next().unwrap(); + let inner: c::TextOrInlineElement = match inner_pair.as_rule() { + Rule::image => convert_image_inline(inner_pair)?.into(), + rule => panic!("Unknown substitution rule {:?}", rule), + }; + let mut subst_def = e::SubstitutionDefinition::with_children(vec![inner.into()]); + subst_def.names_mut().push(name.to_owned()); + Ok(subst_def) +} + +fn convert_image_inline(pair: Pair<Rule>) -> Result<e::ImageInline, Error> { + let mut pairs = pair.into_inner(); + let mut image = e::ImageInline::with_extra(a::ImageInline::new( + pairs.next().unwrap().as_str().parse()?, // line + )); + if let Some(opt_block) = pairs.next() { // image_opt_block + let options = opt_block.into_inner(); + for opt in options { + let mut opt_iter = opt.into_inner(); + let opt_name = opt_iter.next().unwrap(); + let opt_val = opt_iter.next().unwrap().as_str(); + match opt_name.as_str() { + "class" => image.classes_mut().push(opt_val.to_owned()), + "name" => image.names_mut().push(opt_val.to_owned()), + "alt" => image.extra_mut().alt = Some(opt_val.to_owned()), + "height" => image.extra_mut().height = Some(opt_val.parse()?), + "width" => image.extra_mut().width = Some(opt_val.parse()?), + "scale" => image.extra_mut().scale = Some(opt_val.parse()?), // TODO: can end with % + "align" => image.extra_mut().align = Some(opt_val.parse()?), + "target" => image.extra_mut().target = Some(opt_val.parse()?), + name => bail!("Unknown Image option {}", name), + } + } + } + Ok(image) +} + fn convert_admonition_gen(pair: Pair<Rule>) -> Result<c::BodyElement, Error> { let mut iter = pair.into_inner(); let typ = iter.next().unwrap().as_str(); diff --git a/src/parser/tests.rs b/src/parser/tests.rs index 74d741d..7c5c114 100644 --- a/src/parser/tests.rs +++ b/src/parser/tests.rs @@ -106,6 +106,9 @@ fn admonitions() { }; } +// TODO: substitutions +// TODO: images + #[test] fn nested_lists() { parses_to! { |