WIP

Author: KyGost

Cargo.toml

@@ -57,6 +57,7 @@
 	serde_json = "1.0.0"
 	uuid = { version = "0.8", features = ["serde", "v4"] }
 	serde_yaml = "0.8.23"
+	enum_dispatch = "0.3.8"
 
 	# OPTIONAL DEPENDENCIES
 		# Storages

src/data/value/declare.rs

@@ -0,0 +1,38 @@
+use {
+	serde::{Deserialize, Serialize},
+	std::fmt::Debug,
+	enum_dispatch::enum_dispatch,
+};
+
+#[enum_dispatch]
+pub trait Valued {
+
+}
+
+macro_rules! value_types {
+	( $($representation:ident: $type:ty),* ) => {
+		$(impl Valued for $type {})*
+
+		#[derive(Debug, Clone, Serialize, Deserialize)]
+		#[enum_dispatch(Valued)]
+		pub enum Value {
+			Null,
+			$($representation($type)),*
+		}
+	}
+}
+
+/*value_types!(
+	Boolean:	bool,
+	UInteger:	u64,
+	Integer:	i64,
+	Float:		f64,
+	Text:			String,
+);*/
+value_types!(
+	Bool:	bool,
+	U64:	u64,
+	I64:	i64,
+	F64:	f64,
+	Str:	String
+);

src/data/value/mod.rs

@@ -17,13 +17,15 @@ mod literal;
 mod methods;
 mod serde_convert;
 mod value_type;
+mod declare;
 
 pub use {
 	big_endian::BigEndian,
 	cast::{Cast, CastWithRules},
 	convert::{Convert, ConvertFrom},
 	error::ValueError,
 	value_type::ValueType,
+	declare::Value,
 };
 
 /// # Value
@@ -65,7 +67,9 @@ pub use {
 ///
 /// Floats and Integers implicitly compare and convert.
 /// (Feature: `implicit_float_conversion`)
-#[derive(Debug, Clone, Serialize, Deserialize)]
+
+
+/*#[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum Value {
 	Null,
 
@@ -79,7 +83,7 @@ pub enum Value {
 	Timestamp(i64),
 
 	Internal(i64),
-}
+}*/
 
 impl Hash for Value {
 	fn hash<H: Hasher>(&self, state: &mut H) {
@@ -93,7 +97,7 @@ impl Ord for Value {
 	}
 }
 
-impl From<bool> for Value {
+/*impl From<bool> for Value {
 	fn from(from: bool) -> Value {
 		Value::Bool(from)
 	}
@@ -162,7 +166,7 @@ impl PartialOrd for Value {
 			_ => None,
 		}
 	}
-}
+}*/
 
 pub trait NullOrd {
 	fn null_cmp(&self, other: &Self) -> Option<Ordering>;