fluencelabs/parity-wasm
1
0
Fork 0
mirror of https://github.com/fluencelabs/parity-wasm synced 2025-04-25 07:12:15 +00:00
Code Issues Projects Releases Wiki Activity

decrease name size

Browse Source
This commit is contained in:
vms 2019-03-29 16:46:57 +03:00
parent b81d95507f
commit b08f8a2d79
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/elements/module.rs
View File

@ -765,7 +765,7 @@ mod integration_tests {
match *section { match *section {
Section::Name(ref name_section) => { Section::Name(ref name_section) => {
let function_name_subsection = name_section let function_name_subsection = name_section
.function_name_subsection() .functions()
.expect("function_name_subsection should be present"); .expect("function_name_subsection should be present");
assert_eq!( assert_eq!(
function_name_subsection.names().get(0).expect("Should be entry #0"), function_name_subsection.names().get(0).expect("Should be entry #0"),

72
src/elements/name_section.rs
View File

@ -12,55 +12,55 @@ const NAME_TYPE_LOCAL: u8 = 2;
#[derive(Clone, Debug, PartialEq)] #[derive(Clone, Debug, PartialEq)]
pub struct NameSection { pub struct NameSection {
/// Module name subsection. /// Module name subsection.
module_name_subsection: Option<ModuleNameSubsection>, module: Option<ModuleNameSubsection>,
/// Function name subsection. /// Function name subsection.
function_name_subsection: Option<FunctionNameSubsection>, functions: Option<FunctionNameSubsection>,
/// Local name subsection. /// Local name subsection.
local_name_subsection: Option<LocalNameSubsection>, locals: Option<LocalNameSubsection>,
} }
impl NameSection { impl NameSection {
/// Creates a new name section. /// Creates a new name section.
pub fn new(module_name_subsection: Option<ModuleNameSubsection>, pub fn new(module: Option<ModuleNameSubsection>,
function_name_subsection: Option<FunctionNameSubsection>, functions: Option<FunctionNameSubsection>,
local_name_subsection: Option<LocalNameSubsection>) -> Self { locals: Option<LocalNameSubsection>) -> Self {
Self { Self {
module_name_subsection, module,
function_name_subsection, functions,
local_name_subsection, locals,
} }
} }
/// Module name subsection of this section. /// Module name subsection of this section.
pub fn module_name_subsection(&self) -> Option<&ModuleNameSubsection> { pub fn module(&self) -> Option<&ModuleNameSubsection> {
self.module_name_subsection.as_ref() self.module.as_ref()
} }
/// Module name subsection of this section (mutable). /// Module name subsection of this section (mutable).
pub fn module_name_subsection_mut(&mut self) -> &mut Option<ModuleNameSubsection> { pub fn module_mut(&mut self) -> &mut Option<ModuleNameSubsection> {
&mut self.module_name_subsection &mut self.module
} }
/// Functions name subsection of this section. /// Functions name subsection of this section.
pub fn function_name_subsection(&self) -> Option<&FunctionNameSubsection> { pub fn functions(&self) -> Option<&FunctionNameSubsection> {
self.function_name_subsection.as_ref() self.functions.as_ref()
} }
/// Functions name subsection of this section (mutable). /// Functions name subsection of this section (mutable).
pub fn function_name_subsection_mut(&mut self) -> &mut Option<FunctionNameSubsection> { pub fn functions_mut(&mut self) -> &mut Option<FunctionNameSubsection> {
&mut self.function_name_subsection &mut self.functions
} }
/// Local name subsection of this section. /// Local name subsection of this section.
pub fn local_name_subsection(&self) -> Option<&LocalNameSubsection> { pub fn locals(&self) -> Option<&LocalNameSubsection> {
self.local_name_subsection.as_ref() self.locals.as_ref()
} }
/// Local name subsection of this section (mutable). /// Local name subsection of this section (mutable).
pub fn local_name_subsection_mut(&mut self) -> &mut Option<LocalNameSubsection> { pub fn locals_mut(&mut self) -> &mut Option<LocalNameSubsection> {
&mut self.local_name_subsection &mut self.locals
} }
} }
@ -70,9 +70,9 @@ impl NameSection {
module: &Module, module: &Module,
rdr: &mut R, rdr: &mut R,
) -> Result<Self, Error> { ) -> Result<Self, Error> {
let mut module_name_subsection: Option<ModuleNameSubsection> = None; let mut module_name: Option<ModuleNameSubsection> = None;
let mut function_name_subsection: Option<FunctionNameSubsection> = None; let mut function_names: Option<FunctionNameSubsection> = None;
let mut local_name_subsection: Option<LocalNameSubsection> = None; let mut local_names: Option<LocalNameSubsection> = None;
loop { loop {
let subsection_type: u8 = match VarUint7::deserialize(rdr) { let subsection_type: u8 = match VarUint7::deserialize(rdr) {
@ -86,24 +86,24 @@ impl NameSection {
match subsection_type { match subsection_type {
NAME_TYPE_MODULE => { NAME_TYPE_MODULE => {
if let Some(_) = module_name_subsection { if let Some(_) = module_name {
return Err(Error::DuplicatedNameSubsections(NAME_TYPE_FUNCTION)); return Err(Error::DuplicatedNameSubsections(NAME_TYPE_FUNCTION));
} }
module_name_subsection = Some(ModuleNameSubsection::deserialize(rdr)?); module_name = Some(ModuleNameSubsection::deserialize(rdr)?);
}, },
NAME_TYPE_FUNCTION => { NAME_TYPE_FUNCTION => {
if let Some(_) = function_name_subsection { if let Some(_) = function_names {
return Err(Error::DuplicatedNameSubsections(NAME_TYPE_FUNCTION)); return Err(Error::DuplicatedNameSubsections(NAME_TYPE_FUNCTION));
} }
function_name_subsection = Some(FunctionNameSubsection::deserialize(module, rdr)?); function_names = Some(FunctionNameSubsection::deserialize(module, rdr)?);
}, },
NAME_TYPE_LOCAL => { NAME_TYPE_LOCAL => {
if let Some(_) = local_name_subsection { if let Some(_) = local_names {
return Err(Error::DuplicatedNameSubsections(NAME_TYPE_LOCAL)); return Err(Error::DuplicatedNameSubsections(NAME_TYPE_LOCAL));
} }
local_name_subsection = Some(LocalNameSubsection::deserialize(module, rdr)?); local_names = Some(LocalNameSubsection::deserialize(module, rdr)?);
}, },
_ => return Err(Error::UnknownNameSubsectionType(subsection_type)) _ => return Err(Error::UnknownNameSubsectionType(subsection_type))
@ -111,9 +111,9 @@ impl NameSection {
} }
Ok(Self { Ok(Self {
module_name_subsection, module: module_name,
function_name_subsection, functions: function_names,
local_name_subsection, locals: local_names,
}) })
} }
} }
@ -128,19 +128,19 @@ impl Serialize for NameSection {
wtr.write(name_payload).map_err(Into::into) wtr.write(name_payload).map_err(Into::into)
} }
if let Some(module_name_subsection) = self.module_name_subsection { if let Some(module_name_subsection) = self.module {
let mut buffer = vec![]; let mut buffer = vec![];
module_name_subsection.serialize(&mut buffer)?; module_name_subsection.serialize(&mut buffer)?;
serialize_subsection(wtr, NAME_TYPE_MODULE, &buffer)?; serialize_subsection(wtr, NAME_TYPE_MODULE, &buffer)?;
} }
if let Some(function_name_subsection) = self.function_name_subsection { if let Some(function_name_subsection) = self.functions {
let mut buffer = vec![]; let mut buffer = vec![];
function_name_subsection.serialize(&mut buffer)?; function_name_subsection.serialize(&mut buffer)?;
serialize_subsection(wtr, NAME_TYPE_FUNCTION, &buffer)?; serialize_subsection(wtr, NAME_TYPE_FUNCTION, &buffer)?;
} }
if let Some(local_name_subsection) = self.local_name_subsection { if let Some(local_name_subsection) = self.locals {
let mut buffer = vec![]; let mut buffer = vec![];
local_name_subsection.serialize(&mut buffer)?; local_name_subsection.serialize(&mut buffer)?;
serialize_subsection(wtr, NAME_TYPE_LOCAL, &buffer)?; serialize_subsection(wtr, NAME_TYPE_LOCAL, &buffer)?;