From 5cec67bb01db010d5edfa83e6f92261bd6640a1d Mon Sep 17 00:00:00 2001 From: Shautvast Date: Mon, 17 Nov 2025 10:51:53 +0100 Subject: [PATCH] rename passes --- src/{ast_compiler.rs => ast_pass.rs} | 2 +- src/builtins/list.rs | 2 +- src/builtins/mod.rs | 2 +- ...{bytecode_compiler.rs => bytecode_pass.rs} | 4 +-- src/chunk.rs | 2 +- src/lib.rs | 26 +++++++++---------- src/repl.rs | 8 +++--- src/{scanner.rs => scan_pass.rs} | 0 src/symbol_builder.rs | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) rename src/{ast_compiler.rs => ast_pass.rs} (99%) rename src/{bytecode_compiler.rs => bytecode_pass.rs} (99%) rename src/{scanner.rs => scan_pass.rs} (100%) diff --git a/src/ast_compiler.rs b/src/ast_pass.rs similarity index 99% rename from src/ast_compiler.rs rename to src/ast_pass.rs index 78f7435..c8e9517 100644 --- a/src/ast_compiler.rs +++ b/src/ast_pass.rs @@ -1,4 +1,4 @@ -use crate::ast_compiler::Expression::{ +use crate::ast_pass::Expression::{ Assignment, FieldGet, FunctionCall, ListGet, MapGet, MethodCall, NamedParameter, Stop, Variable, }; use crate::errors::CompilerError::{ diff --git a/src/builtins/list.rs b/src/builtins/list.rs index e5e2361..9cf3bb0 100644 --- a/src/builtins/list.rs +++ b/src/builtins/list.rs @@ -1,4 +1,4 @@ -use crate::ast_compiler::Parameter; +use crate::ast_pass::Parameter; use crate::builtins::{FunctionMap, Signature, add, expected}; use crate::errors::RuntimeError; use crate::tokens::TokenType; diff --git a/src/builtins/mod.rs b/src/builtins/mod.rs index d73596f..939e82e 100644 --- a/src/builtins/mod.rs +++ b/src/builtins/mod.rs @@ -7,7 +7,7 @@ use crate::tokens::TokenType; use crate::value::Value; use std::collections::HashMap; use std::sync::LazyLock; -use crate::ast_compiler::Parameter; +use crate::ast_pass::Parameter; use crate::builtins::list::list_functions; pub(crate) struct Signature { diff --git a/src/bytecode_compiler.rs b/src/bytecode_pass.rs similarity index 99% rename from src/bytecode_compiler.rs rename to src/bytecode_pass.rs index 7b19d36..304478b 100644 --- a/src/bytecode_compiler.rs +++ b/src/bytecode_pass.rs @@ -1,5 +1,5 @@ -use crate::ast_compiler::Expression::NamedParameter; -use crate::ast_compiler::{Expression, Function, Parameter, Statement}; +use crate::ast_pass::Expression::NamedParameter; +use crate::ast_pass::{Expression, Function, Parameter, Statement}; use crate::builtins::lookup; use crate::chunk::Chunk; use crate::errors::CompilerError::{IncompatibleTypes, UndeclaredVariable}; diff --git a/src/chunk.rs b/src/chunk.rs index 79dd59a..5cc4e84 100644 --- a/src/chunk.rs +++ b/src/chunk.rs @@ -1,4 +1,4 @@ -use crate::ast_compiler::Parameter; +use crate::ast_pass::Parameter; use crate::tokens::TokenType; use crate::value::Value; use crate::vm::{ diff --git a/src/lib.rs b/src/lib.rs index bc3f1b5..acd7169 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,24 +1,24 @@ -use crate::ast_compiler::{Expression, Statement}; +use crate::ast_pass::{Expression, Statement}; use crate::chunk::Chunk; use crate::errors::CrudLangError::Platform; use crate::errors::{CompilerErrorAtLine, CrudLangError}; -use crate::scanner::scan; +use crate::scan_pass::scan; use crate::symbol_builder::Symbol; use std::collections::HashMap; use std::fs; use walkdir::WalkDir; use crate::value::Value::Void; -pub mod ast_compiler; +pub mod ast_pass; mod builtins; -pub mod bytecode_compiler; +pub mod bytecode_pass; pub mod chunk; mod compiler_tests; pub mod errors; pub mod file_watch; mod keywords; pub mod repl; -pub mod scanner; +pub mod scan_pass; mod symbol_builder; mod tokens; mod value; @@ -39,12 +39,12 @@ pub fn compile_sourcedir(source_dir: &str) -> Result, Cru let source = fs::read_to_string(path).map_err(map_underlying())?; let tokens = scan(&source)?; let mut symbol_table = HashMap::new(); - match ast_compiler::compile(Some(path), tokens, &mut symbol_table) { + match ast_pass::compile(Some(path), tokens, &mut symbol_table) { Ok(statements) => { let path = path.strip_prefix(source_dir).unwrap().replace(".crud", ""); symbol_builder::build(&path, &statements, &mut symbol_table); - bytecode_compiler::compile( + bytecode_pass::compile( Some(&path), &statements, &symbol_table, @@ -69,9 +69,9 @@ pub fn map_underlying() -> fn(std::io::Error) -> CrudLangError { pub fn recompile(src: &str, registry: &mut HashMap) -> Result<(), CrudLangError> { let tokens = scan(src)?; let mut symbol_table = HashMap::new(); - let ast = ast_compiler::compile(None, tokens, &mut symbol_table)?; + let ast = ast_pass::compile(None, tokens, &mut symbol_table)?; symbol_builder::build("", &ast, &mut symbol_table); - bytecode_compiler::compile(None, &ast, &symbol_table, registry)?; + bytecode_pass::compile(None, &ast, &symbol_table, registry)?; Ok(()) } @@ -79,9 +79,9 @@ pub fn compile(src: &str) -> Result, CrudLangError> { let tokens = scan(src)?; let mut registry = HashMap::new(); let mut symbol_table = HashMap::new(); - let ast = ast_compiler::compile(None, tokens, &mut symbol_table)?; + let ast = ast_pass::compile(None, tokens, &mut symbol_table)?; symbol_builder::build("", &ast, &mut symbol_table); - bytecode_compiler::compile(None, &ast, &symbol_table, &mut registry)?; + bytecode_pass::compile(None, &ast, &symbol_table, &mut registry)?; Ok(registry) } @@ -89,10 +89,10 @@ pub fn compile(src: &str) -> Result, CrudLangError> { pub(crate) fn run(src: &str) -> Result { let tokens = scan(src)?; let mut symbol_table = HashMap::new(); - let ast = ast_compiler::compile(None, tokens, &mut symbol_table)?; + let ast = ast_pass::compile(None, tokens, &mut symbol_table)?; symbol_builder::build("", &ast, &mut symbol_table); let mut registry = HashMap::new(); - bytecode_compiler::compile(None, &ast, &symbol_table, &mut registry)?; + bytecode_pass::compile(None, &ast, &symbol_table, &mut registry)?; let registry = arc_swap::ArcSwap::from(std::sync::Arc::new(registry)); vm::interpret(registry.load(), "main").map_err(CrudLangError::from) diff --git a/src/repl.rs b/src/repl.rs index 5a4ba4e..f831db5 100644 --- a/src/repl.rs +++ b/src/repl.rs @@ -1,8 +1,8 @@ use crate::chunk::Chunk; use crate::errors::CrudLangError; -use crate::scanner::scan; +use crate::scan_pass::scan; use crate::vm::Vm; -use crate::{ast_compiler, bytecode_compiler, map_underlying, symbol_builder}; +use crate::{ast_pass, bytecode_pass, map_underlying, symbol_builder}; use arc_swap::ArcSwap; use std::collections::HashMap; use std::io; @@ -15,7 +15,7 @@ pub fn start(registry: Arc>>) -> Result<(), CrudL println!(":h for help"); let mut symbol_table = HashMap::new(); let mut vm = Vm::new(®istry.load()); - let mut bytecode_compiler = bytecode_compiler::Compiler::new("main"); + let mut bytecode_compiler = bytecode_pass::Compiler::new("main"); loop { print!(">"); io::stdout().flush().map_err(map_underlying())?; @@ -34,7 +34,7 @@ pub fn start(registry: Arc>>) -> Result<(), CrudL let tokens = scan(input)?; - let ast = match ast_compiler::compile(None, tokens, &mut symbol_table){ + let ast = match ast_pass::compile(None, tokens, &mut symbol_table){ Ok(ast) => ast, Err(e) => { println!("{}", e); diff --git a/src/scanner.rs b/src/scan_pass.rs similarity index 100% rename from src/scanner.rs rename to src/scan_pass.rs diff --git a/src/symbol_builder.rs b/src/symbol_builder.rs index 0c7d6c6..2e8f2de 100644 --- a/src/symbol_builder.rs +++ b/src/symbol_builder.rs @@ -1,4 +1,4 @@ -use crate::ast_compiler::{Expression, Parameter, Statement}; +use crate::ast_pass::{Expression, Parameter, Statement}; use crate::builtins::lookup; use crate::errors::CompilerError; use crate::errors::CompilerError::IncompatibleTypes;