Record refactoring (#19)

This commit is contained in:
vms
2020-09-16 01:14:15 +03:00
committed by GitHub
parent 5259036913
commit dd52743024
66 changed files with 2382 additions and 386 deletions

View File

@ -19,34 +19,55 @@ use crate::instructions_generator::WITResolver;
use crate::Result;
use fluence_sdk_wit::ParsedType;
use fluence_sdk_wit::WasmType;
use fluence_sdk_wit::RustType;
pub(crate) fn ptype_to_itype(pty: &ParsedType, wit_resolver: &WITResolver) -> Result<IType> {
// return error if there is no record with such name
pub(crate) fn ptype_to_itype_checked(
pty: &ParsedType,
wit_resolver: &mut WITResolver,
) -> Result<IType> {
match pty {
ParsedType::I8 => Ok(IType::S8),
ParsedType::I16 => Ok(IType::S16),
ParsedType::I32 => Ok(IType::S32),
ParsedType::I64 => Ok(IType::S64),
ParsedType::U8 => Ok(IType::U8),
ParsedType::U16 => Ok(IType::U16),
ParsedType::U32 => Ok(IType::U32),
ParsedType::U64 => Ok(IType::U64),
ParsedType::F32 => Ok(IType::F32),
ParsedType::F64 => Ok(IType::F64),
ParsedType::Boolean => Ok(IType::I32),
ParsedType::Utf8String => Ok(IType::String),
ParsedType::ByteVector => Ok(IType::ByteArray),
ParsedType::Record(record_name) => {
Ok(IType::Record(wit_resolver.get_record_type(record_name)?))
let record_type_id = wit_resolver.get_record_type_id(record_name)?;
Ok(IType::Record(record_type_id as _))
}
_ => Ok(ptype_to_itype_unchecked(pty, wit_resolver)),
}
}
pub(crate) fn ptype_to_itype_unchecked(pty: &ParsedType, wit_resolver: &mut WITResolver) -> IType {
match pty {
ParsedType::I8 => IType::S8,
ParsedType::I16 => IType::S16,
ParsedType::I32 => IType::S32,
ParsedType::I64 => IType::S64,
ParsedType::U8 => IType::U8,
ParsedType::U16 => IType::U16,
ParsedType::U32 => IType::U32,
ParsedType::U64 => IType::U64,
ParsedType::F32 => IType::F32,
ParsedType::F64 => IType::F64,
ParsedType::Boolean => IType::I32,
ParsedType::Utf8String => IType::String,
ParsedType::ByteVector => IType::ByteArray,
ParsedType::Record(record_name) => {
let record_type_id = wit_resolver.get_record_type_id_unchecked(record_name);
IType::Record(record_type_id as _)
}
}
}
pub(crate) fn wtype_to_itype(pty: &WasmType) -> IType {
pub(crate) fn wtype_to_itype(pty: &RustType) -> IType {
match pty {
WasmType::I32 => IType::I32,
WasmType::I64 => IType::I64,
WasmType::F32 => IType::F32,
WasmType::F64 => IType::F64,
RustType::I8 => IType::S8,
RustType::I16 => IType::S16,
RustType::I32 => IType::S32,
RustType::I64 => IType::S64,
RustType::U8 => IType::U8,
RustType::U16 => IType::U16,
RustType::U32 => IType::U32,
RustType::U64 => IType::U64,
RustType::F32 => IType::F32,
RustType::F64 => IType::F64,
}
}