diff options
| author | aarne <aarne@cs.chalmers.se> | 2006-09-29 10:55:36 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2006-09-29 10:55:36 +0000 |
| commit | b39ecf4c324b674918813099711aaf437d7db1df (patch) | |
| tree | 052d0b8ccb4d39dc95ffef7c184323b6f1ff2340 /src/GF/Canon/GFCC/AbsGFCC.hs | |
| parent | f705205b529e7761f2ba1d0fd4ba5dcf566dbf0d (diff) | |
new constructs in gfcc, removed lambda
Diffstat (limited to 'src/GF/Canon/GFCC/AbsGFCC.hs')
| -rw-r--r-- | src/GF/Canon/GFCC/AbsGFCC.hs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/GF/Canon/GFCC/AbsGFCC.hs b/src/GF/Canon/GFCC/AbsGFCC.hs index 0617c921b..986bbaee6 100644 --- a/src/GF/Canon/GFCC/AbsGFCC.hs +++ b/src/GF/Canon/GFCC/AbsGFCC.hs @@ -21,10 +21,12 @@ data Concrete = data AbsDef = Fun CId Type Exp + | AFl CId String deriving (Eq,Ord,Show) data CncDef = Lin CId Term + | CFl CId String deriving (Eq,Ord,Show) data Type = @@ -39,6 +41,8 @@ data Atom = AC CId | AS String | AI Integer + | AF Double + | AM deriving (Eq,Ord,Show) data Term = @@ -49,10 +53,9 @@ data Term = | V Integer | C Integer | F CId - | L CId - | A CId Term | FV [Term] | W String Term + | RP Term Term deriving (Eq,Ord,Show) data Tokn = |