diff --git a/Cargo.toml b/Cargo.toml index 8c95443..5abff97 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,13 +6,13 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -clap = { version = "4.5.4", features = ["derive"] } +clap = { version = "4.5.7", features = ["derive"] } once_cell = "1.19.0" -proc-macro2 = "1.0.78" -serde_json = "1.0.115" +proc-macro2 = "1.0.85" +serde_json = "1.0.117" snailquote = "0.3.1" -thiserror = "1.0.58" -tree-sitter = "0.22.5" +thiserror = "1.0.61" +tree-sitter = "0.22.6" tree-sitter-frugurt = "0.0.11" #tree-sitter-frugurt = { path = "../tree-sitter-frugurt" } #uid = "0.1.7" diff --git a/src/interpreter/mod.rs b/src/interpreter/mod.rs index 78fe709..6f6f808 100644 --- a/src/interpreter/mod.rs +++ b/src/interpreter/mod.rs @@ -1,5 +1,4 @@ mod ast_helpers; -pub mod builtins; pub mod control; pub mod error; pub mod expression; diff --git a/src/interpreter/scope.rs b/src/interpreter/scope.rs index 6354707..51ba805 100644 --- a/src/interpreter/scope.rs +++ b/src/interpreter/scope.rs @@ -1,14 +1,15 @@ use std::{cell::RefCell, collections::HashMap, rc::Rc}; -use crate::interpreter::{ - builtins::functions, - builtins::operators, - error::FruError, - identifier::{Identifier, OperatorIdentifier}, - value::fru_object::FruObject, - value::fru_type::FruType, - value::fru_value::FruValue, - value::operator::AnyOperator, +use crate::{ + interpreter::{ + error::FruError, + identifier::{Identifier, OperatorIdentifier}, + value::fru_object::FruObject, + value::fru_type::FruType, + value::fru_value::FruValue, + value::operator::AnyOperator, + }, + stdlib::builtins::{functions, operators}, }; pub struct Scope { diff --git a/src/interpreter/builtins/functions.rs b/src/stdlib/builtins/functions.rs similarity index 100% rename from src/interpreter/builtins/functions.rs rename to src/stdlib/builtins/functions.rs diff --git a/src/interpreter/builtins/mod.rs b/src/stdlib/builtins/mod.rs similarity index 100% rename from src/interpreter/builtins/mod.rs rename to src/stdlib/builtins/mod.rs diff --git a/src/interpreter/builtins/operators.rs b/src/stdlib/builtins/operators.rs similarity index 100% rename from src/interpreter/builtins/operators.rs rename to src/stdlib/builtins/operators.rs diff --git a/src/stdlib/mod.rs b/src/stdlib/mod.rs index 88e6afc..534c86f 100644 --- a/src/stdlib/mod.rs +++ b/src/stdlib/mod.rs @@ -1 +1,2 @@ +pub mod builtins; pub mod scope;