diff options
| author |  msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2012-03-14 09:53:06 +0000 |
|---|---|---|
| committer | msozeau <msozeau@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2012-03-14 09:53:06 +0000 |
| commit | 8ff2de8c01b3ba3563517627b1f5c9eb2c4bcb77 (patch) | |
| tree | 4f7e99ba36af1cf03d8c3315c371293ae46fe77c /toplevel/vernacentries.ml | |
| parent | 4d7b12f27a7cc520a319a9d4b652137c0a0cbb60 (diff) | |
Final part of moving Program code inside the main code. Adapted add_definition/fixpoint and parsing of the "Program" prefix.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15036 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'toplevel/vernacentries.ml')
| -rw-r--r-- | toplevel/vernacentries.ml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/toplevel/vernacentries.ml b/toplevel/vernacentries.ml index 7a7246733..20c9531fe 100644 --- a/toplevel/vernacentries.ml +++ b/toplevel/vernacentries.ml @@ -343,8 +343,7 @@ let vernac_definition (local,k) (loc,id as lid) def hook = | Some r -> let (evc,env)= get_current_context () in Some (interp_redexp env evc r) in - let ce,imps = interp_definition bl red_option c typ_opt in - declare_definition id (local,k) ce imps hook) + do_definition id (local,k) bl red_option c typ_opt hook) let vernac_start_proof kind l lettop hook = if Dumpglob.dump () then @@ -1578,5 +1577,12 @@ let interp c = match c with (* Extensions *) | VernacExtend (opn,args) -> Vernacinterp.call (opn,args) -let interp c = interp c ; check_locality () +let interp c = + let mode = Flags.is_program_mode () in + let flag = mode || !program_flag in + Flags.program_mode := flag; + interp c; check_locality (); + program_flag := false; + Flags.program_mode := mode + (* with_program_flag (fun () -> interp c ; check_locality ()) *) |