From e3f12103697e5eb9caada06134ba9aba01333928 Mon Sep 17 00:00:00 2001 From: aarne Date: Tue, 19 Jun 2007 18:12:35 +0000 Subject: extended functor syntax --- src/GF/Source/GF.cf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/GF/Source/GF.cf') diff --git a/src/GF/Source/GF.cf b/src/GF/Source/GF.cf index f90499f52..9cb3faf66 100644 --- a/src/GF/Source/GF.cf +++ b/src/GF/Source/GF.cf @@ -43,9 +43,14 @@ MTConcrete. ModType ::= "concrete" Ident "of" Ident ; MTInstance. ModType ::= "instance" Ident "of" Ident ; MTTransfer. ModType ::= "transfer" Ident ":" Open "->" Open ; -MBody. ModBody ::= Extend Opens "{" [TopDef] "}" ; -MWith. ModBody ::= Ident "with" [Open] ; -MWithE. ModBody ::= [Included] "**" Ident "with" [Open] ; + +MBody. ModBody ::= Extend Opens "{" [TopDef] "}" ; +MNoBody. ModBody ::= [Included] ; +MWith. ModBody ::= Included "with" [Open] ; +MWithBody. ModBody ::= Included "with" [Open] "**" Opens "{" [TopDef] "}" ; +MWithE. ModBody ::= [Included] "**" Included "with" [Open] ; +MWithEBody. ModBody ::= [Included] "**" Included "with" [Open] "**" Opens "{" [TopDef] "}" ; + MReuse. ModBody ::= "reuse" Ident ; --% MUnion. ModBody ::= "union" [Included] ;--% -- cgit v1.2.3