mark/mers
1
0
Fork 0
mirror of https://github.com/Dummi26/mers.git synced 2025-03-10 05:43:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix, functions added via config have bad infos

Browse Source 
functions added to a Config may have
`info::neverused()` as their info,
which also makes the DisplayInfo part of the info
not work, which can be a problem if the function
uses its infos to define object fields
or to format an object.
This commit is contained in:
Mark 2024-10-11 22:09:59 +02:00
parent 37f2e46d0c
commit bdd7260c12
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mers_lib/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "mers_lib" name = "mers_lib"
version = "0.9.6" version = "0.9.7"
edition = "2021" edition = "2021"
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"
description = "library to use the mers language in other projects" description = "library to use the mers language in other projects"

14
mers_lib/src/program/configs/mod.rs
View File

@ -157,6 +157,20 @@ impl Config {
val: Arc<RwLock<Data>>, val: Arc<RwLock<Data>>,
val_type: crate::data::Type, val_type: crate::data::Type,
) -> Self { ) -> Self {
// give the correct DisplayInfo to functions' inner scopes.
{
let data = val.write().unwrap();
let mut data = data.get_mut_unchecked();
if let Some(f) = data.mut_any().downcast_mut::<data::function::Function>() {
f.info.global.object_fields = Arc::clone(&self.info_check.global.object_fields);
f.info.global.object_fields_rev =
Arc::clone(&self.info_check.global.object_fields_rev);
let mut info_check = f.info_check.lock().unwrap();
info_check.global.object_fields = Arc::clone(&self.info_check.global.object_fields);
info_check.global.object_fields_rev =
Arc::clone(&self.info_check.global.object_fields_rev);
}
}
self.info_parsed.scopes[0].init_var(name, (0, self.globals)); self.info_parsed.scopes[0].init_var(name, (0, self.globals));
self.info_run.scopes[0].init_var(self.globals, val); self.info_run.scopes[0].init_var(self.globals, val);
self.info_check.scopes[0].init_var(self.globals, val_type); self.info_check.scopes[0].init_var(self.globals, val_type);