Skip to content

Commit

Permalink
Split path, better error handling, clean element
Browse files Browse the repository at this point in the history
This commit:

- Splits the `path.rs` module of `bevy_reflect` in two. the `Access`
  structs are now defined in their own submodules
- Revamps error handling
    - Separate Parse error from access errors
    - rename "index" to offset. "offset" is more commonly used to
      designate parsing position, and it can't be confused with the
      other kind of indexing done in this module
    - Instead of having one error variant per possible mismatching type,
      create a single error with a "expected" and "actual" type.
    - The error values now contain more details about the nature of the
      error.
- Refactor the `read_element{_mut}` methods
    - They are now about 70 lines, while previously they were 188 lines
    - They are much more readable now.
    - Rename them to `element{_mut}`, since the  "read" is a bit
      misleading.
    - They accept a `self` rather than `&self`, since AccessRef is Copy
      now.
- We also rewrite Display for Access in term of write! rather than
  sequential write.fmt()
- Rename `to_ref` to `as_ref`
- Make AccessRef Copy: because it's a very small type. The downside is
  that it doesn't benefit from niching in the error type anymore.
  • Loading branch information
nicopap committed Jun 19, 2023
1 parent d08c5b1 commit fc61ce6
Show file tree
Hide file tree
Showing 2 changed files with 318 additions and 320 deletions.
240 changes: 240 additions & 0 deletions crates/bevy_reflect/src/path/access.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,240 @@
use std::fmt;

use super::ReflectPathError;
use crate::{Reflect, ReflectMut, ReflectRef, VariantType};
use thiserror::Error;

type InnerResult<T> = Result<Option<T>, AccessError<'static>>;

#[derive(Debug, PartialEq, Eq, Error)]
pub enum AccessError<'a> {
#[error(
"the current {ty} doesn't have the {} {}",
access.kind(),
access.display_value(),
)]
Access { ty: Type, access: AccessRef<'a> },

#[error("invalid type shape: expected {expected} but found a reflect {actual}")]
Type { expected: Type, actual: Type },

#[error("invalid enum access: expected {expected} variant but found {actual} variant")]
Enum { expected: Type, actual: Type },
}

impl<'a> AccessError<'a> {
fn with_offset(self, offset: usize) -> ReflectPathError<'a> {
let error = self;
ReflectPathError::InvalidAccess { offset, error }
}
}
impl AccessError<'static> {
fn bad_enum(expected: Type, actual: impl Into<Type>) -> Self {
let actual = actual.into();
AccessError::Enum { expected, actual }
}
fn bad_type(expected: Type, actual: impl Into<Type>) -> Self {
let actual = actual.into();
AccessError::Type { expected, actual }
}
}

#[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub enum Type {
Struct,
TupleStruct,
Tuple,
List,
Array,
Map,
Enum,
Value,
Unit,
}

impl fmt::Display for Type {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let name = match self {
Type::Struct => "struct",
Type::TupleStruct => "tuple struct",
Type::Tuple => "tuple",
Type::List => "list",
Type::Array => "array",
Type::Map => "map",
Type::Enum => "enum",
Type::Value => "value",
Type::Unit => "unit",
};
write!(f, "{name}")
}
}
impl<'a> From<ReflectRef<'a>> for Type {
fn from(value: ReflectRef<'a>) -> Self {
match value {
ReflectRef::Struct(_) => Type::Struct,
ReflectRef::TupleStruct(_) => Type::TupleStruct,
ReflectRef::Tuple(_) => Type::Tuple,
ReflectRef::List(_) => Type::List,
ReflectRef::Array(_) => Type::Array,
ReflectRef::Map(_) => Type::Map,
ReflectRef::Enum(_) => Type::Enum,
ReflectRef::Value(_) => Type::Value,
}
}
}
impl From<VariantType> for Type {
fn from(value: VariantType) -> Self {
match value {
VariantType::Struct => Type::Struct,
VariantType::Tuple => Type::Tuple,
VariantType::Unit => Type::Unit,
}
}
}

/// A singular owned element access within a path.
///
/// Can be applied to a `dyn Reflect` to get a reference to the targeted element.
///
/// A path is composed of multiple accesses in sequence.
#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
pub(super) enum Access {
Field(Box<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}]"),
}
}
}

/// A singular borrowed element access within a path.
///
/// Can be applied to a `dyn Reflect` to get a reference to the targeted element.
///
/// Does not own the backing store it's sourced from.
/// For an owned version, you can convert one to an [`Access`] with [`AccessRef::to_owned`].
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum AccessRef<'a> {
Field(&'a str),
FieldIndex(usize),
TupleIndex(usize),
ListIndex(usize),
}

impl Access {
pub(super) fn as_ref(&self) -> AccessRef<'_> {
match self {
Self::Field(value) => AccessRef::Field(value),
Self::FieldIndex(value) => AccessRef::FieldIndex(*value),
Self::TupleIndex(value) => AccessRef::TupleIndex(*value),
Self::ListIndex(value) => AccessRef::ListIndex(*value),
}
}
}

impl<'a> AccessRef<'a> {
pub(super) fn to_owned(self) -> Access {
match self {
Self::Field(value) => Access::Field(value.to_string().into_boxed_str()),
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(
self,
base: &dyn Reflect,
offset: usize,
) -> Result<&dyn Reflect, ReflectPathError<'a>> {
let ty = base.reflect_ref().into();
self.element_inner(base)
.and_then(|maybe| maybe.ok_or(AccessError::Access { ty, access: self }))
.map_err(|err| err.with_offset(offset))
}
fn element_inner(self, base: &dyn Reflect) -> InnerResult<&dyn Reflect> {
use ReflectRef::*;
match (self, base.reflect_ref()) {
(Self::Field(field), Struct(struct_ref)) => Ok(struct_ref.field(field)),
(Self::Field(field), Enum(enum_ref)) => match enum_ref.variant_type() {
VariantType::Struct => Ok(enum_ref.field(field)),
actual => Err(AccessError::bad_enum(Type::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(AccessError::bad_enum(Type::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(AccessError::bad_enum(Type::Tuple, actual)),
},
(Self::ListIndex(index), List(list)) => Ok(list.get(index)),
(Self::ListIndex(index), Array(list)) => Ok(list.get(index)),
(Self::ListIndex(_), actual) => Err(AccessError::bad_type(Type::List, actual)),
(_, actual) => Err(AccessError::bad_type(Type::Struct, actual)),
}
}

pub(super) fn element_mut(
self,
base: &mut dyn Reflect,
offset: usize,
) -> Result<&mut dyn Reflect, ReflectPathError<'a>> {
let ty = base.reflect_ref().into();
self.element_inner_mut(base)
.and_then(|maybe| maybe.ok_or(AccessError::Access { ty, access: self }))
.map_err(|err| err.with_offset(offset))
}
fn element_inner_mut(self, base: &mut dyn Reflect) -> InnerResult<&mut dyn Reflect> {
use ReflectMut::*;
let base_kind: Type = base.reflect_ref().into();
match (self, base.reflect_mut()) {
(Self::Field(field), Struct(struct_mut)) => Ok(struct_mut.field_mut(field)),
(Self::Field(field), Enum(enum_mut)) => match enum_mut.variant_type() {
VariantType::Struct => Ok(enum_mut.field_mut(field)),
actual => Err(AccessError::bad_enum(Type::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(AccessError::bad_enum(Type::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(AccessError::bad_enum(Type::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(AccessError::bad_type(Type::List, base_kind)),
(_, _) => Err(AccessError::bad_type(Type::Struct, base_kind)),
}
}
}
Loading

0 comments on commit fc61ce6

Please sign in to comment.