kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Optimize AST.

Browse Source
This commit is contained in:
Stephen Chung 2020-11-19 10:41:08 +08:00
parent d35a7eeaa8
commit 1de85d749d
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ast.rs
View File

@ -1,6 +1,7 @@
//! Module defining the AST (abstract syntax tree). //! Module defining the AST (abstract syntax tree).
use crate::dynamic::Union; use crate::dynamic::Union;
use crate::fn_native::shared_make_mut;
use crate::module::NamespaceRef; use crate::module::NamespaceRef;
use crate::stdlib::{ use crate::stdlib::{
borrow::Cow, borrow::Cow,
@ -114,7 +115,7 @@ pub struct AST(
/// Global statements. /// Global statements.
Vec<Stmt>, Vec<Stmt>,
/// Script-defined functions. /// Script-defined functions.
Module, Shared<Module>,
); );
impl Default for AST { impl Default for AST {
@ -126,8 +127,8 @@ impl Default for AST {
impl AST { impl AST {
/// Create a new `AST`. /// Create a new `AST`.
#[inline(always)] #[inline(always)]
pub fn new(statements: impl IntoIterator<Item = Stmt>, lib: Module) -> Self { pub fn new(statements: impl IntoIterator<Item = Stmt>, lib: impl Into<Shared<Module>>) -> Self {
Self(statements.into_iter().collect(), lib) Self(statements.into_iter().collect(), lib.into())
} }
/// Get the statements. /// Get the statements.
#[cfg(not(feature = "internals"))] #[cfg(not(feature = "internals"))]
@ -184,7 +185,7 @@ impl AST {
) -> Self { ) -> Self {
let mut functions: Module = Default::default(); let mut functions: Module = Default::default();
functions.merge_filtered(&self.1, &mut filter); functions.merge_filtered(&self.1, &mut filter);
Self(Default::default(), functions) Self(Default::default(), functions.into())
} }
/// Clone the `AST`'s script statements into a new `AST`. /// Clone the `AST`'s script statements into a new `AST`.
/// No functions are cloned. /// No functions are cloned.
@ -368,7 +369,7 @@ impl AST {
(true, true) => vec![], (true, true) => vec![],
}; };
let mut functions = functions.clone(); let mut functions = functions.as_ref().clone();
functions.merge_filtered(&other.1, &mut filter); functions.merge_filtered(&other.1, &mut filter);
Self::new(ast, functions) Self::new(ast, functions)
@ -430,9 +431,10 @@ impl AST {
other: Self, other: Self,
mut filter: impl FnMut(FnNamespace, FnAccess, bool, &str, usize) -> bool, mut filter: impl FnMut(FnNamespace, FnAccess, bool, &str, usize) -> bool,
) -> &mut Self { ) -> &mut Self {
let Self(ref mut statements, ref mut functions) = self; self.0.extend(other.0.into_iter());
statements.extend(other.0.into_iter()); if !other.1.is_empty() {
functions.merge_filtered(&other.1, &mut filter); shared_make_mut(&mut self.1).merge_filtered(&other.1, &mut filter);
}
self self
} }
/// Filter out the functions, retaining only some based on a filter predicate. /// Filter out the functions, retaining only some based on a filter predicate.
@ -463,8 +465,11 @@ impl AST {
pub fn retain_functions( pub fn retain_functions(
&mut self, &mut self,
filter: impl FnMut(FnNamespace, FnAccess, &str, usize) -> bool, filter: impl FnMut(FnNamespace, FnAccess, &str, usize) -> bool,
) { ) -> &mut Self {
self.1.retain_script_functions(filter); if !self.1.is_empty() {
shared_make_mut(&mut self.1).retain_script_functions(filter);
}
self
} }
/// Iterate through all functions /// Iterate through all functions
#[cfg(not(feature = "no_function"))] #[cfg(not(feature = "no_function"))]