1 files changed, 15 insertions, 7 deletions

diff --git a/parser.ml b/parser.ml
index e01208f..1f367d1 100644
--- a/parser.ml
+++ b/parser.ml
@@ -13,12 +13,20 @@ let rec string_of_file f =
 
 let rec program_of_lex = function
   | [] -> []
-  | "zero" :: arg_1 :: tail -> (Zero (int_of_string arg_1)) :: (program_of_lex tail)
-  | "succ" :: arg_1 :: tail -> (Succ (int_of_string arg_1)) :: (program_of_lex tail)
-  | "copy" :: arg_1 :: arg_2 :: tail -> (Copy ((int_of_string arg_1), (int_of_string arg_2))) :: (program_of_lex tail)
-  | "jump" :: arg_1 :: arg_2 :: arg_3 :: tail -> (Jump ((int_of_string arg_1), (int_of_string arg_2), (int_of_string arg_3))) :: (program_of_lex tail)
+  | instr :: tail -> match (String.lowercase_ascii instr) :: tail with
+    | "zero" :: arg_1 :: tail -> (Zero (int_of_string arg_1)) :: (program_of_lex tail)
+    | "succ" :: arg_1 :: tail -> (Succ (int_of_string arg_1)) :: (program_of_lex tail)
+    | "copy" :: arg_1 :: arg_2 :: tail -> (Copy ((int_of_string arg_1), (int_of_string arg_2))) :: (program_of_lex tail)
+    | "jump" :: arg_1 :: arg_2 :: arg_3 :: tail -> (Jump ((int_of_string arg_1), (int_of_string arg_2), (int_of_string arg_3))) :: (program_of_lex tail)
+    | _ -> raise Syntax_error
+
+(* FIXME: reject multiple definition of a single register *)
+let rec regs_of_lex = function
+  | [] -> []
+  | regnum :: regvalue :: tail -> Reg (int_of_string regnum, int_of_string regvalue) :: (regs_of_lex tail)
   | _ -> raise Syntax_error
 
-let program_of_string str =
-  let lex = Str.split (Str.regexp "[\t\n(),]+") str
-  in List.iter (fun s -> print_string s; print_newline ()) lex; program_of_lex lex
+let seq_from_string lexer_func str =  Str.split (Str.regexp "[\t\n(), ]+") str |> lexer_func
+let program_of_string = seq_from_string program_of_lex
+let regs_of_string = seq_from_string regs_of_lex
+