From beb97c20dd808849c5ffee059f54911c93576b1b Mon Sep 17 00:00:00 2001 From: Bryan English Date: Wed, 4 Feb 2026 23:50:47 -0500 Subject: [PATCH] rename to sorel --- rel-lang/Cargo.lock | 54 +++++++++---------- rel-lang/Cargo.toml | 6 +-- rel-lang/README.md | 6 +-- rel-lang/examples/{alloc.rel => alloc.sorel} | 0 rel-lang/examples/{fib.rel => fib.sorel} | 0 rel-lang/examples/{put2.rel => put2.sorel} | 0 .../examples/{syscalls.rel => syscalls.sorel} | 0 rel-lang/fib-example/compile.sh | 2 +- rel-lang/relc/Cargo.toml | 9 ---- .../Cargo.toml | 4 +- .../src/lib.rs | 2 +- rel-lang/{rel-ir => sorel-ir}/Cargo.toml | 2 +- rel-lang/{rel-ir => sorel-ir}/src/lib.rs | 0 rel-lang/sorelc/Cargo.toml | 9 ++++ rel-lang/{relc => sorelc}/src/ir.rs | 6 +-- rel-lang/{relc => sorelc}/src/main.rs | 2 +- rel-lang/{relc => sorelc}/src/parser.rs | 0 .../{relc => sorelc}/src/riscv_asm_codegen.rs | 2 +- rel-lang/{relc => sorelc}/src/tokenizer.rs | 0 rel-lang/stdlib/{mem.rel => mem.sorel} | 0 rel-lang/stdlib/{out.rel => out.sorel} | 0 rel-lang/tests/test.sh | 2 +- rel-lang/tests/{test1.rel => test1.sorel} | 0 23 files changed, 53 insertions(+), 53 deletions(-) rename rel-lang/examples/{alloc.rel => alloc.sorel} (100%) rename rel-lang/examples/{fib.rel => fib.sorel} (100%) rename rel-lang/examples/{put2.rel => put2.sorel} (100%) rename rel-lang/examples/{syscalls.rel => syscalls.sorel} (100%) delete mode 100644 rel-lang/relc/Cargo.toml rename rel-lang/{rel-interpret => sorel-interpret}/Cargo.toml (63%) rename rel-lang/{rel-interpret => sorel-interpret}/src/lib.rs (99%) rename rel-lang/{rel-ir => sorel-ir}/Cargo.toml (87%) rename rel-lang/{rel-ir => sorel-ir}/src/lib.rs (100%) create mode 100644 rel-lang/sorelc/Cargo.toml rename rel-lang/{relc => sorelc}/src/ir.rs (98%) rename rel-lang/{relc => sorelc}/src/main.rs (94%) rename rel-lang/{relc => sorelc}/src/parser.rs (100%) rename rel-lang/{relc => sorelc}/src/riscv_asm_codegen.rs (99%) rename rel-lang/{relc => sorelc}/src/tokenizer.rs (100%) rename rel-lang/stdlib/{mem.rel => mem.sorel} (100%) rename rel-lang/stdlib/{out.rel => out.sorel} (100%) rename rel-lang/tests/{test1.rel => test1.sorel} (100%) diff --git a/rel-lang/Cargo.lock b/rel-lang/Cargo.lock index b6c79c0..4280816 100644 --- a/rel-lang/Cargo.lock +++ b/rel-lang/Cargo.lock @@ -54,33 +54,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rel-interpret" -version = "0.1.0" -dependencies = [ - "anyhow", - "rel-ir", - "syscalls", -] - -[[package]] -name = "rel-ir" -version = "0.1.0" -dependencies = [ - "serde", - "serde_derive", - "serde_yaml", -] - -[[package]] -name = "relc" -version = "0.1.0" -dependencies = [ - "anyhow", - "rel-interpret", - "rel-ir", -] - [[package]] name = "ryu" version = "1.0.20" @@ -141,6 +114,33 @@ dependencies = [ "unsafe-libyaml", ] +[[package]] +name = "sorel-interpret" +version = "0.1.0" +dependencies = [ + "anyhow", + "sorel-ir", + "syscalls", +] + +[[package]] +name = "sorel-ir" +version = "0.1.0" +dependencies = [ + "serde", + "serde_derive", + "serde_yaml", +] + +[[package]] +name = "sorelc" +version = "0.1.0" +dependencies = [ + "anyhow", + "sorel-interpret", + "sorel-ir", +] + [[package]] name = "syn" version = "2.0.111" diff --git a/rel-lang/Cargo.toml b/rel-lang/Cargo.toml index fcafffc..19da6a8 100644 --- a/rel-lang/Cargo.toml +++ b/rel-lang/Cargo.toml @@ -1,9 +1,9 @@ [workspace] resolver = "3" -members = ["rel-ir","relc", "rel-interpret"] +members = ["sorel-ir","sorelc", "sorel-interpret"] [workspace.dependencies] -rel-ir = { path = "./rel-ir", version = "0.1.0" } -rel-interpret = { path = "./rel-interpret", version = "0.1.0" } +sorel-ir = { path = "./sorel-ir", version = "0.1.0" } +sorel-interpret = { path = "./sorel-interpret", version = "0.1.0" } diff --git a/rel-lang/README.md b/rel-lang/README.md index e703eb1..40b5544 100644 --- a/rel-lang/README.md +++ b/rel-lang/README.md @@ -1,13 +1,13 @@ -# rel +# sorel -The name means "Rethought Language". +The name means "Stack-Oriented Rethought Language". ## TODO * [x] Imports * [x] Syscalls -* [ ] Loops +* [x] Loops * [ ] Structs * [ ] many, many more things diff --git a/rel-lang/examples/alloc.rel b/rel-lang/examples/alloc.sorel similarity index 100% rename from rel-lang/examples/alloc.rel rename to rel-lang/examples/alloc.sorel diff --git a/rel-lang/examples/fib.rel b/rel-lang/examples/fib.sorel similarity index 100% rename from rel-lang/examples/fib.rel rename to rel-lang/examples/fib.sorel diff --git a/rel-lang/examples/put2.rel b/rel-lang/examples/put2.sorel similarity index 100% rename from rel-lang/examples/put2.rel rename to rel-lang/examples/put2.sorel diff --git a/rel-lang/examples/syscalls.rel b/rel-lang/examples/syscalls.sorel similarity index 100% rename from rel-lang/examples/syscalls.rel rename to rel-lang/examples/syscalls.sorel diff --git a/rel-lang/fib-example/compile.sh b/rel-lang/fib-example/compile.sh index 2e8be05..6ef003e 100644 --- a/rel-lang/fib-example/compile.sh +++ b/rel-lang/fib-example/compile.sh @@ -1,4 +1,4 @@ -../target/debug/relc fib.rel +../target/debug/sorelc fib.sorel riscv64-unknown-linux-gnu-as -o fib.o fib.asm riscv64-unknown-linux-gnu-cc -O1 -no-pie -o test.out fib.o putn.c -nostartfiles ./test.out diff --git a/rel-lang/relc/Cargo.toml b/rel-lang/relc/Cargo.toml deleted file mode 100644 index e5419b6..0000000 --- a/rel-lang/relc/Cargo.toml +++ /dev/null @@ -1,9 +0,0 @@ -[package] -name = "relc" -version = "0.1.0" -edition = "2024" - -[dependencies] -rel-ir = { workspace = true } -rel-interpret = { workspace = true } -anyhow = "1.0.100" diff --git a/rel-lang/rel-interpret/Cargo.toml b/rel-lang/sorel-interpret/Cargo.toml similarity index 63% rename from rel-lang/rel-interpret/Cargo.toml rename to rel-lang/sorel-interpret/Cargo.toml index c1dc773..6afe8a9 100644 --- a/rel-lang/rel-interpret/Cargo.toml +++ b/rel-lang/sorel-interpret/Cargo.toml @@ -1,9 +1,9 @@ [package] -name = "rel-interpret" +name = "sorel-interpret" version = "0.1.0" edition = "2024" [dependencies] anyhow = "1.0.100" -rel-ir = { workspace = true } +sorel-ir = { workspace = true } syscalls = "0.7.0" diff --git a/rel-lang/rel-interpret/src/lib.rs b/rel-lang/sorel-interpret/src/lib.rs similarity index 99% rename from rel-lang/rel-interpret/src/lib.rs rename to rel-lang/sorel-interpret/src/lib.rs index edd6e48..b637594 100644 --- a/rel-lang/rel-interpret/src/lib.rs +++ b/rel-lang/sorel-interpret/src/lib.rs @@ -1,4 +1,4 @@ -use rel_ir::*; +use sorel_ir::*; use std::collections::HashMap; diff --git a/rel-lang/rel-ir/Cargo.toml b/rel-lang/sorel-ir/Cargo.toml similarity index 87% rename from rel-lang/rel-ir/Cargo.toml rename to rel-lang/sorel-ir/Cargo.toml index 831de69..5618a61 100644 --- a/rel-lang/rel-ir/Cargo.toml +++ b/rel-lang/sorel-ir/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "rel-ir" +name = "sorel-ir" version = "0.1.0" edition = "2024" diff --git a/rel-lang/rel-ir/src/lib.rs b/rel-lang/sorel-ir/src/lib.rs similarity index 100% rename from rel-lang/rel-ir/src/lib.rs rename to rel-lang/sorel-ir/src/lib.rs diff --git a/rel-lang/sorelc/Cargo.toml b/rel-lang/sorelc/Cargo.toml new file mode 100644 index 0000000..dc3b9bc --- /dev/null +++ b/rel-lang/sorelc/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "sorelc" +version = "0.1.0" +edition = "2024" + +[dependencies] +sorel-ir = { workspace = true } +sorel-interpret = { workspace = true } +anyhow = "1.0.100" diff --git a/rel-lang/relc/src/ir.rs b/rel-lang/sorelc/src/ir.rs similarity index 98% rename from rel-lang/relc/src/ir.rs rename to rel-lang/sorelc/src/ir.rs index 55006f6..7d31d1a 100644 --- a/rel-lang/relc/src/ir.rs +++ b/rel-lang/sorelc/src/ir.rs @@ -1,6 +1,6 @@ use crate::parser::Module; use crate::tokenizer::{Token, tokenize}; -use rel_ir::*; +use sorel_ir::*; use std::collections::{HashSet, HashMap}; use std::path::PathBuf; @@ -61,8 +61,8 @@ struct ImportTree { fn std_import(specifier: &str) -> Result<&str> { match specifier { - "std:mem" => Ok(include_str!("../../stdlib/mem.rel")), - "std:out" => Ok(include_str!("../../stdlib/out.rel")), + "std:mem" => Ok(include_str!("../../stdlib/mem.sorel")), + "std:out" => Ok(include_str!("../../stdlib/out.sorel")), _ => bail!("{} is not a standard library module", specifier), } } diff --git a/rel-lang/relc/src/main.rs b/rel-lang/sorelc/src/main.rs similarity index 94% rename from rel-lang/relc/src/main.rs rename to rel-lang/sorelc/src/main.rs index 3171c43..89f1d7a 100644 --- a/rel-lang/relc/src/main.rs +++ b/rel-lang/sorelc/src/main.rs @@ -3,7 +3,7 @@ mod parser; mod ir; mod riscv_asm_codegen; -use rel_interpret::Interpreter; +use sorel_interpret::Interpreter; use anyhow::Result; diff --git a/rel-lang/relc/src/parser.rs b/rel-lang/sorelc/src/parser.rs similarity index 100% rename from rel-lang/relc/src/parser.rs rename to rel-lang/sorelc/src/parser.rs diff --git a/rel-lang/relc/src/riscv_asm_codegen.rs b/rel-lang/sorelc/src/riscv_asm_codegen.rs similarity index 99% rename from rel-lang/relc/src/riscv_asm_codegen.rs rename to rel-lang/sorelc/src/riscv_asm_codegen.rs index 5ade98e..efc1521 100644 --- a/rel-lang/relc/src/riscv_asm_codegen.rs +++ b/rel-lang/sorelc/src/riscv_asm_codegen.rs @@ -1,4 +1,4 @@ -use rel_ir::*; +use sorel_ir::*; use anyhow::*; diff --git a/rel-lang/relc/src/tokenizer.rs b/rel-lang/sorelc/src/tokenizer.rs similarity index 100% rename from rel-lang/relc/src/tokenizer.rs rename to rel-lang/sorelc/src/tokenizer.rs diff --git a/rel-lang/stdlib/mem.rel b/rel-lang/stdlib/mem.sorel similarity index 100% rename from rel-lang/stdlib/mem.rel rename to rel-lang/stdlib/mem.sorel diff --git a/rel-lang/stdlib/out.rel b/rel-lang/stdlib/out.sorel similarity index 100% rename from rel-lang/stdlib/out.rel rename to rel-lang/stdlib/out.sorel diff --git a/rel-lang/tests/test.sh b/rel-lang/tests/test.sh index 328e1e6..2838100 100644 --- a/rel-lang/tests/test.sh +++ b/rel-lang/tests/test.sh @@ -3,7 +3,7 @@ CMD_PREFIX=$([ "$UNAME" = "riscv64" ] && echo "" || echo "riscv64-unknown-linux- AS="${CMD_PREFIX}as" LD="${CMD_PREFIX}ld" -../target/debug/relc test1.rel +../target/debug/sorelc test1.sorel $AS -o test1.o test1.asm $LD -o test1.out test1.o ./test1.out diff --git a/rel-lang/tests/test1.rel b/rel-lang/tests/test1.sorel similarity index 100% rename from rel-lang/tests/test1.rel rename to rel-lang/tests/test1.sorel -- 2.43.0