aboutsummaryrefslogtreecommitdiff
path: root/toplevel
diff options
context:
space:
mode:
authorgareuselesinge2013-10-31 14:24:43 +0000
committergareuselesinge2013-10-31 14:24:43 +0000
commitdbd94e12c9c6cb0fdecb44bfedacf0c4ae50bc3e (patch)
treef09931dac187ca9b20bb483aee7bc9beca1e78f1 /toplevel
parentb0631cba10fda88eb3518153860807b10441ef34 (diff)
Conv_orable made functional and part of pre_env
But for vm, the kernel should be functional now git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16961 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'toplevel')
-rw-r--r--toplevel/command.ml2
-rw-r--r--toplevel/vernacentries.ml4
2 files changed, 3 insertions, 3 deletions
diff --git a/toplevel/command.ml b/toplevel/command.ml
index 3017aeacb5..04a2661d72 100644
--- a/toplevel/command.ml
+++ b/toplevel/command.ml
@@ -70,7 +70,7 @@ let red_constant_entry n ce = function
let proof_out = ce.const_entry_body in
{ ce with const_entry_body = Future.chain proof_out (fun (body,eff) ->
under_binders (Global.env())
- (fst (reduction_of_red_expr red)) n body,eff) }
+ (fst (reduction_of_red_expr (Global.env()) red)) n body,eff) }
let interp_definition bl red_option c ctypopt =
let env = Global.env() in
diff --git a/toplevel/vernacentries.ml b/toplevel/vernacentries.ml
index 3c104f543f..9ee91815e9 100644
--- a/toplevel/vernacentries.ml
+++ b/toplevel/vernacentries.ml
@@ -1350,7 +1350,7 @@ let vernac_check_may_eval redexp glopt rc =
| Some r ->
Tacintern.dump_glob_red_expr r;
let (sigma',r_interp) = interp_redexp env sigma' r in
- let redfun = fst (reduction_of_red_expr r_interp) in
+ let redfun = fst (reduction_of_red_expr env r_interp) in
msg_notice (print_eval redfun env sigma' rc j)
let vernac_declare_reduction locality s r =
@@ -1413,7 +1413,7 @@ let vernac_print = function
| PrintAssumptions (o,t,r) ->
(* Prints all the axioms and section variables used by a term *)
let cstr = constr_of_global (smart_global r) in
- let st = Conv_oracle.get_transp_state () in
+ let st = Conv_oracle.get_transp_state (Environ.oracle (Global.env())) in
let nassums =
Assumptions.assumptions st ~add_opaque:o ~add_transparent:t cstr in
msg_notice (Printer.pr_assumptionset (Global.env ()) nassums)