diff options
| -rw-r--r-- | progs/tests/global_collision.sy | 1 | ||||
| -rw-r--r-- | src/compiler.rs | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/progs/tests/global_collision.sy b/progs/tests/global_collision.sy index 8dba295..6bce509 100644 --- a/progs/tests/global_collision.sy +++ b/progs/tests/global_collision.sy @@ -1,4 +1,3 @@ -// TODO(ed): Pure functions fac :: fn a: int -> int { if a < 1 { ret 1 } ret a * fac! a - 1 diff --git a/src/compiler.rs b/src/compiler.rs index 116e3d2..b5d05d6 100644 --- a/src/compiler.rs +++ b/src/compiler.rs @@ -1124,17 +1124,19 @@ impl Compiler { } fn define(&mut self, mut var: Variable) -> Result<usize, ()> { - if let Some(var) = self.find_variable(&var.name) { - if var.scope == self.frame().scope { + let frame = self.frame(); + + if let Some(res) = frame.find_local(&var.name).or(frame.find_upvalue(&var.name)) { + if res.scope == frame.scope { error!(self, format!("Multiple definitions of '{}' in this block.", - var.name)); + res.name)); return Err(()); } } let slot = self.stack().len(); var.slot = slot; - var.scope = self.frame().scope; + var.scope = frame.scope; var.line = self.line(); self.stack_mut().push(var); Ok(slot) |