From 5ee6edf222658e73ee97871972b6fbeef444451b Mon Sep 17 00:00:00 2001 From: Titus Wormer Date: Mon, 25 Jul 2022 17:42:20 +0200 Subject: Refactor to not pass codes around --- src/construct/hard_break_trailing.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/construct/hard_break_trailing.rs') diff --git a/src/construct/hard_break_trailing.rs b/src/construct/hard_break_trailing.rs index 1d1f10f..f0ef83b 100644 --- a/src/construct/hard_break_trailing.rs +++ b/src/construct/hard_break_trailing.rs @@ -51,13 +51,13 @@ use crate::tokenizer::{Code, State, Tokenizer}; /// ^ /// | b /// ``` -pub fn start(tokenizer: &mut Tokenizer, code: Code) -> State { - match code { +pub fn start(tokenizer: &mut Tokenizer) -> State { + match tokenizer.current { Code::Char(' ') if tokenizer.parse_state.constructs.hard_break_trailing => { tokenizer.enter(Token::HardBreakTrailing); tokenizer.enter(Token::HardBreakTrailingSpace); - tokenizer.consume(code); - State::Fn(Box::new(|t, c| inside(t, c, 1))) + tokenizer.consume(); + State::Fn(Box::new(|t| inside(t, 1))) } _ => State::Nok, } @@ -70,11 +70,11 @@ pub fn start(tokenizer: &mut Tokenizer, code: Code) -> State { /// ^ /// | b /// ``` -fn inside(tokenizer: &mut Tokenizer, code: Code, size: usize) -> State { - match code { +fn inside(tokenizer: &mut Tokenizer, size: usize) -> State { + match tokenizer.current { Code::Char(' ') => { - tokenizer.consume(code); - State::Fn(Box::new(move |t, c| inside(t, c, size + 1))) + tokenizer.consume(); + State::Fn(Box::new(move |t| inside(t, size + 1))) } Code::CarriageReturnLineFeed | Code::Char('\n' | '\r') if size >= HARD_BREAK_PREFIX_SIZE_MIN => -- cgit