From 8dab4d3eee0521c630777e329bfff64fec7e25d0 Mon Sep 17 00:00:00 2001 From: Shautvast Date: Fri, 21 Nov 2025 16:19:16 +0100 Subject: [PATCH] rename to assembly_pass --- README.md | 2 +- src/compiler/{asm_pass.rs => assembly_pass.rs} | 2 +- src/compiler/mod.rs | 10 +++++----- src/file_watch.rs | 2 +- src/lib.rs | 2 +- src/main.rs | 2 +- src/repl.rs | 6 +++--- src/vm.rs | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) rename src/compiler/{asm_pass.rs => assembly_pass.rs} (98%) diff --git a/README.md b/README.md index 862e53b..58db44a 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Borrowing from that: 'the place where http lives'. - Therefore, services cannot call other services, because that is the recipe for spaghetti. Refactor your logic, abstract and put lower level code in utilities. - openapi support -### An interpreter written in Rust. +### An compiler/runtime written in Rust. I cherry picked things I like, mostly from rust and python. - strictly typed - [] is a list diff --git a/src/compiler/asm_pass.rs b/src/compiler/assembly_pass.rs similarity index 98% rename from src/compiler/asm_pass.rs rename to src/compiler/assembly_pass.rs index 74d307a..0727dca 100644 --- a/src/compiler/asm_pass.rs +++ b/src/compiler/assembly_pass.rs @@ -1,5 +1,5 @@ use crate::builtins::lookup; -use crate::compiler::asm_pass::Op::{Add, And, Assign, BitAnd, BitOr, BitXor, Call, CallBuiltin, Constant, DefList, DefMap, Divide, Dup, Equal, Get, Goto, GotoIf, GotoIfNot, Greater, GreaterEqual, Less, LessEqual, ListGet, Multiply, Negate, Not, NotEqual, Or, Pop, Print, Return, Shr, Subtract}; +use crate::compiler::assembly_pass::Op::{Add, And, Assign, BitAnd, BitOr, BitXor, Call, CallBuiltin, Constant, DefList, DefMap, Divide, Dup, Equal, Get, Goto, GotoIf, GotoIfNot, Greater, GreaterEqual, Less, LessEqual, ListGet, Multiply, Negate, Not, NotEqual, Or, Pop, Print, Return, Shr, Subtract}; use crate::compiler::ast_pass::Expression::NamedParameter; use crate::compiler::ast_pass::{Expression, Function, Parameter, Statement}; use crate::compiler::tokens::TokenType; diff --git a/src/compiler/mod.rs b/src/compiler/mod.rs index bc6543b..1874e98 100644 --- a/src/compiler/mod.rs +++ b/src/compiler/mod.rs @@ -2,7 +2,7 @@ use std::collections::HashMap; use std::fs; use walkdir::WalkDir; use crate::{compiler, symbol_builder, AsmRegistry, TIPI_EXT}; -use crate::compiler::asm_pass::AsmChunk; +use crate::compiler::assembly_pass::AsmChunk; use crate::errors::TipiLangError; use crate::errors::TipiLangError::Platform; @@ -10,7 +10,7 @@ mod compiler_tests; pub mod scan_pass; pub mod ast_pass; pub mod tokens; -pub mod asm_pass; +pub mod assembly_pass; pub fn compile_sourcedir(source_dir: &str) -> Result, TipiLangError> { let mut asm_registry = AsmRegistry::new(); @@ -27,7 +27,7 @@ pub fn compile_sourcedir(source_dir: &str) -> Result, let path = path.strip_prefix(source_dir).unwrap().replace(TIPI_EXT, ""); symbol_builder::build(&path, &statements, &mut symbol_table); - asm_pass::compile(Some(&path), &statements, &symbol_table, &mut asm_registry)?; + assembly_pass::compile(Some(&path), &statements, &symbol_table, &mut asm_registry)?; } Err(e) => { println!("{}", e); @@ -51,7 +51,7 @@ pub fn compile(src: &str) -> Result, TipiLangError> { let mut symbol_table = HashMap::new(); let ast = compiler::ast_pass::compile(None, tokens, &mut symbol_table)?; symbol_builder::build("", &ast, &mut symbol_table); - asm_pass::compile(None, &ast, &symbol_table, &mut asm_registry)?; + assembly_pass::compile(None, &ast, &symbol_table, &mut asm_registry)?; Ok(asm_registry) } @@ -62,7 +62,7 @@ pub(crate) fn run(src: &str) -> Result { let ast = compiler::ast_pass::compile(None, tokens, &mut symbol_table)?; symbol_builder::build("", &ast, &mut symbol_table); let mut asm_registry = HashMap::new(); - asm_pass::compile(None, &ast, &symbol_table, &mut asm_registry)?; + assembly_pass::compile(None, &ast, &symbol_table, &mut asm_registry)?; let registry = arc_swap::ArcSwap::from(std::sync::Arc::new(asm_registry)); crate::vm::interpret(registry.load(), "main").map_err(TipiLangError::from) } diff --git a/src/file_watch.rs b/src/file_watch.rs index 2c152a9..a788a38 100644 --- a/src/file_watch.rs +++ b/src/file_watch.rs @@ -7,7 +7,7 @@ use std::thread; use std::time::{Duration, SystemTime}; use arc_swap::ArcSwap; use log::info; -use crate::compiler::asm_pass::AsmChunk; +use crate::compiler::assembly_pass::AsmChunk; use crate::compiler::compile_sourcedir; const ONE_SEC: Duration = Duration::from_secs(1); diff --git a/src/lib.rs b/src/lib.rs index 99288ee..bd1436b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -use crate::compiler::asm_pass::AsmChunk; +use crate::compiler::assembly_pass::AsmChunk; use crate::compiler::ast_pass::{Expression, Statement}; use crate::errors::CompilerErrorAtLine; use crate::symbol_builder::Symbol; diff --git a/src/main.rs b/src/main.rs index 440f06e..e59d858 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,7 +9,7 @@ use std::collections::HashMap; use std::sync::Arc; use arc_swap::ArcSwap; use log::info; -use tipi_lang::compiler::asm_pass::AsmChunk; +use tipi_lang::compiler::assembly_pass::AsmChunk; use tipi_lang::compiler::{compile_sourcedir, map_underlying}; /// A simple CLI tool to greet users diff --git a/src/repl.rs b/src/repl.rs index bd0ce13..bc901f3 100644 --- a/src/repl.rs +++ b/src/repl.rs @@ -1,6 +1,6 @@ -use crate::compiler::asm_pass::AsmChunk; +use crate::compiler::assembly_pass::AsmChunk; use crate::compiler::scan_pass::scan; -use crate::compiler::{asm_pass, ast_pass, map_underlying}; +use crate::compiler::{assembly_pass, ast_pass, map_underlying}; use crate::errors::TipiLangError; use crate::symbol_builder; use crate::vm::Vm; @@ -16,7 +16,7 @@ pub fn start(registry: Arc>>) -> Result<(), Ti println!(":h for help"); let mut symbol_table = HashMap::new(); let mut vm = Vm::new(®istry.load()); - let mut asm_pass = asm_pass::AsmPass::new("main"); + let mut asm_pass = assembly_pass::AsmPass::new("main"); loop { print!(">"); io::stdout().flush().map_err(map_underlying())?; diff --git a/src/vm.rs b/src/vm.rs index 5ffe4b2..1c168ad 100644 --- a/src/vm.rs +++ b/src/vm.rs @@ -1,4 +1,4 @@ -use crate::compiler::asm_pass::{AsmChunk, Op}; +use crate::compiler::assembly_pass::{AsmChunk, Op}; use crate::errors::{RuntimeError, ValueError}; use crate::value::{Object, Value}; use crate::{AsmRegistry};