diff options
| author |  barras <barras@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2004-11-17 16:17:08 +0000 |
|---|---|---|
| committer | barras <barras@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2004-11-17 16:17:08 +0000 |
| commit | 85500252f0e8c0d2b2cceb2418bcadadbbc5cfd0 (patch) | |
| tree | 57c2c1639c5e1f0e12cd7d7b8a12fec50d26a9fc /kernel/mod_typing.ml | |
| parent | 575ffea40287fa3030698937752d2b7704334f9e (diff) | |
bug module with ... + vm
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@6323 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'kernel/mod_typing.ml')
| -rw-r--r-- | kernel/mod_typing.ml | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/kernel/mod_typing.ml b/kernel/mod_typing.ml index 9ab200ad1..0001a6c5e 100644 --- a/kernel/mod_typing.ml +++ b/kernel/mod_typing.ml @@ -89,18 +89,22 @@ and merge_with env mtb with_decl = let cst = Constraint.union (Constraint.union cb.const_constraints cst1) - cst2 - in + cst2 in + let body = Some (Declarations.from_val j.uj_val) in SPBconst {cb with - const_body = - Some (Declarations.from_val j.uj_val); - const_constraints = cst} + const_body = body; + const_body_code = Cemitcodes.from_val + (Cbytegen.compile_constant_body env' body false false); + const_constraints = cst} | Some b -> let cst1 = Reduction.conv env' c (Declarations.force b) in let cst = Constraint.union cb.const_constraints cst1 in + let body = Some (Declarations.from_val c) in SPBconst {cb with - const_body = Some (Declarations.from_val c); - const_constraints = cst} + const_body = body; + const_body_code = Cemitcodes.from_val + (Cbytegen.compile_constant_body env' body false false); + const_constraints = cst} end (* and what about msid's ????? Don't they clash ? *) | With_Module (id, mp) -> |