Updated to latest CFG specification from gfc2java

1 files changed, 17 insertions, 3 deletions

diff --git a/src/GF/CFGM/AbsCFG.hs b/src/GF/CFGM/AbsCFG.hs
index c709aee38..61a6154f5 100644
--- a/src/GF/CFGM/AbsCFG.hs
+++ b/src/GF/CFGM/AbsCFG.hs
@@ -37,14 +37,28 @@ data Name =
   deriving (Eq,Ord,Show)
 
 data Category =
-   Category IdentParam Ident [Param]
+   Category IdentParam Ident [Proj]
   deriving (Eq,Ord,Show)
 
 data IdentParam =
-   IdentParam Ident [Param]
+   IdentParam Ident [Field]
+  deriving (Eq,Ord,Show)
+
+data Field =
+   Field KeyValue
+  deriving (Eq,Ord,Show)
+
+data Proj =
+   Proj Param
+  deriving (Eq,Ord,Show)
+
+data KeyValue =
+   KeyValue Ident Param
   deriving (Eq,Ord,Show)
 
 data Param =
-   Param Ident
+   ParamSimple Ident
+ | ParamPatt Ident [Param]
+ | ParamRec [KeyValue]
   deriving (Eq,Ord,Show)