summaryrefslogtreecommitdiffstats
path: root/src/poem/read.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/poem/read.rs')
-rw-r--r--src/poem/read.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/poem/read.rs b/src/poem/read.rs
index afa35e7..35ca2e1 100644
--- a/src/poem/read.rs
+++ b/src/poem/read.rs
@@ -5,7 +5,8 @@ use super::{
use core::fmt;
mod parse;
use crate::compose::Environment;
-use crate::{next, poem, remark, string};
+use crate::{poem, remark, string};
+use parse::next;
#[derive(Debug, PartialEq, Eq)]
pub enum Mishap {
@@ -191,9 +192,9 @@ impl Readable for Poem {
verse.couplet = true;
Rune::Read
}
- '>' => next!(chars, i, Rune::Write, Rune::Addendum, '>'),
+ '>' => next(&mut chars, &mut i, Rune::Write, vec![('>', Rune::Addendum)]),
'|' => Rune::Couplet,
- '&' => next!(chars, i, Rune::Quiet, Rune::And, '&'),
+ '&' => next(&mut chars, &mut i, Rune::Quiet, vec![('&', Rune::And)]),
';' => Rune::Continue,
'\n' => {
j += 1;