From 7ee332a2ae704823dd34a4949585643890cac9d2 Mon Sep 17 00:00:00 2001 From: Antoni Boucher Date: Sat, 9 Nov 2024 14:53:28 -0500 Subject: [PATCH] Fix clippy warnings --- tiger/src/env.rs | 11 ++--------- tiger/src/semant.rs | 18 ------------------ 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/tiger/src/env.rs b/tiger/src/env.rs index 575e33f..92ee3a5 100644 --- a/tiger/src/env.rs +++ b/tiger/src/env.rs @@ -20,13 +20,12 @@ */ use std::cmp::Ordering; -use std::collections::{BTreeMap, BTreeSet}; +use std::collections::BTreeMap; use std::rc::Rc; use escape::{DepthEscape, EscapeEnv}; use frame::Frame; -use gen; -use gen::{Access, Level}; +use gen::Access; use position::WithPos; use symbol::{ Strings, @@ -62,10 +61,7 @@ impl Ord for ClosureField { pub enum Entry { Fun { external: bool, - is_normal_function: bool, label: Label, - level: Level, - escaping_vars: BTreeSet, parameters: Vec, param_type_symbols: Vec, result: Type, @@ -126,10 +122,7 @@ impl Env { let symbol = self.var_env.symbol(name); let entry = Entry::Fun { external: true, - is_normal_function: true, label: Label::with_name(name), - level: gen::outermost(), // FIXME: Might want to create a new level. - escaping_vars: BTreeSet::new(), parameters, param_type_symbols: vec![], result, diff --git a/tiger/src/semant.rs b/tiger/src/semant.rs index 2db766e..0907bc8 100644 --- a/tiger/src/semant.rs +++ b/tiger/src/semant.rs @@ -333,16 +333,9 @@ impl<'a, F: Clone + Debug + Frame + PartialEq> SemanticAnalyzer<'a, F> { } levels.push(level.clone()); - // escaping_vars contains the variables that escape and are defined in the - // outside scopes. - let escaping_vars = self.find_escaping_vars(); - self.env.enter_var(func_symbol, Entry::Fun { external: false, - is_normal_function: true, label: Label::with_name(&func_name), - level, - escaping_vars, parameters, param_type_symbols, result: result_type.clone(), @@ -1079,17 +1072,6 @@ impl<'a, F: Clone + Debug + Frame + PartialEq> SemanticAnalyzer<'a, F> { } } - fn find_escaping_vars(&self) -> BTreeSet { - if let Some(escaping_vars) = self.escaping_vars.last() { - escaping_vars.iter() - .cloned() - .collect() - } - else { - BTreeSet::new() - } - } - fn duplicate_param(&mut self, param: &FieldWithPos) { let ident = self.env.var_name(param.node.name); self.add_error(Error::DuplicateParam {