real conflict
This commit is contained in:
parent
bfe0ab706b
commit
4990e18caf
1 changed files with 0 additions and 12 deletions
|
@ -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
|
||||
|
|
Reference in a new issue