From 48b4e3de1dd02a9956a7a051ea5c44fb24b6130a Mon Sep 17 00:00:00 2001 From: kr_angelov Date: Thu, 28 Dec 2006 16:35:16 +0000 Subject: simplify GFCC syntax --- src/GF/Canon/GFCC/AbsGFCC.hs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/GF/Canon/GFCC/AbsGFCC.hs') diff --git a/src/GF/Canon/GFCC/AbsGFCC.hs b/src/GF/Canon/GFCC/AbsGFCC.hs index af9f18088..ccb964689 100644 --- a/src/GF/Canon/GFCC/AbsGFCC.hs +++ b/src/GF/Canon/GFCC/AbsGFCC.hs @@ -47,24 +47,19 @@ data Term = R [Term] | P Term Term | S [Term] - | K Tokn - | V Integer - | C Integer + | KS String + | KP [String] [Variant] + | V Int + | C Int | F CId | FV [Term] - | W String Term + | W String [String] | RP Term Term | TM | L CId Term | BV CId deriving (Eq,Ord,Show) -data Tokn = - KS String - | KP [String] [Variant] - deriving (Eq,Ord,Show) - data Variant = Var [String] [String] deriving (Eq,Ord,Show) - -- cgit v1.2.3