demostf/parser
1
0
Fork 0
mirror of https://codeberg.org/demostf/parser.git synced 2026-06-03 18:24:05 +02:00
Code Issues Releases Wiki Activity

flatten props by ref

Browse source
This commit is contained in:
Robin Appelman 2019-08-10 19:58:34 +02:00
commit e5aa4afa04
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/demo/packet/datatable.rs
View file

@ -93,7 +93,7 @@ impl Parse for SendTable {
} }
impl SendTable { impl SendTable {
pub fn flatten_props(&self, tables: &[SendTable]) -> Vec<SendPropDefinition> { pub fn flatten_props<'a>(&'a self, tables: &'a [SendTable]) -> Vec<&'a SendPropDefinition> {
let mut flat = Vec::new(); let mut flat = Vec::new();
self.get_all_props(tables, &self.get_excludes(tables), &mut flat); self.get_all_props(tables, &self.get_excludes(tables), &mut flat);
@ -131,14 +131,14 @@ impl SendTable {
} }
// TODO: below is a direct port from the js which is a direct port from C++ and not very optimal // TODO: below is a direct port from the js which is a direct port from C++ and not very optimal
fn get_all_props(&self, tables: &[SendTable], excludes: &[Exclude], props: &mut Vec<SendPropDefinition>) { fn get_all_props<'a>(&'a self, tables: &'a [SendTable], excludes: &[Exclude], props: &mut Vec<&'a SendPropDefinition>) {
let mut local_props = Vec::new(); let mut local_props = Vec::new();
self.get_all_props_iterator_props(tables, excludes, &mut local_props, props); self.get_all_props_iterator_props(tables, excludes, &mut local_props, props);
props.extend_from_slice(&local_props); props.extend_from_slice(&local_props);
} }
fn get_all_props_iterator_props(&self, tables: &[SendTable], excludes: &[Exclude], props: &mut Vec<SendPropDefinition>, child_props: &mut Vec<SendPropDefinition>) { fn get_all_props_iterator_props<'a>(&'a self, tables: &'a [SendTable], excludes: &[Exclude], local_props: &mut Vec<&'a SendPropDefinition>, props: &mut Vec<&'a SendPropDefinition>) {
for prop in self.props.iter() { for prop in self.props.iter() {
if prop.is_exclude() { if prop.is_exclude() {
continue; continue;
@ -151,13 +151,13 @@ impl SendTable {
if prop.prop_type == SendPropType::DataTable { if prop.prop_type == SendPropType::DataTable {
if let Some(table) = prop.get_data_table(tables) { if let Some(table) = prop.get_data_table(tables) {
if prop.flags.contains(SendPropFlag::Collapsible) { if prop.flags.contains(SendPropFlag::Collapsible) {
table.get_all_props_iterator_props(tables, excludes, props, child_props); table.get_all_props_iterator_props(tables, excludes, local_props, props);
} else { } else {
table.get_all_props(tables, excludes, child_props); table.get_all_props(tables, excludes, props);
} }
} }
} else { } else {
props.push(prop.clone()); local_props.push(prop);
} }
} }
} }