Paris7/compilation
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

conflict

Browse source
This commit is contained in:
Nicolas PENELOUX 2023-11-25 14:33:32 +01:00
commit ad14b5bd46
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
flap/src/hopix/hopixTypechecker.ml
View file

@ -79,6 +79,17 @@ and check_value_definition
: HopixTypes.typing_environment -> HopixAST.value_definition : HopixTypes.typing_environment -> HopixAST.value_definition
-> HopixTypes.typing_environment -> HopixTypes.typing_environment
= =
<<<<<<< HEAD
=======
fun env -> function
| SimpleValue (id, Some ty, ex) ->
failwith "Students! This is your job! (check_value_definition | SimpleValue)"
| RecFunctions _ ->
(* Je crois que c'est galère et donc c'est pas grave si on arrive pas
à faire les fonctions récursives *)
failwith "Students! This is your job! (check_value_definition | RecFunctions)"
| _ -> failwith "Students! This is your job!"
>>>>>>> acd881c0dd51529a11929a7e8abb27d101b9297f
;; ;;
let check_definition env = function let check_definition env = function