Add chrono dependency and example files
This commit introduces the `chrono` dependency to the project, enabling the use of time-related functionalities. Additionally, it adds several example files (`closure.myc`, `fib.myc`, `hof.myc`) to showcase the language's features like closures, recursion, and higher-order functions. The `Cargo.lock` and `Cargo.toml` files have been updated to reflect the new dependency. The `integration_test.rs` file now includes a test to run all `.myc` files found in the `examples` directory, ensuring their correctness. The `main.rs` file has also been updated to load and display these examples in the UI.
This commit is contained in:
Generated
+38
@@ -642,6 +642,19 @@ dependencies = [
|
|||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "chrono"
|
||||||
|
version = "0.4.43"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118"
|
||||||
|
dependencies = [
|
||||||
|
"iana-time-zone",
|
||||||
|
"js-sys",
|
||||||
|
"num-traits",
|
||||||
|
"wasm-bindgen",
|
||||||
|
"windows-link 0.2.1",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "clap"
|
name = "clap"
|
||||||
version = "4.5.59"
|
version = "4.5.59"
|
||||||
@@ -1480,6 +1493,30 @@ version = "0.2.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
|
checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "iana-time-zone"
|
||||||
|
version = "0.1.65"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470"
|
||||||
|
dependencies = [
|
||||||
|
"android_system_properties",
|
||||||
|
"core-foundation-sys",
|
||||||
|
"iana-time-zone-haiku",
|
||||||
|
"js-sys",
|
||||||
|
"log",
|
||||||
|
"wasm-bindgen",
|
||||||
|
"windows-core 0.61.2",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "iana-time-zone-haiku"
|
||||||
|
version = "0.1.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "icu_collections"
|
name = "icu_collections"
|
||||||
version = "2.1.1"
|
version = "2.1.1"
|
||||||
@@ -1841,6 +1878,7 @@ dependencies = [
|
|||||||
name = "myc"
|
name = "myc"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"chrono",
|
||||||
"clap",
|
"clap",
|
||||||
"eframe",
|
"eframe",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
|
|||||||
@@ -2,8 +2,10 @@
|
|||||||
name = "myc"
|
name = "myc"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
default-run = "myc"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
eframe = "0.33.3"
|
eframe = "0.33.3"
|
||||||
lazy_static = "1.4.0"
|
lazy_static = "1.4.0"
|
||||||
clap = { version = "4.5", features = ["derive"] }
|
clap = { version = "4.5", features = ["derive"] }
|
||||||
|
chrono = "0.4"
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
;; Closure Scope Test
|
||||||
|
;; Output: 15
|
||||||
|
(do
|
||||||
|
(def make-adder (fn [x]
|
||||||
|
(fn [y] (+ x y))))
|
||||||
|
|
||||||
|
(def add5 (make-adder 5))
|
||||||
|
|
||||||
|
(add5 10)
|
||||||
|
)
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
;; Fibonacci Recursive
|
||||||
|
;; Output: 55
|
||||||
|
(do
|
||||||
|
(def fib (fn [n]
|
||||||
|
(if (< n 2)
|
||||||
|
n
|
||||||
|
(+ (fib (- n 1)) (fib (- n 2))))))
|
||||||
|
|
||||||
|
(fib 10)
|
||||||
|
)
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
;; Higher-Order Function Example
|
||||||
|
;; Output: 25
|
||||||
|
(do
|
||||||
|
(def apply (fn [f x] (f x)))
|
||||||
|
(def square (fn [x] (* x x)))
|
||||||
|
|
||||||
|
(apply square 5)
|
||||||
|
)
|
||||||
+37
-1
@@ -6,8 +6,9 @@ mod tests {
|
|||||||
use crate::ast::compiler::binder::Binder;
|
use crate::ast::compiler::binder::Binder;
|
||||||
use crate::ast::vm::VM;
|
use crate::ast::vm::VM;
|
||||||
use crate::ast::types::Value;
|
use crate::ast::types::Value;
|
||||||
|
|
||||||
use crate::ast::nodes::UntypedKind;
|
use crate::ast::nodes::UntypedKind;
|
||||||
|
use crate::ast::environment::Environment;
|
||||||
|
use std::fs;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_parse_integer_constant() {
|
fn test_parse_integer_constant() {
|
||||||
@@ -89,4 +90,39 @@ mod tests {
|
|||||||
Err(e) => panic!("VM Error: {}", e),
|
Err(e) => panic!("VM Error: {}", e),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_examples() {
|
||||||
|
let entries = fs::read_dir("examples").expect("Could not read examples directory");
|
||||||
|
for entry in entries {
|
||||||
|
let entry = entry.expect("Invalid entry");
|
||||||
|
let path = entry.path();
|
||||||
|
if path.extension().map_or(false, |ext| ext == "myc") {
|
||||||
|
let content = fs::read_to_string(&path).expect("Could not read file");
|
||||||
|
|
||||||
|
// Skip benchmarks during normal functional tests
|
||||||
|
if content.contains(";; Benchmark") {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find expected output tag: ;; Output: <value>
|
||||||
|
let expected_output = content.lines()
|
||||||
|
.find(|line| line.starts_with(";; Output:"))
|
||||||
|
.map(|line| line.replace(";; Output:", "").trim().to_string());
|
||||||
|
|
||||||
|
if let Some(expected) = expected_output {
|
||||||
|
let env = Environment::new();
|
||||||
|
let result = env.run_script(&content);
|
||||||
|
|
||||||
|
match result {
|
||||||
|
Ok(val) => {
|
||||||
|
let val_str = format!("{}", val);
|
||||||
|
assert_eq!(val_str, expected, "Example {:?} failed: expected {}, got {}", path, expected, val_str);
|
||||||
|
}
|
||||||
|
Err(e) => panic!("Example {:?} failed with error: {}", path, e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+49
-42
@@ -13,15 +13,37 @@ fn main() -> eframe::Result {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct Example {
|
||||||
|
name: String,
|
||||||
|
content: String,
|
||||||
|
is_benchmark: bool,
|
||||||
|
}
|
||||||
|
|
||||||
struct CompilerApp {
|
struct CompilerApp {
|
||||||
source_code: String,
|
source_code: String,
|
||||||
output_log: String,
|
output_log: String,
|
||||||
env: Environment,
|
env: Environment,
|
||||||
is_first_frame: bool,
|
is_first_frame: bool,
|
||||||
|
examples: Vec<Example>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for CompilerApp {
|
impl Default for CompilerApp {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
|
let examples = std::fs::read_dir("examples")
|
||||||
|
.map(|entries| {
|
||||||
|
entries
|
||||||
|
.filter_map(|e| e.ok())
|
||||||
|
.filter(|e| e.path().extension().map_or(false, |ext| ext == "myc"))
|
||||||
|
.filter_map(|e| {
|
||||||
|
let name = e.file_name().into_string().ok()?;
|
||||||
|
let content = std::fs::read_to_string(e.path()).ok()?;
|
||||||
|
let is_benchmark = content.contains(";; Benchmark");
|
||||||
|
Some(Example { name, content, is_benchmark })
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
})
|
||||||
|
.unwrap_or_default();
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
source_code: String::from(r#"
|
source_code: String::from(r#"
|
||||||
(do
|
(do
|
||||||
@@ -30,33 +52,29 @@ impl Default for CompilerApp {
|
|||||||
n
|
n
|
||||||
(+ (fib (- n 1)) (fib (- n 2))))))
|
(+ (fib (- n 1)) (fib (- n 2))))))
|
||||||
|
|
||||||
(def result (fib 10))
|
(fib 10)
|
||||||
|
|
||||||
(def data {
|
|
||||||
:name "Fibonacci"
|
|
||||||
:input 10
|
|
||||||
:output result
|
|
||||||
:sequence [0 1 1 2 3 5 8 13 21 34 55]
|
|
||||||
})
|
|
||||||
|
|
||||||
data
|
|
||||||
)
|
)
|
||||||
"#),
|
"#),
|
||||||
output_log: String::from("Ready to compile..."),
|
output_log: String::from("Ready to compile..."),
|
||||||
env: Environment::new(),
|
env: Environment::new(),
|
||||||
is_first_frame: true,
|
is_first_frame: true,
|
||||||
|
examples,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl CompilerApp {
|
impl CompilerApp {
|
||||||
fn compile(&mut self) {
|
fn compile(&mut self) {
|
||||||
|
let start = std::time::Instant::now();
|
||||||
match self.env.run_script(&self.source_code) {
|
match self.env.run_script(&self.source_code) {
|
||||||
Ok(result) => {
|
Ok(result) => {
|
||||||
|
let duration = start.elapsed();
|
||||||
|
let now = chrono::Local::now().format("%H:%M:%S").to_string();
|
||||||
self.output_log = format!(
|
self.output_log = format!(
|
||||||
"Execution Successful.\nResult: {}\n\nFinished at {:?}",
|
"Execution Successful.\nResult: {}\n\nDuration: {:?}\nFinished at: {}",
|
||||||
result,
|
result,
|
||||||
std::time::SystemTime::now(),
|
duration,
|
||||||
|
now,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
@@ -68,6 +86,25 @@ impl CompilerApp {
|
|||||||
|
|
||||||
impl eframe::App for CompilerApp {
|
impl eframe::App for CompilerApp {
|
||||||
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
||||||
|
// Left Side Panel: Examples
|
||||||
|
egui::SidePanel::left("examples_panel")
|
||||||
|
.resizable(true)
|
||||||
|
.default_width(150.0)
|
||||||
|
.show(ctx, |ui| {
|
||||||
|
ui.heading("Examples");
|
||||||
|
ui.add_space(5.0);
|
||||||
|
for example in &self.examples {
|
||||||
|
let label = if example.is_benchmark {
|
||||||
|
format!("⚡ {}", example.name)
|
||||||
|
} else {
|
||||||
|
example.name.clone()
|
||||||
|
};
|
||||||
|
if ui.button(label).clicked() {
|
||||||
|
self.source_code = example.content.clone();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// Bottom Panel: Output Log & Controls (Resizable)
|
// Bottom Panel: Output Log & Controls (Resizable)
|
||||||
egui::TopBottomPanel::bottom("bottom_panel")
|
egui::TopBottomPanel::bottom("bottom_panel")
|
||||||
.resizable(true)
|
.resizable(true)
|
||||||
@@ -137,33 +174,3 @@ impl eframe::App for CompilerApp {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use super::*;
|
|
||||||
use crate::ast::types::Value;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_basic_eval() {
|
|
||||||
let env = Environment::new();
|
|
||||||
let result = env.run_script("(+ 1 2)").unwrap();
|
|
||||||
if let Value::Int(i) = result {
|
|
||||||
assert_eq!(i, 3);
|
|
||||||
} else if let Value::Float(f) = result {
|
|
||||||
assert_eq!(f, 3.0);
|
|
||||||
} else {
|
|
||||||
panic!("Expected number result");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn test_type_error() {
|
|
||||||
let env = Environment::new();
|
|
||||||
// This should fail because 'if' condition must be bool (and currently '+' returns Any/Float/Int)
|
|
||||||
// Wait, '+' returns Any currently in my registration.
|
|
||||||
// Let's try something that definitely fails type check.
|
|
||||||
let result = env.run_script("(if 1 2 3)");
|
|
||||||
assert!(result.is_err());
|
|
||||||
assert!(result.unwrap_err().contains("Condition must be boolean"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user