From d067cee68744691f3aebd939befc9837247e639c Mon Sep 17 00:00:00 2001
From: Philipp A
Date: Sun, 2 Dec 2018 17:22:51 +0100
Subject: First bit of inlines parsing

---
 src/parser/conversion.rs        | 11 +----------
 src/parser/conversion/block.rs  | 13 ++++++++++---
 src/parser/conversion/inline.rs | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+), 13 deletions(-)
 create mode 100644 src/parser/conversion/inline.rs

(limited to 'src/parser')

diff --git a/src/parser/conversion.rs b/src/parser/conversion.rs
index def67e5..ad214d5 100644
--- a/src/parser/conversion.rs
+++ b/src/parser/conversion.rs
@@ -1,7 +1,7 @@
 mod block;
+mod inline;
 
 use failure::Error;
-use failure_derive::Fail;
 use pest::iterators::Pairs;
 
 use crate::document_tree::{
@@ -12,15 +12,6 @@ use crate::document_tree::{
 use super::pest_rst::Rule;
 
 
-#[derive(Debug, Fail)]
-enum ConversionError {
-    #[fail(display = "unknown rule: {:?}", rule)]
-    UnknownRuleError {
-        rule: Rule,
-    },
-}
-
-
 pub fn convert_document(pairs: Pairs<Rule>) -> Result<e::Document, Error> {
     let structural_elems = pairs.map(block::convert_ssubel)
         .filter_map(|elem| match elem { Ok(Some(e)) => Some(Ok(e)), Err(e) => Some(Err(e)), Ok(None) => None })
diff --git a/src/parser/conversion/block.rs b/src/parser/conversion/block.rs
index 0b638e7..5a92ed6 100644
--- a/src/parser/conversion/block.rs
+++ b/src/parser/conversion/block.rs
@@ -13,20 +13,20 @@ use crate::parser::{
     pest_rst::Rule,
     pair_ext_parse::PairExt,
 };
-use super::ConversionError;
+use super::inline::convert_inline;
 
 
 pub fn convert_ssubel(pair: Pair<Rule>) -> Result<Option<c::StructuralSubElement>, Error> {
     // TODO: This is just a proof of concep. Keep closely to DTD in final version!
     Ok(Some(match pair.as_rule() {
         Rule::title            => convert_title(pair).into(),
-        Rule::paragraph        => e::Paragraph::with_children(vec![pair.as_str().into()]).into(),
+        Rule::paragraph        => convert_paragraph(pair)?.into(),
         Rule::target           => convert_target(pair)?.into(),
         Rule::substitution_def => convert_substitution_def(pair)?.into(),
         Rule::admonition_gen   => convert_admonition_gen(pair)?.into(),
         Rule::image            => convert_image::<e::Image>(pair)?.into(),
         Rule::EOI              => return Ok(None),
-        rule => return Err(ConversionError::UnknownRuleError { rule }.into()),
+        rule => panic!("unknown rule {:?}", rule),
     }))
 }
 
@@ -47,6 +47,13 @@ fn convert_title(pair: Pair<Rule>) -> e::Title {
     ])
 }
 
+
+fn convert_paragraph(pair: Pair<Rule>) -> Result<e::Paragraph, Error> {
+    let children = pair.into_inner().map(convert_inline).collect::<Result<_,_>>()?;
+    Ok(e::Paragraph::with_children(children))
+}
+
+
 fn convert_target(pair: Pair<Rule>) -> Result<e::Target, Error> {
     let mut attrs = a::Target {
         anonymous: false,
diff --git a/src/parser/conversion/inline.rs b/src/parser/conversion/inline.rs
new file mode 100644
index 0000000..0b6f659
--- /dev/null
+++ b/src/parser/conversion/inline.rs
@@ -0,0 +1,38 @@
+use failure::Error;
+use pest::iterators::Pair;
+
+use crate::document_tree::{
+    ExtraAttributes,
+    elements as e,
+    element_categories as c,
+//    attribute_types::ID,
+    extra_attributes as a,
+};
+
+use crate::parser::{
+    pest_rst::Rule,
+//    pair_ext_parse::PairExt,
+};
+
+
+pub fn convert_inline(pair: Pair<Rule>) -> Result<c::TextOrInlineElement, Error> {
+    Ok(match pair.as_rule() {
+        Rule::str       => pair.as_str().into(),
+        Rule::reference => convert_reference(pair)?.into(),
+        rule => panic!("unknown rule {:?}", rule),
+    })
+}
+
+fn convert_reference(pair: Pair<Rule>) -> Result<e::Reference, Error> {
+    let name = None;
+    let uri = None;
+    let id = None;
+    let name_tokens = vec![];
+    let extra = a::Reference {
+        name: name,
+        refuri: uri,
+        refid: id,
+        refname: name_tokens,
+    };
+    Ok(e::Reference::with_extra(extra))
+}
-- 
cgit v1.2.3