diff options
| author |  letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2013-02-13 00:42:57 +0000 |
|---|---|---|
| committer | letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2013-02-13 00:42:57 +0000 |
| commit | 7cadf058d5f94cbd79f9318d6045e050994091c8 (patch) | |
| tree | 9db84752627c801d3abd99abb6f0da13fa947493 | |
| parent | 33c0d04c1ae40fb3eded886f8d82eb941e588fc9 (diff) | |
make validate repaired via a temporary fix for #2949
The offending functor in NZOrder wasn't actually used, so
I've commented it for now.
Btw, the Not_found in coqchk is now turned into something slightly
more informative
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16199 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | checker/checker.ml | 2 | ||||
| -rw-r--r-- | checker/mod_checking.ml | 7 | ||||
| -rw-r--r-- | theories/Numbers/NatInt/NZOrder.v | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/checker/checker.ml b/checker/checker.ml index b3c8b0e8c..42e5b868b 100644 --- a/checker/checker.ml +++ b/checker/checker.ml @@ -17,7 +17,7 @@ open Check let () = at_exit flush_all let fatal_error info = - pperrnl info; flush_all (); exit 1 + flush_all (); pperrnl info; flush_all (); exit 1 let coq_root = Id.of_string "Coq" let parse_dir s = diff --git a/checker/mod_checking.ml b/checker/mod_checking.ml index fa1b26cc5..abc2da8b6 100644 --- a/checker/mod_checking.ml +++ b/checker/mod_checking.ml @@ -133,6 +133,11 @@ let lookup_modtype mp env = with Not_found -> failwith ("Unknown module type: "^string_of_mp mp) +let lookup_module mp env = + try Environ.lookup_module mp env + with Not_found -> + failwith ("Unknown module: "^string_of_mp mp) + let rec check_with env mtb with_decl mp= match with_decl with | With_definition_body (idl,c) -> @@ -199,7 +204,7 @@ and check_with_mod env mtb (idl,mp1) mp = SFBmodule msb -> msb | _ -> error_not_a_module l in - let (_:module_body) = (lookup_module mp1 env) in () + let (_:module_body) = (Environ.lookup_module mp1 env) in () else let old = match spec with SFBmodule msb -> msb diff --git a/theories/Numbers/NatInt/NZOrder.v b/theories/Numbers/NatInt/NZOrder.v index 5582438b7..1f23bf37a 100644 --- a/theories/Numbers/NatInt/NZOrder.v +++ b/theories/Numbers/NatInt/NZOrder.v @@ -644,6 +644,8 @@ End NZOrderProp. (** If we have moreover a [compare] function, we can build an [OrderedType] structure. *) +(* Temporary workaround for bug #2949: remove this problematic + unused functor Module NZOrderedType (NZ : NZDecOrdSig') <: DecidableTypeFull <: OrderedTypeFull := NZ <+ NZBaseProp <+ NZOrderProp <+ Compare2EqBool <+ HasEqBool2Dec. +*) |