From 4990e18caf5ee4af376b7d13ba4f165fbfaffe7f Mon Sep 17 00:00:00 2001 From: Nicolas PENELOUX Date: Tue, 5 Dec 2023 20:53:12 +0100 Subject: [PATCH] real conflict --- flap/src/hopix/hopixTypechecker.ml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/flap/src/hopix/hopixTypechecker.ml b/flap/src/hopix/hopixTypechecker.ml index b4c22d1..d4e2d71 100644 --- a/flap/src/hopix/hopixTypechecker.ml +++ b/flap/src/hopix/hopixTypechecker.ml @@ -116,17 +116,6 @@ and synth_pattern = fun env Position.{ value = p; position = pos } -> match p with -<<<<<<< HEAD - | PWildcard -> assert false - | PLiteral l -> synth_literal l.value, env - | PVariable pv -> assert false - | PTypeAnnotation (p, ty) -> failwith "synth_pattern | PTypeAnnot" - | PTuple plist -> failwith "synth_pattern | PTuple" - | POr plist -> failwith "synth_pattern | POr" - | PAnd plist -> failwith "synth_pattern | PAnd" - | PTaggedValue (cons, tlist, plist) -> failwith "synth_pattern | PTagged" - | PRecord (plist, tlist) -> failwith "synth_pattern | PRecord" -======= | PWildcard -> pattern_wildcard pos | PLiteral l -> pattern_literal env l | PVariable _ -> pattern_variable pos @@ -187,7 +176,6 @@ and pattern_record -> HopixTypes.aty * HopixTypes.typing_environment = fun tenv plist tlist -> failwith "synth_pattern | PRecord" ->>>>>>> 1eab8ed491425b58b8d3d912b6ca2f4d056e75da and synth_variable : HopixTypes.typing_environment -> identifier Position.located