feat: Add support for <> operator

AmrDeveloper · Nov 5, 2023 · 0e6cb4f · 0e6cb4f
1 parent b165927
commit 0e6cb4f
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 38 deletions.
diff --git a/crates/gitql-parser/src/parser.rs b/crates/gitql-parser/src/parser.rs
@@ -1677,6 +1677,14 @@ fn un_expected_expression_error(tokens: &Vec<Token>, position: &usize) -> GQLErr
         };
     }
 
+    // `< >` the user may mean to write `<>`
+    if previous.kind == TokenKind::Less && current.kind == TokenKind::Greater {
+        return GQLError {
+            message: "Unexpected `< >`, do you mean `<>`?".to_owned(),
+            location,
+        };
+    }
+
     // Default error message
     GQLError {
         message: "Can't complete parsing this expression".to_owned(),

diff --git a/crates/gitql-parser/src/tokenizer.rs b/crates/gitql-parser/src/tokenizer.rs
@@ -257,13 +257,13 @@ pub fn tokenize(script: String) -> Result<Vec<Token>, GQLError> {
             position += 1;
 
             let mut kind = TokenKind::BitwiseOr;
-            let mut literal = "|";
-
-            if position < len && characters[position] == '|' {
+            let literal = if position < len && characters[position] == '|' {
                 position += 1;
                 kind = TokenKind::LogicalOr;
-                literal = "||";
-            }
+                "||"
+            } else {
+                "|"
+            };
 
             let token = Token {
                 location,
@@ -284,13 +284,13 @@ pub fn tokenize(script: String) -> Result<Vec<Token>, GQLError> {
 
             position += 1;
             let mut kind = TokenKind::BitwiseAnd;
-            let mut literal = "&";
-
-            if position < len && characters[position] == '&' {
+            let literal = if position < len && characters[position] == '&' {
                 position += 1;
                 kind = TokenKind::LogicalAnd;
-                literal = "&&";
-            }
+                "&&"
+            } else {
+                "&"
+            };
 
             let token = Token {
                 location,
@@ -348,13 +348,13 @@ pub fn tokenize(script: String) -> Result<Vec<Token>, GQLError> {
             position += 1;
 
             let mut kind = TokenKind::Dot;
-            let mut literal = ".";
-
-            if position < len && characters[position] == '.' {
+            let literal = if position < len && characters[position] == '.' {
                 position += 1;
                 kind = TokenKind::DotDot;
-                literal = "..";
-            }
+                ".."
+            } else {
+                "."
+            };
 
             let token = Token {
                 location,
@@ -376,17 +376,17 @@ pub fn tokenize(script: String) -> Result<Vec<Token>, GQLError> {
             position += 1;
 
             let mut kind = TokenKind::Greater;
-            let mut literal = ">";
-
-            if position < len && characters[position] == '=' {
+            let literal = if position < len && characters[position] == '=' {
                 position += 1;
                 kind = TokenKind::GreaterEqual;
-                literal = ">=";
+                ">="
             } else if position < len && characters[position] == '>' {
                 position += 1;
                 kind = TokenKind::BitwiseRightShift;
-                literal = ">>";
-            }
+                ">>"
+            } else {
+                ">"
+            };
 
             let token = Token {
                 location,
@@ -408,17 +408,21 @@ pub fn tokenize(script: String) -> Result<Vec<Token>, GQLError> {
             position += 1;
 
             let mut kind = TokenKind::Less;
-            let mut literal = "<";
-
-            if position < len && characters[position] == '=' {
+            let literal = if position < len && characters[position] == '=' {
                 position += 1;
                 kind = TokenKind::LessEqual;
-                literal = "<=";
+                "<="
             } else if position < len && characters[position] == '<' {
                 position += 1;
                 kind = TokenKind::BitwiseLeftShift;
-                literal = "<<";
-            }
+                "<<"
+            } else if position < len && characters[position] == '>' {
+                position += 1;
+                kind = TokenKind::BangEqual;
+                "<>"
+            } else {
+                "<"
+            };
 
             let token = Token {
                 location,
@@ -458,13 +462,13 @@ pub fn tokenize(script: String) -> Result<Vec<Token>, GQLError> {
             position += 1;
 
             let mut kind = TokenKind::Bang;
-            let mut literal = "!";
-
-            if position < len && characters[position] == '=' {
+            let literal = if position < len && characters[position] == '=' {
                 position += 1;
                 kind = TokenKind::BangEqual;
-                literal = "!=";
-            }
+                "!="
+            } else {
+                "!"
+            };
 
             let token = Token {
                 location,

diff --git a/docs/expression/binary.md b/docs/expression/binary.md
@@ -11,12 +11,12 @@ Used to perform arithmetic operators on number types.
 - `%` Modulus.
 
 ### Comparison Expression
-- `=` used to check if field equal to expected value.
-- `!=` used to check if field not equal to expected value.
-- `>` used to check if field greater than expected value.
-- `>=` used to check if field greater than or equals expected value.
-- `<` used to check if field less than expected value.
-- `<=` used to check if field less than or equals expected value.
+- `=` used to check if two values are equals.
+- `!=` or `<>` used to check if two values are not equals.
+- `>` used to check value greater than other value.
+- `>=` used to check if value is greater than or equals than other value
+- `<` used to check if value is less than than other value.
+- `<=` used to check if value is less than or equals than other value.
 
 ---