feat: Support consuming ; at the end of select or set statement

Author: AmrDeveloper

crates/gitql-parser/src/parser.rs

@@ -21,7 +21,9 @@ use gitql_ast::statement::*;
 use gitql_ast::types::DataType;
 use gitql_ast::types::TABLES_FIELDS_TYPES;
 
-pub fn parse_gql(tokens: Vec<Token>, env: &mut Enviroment) -> Result<Query, GQLError> {
+pub fn parse_gql(mut tokens: Vec<Token>, env: &mut Enviroment) -> Result<Query, GQLError> {
+    consume_optional_semicolon_if_exists(&mut tokens);
+
     let mut position = 0;
     let first_token = &tokens[position];
     match &first_token.kind {
@@ -1866,6 +1868,19 @@ fn un_expected_expression_error(tokens: &Vec<Token>, position: &usize) -> GQLErr
     }
 }
 
+/// Remove last token if it semicolon, because it's optional
+fn consume_optional_semicolon_if_exists(tokens: &mut Vec<Token>) {
+    if tokens.is_empty() {
+        return;
+    }
+
+    if let Some(last_token) = tokens.last() {
+        if last_token.kind == TokenKind::Semicolon {
+            tokens.remove(tokens.len() - 1);
+        }
+    }
+}
+
 #[allow(clippy::borrowed_box)]
 fn get_expression_name(expression: &Box<dyn Expression>) -> Result<String, ()> {
     if let Some(symbol) = expression.as_any().downcast_ref::<SymbolExpression>() {

crates/gitql-parser/src/tokenizer.rs

@@ -67,6 +67,7 @@ pub enum TokenKind {
 
     Comma,
     Dot,
+    Semicolon,
 
     Ascending,
     Descending,
@@ -537,6 +538,24 @@ pub fn tokenize(script: String) -> Result<Vec<Token>, GQLError> {
             continue;
         }
 
+        // Semicolon
+        if char == ';' {
+            let location = Location {
+                start: column_start,
+                end: position,
+            };
+
+            let token = Token {
+                location,
+                kind: TokenKind::Semicolon,
+                literal: ";".to_owned(),
+            };
+
+            tokens.push(token);
+            position += 1;
+            continue;
+        }
+
         // Characters to ignoring
         if char == ' ' || char == '\n' || char == '\t' {
             position += 1;