fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-06-06 19:41:35 +00:00
Code Issues Projects Releases Wiki Activity

Rename UserError to HostError and move to host

Browse Source
This commit is contained in:
Sergey Pepyakin 2018-01-09 18:11:02 +03:00
parent 4bfd0384d6
commit 0db8f109b3
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/interpreter/host.rs
View File

@ -1,7 +1,37 @@
use std::any::TypeId;
use elements::FunctionType; use elements::FunctionType;
use interpreter::value::RuntimeValue; use interpreter::value::RuntimeValue;
use interpreter::Error; use interpreter::Error;
/// Custom user error.
pub trait HostError: 'static + ::std::fmt::Display + ::std::fmt::Debug {
#[doc(hidden)]
fn __private_get_type_id__(&self) -> TypeId {
TypeId::of::<Self>()
}
}
impl HostError {
/// Attempt to downcast this `HostError` to a concrete type by reference.
pub fn downcast_ref<T: HostError>(&self) -> Option<&T> {
if self.__private_get_type_id__() == TypeId::of::<T>() {
unsafe { Some(&*(self as *const HostError as *const T)) }
} else {
None
}
}
/// Attempt to downcast this `HostError` to a concrete type by mutable
/// reference.
pub fn downcast_mut<T: HostError>(&mut self) -> Option<&mut T> {
if self.__private_get_type_id__() == TypeId::of::<T>() {
unsafe { Some(&mut *(self as *mut HostError as *mut T)) }
} else {
None
}
}
}
pub type HostFuncIndex = u32; pub type HostFuncIndex = u32;
pub trait Externals { pub trait Externals {

38
src/interpreter/mod.rs
View File

@ -4,39 +4,9 @@
#![allow(deprecated)] #![allow(deprecated)]
#![allow(missing_docs)] #![allow(missing_docs)]
use std::any::TypeId;
use validation; use validation;
use common; use common;
/// Custom user error.
pub trait UserError: 'static + ::std::fmt::Display + ::std::fmt::Debug {
#[doc(hidden)]
fn __private_get_type_id__(&self) -> TypeId {
TypeId::of::<Self>()
}
}
impl UserError {
/// Attempt to downcast this `UserError` to a concrete type by reference.
pub fn downcast_ref<T: UserError>(&self) -> Option<&T> {
if self.__private_get_type_id__() == TypeId::of::<T>() {
unsafe { Some(&*(self as *const UserError as *const T)) }
} else {
None
}
}
/// Attempt to downcast this `UserError` to a concrete type by mutable
/// reference.
pub fn downcast_mut<T: UserError>(&mut self) -> Option<&mut T> {
if self.__private_get_type_id__() == TypeId::of::<T>() {
unsafe { Some(&mut *(self as *mut UserError as *mut T)) }
} else {
None
}
}
}
/// Internal interpreter error. /// Internal interpreter error.
#[derive(Debug)] #[derive(Debug)]
pub enum Error { pub enum Error {
@ -70,7 +40,7 @@ pub enum Error {
/// Trap. /// Trap.
Trap(String), Trap(String),
/// Custom user error. /// Custom user error.
User(Box<UserError>), User(Box<host::HostError>),
} }
impl Into<String> for Error { impl Into<String> for Error {
@ -117,7 +87,7 @@ impl ::std::fmt::Display for Error {
} }
} }
impl<U> From<U> for Error where U: UserError + Sized { impl<U> From<U> for Error where U: host::HostError + Sized {
fn from(e: U) -> Self { fn from(e: U) -> Self {
Error::User(Box::new(e)) Error::User(Box::new(e))
} }
@ -153,8 +123,8 @@ pub use self::memory::{MemoryInstance, MemoryRef};
pub use self::table::{TableInstance, TableRef}; pub use self::table::{TableInstance, TableRef};
pub use self::program::ProgramInstance; pub use self::program::ProgramInstance;
pub use self::value::{RuntimeValue, TryInto}; pub use self::value::{RuntimeValue, TryInto};
pub use self::host::{Externals, HostFuncIndex, EmptyExternals}; pub use self::host::{Externals, HostFuncIndex, EmptyExternals, HostError};
pub use self::imports::{ImportResolver, Imports}; pub use self::imports::{ImportResolver, Imports};
pub use self::module::{ModuleInstance, ModuleRef}; pub use self::module::{ModuleInstance, ModuleRef, ExternVal};
pub use self::global::{GlobalInstance, GlobalRef}; pub use self::global::{GlobalInstance, GlobalRef};
pub use self::func::{FuncInstance, FuncRef}; pub use self::func::{FuncInstance, FuncRef};