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

fix bug where #include included files would be able to access local variables and custom types. now, only globals are shared.

Browse Source
This commit is contained in:
Mark 2023-11-24 12:51:54 +01:00
parent 4144d6cf71
commit 12af47d18a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mers_lib/src/info/mod.rs
View File

@ -52,7 +52,7 @@ impl<L: Local> Local for Info<L> {
} }
fn duplicate(&self) -> Self { fn duplicate(&self) -> Self {
Self { Self {
scopes: self.scopes.iter().map(|v| v.duplicate()).collect(), scopes: vec![self.scopes[0].duplicate()],
global: self.global.clone(), global: self.global.clone(),
} }
} }

2
mers_lib/src/program/parsed/include_mers.rs
View File

@ -28,7 +28,7 @@ impl MersStatement for IncludeMers {
comp: CompInfo, comp: CompInfo,
) -> Result<Box<dyn program::run::MersStatement>, CheckError> { ) -> Result<Box<dyn program::run::MersStatement>, CheckError> {
let compiled: Arc<Box<dyn crate::program::run::MersStatement>> = let compiled: Arc<Box<dyn crate::program::run::MersStatement>> =
match self.include.compile(info, comp) { match self.include.compile(&mut info.duplicate(), comp) {
Ok(v) => Arc::new(v), Ok(v) => Arc::new(v),
Err(e) => { Err(e) => {
return Err(CheckError::new() return Err(CheckError::new()