Instruction Get fonctionnelle

expr/fun/eval.ml

@@ -12,3 +12,5 @@ let rec eval env = function
        | _, v -> (BinOp.eval op) (eval env e1) v
      end
   | Uminus e -> - (eval env e)
+  | App(_, _) -> failwith "Not yet supported" (* TODO *)
+  | Fun(_, _) -> failwith "Not yet supported"

expr/fun/toPfx.ml

@@ -10,5 +10,7 @@ let rec generate = function
   | Binop(Bmul,a,b) -> (generate b) @ (generate a) @ [Mul]
   | Binop(Bdiv,a,b) -> (generate b) @ (generate a) @ [Div]
   | Binop(Bmod,a,b) -> (generate b) @ (generate a) @ [Rem]
+  | App(_, _) -> failwith "Not yet supported" (* TODO *)
+  | Fun(_, _) -> failwith "Not yet supported"
   | Uminus x -> (generate x) @ [Push 0] @ [Sub]
   | Var _ -> failwith "Not yet supported"

pfx/basic/ast.ml

@@ -14,6 +14,8 @@ let string_of_command = function
   | Mul -> "Mul"
   | Div -> "Div"
   | Rem -> "Rem"
+  | Exec -> "Exec"
+  | Get -> "Get"
 
 let string_of_commands cmds = String.concat " " (List.map string_of_command cmds)
 

pfx/basic/eval.ml

@@ -30,7 +30,9 @@ let step state =
   | Rem::_, [] -> Error("Nothing to divide",state)
   | Rem::_, _::0::_ -> Error("Forbidden operation",state)
   | Get::_, i::stack when (List.length stack) < i -> Error("Invalid get operation", state)
-  | Get::_, i::_ when i < O -> Error("Cannot get negative index", state)
+  | Get::_, i::_ when i < 0 -> Error("Cannot get negative index", state)
+  | Get::_, [] -> Error("Nothing to get", state)
+  | Exec::_, _ -> Error("Not yet supported", state) (* TODO *)
   (* Valid configurations *)
   | (Push x)::q, stack -> Ok (q, x::stack)
   | Pop::q, _::stack -> Ok (q, stack)