diff options
| author | Maxime Dénès | 2015-10-16 15:34:46 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2015-10-16 15:34:46 +0200 |
| commit | f93b5d45ed95816cb23ce2646437bb5037a17f72 (patch) | |
| tree | e38ecd02addffe86cf05996c651fdd55034b7aaa /kernel/typeops.ml | |
| parent | 8cb3a606f7c72c32298fe028c9f98e44ea0d378b (diff) | |
| parent | d1ce79ce293c9b77f2c6a9d0b9a8b4f84ea617e5 (diff) | |
Merge branch 'v8.5' into trunk
Diffstat (limited to 'kernel/typeops.ml')
| -rw-r--r-- | kernel/typeops.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/typeops.ml b/kernel/typeops.ml index 8895bae5da..09299f31d7 100644 --- a/kernel/typeops.ml +++ b/kernel/typeops.ml @@ -300,7 +300,7 @@ let judge_of_cast env cj k tj = match k with | VMcast -> mkCast (cj.uj_val, k, expected_type), - vm_conv CUMUL env cj.uj_type expected_type + Reduction.vm_conv CUMUL env cj.uj_type expected_type | DEFAULTcast -> mkCast (cj.uj_val, k, expected_type), default_conv ~l2r:false CUMUL env cj.uj_type expected_type @@ -310,7 +310,7 @@ let judge_of_cast env cj k tj = | NATIVEcast -> let sigma = Nativelambda.empty_evars in mkCast (cj.uj_val, k, expected_type), - native_conv CUMUL sigma env cj.uj_type expected_type + Nativeconv.native_conv CUMUL sigma env cj.uj_type expected_type in { uj_val = c; uj_type = expected_type } |