From 8f228a06ce6e5dc14a42c43058870acb777065b6 Mon Sep 17 00:00:00 2001
From: Rowan Torbitzky-Lane <rowan.a.tl@protonmail.com>
Date: Tue, 15 Apr 2025 13:43:50 -0500
Subject: [PATCH] start to get this ready
---
Cargo.toml | 1 +
rush_macro/Cargo.toml | 7 +++++++
rush_macro/src/lib.rs | 7 +------
src/instructions/mod.rs | 4 ++--
src/main.rs | 6 +++---
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index f6daca5..be81d05 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.1.0"
edition = "2024"
[dependencies]
+rush_macro = { path = "rush_macro" }
rand = "0.9.0"
paste = "1.0.15"
rust_decimal = { version = "1.37", features = ["macros", "maths"] }
diff --git a/rush_macro/Cargo.toml b/rush_macro/Cargo.toml
index c5a922d..1eb69f1 100644
--- a/rush_macro/Cargo.toml
+++ b/rush_macro/Cargo.toml
@@ -3,4 +3,11 @@ name = "rush_macro"
version = "0.1.0"
edition = "2024"
+# wait to add this until later bc Rust errors
+# until it works.
+#[lib]
+#proc-macro = true
+
[dependencies]
+syn = { version = "2.0.100" }
+quote = { version = "1.0.40" }
\ No newline at end of file
diff --git a/rush_macro/src/lib.rs b/rush_macro/src/lib.rs
index b93cf3f..06a83c8 100644
--- a/rush_macro/src/lib.rs
+++ b/rush_macro/src/lib.rs
@@ -1,14 +1,9 @@
-pub fn add(left: u64, right: u64) -> u64 {
- left + right
-}
-
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn it_works() {
- let result = add(2, 2);
- assert_eq!(result, 4);
+ assert_eq!(true, true);
}
}
diff --git a/src/instructions/mod.rs b/src/instructions/mod.rs
index 342296c..59bb86e 100644
--- a/src/instructions/mod.rs
+++ b/src/instructions/mod.rs
@@ -275,7 +275,7 @@ pub mod vector;
// unsure how to procedurally read a file and put all functions
// into a vector. Probably need to use procedural macros, but I'm not there yet.
-pub fn int_instructions() -> Vec<fn(&mut PushState)> {
+/*pub fn int_instructions() -> Vec<fn(&mut PushState)> {
vec![
// numeric.rs
int_add,
@@ -657,4 +657,4 @@ pub fn code_instructions() -> Vec<fn(&mut PushState)> {
code_from_vector_char,
code_from_exec,
]
-}
+}*/
diff --git a/src/main.rs b/src/main.rs
index c9c20e8..8b5e689 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,8 +6,8 @@ mod instructions;
mod push;
fn main() {
- // These need to stay so linter doesn't go crazy.
- int_instructions();
+ // These need to stay so linter doesn't go crazy.
+ /* int_instructions();
float_instructions();
string_instructions();
boolean_instructions();
@@ -18,7 +18,7 @@ fn main() {
vector_boolean_instructions();
vector_char_instructions();
exec_instructions();
- code_instructions();
+ code_instructions();*/
let mut empty_state = EMPTY_STATE;
interpret_program(&mut empty_state, 1000, 1000);
}