From bc05653e825e082b70eebf2f420eb5a97610f56c Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Fri, 4 Feb 2005 19:17:57 +0000
Subject: resources and new instantiation syntax

---
 src/GF/Source/GF.cf | 7 ++++---
 1 file changed, 4 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 98eeb7498..9dd3eaa1f 100644
--- a/src/GF/Source/GF.cf
+++ b/src/GF/Source/GF.cf
@@ -39,7 +39,8 @@ MTInstance.  ModType ::= "instance" Ident "of" Ident ;
 MTTransfer.  ModType ::= "transfer" Ident ":" Open "->" Open ;
 
 MBody.  ModBody ::= Extend Opens "{" [TopDef] "}" ;
-MWith.  ModBody ::= Ident "with" [Open] ;
+MWith.  ModBody ::=              Ident "with" [Open] ;
+MWithE. ModBody ::= [Ident] "**" Ident "with" [Open] ;
 MReuse. ModBody ::= "reuse" Ident ;
 MUnion. ModBody ::= "union" [Included] ;
 
@@ -50,7 +51,7 @@ NoExt. Extend ::= ;
 
 separator Open "," ;
 NoOpens. Opens ::= ;
-Opens.   Opens ::= "open" [Open] "in" ;
+OpenIn.  Opens ::= "open" [Open] "in" ;
 
 OName.   Open ::= Ident ;
 OQualQO. Open ::= "(" QualOpen Ident ")" ;
@@ -105,7 +106,7 @@ DataQId.   DataConstr ::= Ident "." Ident ;
 separator DataConstr "|" ;
 
 
-ParDef.      ParDef ::= Ident "=" [ParConstr] ;
+ParDefDir.   ParDef ::= Ident "=" [ParConstr] ;
 ParDefIndir. ParDef ::= Ident "=" "(" "in" Ident ")" ;
 ParDefAbs.   ParDef ::= Ident ;
 
-- 
cgit v1.2.3