summaryrefslogtreecommitdiff
path: root/src/GF/Source/GF.cf
diff options
context:
space:
mode:
authoraarne <unknown>2005-05-26 13:18:17 +0000
committeraarne <unknown>2005-05-26 13:18:17 +0000
commit9a756a3ac10128bc60708d4f41e2379450adf57c (patch)
treecc145fce9d5ff048fe3780922b002b3759076f5a /src/GF/Source/GF.cf
parent71c50e18d328d1fbf04749e8a453f1e8390c15f9 (diff)
romance Inf ; %, included
Diffstat (limited to 'src/GF/Source/GF.cf')
-rw-r--r--src/GF/Source/GF.cf11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/GF/Source/GF.cf b/src/GF/Source/GF.cf
index 9c63d43ee..06c81b61f 100644
--- a/src/GF/Source/GF.cf
+++ b/src/GF/Source/GF.cf
@@ -40,13 +40,13 @@ MTTransfer. ModType ::= "transfer" Ident ":" Open "->" Open ;
MBody. ModBody ::= Extend Opens "{" [TopDef] "}" ;
MWith. ModBody ::= Ident "with" [Open] ;
-MWithE. ModBody ::= [Ident] "**" Ident "with" [Open] ;
+MWithE. ModBody ::= [Included] "**" Ident "with" [Open] ;
MReuse. ModBody ::= "reuse" Ident ;
MUnion. ModBody ::= "union" [Included] ;
separator TopDef "" ;
-Ext. Extend ::= [Ident] "**" ;
+Ext. Extend ::= [Included] "**" ;
NoExt. Extend ::= ;
separator Open "," ;
@@ -66,8 +66,9 @@ QOInterface. QualOpen ::= "interface" ;
separator Included "," ;
-IAll. Included ::= Ident ;
-ISome. Included ::= Ident "[" [Ident] "]" ;
+IAll. Included ::= Ident ;
+ISome. Included ::= Ident "[" [Ident] "]" ;
+IMinus. Included ::= Ident "-" "[" [Ident] "]" ;
-- definitions after the $oper$ keywords
@@ -167,7 +168,7 @@ ETyped. Exp4 ::= "<" Exp ":" Exp ">" ; -- typing, used for annotations
EProj. Exp3 ::= Exp3 "." Label ;
EQConstr. Exp3 ::= "{" Ident "." Ident "}" ; -- qualified constructor
-EQCons. Exp3 ::= "%" Ident "." Ident "%" ; -- qualified constant
+EQCons. Exp3 ::= "%" Ident "." Ident ; -- qualified constant
EApp. Exp2 ::= Exp2 Exp3 ;
ETable. Exp2 ::= "table" "{" [Case] "}" ;