Skip to content
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

Jump to bottom

Add type assertions of the functions in src/composer.jl. #153

Merged
merged 2 commits into from
Jun 16, 2024
Merged

Add type assertions of the functions in src/composer.jl. #153

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58c1fff
Add type assertions for function arguments in `src/composer.jl`.
Paalon Jun 11, 2024
14f1c4e
Add missing type annotations.
Paalon Jun 11, 2024
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
27 changes: 11 additions & 16 deletions src/composer.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ mutable struct Composer
resolver::Resolver
end


function compose(events)
function compose(events::EventStream)
composer = Composer(events, Dict{String, Node}(), Resolver())
@assert typeof(forward!(composer.input)) == StreamStartEvent
node = compose_document(composer)
Expand All @@ -53,41 +52,39 @@ function compose_document(composer::Composer)
node
end


function handle_event(event::AliasEvent, composer)
function handle_event(event::AliasEvent, composer::Composer)
anchor = event.anchor
forward!(composer.input)
haskey(composer.anchors, anchor) || throw(ComposerError(
nothing, nothing, "found undefined alias '$(anchor)'", event.start_mark))
return composer.anchors[anchor]
end

handle_error(event, composer, anchor) =
handle_error(event::Event, composer::Composer, anchor::Union{String, Nothing}) =
anchor !== nothing && haskey(composer.anchors, anchor) && throw(ComposerError(
"found duplicate anchor '$(anchor)'; first occurance",
composer.anchors[anchor].start_mark, "second occurence",
event.start_mark))

function handle_event(event::ScalarEvent, composer)
function handle_event(event::ScalarEvent, composer::Composer)
anchor = event.anchor
handle_error(event, composer, anchor)
compose_scalar_node(composer, anchor)
end

function handle_event(event::SequenceStartEvent, composer)
function handle_event(event::SequenceStartEvent, composer::Composer)
anchor = event.anchor
handle_error(event, composer, anchor)
compose_sequence_node(composer, anchor)
end

function handle_event(event::MappingStartEvent, composer)
function handle_event(event::MappingStartEvent, composer::Composer)
anchor = event.anchor
handle_error(event, composer, anchor)
compose_mapping_node(composer, anchor)
end

handle_event(event, composer) = nothing

handle_event(event::Event, composer::Composer) = nothing

function compose_node(composer::Composer)
event = peek(composer.input)
Expand All @@ -114,14 +111,13 @@ end
compose_scalar_node(composer::Composer, anchor::Union{String, Nothing}) =
_compose_scalar_node(forward!(composer.input), composer, anchor)


__compose_sequence_node(event::SequenceEndEvent, composer, node) = false
__compose_sequence_node(event::SequenceEndEvent, composer::Composer, node::Node) = false
function __compose_sequence_node(event::Event, composer, node)
push!(node.value, compose_node(composer))
true
end

function _compose_sequence_node(start_event::SequenceStartEvent, composer, anchor)
function _compose_sequence_node(start_event::SequenceStartEvent, composer::Composer, anchor::Union{String, Nothing})
tag = start_event.tag
if tag === nothing || tag == "!"
tag = resolve(composer.resolver, SequenceNode,
Expand All @@ -147,9 +143,8 @@ end
compose_sequence_node(composer::Composer, anchor::Union{String, Nothing}) =
_compose_sequence_node(forward!(composer.input), composer, anchor)


__compose_mapping_node(event::MappingEndEvent, composer, node) = false
function __compose_mapping_node(event::Event, composer, node)
__compose_mapping_node(event::MappingEndEvent, composer::Composer, node::Node) = false
function __compose_mapping_node(event::Event, composer::Composer, node::Node)
item_key = compose_node(composer)
item_value = compose_node(composer)
push!(node.value, (item_key, item_value))
Expand Down
Loading