Create structure for plain links.
All checks were successful
organic-test Build organic-test has succeeded
All checks were successful
organic-test Build organic-test has succeeded
This commit is contained in:
parent
357b6f25b7
commit
dcec5c490a
@ -24,6 +24,7 @@ use crate::parser::Keyword;
|
|||||||
use crate::parser::LatexEnvironment;
|
use crate::parser::LatexEnvironment;
|
||||||
use crate::parser::Object;
|
use crate::parser::Object;
|
||||||
use crate::parser::Paragraph;
|
use crate::parser::Paragraph;
|
||||||
|
use crate::parser::PlainLink;
|
||||||
use crate::parser::PlainList;
|
use crate::parser::PlainList;
|
||||||
use crate::parser::PlainListItem;
|
use crate::parser::PlainListItem;
|
||||||
use crate::parser::PlainText;
|
use crate::parser::PlainText;
|
||||||
@ -148,6 +149,7 @@ fn compare_object<'s>(
|
|||||||
Object::RegularLink(obj) => compare_regular_link(source, emacs, obj),
|
Object::RegularLink(obj) => compare_regular_link(source, emacs, obj),
|
||||||
Object::RadioLink(obj) => compare_radio_link(source, emacs, obj),
|
Object::RadioLink(obj) => compare_radio_link(source, emacs, obj),
|
||||||
Object::RadioTarget(obj) => compare_radio_target(source, emacs, obj),
|
Object::RadioTarget(obj) => compare_radio_target(source, emacs, obj),
|
||||||
|
Object::PlainLink(obj) => compare_plain_link(source, emacs, obj),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1163,3 +1165,26 @@ fn compare_radio_target<'s>(
|
|||||||
children: Vec::new(),
|
children: Vec::new(),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn compare_plain_link<'s>(
|
||||||
|
source: &'s str,
|
||||||
|
emacs: &'s Token<'s>,
|
||||||
|
rust: &'s PlainLink<'s>,
|
||||||
|
) -> Result<DiffResult, Box<dyn std::error::Error>> {
|
||||||
|
let mut this_status = DiffStatus::Good;
|
||||||
|
let emacs_name = "link";
|
||||||
|
if assert_name(emacs, emacs_name).is_err() {
|
||||||
|
this_status = DiffStatus::Bad;
|
||||||
|
}
|
||||||
|
|
||||||
|
if assert_bounds(source, emacs, rust).is_err() {
|
||||||
|
this_status = DiffStatus::Bad;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(DiffResult {
|
||||||
|
status: this_status,
|
||||||
|
name: emacs_name.to_owned(),
|
||||||
|
message: None,
|
||||||
|
children: Vec::new(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
@ -22,6 +22,7 @@ mod object_parser;
|
|||||||
mod paragraph;
|
mod paragraph;
|
||||||
mod parser_context;
|
mod parser_context;
|
||||||
mod parser_with_context;
|
mod parser_with_context;
|
||||||
|
mod plain_link;
|
||||||
mod plain_list;
|
mod plain_list;
|
||||||
mod plain_text;
|
mod plain_text;
|
||||||
mod planning;
|
mod planning;
|
||||||
@ -67,6 +68,7 @@ pub use object::Bold;
|
|||||||
pub use object::Code;
|
pub use object::Code;
|
||||||
pub use object::Italic;
|
pub use object::Italic;
|
||||||
pub use object::Object;
|
pub use object::Object;
|
||||||
|
pub use object::PlainLink;
|
||||||
pub use object::PlainText;
|
pub use object::PlainText;
|
||||||
pub use object::RadioLink;
|
pub use object::RadioLink;
|
||||||
pub use object::RadioTarget;
|
pub use object::RadioTarget;
|
||||||
|
@ -5,6 +5,7 @@ pub enum Object<'s> {
|
|||||||
RegularLink(RegularLink<'s>),
|
RegularLink(RegularLink<'s>),
|
||||||
RadioLink(RadioLink<'s>),
|
RadioLink(RadioLink<'s>),
|
||||||
RadioTarget(RadioTarget<'s>),
|
RadioTarget(RadioTarget<'s>),
|
||||||
|
PlainLink(PlainLink<'s>),
|
||||||
Bold(Bold<'s>),
|
Bold(Bold<'s>),
|
||||||
Italic(Italic<'s>),
|
Italic(Italic<'s>),
|
||||||
Underline(Underline<'s>),
|
Underline(Underline<'s>),
|
||||||
@ -72,6 +73,12 @@ pub struct RadioLink<'s> {
|
|||||||
pub children: Vec<Object<'s>>,
|
pub children: Vec<Object<'s>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, PartialEq)]
|
||||||
|
pub struct PlainLink<'s> {
|
||||||
|
pub source: &'s str,
|
||||||
|
pub children: Vec<Object<'s>>,
|
||||||
|
}
|
||||||
|
|
||||||
impl<'s> Source<'s> for Object<'s> {
|
impl<'s> Source<'s> for Object<'s> {
|
||||||
fn get_source(&'s self) -> &'s str {
|
fn get_source(&'s self) -> &'s str {
|
||||||
match self {
|
match self {
|
||||||
@ -85,6 +92,7 @@ impl<'s> Source<'s> for Object<'s> {
|
|||||||
Object::RegularLink(obj) => obj.source,
|
Object::RegularLink(obj) => obj.source,
|
||||||
Object::RadioLink(obj) => obj.source,
|
Object::RadioLink(obj) => obj.source,
|
||||||
Object::RadioTarget(obj) => obj.source,
|
Object::RadioTarget(obj) => obj.source,
|
||||||
|
Object::PlainLink(obj) => obj.source,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -142,3 +150,9 @@ impl<'s> Source<'s> for RadioTarget<'s> {
|
|||||||
self.source
|
self.source
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<'s> Source<'s> for PlainLink<'s> {
|
||||||
|
fn get_source(&'s self) -> &'s str {
|
||||||
|
self.source
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -8,6 +8,7 @@ use super::regular_link::regular_link;
|
|||||||
use super::Context;
|
use super::Context;
|
||||||
use crate::error::Res;
|
use crate::error::Res;
|
||||||
use crate::parser::object::Object;
|
use crate::parser::object::Object;
|
||||||
|
use crate::parser::plain_link::plain_link;
|
||||||
use crate::parser::radio_link::radio_link;
|
use crate::parser::radio_link::radio_link;
|
||||||
use crate::parser::radio_link::radio_target;
|
use crate::parser::radio_link::radio_target;
|
||||||
use crate::parser::text_markup::text_markup;
|
use crate::parser::text_markup::text_markup;
|
||||||
@ -31,6 +32,7 @@ pub fn standard_set_object<'r, 's>(
|
|||||||
parser_with_context!(regular_link)(context),
|
parser_with_context!(regular_link)(context),
|
||||||
Object::RegularLink,
|
Object::RegularLink,
|
||||||
),
|
),
|
||||||
|
map(parser_with_context!(plain_link)(context), Object::PlainLink),
|
||||||
map(parser_with_context!(plain_text)(context), Object::PlainText),
|
map(parser_with_context!(plain_text)(context), Object::PlainText),
|
||||||
))(input)
|
))(input)
|
||||||
}
|
}
|
||||||
|
10
src/parser/plain_link.rs
Normal file
10
src/parser/plain_link.rs
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
use super::Context;
|
||||||
|
use crate::error::Res;
|
||||||
|
use crate::parser::object::PlainLink;
|
||||||
|
use crate::parser::util::not_yet_implemented;
|
||||||
|
|
||||||
|
#[tracing::instrument(ret, level = "debug")]
|
||||||
|
pub fn plain_link<'r, 's>(context: Context<'r, 's>, input: &'s str) -> Res<&'s str, PlainLink<'s>> {
|
||||||
|
not_yet_implemented()?;
|
||||||
|
todo!();
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user