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

Use remove for flags.

Browse Source
This commit is contained in:
Stephen Chung 2023-02-03 15:58:07 +08:00
parent 675a45fac7
commit 9608e58ded
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/module/mod.rs
View File

@ -462,7 +462,8 @@ impl Module {
self.dynamic_functions_filter = None; self.dynamic_functions_filter = None;
self.type_iterators = None; self.type_iterators = None;
self.all_type_iterators = None; self.all_type_iterators = None;
self.flags &= !ModuleFlags::INDEXED & !ModuleFlags::INDEXED_GLOBAL_FUNCTIONS; self.flags
.remove(ModuleFlags::INDEXED | ModuleFlags::INDEXED_GLOBAL_FUNCTIONS);
} }
/// Map a custom type to a friendly display name. /// Map a custom type to a friendly display name.
@ -746,7 +747,8 @@ impl Module {
func: fn_def.into(), func: fn_def.into(),
}, },
); );
self.flags &= !ModuleFlags::INDEXED & !ModuleFlags::INDEXED_GLOBAL_FUNCTIONS; self.flags
.remove(ModuleFlags::INDEXED | ModuleFlags::INDEXED_GLOBAL_FUNCTIONS);
hash_script hash_script
} }
@ -785,7 +787,8 @@ impl Module {
self.all_functions = None; self.all_functions = None;
self.all_variables = None; self.all_variables = None;
self.all_type_iterators = None; self.all_type_iterators = None;
self.flags &= !ModuleFlags::INDEXED & !ModuleFlags::INDEXED_GLOBAL_FUNCTIONS; self.flags
.remove(ModuleFlags::INDEXED | ModuleFlags::INDEXED_GLOBAL_FUNCTIONS);
self.modules.get_or_insert_with(Default::default) self.modules.get_or_insert_with(Default::default)
} }
@ -851,7 +854,8 @@ impl Module {
self.modules self.modules
.get_or_insert_with(Default::default) .get_or_insert_with(Default::default)
.insert(name.into(), sub_module.into()); .insert(name.into(), sub_module.into());
self.flags &= !ModuleFlags::INDEXED & !ModuleFlags::INDEXED_GLOBAL_FUNCTIONS; self.flags
.remove(ModuleFlags::INDEXED | ModuleFlags::INDEXED_GLOBAL_FUNCTIONS);
self self
} }
@ -962,7 +966,8 @@ impl Module {
pub fn update_fn_namespace(&mut self, hash_fn: u64, namespace: FnNamespace) -> &mut Self { pub fn update_fn_namespace(&mut self, hash_fn: u64, namespace: FnNamespace) -> &mut Self {
if let Some(f) = self.functions.as_mut().and_then(|m| m.get_mut(&hash_fn)) { if let Some(f) = self.functions.as_mut().and_then(|m| m.get_mut(&hash_fn)) {
f.metadata.namespace = namespace; f.metadata.namespace = namespace;
self.flags &= !ModuleFlags::INDEXED & !ModuleFlags::INDEXED_GLOBAL_FUNCTIONS; self.flags
.remove(ModuleFlags::INDEXED | ModuleFlags::INDEXED_GLOBAL_FUNCTIONS);
} }
self self
} }
@ -1078,7 +1083,8 @@ impl Module {
}, },
); );
self.flags &= !ModuleFlags::INDEXED & !ModuleFlags::INDEXED_GLOBAL_FUNCTIONS; self.flags
.remove(ModuleFlags::INDEXED | ModuleFlags::INDEXED_GLOBAL_FUNCTIONS);
hash_fn hash_fn
} }
@ -1676,7 +1682,8 @@ impl Module {
self.all_functions = None; self.all_functions = None;
self.all_variables = None; self.all_variables = None;
self.all_type_iterators = None; self.all_type_iterators = None;
self.flags &= !ModuleFlags::INDEXED & !ModuleFlags::INDEXED_GLOBAL_FUNCTIONS; self.flags
.remove(ModuleFlags::INDEXED | ModuleFlags::INDEXED_GLOBAL_FUNCTIONS);
#[cfg(feature = "metadata")] #[cfg(feature = "metadata")]
if !other.doc.as_deref().map_or(true, SmartString::is_empty) { if !other.doc.as_deref().map_or(true, SmartString::is_empty) {
@ -1732,7 +1739,8 @@ impl Module {
self.all_functions = None; self.all_functions = None;
self.all_variables = None; self.all_variables = None;
self.all_type_iterators = None; self.all_type_iterators = None;
self.flags &= !ModuleFlags::INDEXED & !ModuleFlags::INDEXED_GLOBAL_FUNCTIONS; self.flags
.remove(ModuleFlags::INDEXED | ModuleFlags::INDEXED_GLOBAL_FUNCTIONS);
#[cfg(feature = "metadata")] #[cfg(feature = "metadata")]
if !other.doc.as_deref().map_or(true, SmartString::is_empty) { if !other.doc.as_deref().map_or(true, SmartString::is_empty) {
@ -1797,7 +1805,8 @@ impl Module {
self.all_functions = None; self.all_functions = None;
self.all_variables = None; self.all_variables = None;
self.all_type_iterators = None; self.all_type_iterators = None;
self.flags &= !ModuleFlags::INDEXED & !ModuleFlags::INDEXED_GLOBAL_FUNCTIONS; self.flags
.remove(ModuleFlags::INDEXED | ModuleFlags::INDEXED_GLOBAL_FUNCTIONS);
#[cfg(feature = "metadata")] #[cfg(feature = "metadata")]
if !other.doc.as_deref().map_or(true, SmartString::is_empty) { if !other.doc.as_deref().map_or(true, SmartString::is_empty) {
@ -1880,7 +1889,8 @@ impl Module {
self.all_functions = None; self.all_functions = None;
self.all_variables = None; self.all_variables = None;
self.all_type_iterators = None; self.all_type_iterators = None;
self.flags &= !ModuleFlags::INDEXED & !ModuleFlags::INDEXED_GLOBAL_FUNCTIONS; self.flags
.remove(ModuleFlags::INDEXED | ModuleFlags::INDEXED_GLOBAL_FUNCTIONS);
#[cfg(feature = "metadata")] #[cfg(feature = "metadata")]
if !other.doc.as_deref().map_or(true, SmartString::is_empty) { if !other.doc.as_deref().map_or(true, SmartString::is_empty) {
@ -1923,7 +1933,8 @@ impl Module {
self.all_functions = None; self.all_functions = None;
self.all_variables = None; self.all_variables = None;
self.all_type_iterators = None; self.all_type_iterators = None;
self.flags &= !ModuleFlags::INDEXED & !ModuleFlags::INDEXED_GLOBAL_FUNCTIONS; self.flags
.remove(ModuleFlags::INDEXED | ModuleFlags::INDEXED_GLOBAL_FUNCTIONS);
self self
} }
@ -2306,7 +2317,7 @@ impl Module {
path.push(""); path.push("");
let r = index_module( let has_global_functions = index_module(
self, self,
&mut path, &mut path,
&mut variables, &mut variables,
@ -2314,9 +2325,8 @@ impl Module {
&mut type_iterators, &mut type_iterators,
); );
if r { self.flags
self.flags |= ModuleFlags::INDEXED_GLOBAL_FUNCTIONS; .set(ModuleFlags::INDEXED_GLOBAL_FUNCTIONS, has_global_functions);
}
self.all_variables = if variables.is_empty() { self.all_variables = if variables.is_empty() {
None None

4
src/parser.rs
View File

@ -2769,7 +2769,7 @@ impl Engine {
}; };
if !orig_breakable { if !orig_breakable {
settings.flags &= !ParseSettingFlags::BREAKABLE; settings.flags.remove(ParseSettingFlags::BREAKABLE);
} }
ensure_not_statement_expr(input, "a boolean")?; ensure_not_statement_expr(input, "a boolean")?;
@ -3146,7 +3146,7 @@ impl Engine {
} }
// Parse statements inside the block // Parse statements inside the block
settings.flags &= !ParseSettingFlags::GLOBAL_LEVEL; settings.flags.remove(ParseSettingFlags::GLOBAL_LEVEL);
let stmt = self.parse_stmt(input, state, lib, settings)?; let stmt = self.parse_stmt(input, state, lib, settings)?;