Merge branch 'master' of https://github.com/leek-lang/leek

Cargo.toml

@@ -1,5 +1,6 @@
 [workspace]
 
+resolver = "2"
 members = [
     "compiler",
 ]

compiler/Cargo.toml

@@ -7,8 +7,8 @@ edition = "2021"
 
 [dependencies]
 ansi_term = "0.12.1"
-clap = { version = "4.1.6", features = ["derive"] }
+clap = { version = "4.3.19", features = ["derive"] }
 diff = "0.1.13"
 indoc = "2.0.1"
-itertools = "0.10.5"
+itertools = "0.11.0"
 mktemp = "0.5.0"

compiler/src/backend/codegen/mod.rs

@@ -1,16 +1,16 @@
 use std::{path::Path, process::Command, str::FromStr};
 
-use crate::frontend::ast::LeekAst;
+use crate::frontend::ast::Ast;
 
 use self::x86_linux_gnu::CodeGeneratorX86LinuxGNU;
 
-use super::LeekCompilerConfig;
+use super::CompilerConfig;
 
 pub mod x86_64_linux_gnu;
 pub mod x86_linux_gnu;
 
 pub trait CodeGenerator {
-    fn generate_assembly(&self, ast: LeekAst, compiler_options: &LeekCompilerConfig) -> String;
+    fn generate_assembly(&self, ast: Ast, compiler_options: &CompilerConfig) -> String;
     fn create_assembler_command(&self, input_file: &Path, output_file: &Path) -> Command;
     fn create_linker_command(&self, input_file: &Path, output_file: &Path) -> Command;
 }

compiler/src/backend/codegen/x86_linux_gnu/mod.rs

@@ -1,14 +1,14 @@
 use indoc::indoc;
 use std::{path::Path, process::Command};
 
-use crate::{backend::LeekCompilerConfig, frontend::ast::LeekAst};
+use crate::{backend::CompilerConfig, frontend::ast::Ast};
 
 use super::CodeGenerator;
 
 pub struct CodeGeneratorX86LinuxGNU;
 
 impl CodeGenerator for CodeGeneratorX86LinuxGNU {
-    fn generate_assembly(&self, _ast: LeekAst, _compiler_options: &LeekCompilerConfig) -> String {
+    fn generate_assembly(&self, _ast: Ast, _compiler_options: &CompilerConfig) -> String {
         String::from(indoc! {"
             global main
     

compiler/src/backend/mod.rs

@@ -4,10 +4,10 @@ use itertools::Itertools;
 
 use crate::{
     common::{
-        config::{EmitMode, LeekCompilerConfig},
-        error::LeekCompilerError,
+        config::{CompilerConfig, EmitMode},
+        error::CompilerError,
     },
-    frontend::ast::LeekAst,
+    frontend::ast::Ast,
 };
 
 use self::codegen::{CodeGenTarget, CodeGenerator};
@@ -33,10 +33,10 @@ macro_rules! display_buffer {
 }
 
 pub fn compile_ast(
-    ast: LeekAst,
-    compiler_options: &LeekCompilerConfig,
+    ast: Ast,
+    compiler_options: &CompilerConfig,
     target: CodeGenTarget,
-) -> Result<(), LeekCompilerError> {
+) -> Result<(), CompilerError> {
     let code_generator = target.get_code_generator();
 
     // If the output name is specified, use that.

compiler/src/common/config.rs

@@ -41,7 +41,7 @@ pub enum EmitMode {
     AssemblyFile,
 }
 
-pub struct LeekCompilerConfig {
+pub struct CompilerConfig {
     pub opt_level: OptimizationLevel,
     pub build_mode: BuildMode,
     pub emit_mode: EmitMode,