Added comma parsing to make more SQL like

Author: bglid

lib/lexer.mll

@@ -51,6 +51,7 @@ rule read =
     | ">="    { GEQ }
     | "<"     { LT }
     | ">"     { GT }
+    | ","     { COMMA }
     | white   { read lexbuf}
     | int     { INT (int_of_string(Lexing.lexeme lexbuf))}
     | float   { FLOAT (float_of_string(Lexing.lexeme lexbuf))}

lib/parser.mly

@@ -12,6 +12,7 @@
 /* Operators */
 %token LPAREN "("
 %token RPAREN ")"
+%token COMMA
 %token SUM
 %token MULT
 %token DIV
@@ -68,7 +69,7 @@ constant:
 
 constant_list:
   | constant { [$1] }
-  | constant constant_list {$1 :: $2}
+  | constant COMMA constant_list {$1 :: $3}
 
 
 statement:
@@ -80,7 +81,7 @@ statement:
 
 field_list:
   | field { [$1] }
-  | field field_list { $1 :: $2 }
+  | field COMMA field_list { $1 :: $3 }
   ;
 
 

test/interpreter_test.ml

@@ -146,7 +146,7 @@ let test_insert_statement_recognized () =
   let res =
     test_helper
       (Interpreter.interpret
-         "INSERT INTO Mbta (Id stop_name rail_line) VALUES (1 'f' 'g') ")
+         "INSERT INTO Mbta (Id, stop_name, rail_line) VALUES (1, 'f', 'g') ")
   in
   Alcotest.(check bool)
     "insert accepted for execution" true
@@ -155,7 +155,7 @@ let test_insert_statement_recognized () =
 
 let test_select_statement_recognized () =
   let res =
-    test_helper (Interpreter.interpret "SELECT stop_name rail_line FROM Mbta")
+    test_helper (Interpreter.interpret "SELECT stop_name, rail_line FROM Mbta")
   in
   Alcotest.(check bool)
     "select accepted for execution" true