From dafb5f443611cf0bfb4626f47d20d65149bd3fe0 Mon Sep 17 00:00:00 2001 From: filliatr Date: Sat, 18 Mar 2000 00:11:25 +0000 Subject: bug discharge (work_alist contenanti plein de fois les memes choses) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@323 85f007b7-540e-0410-9357-904b9bb8a0f7 --- .depend.coq | 5 +++++ dev/ocamldebug-v7 | 2 +- toplevel/discharge.ml | 6 ++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.depend.coq b/.depend.coq index e94ce6bef1..ca469fd439 100644 --- a/.depend.coq +++ b/.depend.coq @@ -16,6 +16,11 @@ theories/Init/LogicSyntax.vo: theories/Init/LogicSyntax.v theories/Init/Logic.vo theories/Init/Logic.vo: theories/Init/Logic.v theories/Init/Datatypes.vo theories/Init/DatatypesSyntax.vo: theories/Init/DatatypesSyntax.v theories/Init/Datatypes.vo theories/Init/Datatypes.vo: theories/Init/Datatypes.v +theories/Bool/Zerob.vo: theories/Bool/Zerob.v theories/Arith/Arith.vo theories/Bool/Bool.vo +theories/Bool/Sumbool.vo: theories/Bool/Sumbool.v +theories/Bool/IfProp.vo: theories/Bool/IfProp.v theories/Bool/Bool.vo +theories/Bool/DecBool.vo: theories/Bool/DecBool.v +theories/Bool/Bool.vo: theories/Bool/Bool.v theories/Arith/Wf_nat.vo: theories/Arith/Wf_nat.v theories/Arith/Lt.vo theories/Arith/Plus.vo: theories/Arith/Plus.v theories/Arith/Le.vo theories/Arith/Lt.vo theories/Arith/Peano_dec.vo: theories/Arith/Peano_dec.v diff --git a/dev/ocamldebug-v7 b/dev/ocamldebug-v7 index 5e9b2aa025..38572b7207 100755 --- a/dev/ocamldebug-v7 +++ b/dev/ocamldebug-v7 @@ -3,7 +3,7 @@ # wrap around ocamldebug for Coq # export COQTOP=`coqtop -where` -export COQTOP=/home/jc/coq/V7 +export COQTOP=$HOME/coq/V7 export COQLIB=$COQTOP export COQTH=$COQLIB/theories export CAMLP4LIB=`camlp4 -where` diff --git a/toplevel/discharge.ml b/toplevel/discharge.ml index 09b10538de..859f00a00f 100644 --- a/toplevel/discharge.ml +++ b/toplevel/discharge.ml @@ -173,10 +173,8 @@ let process_constant osecsp nsecsp oldenv (ids_to_discard,modlist) cb = expmod_constant_value cb.const_opaque oldenv modlist cb.const_body in let typ = expmod_type oldenv modlist cb.const_type in let hyps = map_sign_typ (expmod_type oldenv modlist) cb.const_hyps in - let (body',typ',modl) = - abstract_constant ids_to_discard hyps (body,typ) - in - let mods = (Const osecsp, DO_ABSTRACT(Const nsecsp,modl)) :: modlist in + let (body',typ',modl) = abstract_constant ids_to_discard hyps (body,typ) in + let mods = [ (Const osecsp, DO_ABSTRACT(Const nsecsp,modl)) ] in (body', typ'.body, mods) -- cgit v1.2.3