From 35159e8aa9bf33b4882bc7f17c2e363f769624c7 Mon Sep 17 00:00:00 2001 From: letouzey Date: Mon, 7 Dec 2009 15:24:13 +0000 Subject: No more specific syntax "Include Self" for inclusion of partially-applied functors For Module F(X:SIG), making now a Include F will try to find the X fields in the current context, just as was doing earlier Include Self F. This specific syntax is removed, freeing the keyword "Self". Anyway, with the use of the syntax "<+" there was already hardly any need for syntax "Include Self". Idem for Include Type. Beware that a typo such as "Include F" instead of "Include F G" will produce a different message now, about a missing field instead of a not-enough-applied functor. By the way, some code clean-up and factorisation of inner recursive functions in declaremods.ml. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12566 85f007b7-540e-0410-9357-904b9bb8a0f7 --- interp/topconstr.ml | 4 ++-- interp/topconstr.mli | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'interp') diff --git a/interp/topconstr.ml b/interp/topconstr.ml index ecb61e15b0..3d2e3fde0d 100644 --- a/interp/topconstr.ml +++ b/interp/topconstr.ml @@ -1024,8 +1024,8 @@ type module_type_ast = | CMTEwith of module_type_ast * with_declaration_ast type include_ast = - | CIMTE of module_type_ast * module_type_ast list - | CIME of module_ast * module_ast list + | CIMTE of module_type_ast list + | CIME of module_ast list type 'a module_signature = | Enforce of 'a (* ... : T *) diff --git a/interp/topconstr.mli b/interp/topconstr.mli index b7e389d6b3..36f8cfad39 100644 --- a/interp/topconstr.mli +++ b/interp/topconstr.mli @@ -257,8 +257,8 @@ type module_type_ast = | CMTEwith of module_type_ast * with_declaration_ast type include_ast = - | CIMTE of module_type_ast * module_type_ast list - | CIME of module_ast * module_ast list + | CIMTE of module_type_ast list + | CIME of module_ast list type 'a module_signature = | Enforce of 'a (* ... : T *) -- cgit v1.2.3