From 3a80fa2d386ffbe74128180a2a4a7da290fe391f Mon Sep 17 00:00:00 2001 From: Klesti Selimaj Date: Wed, 29 Apr 2026 13:01:45 +0200 Subject: [PATCH] Rmoved package --- parser/src/ast.rs | 1 - parser/src/grammar.pest | 4 +--- parser/src/lib.rs | 5 ----- semantic/src/lib.rs | 1 - semantic/src/top_level.rs | 1 - src/codegen.rs | 4 ---- src/compiler.rs | 6 +----- 7 files changed, 2 insertions(+), 20 deletions(-) diff --git a/parser/src/ast.rs b/parser/src/ast.rs index 61e2152..5028788 100644 --- a/parser/src/ast.rs +++ b/parser/src/ast.rs @@ -31,7 +31,6 @@ pub enum BinaryOp { #[derive(Debug, Clone, Serialize)] pub enum TopLevel { Import(String), - Package(String), StructDecl { export: bool, name: String, diff --git a/parser/src/grammar.pest b/parser/src/grammar.pest index 331b703..0be7182 100644 --- a/parser/src/grammar.pest +++ b/parser/src/grammar.pest @@ -13,9 +13,7 @@ inner_str = @{ (!"\"" ~ ANY)* } // ================= TOP LEVEL ================= -top_level = _{ import | function_decl | struct_decl | package } - -package = { "package" ~ identifier ~ ";" } +top_level = _{ import | function_decl | struct_decl } export = { "public" } diff --git a/parser/src/lib.rs b/parser/src/lib.rs index 60cd0c3..f71ad03 100644 --- a/parser/src/lib.rs +++ b/parser/src/lib.rs @@ -4,7 +4,6 @@ use pest::Parser; use pest_derive::Parser; pub mod ast; -pub mod script_parser; use ast::*; @@ -79,10 +78,6 @@ impl TryFrom> for TopLevel { let path = pair.into_inner().next().unwrap().as_str().to_string(); Ok(TopLevel::Import(path)) } - Rule::package => { - let name = pair.into_inner().next().unwrap().as_str().to_string(); - Ok(TopLevel::Package(name)) - } Rule::function_decl => { let mut inner = pair.into_inner(); diff --git a/semantic/src/lib.rs b/semantic/src/lib.rs index 340e2ea..aa5ba6d 100644 --- a/semantic/src/lib.rs +++ b/semantic/src/lib.rs @@ -15,7 +15,6 @@ pub fn walk_ast(top_scope: Arc, tl: &mut Vec) { for tl in tl { match tl { parser::ast::TopLevel::Import(_) => {} - parser::ast::TopLevel::Package(_) => {} parser::ast::TopLevel::FunctionDecl { params, body, name, .. diff --git a/semantic/src/top_level.rs b/semantic/src/top_level.rs index 9be616f..1f8543e 100644 --- a/semantic/src/top_level.rs +++ b/semantic/src/top_level.rs @@ -137,7 +137,6 @@ impl TopLevelSymbolScope { .imports .insert(json_scope.package_name.clone(), json_scope); } - TopLevel::Package(_) => {} TopLevel::FunctionDecl { export, diff --git a/src/codegen.rs b/src/codegen.rs index 7e3bb54..29d6eb6 100644 --- a/src/codegen.rs +++ b/src/codegen.rs @@ -102,10 +102,6 @@ impl GoCodegen { self.indent -= 1; self.addln("}\n"); } - TopLevel::Package(pkg) => { - self.addln(&format!("package {}", pkg)); - self.addln(""); - } } } diff --git a/src/compiler.rs b/src/compiler.rs index d0f374e..01e0074 100644 --- a/src/compiler.rs +++ b/src/compiler.rs @@ -47,11 +47,7 @@ pub fn build() { } }; - let parser_result = if script { - parser::script_parser::parse(&source).map_err(|e| e.to_string()) - } else { - parser::parse(&source).map_err(|e| e.to_string()) - }; + let parser_result = parser::parse(&source).map_err(|e| e.to_string()); let mut ast = match parser_result { Ok(ast) => ast,