fix: Value reorg

lykia-rs · Sep 29, 2024 · fb66d9f · fb66d9f
1 parent 4f8c26c
commit fb66d9f
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 36 deletions.
diff --git a/lykiadb-server/src/comm/mod.rs b/lykiadb-server/src/comm/mod.rs
@@ -1,5 +1,5 @@
 use crate::engine::{Runtime, RuntimeMode};
-use crate::value::types::RV;
+use crate::value::RV;
 use ::std::time::Instant;
 use tcp::TcpConnection;
 use tokio::net::TcpStream;

diff --git a/lykiadb-server/src/engine/interpreter.rs b/lykiadb-server/src/engine/interpreter.rs
@@ -17,7 +17,7 @@ use crate::plan::planner::Planner;
 use crate::util::{alloc_shared, Shared};
 use crate::value::callable::{Callable, CallableKind, Function, Stateful};
 use crate::value::environment::{EnvId, Environment};
-use crate::value::types::{eval_binary, RV};
+use crate::value::{RV, types::eval_binary};
 
 use std::sync::Arc;
 use std::vec;
@@ -706,7 +706,7 @@ impl Stateful for Output {
 pub mod test_helpers {
     use crate::engine::{Runtime, RuntimeMode};
     use crate::util::{alloc_shared, Shared};
-    use crate::value::types::RV;
+    use crate::value::RV;
 
     use super::Output;
 
@@ -725,7 +725,7 @@ pub mod test_helpers {
 
 #[cfg(test)]
 mod test {
-    use crate::value::types::RV;
+    use crate::value::RV;
 
     use super::test_helpers::get_runtime;
 

diff --git a/lykiadb-server/src/engine/mod.rs b/lykiadb-server/src/engine/mod.rs
@@ -4,7 +4,7 @@ use self::stdlib::stdlib;
 use crate::engine::interpreter::Interpreter;
 use crate::util::{alloc_shared, Shared};
 use crate::value::environment::Environment;
-use crate::value::types::RV;
+use crate::value::RV;
 use lykiadb_lang::parser::Parser;
 use lykiadb_lang::tokenizer::scanner::Scanner;
 use serde_json::Value;

diff --git a/lykiadb-server/src/engine/stdlib/fib.rs b/lykiadb-server/src/engine/stdlib/fib.rs
@@ -1,6 +1,6 @@
 use crate::{
     engine::interpreter::{HaltReason, InterpretError, Interpreter},
-    value::types::RV,
+    value::RV,
 };
 
 fn _calculate(n: f64) -> f64 {

diff --git a/lykiadb-server/src/engine/stdlib/json.rs b/lykiadb-server/src/engine/stdlib/json.rs
@@ -1,6 +1,6 @@
 use crate::{
     engine::interpreter::{HaltReason, InterpretError, Interpreter},
-    value::types::RV,
+    value::RV,
 };
 use serde_json::json;
 use std::sync::Arc;

diff --git a/lykiadb-server/src/engine/stdlib/mod.rs b/lykiadb-server/src/engine/stdlib/mod.rs
@@ -2,7 +2,7 @@ use rustc_hash::FxHashMap;
 
 use crate::{
     util::{alloc_shared, Shared},
-    value::{callable::{Callable, CallableKind, Function}, types::RV},
+    value::{callable::{Callable, CallableKind, Function}, RV},
 };
 
 use self::{

diff --git a/lykiadb-server/src/engine/stdlib/out.rs b/lykiadb-server/src/engine/stdlib/out.rs
@@ -1,6 +1,6 @@
 use crate::{
     engine::interpreter::{HaltReason, Interpreter},
-    value::types::RV,
+    value::RV,
 };
 
 pub fn nt_print(_interpreter: &mut Interpreter, args: &[RV]) -> Result<RV, HaltReason> {

diff --git a/lykiadb-server/src/engine/stdlib/time.rs b/lykiadb-server/src/engine/stdlib/time.rs
@@ -1,5 +1,5 @@
 use crate::engine::interpreter::{HaltReason, Interpreter};
-use crate::value::types::RV;
+use crate::value::RV;
 use std::time;
 
 pub fn nt_clock(_interpreter: &mut Interpreter, _args: &[RV]) -> Result<RV, HaltReason> {

diff --git a/lykiadb-server/src/value/callable.rs b/lykiadb-server/src/value/callable.rs
@@ -3,7 +3,7 @@ use std::fmt::{Debug, Display, Formatter};
 use lykiadb_lang::ast::stmt::Stmt;
 use crate::{engine::interpreter::{HaltReason, Interpreter}, util::Shared};
 use super::environment::EnvId;
-use super::types::RV;
+use super::RV;
 
 #[derive(Debug, Clone)]
 pub enum CallableKind {

diff --git a/lykiadb-server/src/value/environment.rs b/lykiadb-server/src/value/environment.rs
@@ -4,7 +4,7 @@ use rustc_hash::FxHashMap;
 use serde::{Deserialize, Serialize};
 use std::borrow::{Borrow, BorrowMut};
 
-use super::types::RV;
+use super::RV;
 
 #[repr(transparent)]
 #[derive(Debug, Eq, PartialEq, Clone, Copy)]
@@ -169,7 +169,7 @@ impl Environment {
 
 #[cfg(test)]
 mod test {
-    use crate::value::types::RV;
+    use crate::value::RV;
 
     #[test]
     fn test_read_basic() {

diff --git a/lykiadb-server/src/value/mod.rs b/lykiadb-server/src/value/mod.rs
@@ -1,3 +1,22 @@
+use std::sync::Arc;
+
+use callable::Callable;
+use rustc_hash::FxHashMap;
+
+use crate::util::Shared;
+
 pub mod environment;
 pub mod types;
-pub mod callable;
+pub mod callable;
+#[derive(Debug, Clone)]
+pub enum RV {
+    Str(Arc<String>),
+    Num(f64),
+    Bool(bool),
+    Object(Shared<FxHashMap<String, RV>>),
+    Array(Shared<Vec<RV>>),
+    Callable(Callable),
+    Undefined,
+    NaN,
+    Null,
+}
diff --git a/lykiadb-server/src/value/types.rs b/lykiadb-server/src/value/types.rs
@@ -2,26 +2,10 @@ use lykiadb_lang::ast::expr::Operation;
 use rustc_hash::FxHashMap;
 use serde::ser::{SerializeMap, SerializeSeq};
 use serde::{Deserialize, Serialize};
-use std::fmt::Debug;
 use std::ops;
 use std::sync::{Arc, RwLock};
-
-use crate::util::{alloc_shared, Shared};
-
-use super::callable::Callable;
-
-#[derive(Debug, Clone)]
-pub enum RV {
-    Str(Arc<String>),
-    Num(f64),
-    Bool(bool),
-    Object(Shared<FxHashMap<String, RV>>),
-    Array(Shared<Vec<RV>>),
-    Callable(Callable),
-    Undefined,
-    NaN,
-    Null,
-}
+use crate::util::alloc_shared;
+use super::RV;
 
 impl Serialize for RV {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>

diff --git a/lykiadb-server/tests/runtime/blocks.rs b/lykiadb-server/tests/runtime/blocks.rs
@@ -6,7 +6,7 @@ use lykiadb_server::{
             InterpretError,
         },
     },
-    value::types::RV,
+    value::RV,
 };
 use std::sync::Arc;
 

diff --git a/lykiadb-server/tests/runtime/functions.rs b/lykiadb-server/tests/runtime/functions.rs
@@ -1,6 +1,6 @@
 use lykiadb_server::{
     engine::interpreter::test_helpers::{exec_assert, get_runtime},
-    value::types::RV,
+    value::RV,
 };
 use std::sync::Arc;
 

diff --git a/lykiadb-server/tests/runtime/ifs.rs b/lykiadb-server/tests/runtime/ifs.rs
@@ -1,4 +1,4 @@
-use lykiadb_server::{engine::interpreter::test_helpers::exec_assert, value::types::RV};
+use lykiadb_server::{engine::interpreter::test_helpers::exec_assert, value::RV};
 use std::sync::Arc;
 
 #[test]

diff --git a/lykiadb-server/tests/runtime/loops.rs b/lykiadb-server/tests/runtime/loops.rs
@@ -1,4 +1,4 @@
-use lykiadb_server::{engine::interpreter::test_helpers::exec_assert, value::types::RV};
+use lykiadb_server::{engine::interpreter::test_helpers::exec_assert, value::RV};
 
 use std::sync::Arc;