Skip to content

remove use of length of Stateful #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 28, 2023
Merged

remove use of length of Stateful #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02b3f81
Remove use of length of Stateful
vtjnash Oct 27, 2023
508ab57
Refactor zip of eachindex to just use pairs
vtjnash Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/stylemacro.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ macro styled_str(raw_content::String)

# Instead we'll just use a `NamedTuple`
state = let content = unescape_string(raw_content, ('{', '}', ':', '$', '\n', '\r'))
(; content, bytes = Vector{UInt8}(content),
s = Iterators.Stateful(zip(eachindex(content), content)),
(; content, bytes = Vector{UInt8}(content),
s = Iterators.Stateful(pairs(content)),
parts = Any[],
active_styles = Vector{Tuple{Int, Int, Union{Symbol, Expr, Pair{Symbol, Any}}}}[],
pending_styles = Tuple{UnitRange{Int}, Union{Symbol, Expr, Pair{Symbol, Any}}}[],
Expand Down Expand Up @@ -246,7 +246,8 @@ macro styled_str(raw_content::String)
end
expr, nextpos = Meta.parseatom(state.content, pos)
nchars = length(state.content[pos:prevind(state.content, nextpos)])
for _ in 1:min(length(state.s), nchars)
for _ in 1:nchars
isempty(state.s) && break
popfirst!(state.s)
end
expr, nextpos
Expand Down