-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Refactor path
module of bevy_reflect
#8887
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
Changes from all commits
5b134ce
e5ce830
49ed09f
60ea04d
28b04a9
d7efd76
eeca518
dba74e1
b100069
9651fc1
9a0db76
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,225 @@ | ||
use std::{borrow::Cow, fmt}; | ||
|
||
use super::{AccessError, ReflectPathError}; | ||
use crate::{Reflect, ReflectMut, ReflectRef, VariantType}; | ||
use thiserror::Error; | ||
|
||
type InnerResult<T> = Result<Option<T>, Error<'static>>; | ||
|
||
#[derive(Debug, PartialEq, Eq, Error)] | ||
pub(super) enum Error<'a> { | ||
#[error( | ||
"the current {ty} doesn't have the {} {}", | ||
access.kind(), | ||
access.display_value(), | ||
)] | ||
Access { ty: TypeShape, access: Access<'a> }, | ||
|
||
#[error("invalid type shape: expected {expected} but found a reflect {actual}")] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Replying to this comment:
Well I think it would be more useful for |
||
Type { | ||
expected: TypeShape, | ||
actual: TypeShape, | ||
}, | ||
|
||
#[error("invalid enum access: expected {expected} variant but found {actual} variant")] | ||
Enum { | ||
expected: TypeShape, | ||
actual: TypeShape, | ||
}, | ||
} | ||
|
||
impl<'a> Error<'a> { | ||
fn with_offset(self, offset: usize) -> ReflectPathError<'a> { | ||
let error = AccessError(self); | ||
ReflectPathError::InvalidAccess { offset, error } | ||
} | ||
|
||
fn access(ty: TypeShape, access: Access<'a>) -> Self { | ||
Self::Access { ty, access } | ||
} | ||
} | ||
impl Error<'static> { | ||
fn bad_enum_variant(expected: TypeShape, actual: impl Into<TypeShape>) -> Self { | ||
let actual = actual.into(); | ||
Error::Enum { expected, actual } | ||
} | ||
fn bad_type(expected: TypeShape, actual: impl Into<TypeShape>) -> Self { | ||
let actual = actual.into(); | ||
Error::Type { expected, actual } | ||
} | ||
} | ||
|
||
#[derive(Debug, Copy, Clone, PartialEq, Eq)] | ||
pub(super) enum TypeShape { | ||
Struct, | ||
TupleStruct, | ||
Tuple, | ||
List, | ||
Array, | ||
Map, | ||
Enum, | ||
Value, | ||
Unit, | ||
} | ||
|
||
impl fmt::Display for TypeShape { | ||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
let name = match self { | ||
TypeShape::Struct => "struct", | ||
TypeShape::TupleStruct => "tuple struct", | ||
TypeShape::Tuple => "tuple", | ||
TypeShape::List => "list", | ||
TypeShape::Array => "array", | ||
TypeShape::Map => "map", | ||
TypeShape::Enum => "enum", | ||
TypeShape::Value => "value", | ||
TypeShape::Unit => "unit", | ||
}; | ||
write!(f, "{name}") | ||
} | ||
} | ||
impl<'a> From<ReflectRef<'a>> for TypeShape { | ||
fn from(value: ReflectRef<'a>) -> Self { | ||
match value { | ||
ReflectRef::Struct(_) => TypeShape::Struct, | ||
ReflectRef::TupleStruct(_) => TypeShape::TupleStruct, | ||
ReflectRef::Tuple(_) => TypeShape::Tuple, | ||
ReflectRef::List(_) => TypeShape::List, | ||
ReflectRef::Array(_) => TypeShape::Array, | ||
ReflectRef::Map(_) => TypeShape::Map, | ||
ReflectRef::Enum(_) => TypeShape::Enum, | ||
ReflectRef::Value(_) => TypeShape::Value, | ||
} | ||
} | ||
} | ||
impl From<VariantType> for TypeShape { | ||
fn from(value: VariantType) -> Self { | ||
match value { | ||
VariantType::Struct => TypeShape::Struct, | ||
VariantType::Tuple => TypeShape::Tuple, | ||
VariantType::Unit => TypeShape::Unit, | ||
} | ||
} | ||
} | ||
|
||
/// A singular element access within a path. | ||
/// | ||
/// Can be applied to a `dyn Reflect` to get a reference to the targeted element. | ||
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] | ||
pub(super) enum Access<'a> { | ||
Field(Cow<'a, str>), | ||
FieldIndex(usize), | ||
TupleIndex(usize), | ||
ListIndex(usize), | ||
} | ||
|
||
impl fmt::Display for Access<'_> { | ||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||
match self { | ||
Access::Field(field) => write!(f, ".{field}"), | ||
Access::FieldIndex(index) => write!(f, "#{index}"), | ||
Access::TupleIndex(index) => write!(f, ".{index}"), | ||
Access::ListIndex(index) => write!(f, "[{index}]"), | ||
} | ||
} | ||
} | ||
|
||
impl<'a> Access<'a> { | ||
pub(super) fn into_owned(self) -> Access<'static> { | ||
match self { | ||
Self::Field(value) => Access::Field(value.to_string().into()), | ||
Self::FieldIndex(value) => Access::FieldIndex(value), | ||
Self::TupleIndex(value) => Access::TupleIndex(value), | ||
Self::ListIndex(value) => Access::ListIndex(value), | ||
} | ||
} | ||
|
||
fn display_value(&self) -> &dyn fmt::Display { | ||
match self { | ||
Self::Field(value) => value, | ||
Self::FieldIndex(value) | Self::TupleIndex(value) | Self::ListIndex(value) => value, | ||
} | ||
} | ||
fn kind(&self) -> &'static str { | ||
match self { | ||
Self::Field(_) => "field", | ||
Self::FieldIndex(_) => "field index", | ||
Self::TupleIndex(_) | Self::ListIndex(_) => "index", | ||
} | ||
} | ||
|
||
pub(super) fn element<'r>( | ||
&self, | ||
base: &'r dyn Reflect, | ||
offset: usize, | ||
) -> Result<&'r dyn Reflect, ReflectPathError<'a>> { | ||
let ty = base.reflect_ref().into(); | ||
self.element_inner(base) | ||
.and_then(|maybe| maybe.ok_or(Error::access(ty, self.clone()))) | ||
.map_err(|err| err.with_offset(offset)) | ||
} | ||
|
||
fn element_inner<'r>(&self, base: &'r dyn Reflect) -> InnerResult<&'r dyn Reflect> { | ||
use ReflectRef::*; | ||
match (self, base.reflect_ref()) { | ||
(Self::Field(field), Struct(struct_ref)) => Ok(struct_ref.field(field.as_ref())), | ||
(Self::Field(field), Enum(enum_ref)) => match enum_ref.variant_type() { | ||
VariantType::Struct => Ok(enum_ref.field(field.as_ref())), | ||
actual => Err(Error::bad_enum_variant(TypeShape::Struct, actual)), | ||
}, | ||
(&Self::FieldIndex(index), Struct(struct_ref)) => Ok(struct_ref.field_at(index)), | ||
(&Self::FieldIndex(index), Enum(enum_ref)) => match enum_ref.variant_type() { | ||
VariantType::Struct => Ok(enum_ref.field_at(index)), | ||
actual => Err(Error::bad_enum_variant(TypeShape::Struct, actual)), | ||
}, | ||
(&Self::TupleIndex(index), TupleStruct(tuple)) => Ok(tuple.field(index)), | ||
(&Self::TupleIndex(index), Tuple(tuple)) => Ok(tuple.field(index)), | ||
(&Self::TupleIndex(index), Enum(enum_ref)) => match enum_ref.variant_type() { | ||
VariantType::Tuple => Ok(enum_ref.field_at(index)), | ||
actual => Err(Error::bad_enum_variant(TypeShape::Tuple, actual)), | ||
}, | ||
(&Self::ListIndex(index), List(list)) => Ok(list.get(index)), | ||
(&Self::ListIndex(index), Array(list)) => Ok(list.get(index)), | ||
(&Self::ListIndex(_), actual) => Err(Error::bad_type(TypeShape::List, actual)), | ||
(_, actual) => Err(Error::bad_type(TypeShape::Struct, actual)), | ||
} | ||
} | ||
|
||
pub(super) fn element_mut<'r>( | ||
&self, | ||
base: &'r mut dyn Reflect, | ||
offset: usize, | ||
) -> Result<&'r mut dyn Reflect, ReflectPathError<'a>> { | ||
let ty = base.reflect_ref().into(); | ||
self.element_inner_mut(base) | ||
.and_then(|maybe| maybe.ok_or(Error::access(ty, self.clone()))) | ||
.map_err(|err| err.with_offset(offset)) | ||
} | ||
|
||
fn element_inner_mut<'r>(&self, base: &'r mut dyn Reflect) -> InnerResult<&'r mut dyn Reflect> { | ||
use ReflectMut::*; | ||
let base_shape: TypeShape = base.reflect_ref().into(); | ||
match (self, base.reflect_mut()) { | ||
(Self::Field(field), Struct(struct_mut)) => Ok(struct_mut.field_mut(field.as_ref())), | ||
(Self::Field(field), Enum(enum_mut)) => match enum_mut.variant_type() { | ||
VariantType::Struct => Ok(enum_mut.field_mut(field.as_ref())), | ||
actual => Err(Error::bad_enum_variant(TypeShape::Struct, actual)), | ||
}, | ||
(&Self::FieldIndex(index), Struct(struct_mut)) => Ok(struct_mut.field_at_mut(index)), | ||
(&Self::FieldIndex(index), Enum(enum_mut)) => match enum_mut.variant_type() { | ||
VariantType::Struct => Ok(enum_mut.field_at_mut(index)), | ||
actual => Err(Error::bad_enum_variant(TypeShape::Struct, actual)), | ||
}, | ||
(&Self::TupleIndex(index), TupleStruct(tuple)) => Ok(tuple.field_mut(index)), | ||
(&Self::TupleIndex(index), Tuple(tuple)) => Ok(tuple.field_mut(index)), | ||
(&Self::TupleIndex(index), Enum(enum_mut)) => match enum_mut.variant_type() { | ||
VariantType::Tuple => Ok(enum_mut.field_at_mut(index)), | ||
actual => Err(Error::bad_enum_variant(TypeShape::Tuple, actual)), | ||
}, | ||
(&Self::ListIndex(index), List(list)) => Ok(list.get_mut(index)), | ||
(&Self::ListIndex(index), Array(list)) => Ok(list.get_mut(index)), | ||
(&Self::ListIndex(_), _) => Err(Error::bad_type(TypeShape::List, base_shape)), | ||
(_, _) => Err(Error::bad_type(TypeShape::Struct, base_shape)), | ||
} | ||
} | ||
} |
Uh oh!
There was an error while loading. Please reload this page.