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.

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

Add enum discriminants (#337) #437

Merged
merged 1 commit into from
Sep 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
50 changes: 45 additions & 5 deletions src/adapter/edges.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
use rustdoc_types::{GenericBound::TraitBound, Id, ItemEnum, VariantKind};
use std::rc::Rc;
use trustfall::provider::{
resolve_neighbors_with, AsVertex, ContextIterator, ContextOutcomeIterator, ResolveEdgeInfo,
VertexIterator,
};

use crate::{adapter::supported_item_kind, attributes::Attribute, IndexedCrate};

use super::{optimizations, origin::Origin, vertex::Vertex, RustdocAdapter};
use super::{
enum_variant::LazyDiscriminants, optimizations, origin::Origin, vertex::Vertex, RustdocAdapter,
};

pub(super) fn resolve_crate_diff_edge<'a, V: AsVertex<Vertex<'a>> + 'a>(
contexts: ContextIterator<'a, V>,
Expand Down Expand Up @@ -263,7 +266,10 @@ pub(super) fn resolve_variant_edge<'a, V: AsVertex<Vertex<'a>> + 'a>(
match edge_name {
"field" => resolve_neighbors_with(contexts, move |vertex| {
let origin = vertex.origin;
let item = vertex.as_variant().expect("vertex was not a Variant");
let item = vertex
.as_variant()
.expect("vertex was not a Variant")
.variant();
let item_index = match origin {
Origin::CurrentCrate => &current_crate.inner.index,
Origin::PreviousCrate => {
Expand Down Expand Up @@ -293,6 +299,14 @@ pub(super) fn resolve_variant_edge<'a, V: AsVertex<Vertex<'a>> + 'a>(
})),
}
}),
"discriminant" => resolve_neighbors_with(contexts, move |vertex: &'_ Vertex<'a>| {
let origin = vertex.origin;
let enum_var = vertex.as_variant().expect("vertex was not a Variant");
let discriminant = enum_var.discriminant();
Box::new(std::iter::once(
origin.make_discriminant_vertex(discriminant),
))
}),
_ => unreachable!("resolve_variant_edge {edge_name}"),
}
}
Expand All @@ -317,9 +331,35 @@ pub(super) fn resolve_enum_edge<'a, V: AsVertex<Vertex<'a>> + 'a>(
.index
}
};
Box::new(enum_item.variants.iter().map(move |field_id| {
origin.make_item_vertex(item_index.get(field_id).expect("missing item"))
}))

let discriminants = {
let variants = enum_item
.variants
.iter()
.map(move |field_id| {
let inner = &item_index.get(field_id).expect("missing item").inner;
match inner {
ItemEnum::Variant(v) => v,
_ => unreachable!("Item {inner:?} not a Variant"),
}
})
.collect();
Rc::new(LazyDiscriminants::new(variants))
};

Box::new(
enum_item
.variants
.iter()
.enumerate()
.map(move |(index, field_id)| {
origin.make_variant_vertex(
item_index.get(field_id).expect("missing item"),
discriminants.clone(),
index,
)
}),
)
}),
_ => unreachable!("resolve_enum_edge {edge_name}"),
}
Expand Down
Loading