diff options
| author |  Titus Wormer <tituswormer@gmail.com> | 2022-07-22 15:03:15 +0200 |
|---|---|---|
| committer | Titus Wormer <tituswormer@gmail.com> | 2022-07-22 15:03:15 +0200 |
| commit | 41fc406af206e21014eaaba94bcf6b1854f892b3 (patch) | |
| tree | 510f6e1d763643da9072f9cf7e097e777fdbd5b8 /src/content/flow.rs | |
| parent | 37fad739ba73d488d4c3652caee01f1ec5d0aaaa (diff) | |
| download | markdown-rs-41fc406af206e21014eaaba94bcf6b1854f892b3.tar.gz markdown-rs-41fc406af206e21014eaaba94bcf6b1854f892b3.tar.bz2 markdown-rs-41fc406af206e21014eaaba94bcf6b1854f892b3.zip | |
Refactor to pass ints instead of vecs around
Diffstat (limited to '')
| -rw-r--r-- | src/content/flow.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/content/flow.rs b/src/content/flow.rs index e52f113..722e2bb 100644 --- a/src/content/flow.rs +++ b/src/content/flow.rs @@ -41,7 +41,7 @@ use crate::tokenizer::{Code, State, StateFnResult, Tokenizer}; /// ``` pub fn start(tokenizer: &mut Tokenizer, code: Code) -> StateFnResult { match code { - Code::None => (State::Ok, None), + Code::None => (State::Ok, 0), _ => tokenizer.attempt(blank_line, |ok| { Box::new(if ok { blank_line_after } else { initial_before }) })(tokenizer, code), @@ -62,7 +62,7 @@ pub fn start(tokenizer: &mut Tokenizer, code: Code) -> StateFnResult { /// ``` fn initial_before(tokenizer: &mut Tokenizer, code: Code) -> StateFnResult { match code { - Code::None => (State::Ok, None), + Code::None => (State::Ok, 0), _ => tokenizer.attempt_n( vec![ Box::new(code_indented), @@ -87,14 +87,14 @@ fn initial_before(tokenizer: &mut Tokenizer, code: Code) -> StateFnResult { /// ``` fn blank_line_after(tokenizer: &mut Tokenizer, code: Code) -> StateFnResult { match code { - Code::None => (State::Ok, None), + Code::None => (State::Ok, 0), Code::CarriageReturnLineFeed | Code::Char('\n' | '\r') => { tokenizer.enter(Token::BlankLineEnding); tokenizer.consume(code); tokenizer.exit(Token::BlankLineEnding); // Feel free to interrupt. tokenizer.interrupt = false; - (State::Fn(Box::new(start)), None) + (State::Fn(Box::new(start)), 0) } _ => unreachable!("expected eol/eof"), } @@ -111,12 +111,12 @@ fn blank_line_after(tokenizer: &mut Tokenizer, code: Code) -> StateFnResult { /// ``` fn after(tokenizer: &mut Tokenizer, code: Code) -> StateFnResult { match code { - Code::None => (State::Ok, None), + Code::None => (State::Ok, 0), Code::CarriageReturnLineFeed | Code::Char('\n' | '\r') => { tokenizer.enter(Token::LineEnding); tokenizer.consume(code); tokenizer.exit(Token::LineEnding); - (State::Fn(Box::new(start)), None) + (State::Fn(Box::new(start)), 0) } _ => unreachable!("expected eol/eof"), } |