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

Merge branch 'jalon3' of gaufre.informatique.univ-paris-diderot.fr:Anri/compilation-m1-2023 into jalon3

Browse source
This commit is contained in:
Nicolas PENELOUX 2023-12-04 18:56:35 +01:00
commit 581185838d
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -158,6 +158,7 @@ and synth_sequence
: HopixTypes.typing_environment -> expression Position.located list -> HopixTypes.aty
=
fun tenv elist ->
<<<<<<< HEAD
match elist with
| [] -> failwith "erreur sequence"
| [x] -> synth_expression tenv x
@ -167,6 +168,15 @@ and synth_sequence
check_equal_types x.position HopixTypes.hunit x_type
; synth_sequence tenv l)
=======
match elist with
| [] -> failwith "erreur sequence"
| [ x ] -> synth_expression tenv x
| x :: l ->
let x_type = synth_expression tenv x in
check_equal_types x.position HopixTypes.hunit x_type;
synth_sequence tenv l
>>>>>>> a4910af26df56be5421c82c370bfcb6cdafae1fd
and synth_define
: HopixTypes.typing_environment -> value_definition -> expression Position.located