diff --git a/crates/aiken-lang/src/ast.rs b/crates/aiken-lang/src/ast.rs index c05b55d1..203a242d 100644 --- a/crates/aiken-lang/src/ast.rs +++ b/crates/aiken-lang/src/ast.rs @@ -857,17 +857,12 @@ pub struct UnqualifiedImport { pub location: Span, pub name: String, pub as_name: Option, - pub layer: Layer, } impl UnqualifiedImport { pub fn variable_name(&self) -> &str { self.as_name.as_deref().unwrap_or(&self.name) } - - pub fn is_value(&self) -> bool { - self.layer.is_value() - } } // TypeAst @@ -1015,20 +1010,6 @@ impl Annotation { } } -#[derive(Debug, Clone, PartialEq, Eq, Default, serde::Serialize, serde::Deserialize)] -pub enum Layer { - #[default] - Value, - Type, -} - -impl Layer { - /// Returns `true` if the layer is [`Value`]. - pub fn is_value(&self) -> bool { - matches!(self, Self::Value) - } -} - #[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)] pub enum BinOp { // Boolean logic diff --git a/crates/aiken-lang/src/parser/definition/import.rs b/crates/aiken-lang/src/parser/definition/import.rs index 2b1d959d..d98366c1 100644 --- a/crates/aiken-lang/src/parser/definition/import.rs +++ b/crates/aiken-lang/src/parser/definition/import.rs @@ -1,9 +1,8 @@ -use chumsky::prelude::*; - use crate::{ ast, parser::{error::ParseError, token::Token}, }; +use chumsky::prelude::*; pub fn parser() -> impl Parser { let unqualified_import = choice(( @@ -22,7 +21,6 @@ pub fn parser() -> impl Parser { let name = module.join("/"); @@ -600,15 +600,6 @@ fn infer_definition( imported_modules: environment.imported_modules.keys().cloned().collect(), })?; - // TODO: remove this most likely - // Record any imports that are types only as this information is - // needed to prevent types being imported in generated JavaScript - for import in unqualified.iter_mut() { - if environment.imported_types.contains(import.variable_name()) { - import.layer = Layer::Type; - } - } - Ok(Definition::Use(Use { location, module,