fmt
This commit is contained in:
parent
8b3a34ba2d
commit
1f1e58f84f
1 changed files with 52 additions and 50 deletions
|
@ -214,7 +214,6 @@ and pattern_tagval
|
||||||
-> HopixTypes.aty * HopixTypes.typing_environment
|
-> HopixTypes.aty * HopixTypes.typing_environment
|
||||||
=
|
=
|
||||||
fun tenv cons tlist plist ->
|
fun tenv cons tlist plist ->
|
||||||
|
|
||||||
let cons_scheme =
|
let cons_scheme =
|
||||||
try HopixTypes.lookup_type_scheme_of_constructor cons.position cons.value tenv with
|
try HopixTypes.lookup_type_scheme_of_constructor cons.position cons.value tenv with
|
||||||
| HopixTypes.Unbound (pos, Constructor (KId c)) ->
|
| HopixTypes.Unbound (pos, Constructor (KId c)) ->
|
||||||
|
@ -233,8 +232,7 @@ and pattern_tagval
|
||||||
invalid_instantiation cons.position expected given
|
invalid_instantiation cons.position expected given
|
||||||
in
|
in
|
||||||
let p_args, tenv = synth_list_pattern tenv plist in
|
let p_args, tenv = synth_list_pattern tenv plist in
|
||||||
(
|
( (let expected_args, result =
|
||||||
let expected_args, result =
|
|
||||||
HopixTypes.destruct_function_type_maximally cons.position tcons
|
HopixTypes.destruct_function_type_maximally cons.position tcons
|
||||||
in
|
in
|
||||||
(try
|
(try
|
||||||
|
@ -249,8 +247,8 @@ and pattern_tagval
|
||||||
cons.position
|
cons.position
|
||||||
~expected:result
|
~expected:result
|
||||||
~given:(HopixTypes.ATyArrow (result, result)));
|
~given:(HopixTypes.ATyArrow (result, result)));
|
||||||
result
|
result)
|
||||||
),tenv
|
, tenv )
|
||||||
|
|
||||||
and synth_list_pattern tenv = function
|
and synth_list_pattern tenv = function
|
||||||
| [] -> [], tenv
|
| [] -> [], tenv
|
||||||
|
@ -268,10 +266,12 @@ and pattern_record
|
||||||
fun tenv plist tlist ->
|
fun tenv plist tlist ->
|
||||||
let label = fst (List.hd plist) in
|
let label = fst (List.hd plist) in
|
||||||
let type_cons, _, labels =
|
let type_cons, _, labels =
|
||||||
let LId label_name = label.value in
|
let (LId label_name) = label.value in
|
||||||
try HopixTypes.lookup_type_constructor_of_label label.position label.value tenv with
|
try HopixTypes.lookup_type_constructor_of_label label.position label.value tenv with
|
||||||
| HopixTypes.Unbound (pos, Label (LId i)) ->
|
| HopixTypes.Unbound (pos, Label (LId i)) ->
|
||||||
HopixTypes.type_error pos (Printf.sprintf "There is no type definition for label `%s'." label_name )
|
HopixTypes.type_error
|
||||||
|
pos
|
||||||
|
(Printf.sprintf "There is no type definition for label `%s'." label_name)
|
||||||
in
|
in
|
||||||
let tlist' =
|
let tlist' =
|
||||||
match tlist with
|
match tlist with
|
||||||
|
@ -279,8 +279,8 @@ and pattern_record
|
||||||
| None -> HopixTypes.type_error label.position "No types found."
|
| None -> HopixTypes.type_error label.position "No types found."
|
||||||
in
|
in
|
||||||
let tenv =
|
let tenv =
|
||||||
List.fold_left (
|
List.fold_left
|
||||||
fun tenv (Position.{ position = label_pos; value = label_val }, pat) ->
|
(fun tenv (Position.{ position = label_pos; value = label_val }, pat) ->
|
||||||
let label_scheme =
|
let label_scheme =
|
||||||
try HopixTypes.lookup_type_scheme_of_label label_pos label_val tenv with
|
try HopixTypes.lookup_type_scheme_of_label label_pos label_val tenv with
|
||||||
| HopixTypes.Unbound (pos, Label (LId i)) ->
|
| HopixTypes.Unbound (pos, Label (LId i)) ->
|
||||||
|
@ -291,15 +291,17 @@ and pattern_record
|
||||||
| HopixTypes.InvalidInstantiation { expected; given } ->
|
| HopixTypes.InvalidInstantiation { expected; given } ->
|
||||||
invalid_instantiation (Position.position pat) expected given
|
invalid_instantiation (Position.position pat) expected given
|
||||||
in
|
in
|
||||||
let _,expected = HopixTypes.destruct_function_type label_pos instance_type_scheme in
|
let _, expected =
|
||||||
let (given,tenv) = synth_pattern tenv pat in
|
HopixTypes.destruct_function_type label_pos instance_type_scheme
|
||||||
check_equal_types label_pos ~expected ~given; tenv
|
in
|
||||||
) tenv plist;
|
let given, tenv = synth_pattern tenv pat in
|
||||||
|
check_equal_types label_pos ~expected ~given;
|
||||||
|
tenv)
|
||||||
|
tenv
|
||||||
|
plist
|
||||||
in
|
in
|
||||||
ATyCon (type_cons, tlist'), tenv
|
ATyCon (type_cons, tlist'), tenv
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
and synth_variable
|
and synth_variable
|
||||||
: HopixTypes.typing_environment -> identifier Position.located
|
: HopixTypes.typing_environment -> identifier Position.located
|
||||||
-> ty Position.located list option -> HopixTypes.aty
|
-> ty Position.located list option -> HopixTypes.aty
|
||||||
|
|
Reference in a new issue