aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorherbelin2000-06-29 11:11:38 +0000
committerherbelin2000-06-29 11:11:38 +0000
commit43af153affecc21f87043ad96259039e20ed795f (patch)
treefb29cc739b952cfbd04d4624a4e6640e676adaf7
parent5537ef7cbd7948981c44b4e625f75b1afbd194e9 (diff)
Bricoles
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@526 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--pretyping/pretype_errors.ml2
-rw-r--r--pretyping/typing.ml4
2 files changed, 3 insertions, 3 deletions
diff --git a/pretyping/pretype_errors.ml b/pretyping/pretype_errors.ml
index 74f4c57486..9f711f390e 100644
--- a/pretyping/pretype_errors.ml
+++ b/pretyping/pretype_errors.ml
@@ -8,7 +8,7 @@ open Type_errors
open Rawterm
let raise_pretype_error (loc,k,ctx,te) =
- raise (Stdpp.Exc_located (loc, TypeError(k,ctx,te)))
+ Stdpp.raise_with_loc loc (TypeError(k,ctx,te))
let error_var_not_found_loc loc k s =
raise_pretype_error (loc,k, Global.context() (*bidon*), VarNotFound s)
diff --git a/pretyping/typing.ml b/pretyping/typing.ml
index 0fbe3c7587..985b1d3998 100644
--- a/pretyping/typing.ml
+++ b/pretyping/typing.ml
@@ -32,7 +32,7 @@ let rec execute mf env sigma cstr =
{ uj_val = cstr; uj_type = jty }
| IsRel n ->
- relative env n
+ relative env sigma n
| IsVar id ->
(try
@@ -111,7 +111,7 @@ let rec execute mf env sigma cstr =
let tj = execute mf env sigma t in
cast_rel env sigma cj tj
- | _ -> error_cant_execute CCI env cstr
+ | IsXtra _ -> anomaly "Typing: found an Extra"
and execute_fix mf env sigma lar lfi vdef =
let larj = execute_array mf env sigma lar in