From 136b0203eb2c2487863ea320eb6c095471be93a6 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 27 May 2005 20:05:17 +0000 Subject: experiment with gfc input --- src/GF/Canon/AbsGFC.hs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/GF/Canon/AbsGFC.hs') diff --git a/src/GF/Canon/AbsGFC.hs b/src/GF/Canon/AbsGFC.hs index 918338b18..0b8618877 100644 --- a/src/GF/Canon/AbsGFC.hs +++ b/src/GF/Canon/AbsGFC.hs @@ -1,4 +1,3 @@ - module GF.Canon.AbsGFC where import GF.Infra.Ident --H @@ -6,12 +5,19 @@ import GF.Infra.Ident --H -- Haskell module generated by the BNF converter, except --H -- newtype Ident = Ident String deriving (Eq,Ord,Show) --H - data Canon = MGr [Ident] Ident [Module] | Gr [Module] deriving (Eq,Ord,Show) +data Line = + LMulti [Ident] Ident + | LHeader ModType Extend Open + | LFlag Flag + | LDef Def + | LEnd + deriving (Eq,Ord,Show) + data Module = Mod ModType Extend Open [Flag] [Def] deriving (Eq,Ord,Show) @@ -131,8 +137,8 @@ data Term = data Tokn = KS String - | KM String | KP [String] [Variant] + | KM String deriving (Eq,Ord,Show) data Assign = -- cgit v1.2.3