Switch to using a type for bracket depth.

This is to make changing the type easier in the future.
This commit is contained in:
Tom Alexander
2023-08-29 11:18:15 -04:00
parent 27a9b5aeb1
commit f29720e5b9
7 changed files with 34 additions and 26 deletions

View File

@@ -12,6 +12,7 @@ use nom::multi::many_till;
#[cfg(feature = "tracing")]
use tracing::span;
use super::org_source::BracketDepth;
use super::org_source::OrgSource;
use super::Context;
use crate::error::CustomError;
@@ -92,7 +93,7 @@ fn header<'r, 's>(
}
fn header_end(
starting_bracket_depth: i16,
starting_bracket_depth: BracketDepth,
) -> impl for<'r, 's> Fn(Context<'r, 's>, OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
move |context: Context, input: OrgSource<'_>| {
_header_end(context, input, starting_bracket_depth)
@@ -103,7 +104,7 @@ fn header_end(
fn _header_end<'r, 's>(
_context: Context<'r, 's>,
input: OrgSource<'s>,
starting_bracket_depth: i16,
starting_bracket_depth: BracketDepth,
) -> Res<OrgSource<'s>, OrgSource<'s>> {
let current_depth = input.get_bracket_depth() - starting_bracket_depth;
if current_depth > 0 {
@@ -152,7 +153,7 @@ fn body<'r, 's>(
}
fn body_end(
starting_brace_depth: i16,
starting_brace_depth: BracketDepth,
) -> impl for<'r, 's> Fn(Context<'r, 's>, OrgSource<'s>) -> Res<OrgSource<'s>, OrgSource<'s>> {
move |context: Context, input: OrgSource<'_>| _body_end(context, input, starting_brace_depth)
}
@@ -161,7 +162,7 @@ fn body_end(
fn _body_end<'r, 's>(
_context: Context<'r, 's>,
input: OrgSource<'s>,
starting_brace_depth: i16,
starting_brace_depth: BracketDepth,
) -> Res<OrgSource<'s>, OrgSource<'s>> {
let current_depth = input.get_brace_depth() - starting_brace_depth;
if current_depth > 0 {