summaryrefslogtreecommitdiff
path: root/src/GF/Canon/GFCC/AbsGFCC.hs
diff options
context:
space:
mode:
authoraarne <aarne@cs.chalmers.se>2007-09-19 13:49:12 +0000
committeraarne <aarne@cs.chalmers.se>2007-09-19 13:49:12 +0000
commit7825a1a1c54d6922c709bed7de3f23f049e0046e (patch)
tree9eedd42bf67ae46b8f233234064c1edce133587c /src/GF/Canon/GFCC/AbsGFCC.hs
parenta886f7042b2ad16fa3ef120548df9773ffafbb45 (diff)
adapted GFCC2FCFG to other uses of GFCC, made it to default parser
Diffstat (limited to 'src/GF/Canon/GFCC/AbsGFCC.hs')
-rw-r--r--src/GF/Canon/GFCC/AbsGFCC.hs11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/GF/Canon/GFCC/AbsGFCC.hs b/src/GF/Canon/GFCC/AbsGFCC.hs
index ccb964689..aab74f7fb 100644
--- a/src/GF/Canon/GFCC/AbsGFCC.hs
+++ b/src/GF/Canon/GFCC/AbsGFCC.hs
@@ -47,19 +47,24 @@ data Term =
R [Term]
| P Term Term
| S [Term]
- | KS String
- | KP [String] [Variant]
+ | K Tokn
| V Int
| C Int
| F CId
| FV [Term]
- | W String [String]
+ | W String Term
| 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)
+