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/attention.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/construct/attention.rs') diff --git a/src/construct/attention.rs b/src/construct/attention.rs index a53a328..27d7544 100644 --- a/src/construct/attention.rs +++ b/src/construct/attention.rs @@ -168,11 +168,11 @@ struct Sequence { /// > | ** /// ^ /// ``` -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.attention => { tokenizer.enter(Token::AttentionSequence); - inside(tokenizer, code, MarkerKind::from_code(code)) + inside(tokenizer, MarkerKind::from_code(tokenizer.current)) } _ => State::Nok, } @@ -184,11 +184,11 @@ pub fn start(tokenizer: &mut Tokenizer, code: Code) -> State { /// > | ** /// ^^ /// ``` -fn inside(tokenizer: &mut Tokenizer, code: Code, marker: MarkerKind) -> State { - match code { +fn inside(tokenizer: &mut Tokenizer, marker: MarkerKind) -> State { + match tokenizer.current { Code::Char(char) if char == marker.as_char() => { - tokenizer.consume(code); - State::Fn(Box::new(move |t, c| inside(t, c, marker))) + tokenizer.consume(); + State::Fn(Box::new(move |t| inside(t, marker))) } _ => { tokenizer.exit(Token::AttentionSequence); -- cgit