diff options
Diffstat (limited to 'src/document_tree')
| -rw-r--r-- | src/document_tree/element_categories.rs | 42 | ||||
| -rw-r--r-- | src/document_tree/macro_util.rs | 42 |
2 files changed, 67 insertions, 17 deletions
diff --git a/src/document_tree/element_categories.rs b/src/document_tree/element_categories.rs index 1cf259d..5d0cecf 100644 --- a/src/document_tree/element_categories.rs +++ b/src/document_tree/element_categories.rs @@ -20,24 +20,33 @@ pub trait HasChildren<C> { } } -macro_rules! synonymous_enum { - ( $name:ident : $super1:ident + $super2:ident { $( $entry:ident ),* $(,)* } ) => { - synonymous_enum!($name: $super1 { $( $entry, )* }); - $( impl Into<$super2> for $entry { - fn into(self) -> $super2 { - $super2::$super1($name::$entry(self).into()) +macro_rules! impl_into { + ([ $( ($subentry:tt, $supcat:tt), )+ ]) => { + $( impl_into!($subentry => $supcat); )+ + }; + ( ($subcat:ident :: $entry:ident) => $supcat:ident ) => { + impl Into<$supcat> for $entry { + fn into(self) -> $supcat { + $supcat::$subcat($subcat::$entry(self)) } - } )* + } }; - ( $name:ident : $super:ident { $( $entry:ident ),* $(,)* } ) => { - synonymous_enum!($name { $( $entry, )* }); - $( impl Into<$super> for $entry { - fn into(self) -> $super { - $super::$name($name::$entry(self).into()) +} + +macro_rules! synonymous_enum { + ( $subcat:ident : $($supcat:ident),+ ; $midcat:ident : $supsupcat:ident { $($entry:ident),+ $(,)* } ) => { + synonymous_enum!($subcat : $( $supcat ),+ , $midcat { $($entry,)* }); + $( impl Into<$supsupcat> for $entry { + fn into(self) -> $supsupcat { + $supsupcat::$midcat($midcat::$subcat($subcat::$entry(self))) } - } )* + } )+ + }; + ( $subcat:ident : $($supcat:ident),+ { $($entry:ident),+ $(,)* } ) => { + synonymous_enum!($subcat { $( $entry, )* }); + cartesian!(impl_into, [ $( ($subcat::$entry) ),+ ], [ $($supcat),+ ]); }; - ( $name:ident { $( $entry:ident ),* $(,)* } ) => { + ( $name:ident { $( $entry:ident ),+ $(,)* } ) => { #[derive(Serialize)] pub enum $name { $( $entry($entry), )* @@ -61,8 +70,7 @@ macro_rules! synonymous_enum { synonymous_enum!(StructuralSubElement { Title, Subtitle, Decoration, Docinfo, SubStructure }); synonymous_enum!(SubStructure: StructuralSubElement { Topic, Sidebar, Transition, Section, BodyElement }); -//TODO: also implement into: SubTopic, SubSidebar, SubBlockQuote, SubFootnote, SubFigure -synonymous_enum!(BodyElement: SubStructure + StructuralSubElement { +synonymous_enum!(BodyElement: SubTopic, SubSidebar, SubBlockQuote, SubFootnote, SubFigure; SubStructure: StructuralSubElement { //Simple Paragraph, LiteralBlock, DoctestBlock, MathBlock, Rubric, SubstitutionDefinition, Comment, Pending, Target, Raw, Image, //Compound @@ -95,7 +103,7 @@ synonymous_enum!(SubOption { OptionString, OptionArgument }); synonymous_enum!(SubLineBlock { LineBlock, Line }); synonymous_enum!(SubBlockQuote { Attribution, BodyElement }); synonymous_enum!(SubFootnote { Label, BodyElement }); -synonymous_enum!(SubFigure { Image, Caption, Legend, BodyElement }); +synonymous_enum!(SubFigure { Caption, Legend, BodyElement }); #[cfg(test)] mod test { diff --git a/src/document_tree/macro_util.rs b/src/document_tree/macro_util.rs new file mode 100644 index 0000000..84e1b29 --- /dev/null +++ b/src/document_tree/macro_util.rs @@ -0,0 +1,42 @@ +macro_rules! cartesian_impl { + ($out:tt [] $b:tt $init_b:tt $submacro:tt) => { + $submacro!{$out} + }; + ($out:tt [$a:tt, $($at:tt)*] [] $init_b:tt $submacro:tt) => { + cartesian_impl!{$out [$($at)*] $init_b $init_b $submacro} + }; + ([$($out:tt)*] [$a:tt, $($at:tt)*] [$b:tt, $($bt:tt)*] $init_b:tt $submacro:tt) => { + cartesian_impl!{[$($out)* ($a, $b),] [$a, $($at)*] [$($bt)*] $init_b $submacro} + }; +} + +macro_rules! cartesian { + ( $submacro:tt, [$($a:tt)*], [$($b:tt)*]) => { + cartesian_impl!{[] [$($a)*,] [$($b)*,] [$($b)*,] $submacro} + }; +} + + +#[cfg(test)] +mod test { + macro_rules! print_cartesian { + ( [ $(($a1:tt, $a2:tt)),* , ] ) => { + fn test_f(x:i64, y:i64) -> Result<(i64, i64), ()> { + match (x, y) { + $( + ($a1, $a2) => { Ok(($a1, $a2)) } + )* + _ => { Err(()) } + } + } + }; + } + + #[test] + fn test_print_cartesian() { + cartesian!(print_cartesian, [1, 2, 3], [4, 5, 6]); + assert_eq!(test_f(1, 4), Ok((1, 4))); + assert_eq!(test_f(1, 3), Err(())); + assert_eq!(test_f(3, 5), Ok((3, 5))); + } +} |