fix: Removed NaN and Null

lykiadb-lang/src/ast/expr.rs

@@ -329,8 +329,7 @@ impl Display for Expr {
                 Literal::Str(s) => write!(f, "Str(\"{}\")", s),
                 Literal::Num(n) => write!(f, "Num({:?})", n),
                 Literal::Bool(b) => write!(f, "{}", b),
-                Literal::Undefined => write!(f, "undefined"),
-                Literal::Object(o) => write!(f, "{:?}", o),
+                Literal::Object(o) => write!(f, "Object({:?})", o),
                 Literal::Array(a) => write!(
                     f,
                     "Array({})",
@@ -339,8 +338,7 @@ impl Display for Expr {
                         .collect::<Vec<_>>()
                         .join(", ")
                 ),
-                Literal::NaN => write!(f, "NaN"),
-                Literal::Null => write!(f, "null"),
+                Literal::Undefined => write!(f, "Undefined"),
             },
             Expr::Function {
                 name, parameters, ..

lykiadb-lang/src/ast/mod.rs

@@ -52,11 +52,9 @@ pub enum Literal {
     Str(Arc<String>),
     Num(f64),
     Bool(bool),
-    Undefined,
     Object(FxHashMap<String, Box<Expr>>),
     Array(Vec<Expr>),
-    NaN,
-    Null,
+    Undefined,
 }
 
 impl Literal {
@@ -78,8 +76,6 @@ impl Hash for Literal {
             Literal::Array(a) => a.hash(state),
             //
             Literal::Undefined => "undefined".hash(state),
-            Literal::NaN => "NaN".hash(state),
-            Literal::Null => "null".hash(state),
         }
     }
 }

lykiadb-lang/src/parser/mod.rs

@@ -750,12 +750,6 @@ impl<'a> Parser<'a> {
                 span: tok.span,
                 id: self.get_expr_id(),
             })),
-            TokenType::Null => Ok(Box::new(Expr::Literal {
-                value: Literal::Null,
-                raw: "null".to_string(),
-                span: tok.span,
-                id: self.get_expr_id(),
-            })),
             TokenType::Undefined => Ok(Box::new(Expr::Literal {
                 value: Literal::Undefined,
                 raw: "undefined".to_string(),

lykiadb-lang/src/tokenizer/scanner.rs

@@ -1210,7 +1210,7 @@ mod test {
     #[test]
     fn test_sql_keywords() {
         assert_tokens(
-            "Begin Transaction Rollback Commit Where Having Asc Desc Order By Explain Is Not Null Offset Like Limit And Or Join Inner Right Left On Create Insert Update Delete Drop Into Values Index Collection Select From As Cross Default Group Key Of Only Primary References Set System Unique Read Write", vec![
+            "Begin Transaction Rollback Commit Where Having Asc Desc Order By Explain Is Not      Offset Like Limit And Or Join Inner Right Left On Create Insert Update Delete Drop Into Values Index Collection Select From As Cross Default Group Key Of Only Primary References Set System Unique Read Write", vec![
             Token {tok_type: skw!(SqlKeyword::Begin), literal: None, lexeme: lexm!("Begin"), span: Span { line: 0, start: 0, line_end: 0, end: 5 }},
             Token {tok_type: skw!(SqlKeyword::Transaction), literal: None, lexeme: lexm!("Transaction") , span: Span { line: 0, start: 6, line_end: 0, end: 17 }},
             Token {tok_type: skw!(SqlKeyword::Rollback), literal: None, lexeme: lexm!("Rollback"), span: Span { line: 0, start: 18, line_end: 0, end: 26 }},
@@ -1224,7 +1224,6 @@ mod test {
             Token {tok_type: skw!(SqlKeyword::Explain), literal: None, lexeme: lexm!("Explain"), span: Span { line: 0, start: 65, line_end: 0, end: 72 }},
             Token {tok_type: skw!(SqlKeyword::Is), literal: None, lexeme: lexm!("Is"), span: Span { line: 0, start: 73, line_end: 0, end: 75 }},
             Token {tok_type: skw!(SqlKeyword::Not), literal: None, lexeme: lexm!("Not"), span: Span { line: 0, start: 76, line_end: 0, end: 79 }},
-            Token {tok_type: skw!(SqlKeyword::Null), literal: None, lexeme: lexm!("Null"), span: Span { line: 0, start: 80, line_end: 0, end: 84 }},
             Token {tok_type: skw!(SqlKeyword::Offset), literal: None, lexeme: lexm!("Offset"), span: Span { line: 0, start: 85, line_end: 0, end: 91 }},
             Token {tok_type: skw!(SqlKeyword::Like), literal: None, lexeme: lexm!("Like"), span: Span { line: 0, start: 92, line_end: 0, end: 96 }},
             Token {tok_type: skw!(SqlKeyword::Limit), literal: None, lexeme: lexm!("Limit"), span: Span { line: 0, start: 97, line_end: 0, end: 102 }},

lykiadb-lang/src/tokenizer/token.rs

@@ -36,7 +36,6 @@ pub enum Symbol {
 pub enum TokenType {
     Str,
     Num,
-    Null,
     Undefined,
     False,
     True,
@@ -102,7 +101,6 @@ pub enum SqlKeyword {
     //
     Is,
     Not,
-    Null,
     Like,
     In,
     Between,
@@ -200,7 +198,6 @@ pub static GENERIC_KEYWORDS: phf::Map<&'static str, TokenType> = phf_map! {
     "while" => kw!(Keyword::While),
     "loop" => kw!(Keyword::Loop),
     //
-    "null" =>  TokenType::Null,
     "undefined" => TokenType::Undefined,
     "false" => TokenType::False,
     "true" => TokenType::True,
@@ -228,7 +225,6 @@ pub static SQL_KEYWORDS: phf::Map<&'static str, TokenType> = phf_map! {
     "EXPLAIN" => skw!(SqlKeyword::Explain),
     "IS" => skw!(SqlKeyword::Is),
     "NOT" => skw!(SqlKeyword::Not),
-    "NULL" => skw!(SqlKeyword::Null),
     "LIKE" => skw!(SqlKeyword::Like),
     "IN" => skw!(SqlKeyword::In),
     "BETWEEN" => skw!(SqlKeyword::Between),

lykiadb-lang/tests/lang/generic/other_literals.rs

@@ -51,20 +51,5 @@ assert_parsing! {
                 }
             ]
         }
-    },
-    null: {
-        "null;" => {
-            "@type": "Stmt::Program",
-            "body": [
-                {
-                    "@type": "Stmt::Expression",
-                    "expr": {
-                        "@type": "Expr::Literal",
-                        "value": "Null",
-                        "raw": "null"
-                    }
-                }
-            ]
-        }
     }
 }

lykiadb-server/benches/scripts/while.ly

@@ -2,19 +2,9 @@ var $i = 0;
 
 while ($i < 10000000) {
   $i = $i + 1;
-
-  1; 1; 1; 2; 1; null; 1; "str"; 1; true;
-  null; null; null; 1; null; "str"; null; true;
-  true; true; true; 1; true; false; true; "str"; true; null;
-  "str"; "str"; "str"; "stru"; "str"; 1; "str"; null; "str"; true;
 }
 
 $i = 0;
 while ($i < 10000000) {
   $i = $i + 1;
-
-  1 == 1; 1 == 2; 1 == null; 1 == "str"; 1 == true;
-  null == null; null == 1; null == "str"; null == true;
-  true == true; true == 1; true == false; true == "str"; true == null;
-  "str" == "str"; "str" == "stru"; "str" == 1; "str" == null; "str" == true;
 }

lykiadb-server/benches/scripts/while.short.ly

@@ -2,9 +2,4 @@ var $i = 0;
 
 while ($i < 10000000) {
   $i = $i + 1;
-
-  1; 1; 1; 2; 1; null; 1; "str"; 1; true;
-  null; null; null; 1; null; "str"; null; true;
-  true; true; true; 1; true; false; true; "str"; true; null;
-  "str"; "str"; "str"; "stru"; "str"; 1; "str"; null; "str"; true;
 }

lykiadb-server/src/engine/interpreter.rs

@@ -200,7 +200,7 @@ impl Interpreter {
             if let Some(num) = self.visit_expr(expr)?.as_number() {
                 return Ok(RV::Num(-num));
             }
-            Ok(RV::NaN)
+            Ok(RV::Undefined)
         } else {
             Ok(RV::Bool(!self.visit_expr(expr)?.as_bool()))
         }
@@ -276,8 +276,6 @@ impl Interpreter {
             Literal::Num(n) => RV::Num(*n),
             Literal::Bool(b) => RV::Bool(*b),
             Literal::Undefined => RV::Undefined,
-            Literal::NaN => RV::NaN,
-            Literal::Null => RV::Null,
             Literal::Object(map) => {
                 let mut new_map = FxHashMap::default();
                 for (k, v) in map.iter() {

lykiadb-server/src/engine/stdlib/json.rs

@@ -70,7 +70,7 @@ mod tests {
         );
 
         assert_eq!(
-            nt_json_encode(&mut interpreter, &[RV::Null]).unwrap(),
+            nt_json_encode(&mut interpreter, &[RV::Undefined]).unwrap(),
             RV::Str(Arc::new("null".to_string()))
         );
 
@@ -121,7 +121,7 @@ mod tests {
 
         assert_eq!(
             nt_json_decode(&mut interpreter, &[RV::Str(Arc::new("null".to_string()))]).unwrap(),
-            RV::Null
+            RV::Undefined
         );
 
         // Test array

lykiadb-server/src/value/datatype.rs

@@ -0,0 +1,11 @@
+use rustc_hash::FxHashMap;
+
+pub enum Datatype {
+    Str,
+    Num,
+    Bool,
+    Composite(FxHashMap<String, Datatype>),
+    Array(Box<Datatype>),
+    Callable,
+    Undefined
+}