Updated to simple CFGM grammar, use CFGM pretty printer when printing cfgm grammars.

1 files changed, 3 insertions, 24 deletions

diff --git a/src/GF/CFGM/AbsCFG.hs b/src/GF/CFGM/AbsCFG.hs
index 61a6154f5..f26175f41 100644
--- a/src/GF/CFGM/AbsCFG.hs
+++ b/src/GF/CFGM/AbsCFG.hs
@@ -3,6 +3,7 @@ module AbsCFG where
 -- Haskell module generated by the BNF converter
 
 newtype Ident = Ident String deriving (Eq,Ord,Show)
+newtype SingleQuoteString = SingleQuoteString String deriving (Eq,Ord,Show)
 data Grammars =
    Grammars [Grammar]
   deriving (Eq,Ord,Show)
@@ -33,32 +34,10 @@ data Symbol =
   deriving (Eq,Ord,Show)
 
 data Name =
-   Name [IdentParam] Category
+   Name SingleQuoteString
   deriving (Eq,Ord,Show)
 
 data Category =
-   Category IdentParam Ident [Proj]
-  deriving (Eq,Ord,Show)
-
-data IdentParam =
-   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 =
-   ParamSimple Ident
- | ParamPatt Ident [Param]
- | ParamRec [KeyValue]
+   Category SingleQuoteString
   deriving (Eq,Ord,Show)