Rename URM types and fix urm_from_eurm signature

1 files changed, 4 insertions, 5 deletions

diff --git a/src/parser.ml b/src/parser.ml
index 1f367d1..0bc1be6 100644
--- a/src/parser.ml
+++ b/src/parser.ml
@@ -14,10 +14,10 @@ let rec string_of_file f =
 let rec program_of_lex = function
   | [] -> []
   | 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)
+    | "zero" :: arg_1 :: tail -> (URMZero (int_of_string arg_1)) :: (program_of_lex tail)
+    | "succ" :: arg_1 :: tail -> (URMSucc (int_of_string arg_1)) :: (program_of_lex tail)
+    | "copy" :: arg_1 :: arg_2 :: tail -> (URMCopy ((int_of_string arg_1), (int_of_string arg_2))) :: (program_of_lex tail)
+    | "jump" :: arg_1 :: arg_2 :: arg_3 :: tail -> (URMJump ((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 *)
@@ -29,4 +29,3 @@ let rec regs_of_lex = function
 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
-