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

Refine data structures

Browse Source
This commit is contained in:
Stephen Chung
2022-03-05 17:57:23 +08:00
parent e06c2b2abb
commit 8bda8c64df
15 changed files with 235 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/packages/lang_core.rs
View File

@@ -92,7 +92,7 @@ fn collect_fn_metadata(
// Create a metadata record for a function.
fn make_metadata(
dict: &BTreeSet<Identifier>,
#[cfg(not(feature = "no_module"))] namespace: Option<Identifier>,
#[cfg(not(feature = "no_module"))] namespace: Identifier,
func: &ScriptFnDef,
) -> Map {
const DICT: &str = "key exists";
@@ -100,8 +100,8 @@ fn collect_fn_metadata(
let mut map = Map::new();
#[cfg(not(feature = "no_module"))]
if let Some(ns) = namespace {
map.insert(dict.get("namespace").expect(DICT).clone(), ns.into());
if !namespace.is_empty() {
map.insert(dict.get("namespace").expect(DICT).clone(), namespace.into());
}
map.insert(
dict.get("name").expect(DICT).clone(),
@@ -157,7 +157,7 @@ fn collect_fn_metadata(
make_metadata(
&dict,
#[cfg(not(feature = "no_module"))]
None,
Identifier::new_const(),
f,
)
.into(),
@@ -174,7 +174,7 @@ fn collect_fn_metadata(
make_metadata(
&dict,
#[cfg(not(feature = "no_module"))]
None,
Identifier::new_const(),
f,
)
.into(),
@@ -192,7 +192,7 @@ fn collect_fn_metadata(
make_metadata(
&dict,
#[cfg(not(feature = "no_module"))]
None,
Identifier::new_const(),
f,
)
.into(),
@@ -219,9 +219,7 @@ fn collect_fn_metadata(
module
.iter_script_fn()
.filter(|(s, a, n, p, f)| filter(*s, *a, n, *p, f))
.for_each(|(.., f)| {
list.push(make_metadata(dict, Some(namespace.clone()), f).into())
});
.for_each(|(.., f)| list.push(make_metadata(dict, namespace.clone(), f).into()));
for (ns, m) in module.iter_sub_modules() {
let ns = format!(
"{}{}{}",