diff options
| author | aarne <aarne@cs.chalmers.se> | 2007-10-05 12:54:29 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2007-10-05 12:54:29 +0000 |
| commit | 48623470cdba12f03f914c19677c6f7dc2072035 (patch) | |
| tree | c46daa2cbe4cb9fe9016181fba3e1aff183fd00c /src/GF/Parsing/FCFG.hs | |
| parent | 945a49214bd49fb082e8f613fc68d192a1b38743 (diff) | |
gf works with the new gfcc format
Diffstat (limited to 'src/GF/Parsing/FCFG.hs')
| -rw-r--r-- | src/GF/Parsing/FCFG.hs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/GF/Parsing/FCFG.hs b/src/GF/Parsing/FCFG.hs index 7784285e1..cf7f0d986 100644 --- a/src/GF/Parsing/FCFG.hs +++ b/src/GF/Parsing/FCFG.hs @@ -21,8 +21,9 @@ import GF.Formalism.Utilities import qualified GF.Parsing.FCFG.Active as Active import GF.Parsing.FCFG.PInfo -import GF.Canon.GFCC.AbsGFCC -import GF.Canon.GFCC.ErrM +import GF.GFCC.AbsGFCC +import GF.GFCC.Macros +import GF.GFCC.ErrM ---------------------------------------------------------------------- @@ -74,12 +75,12 @@ cnv_forests2 (FFloat x) = FFloat x -- parse trees to GFCC terms tree2term :: SyntaxTree CId -> Exp -tree2term (TNode f ts) = Tr (AC f) (map tree2term ts) +tree2term (TNode f ts) = tree (AC f) (map tree2term ts) -tree2term (TString s) = Tr (AS s) [] -tree2term (TInt n) = Tr (AI n) [] -tree2term (TFloat f) = Tr (AF f) [] -tree2term (TMeta) = Tr AM [] +tree2term (TString s) = tree (AS s) [] +tree2term (TInt n) = tree (AI n) [] +tree2term (TFloat f) = tree (AF f) [] +tree2term (TMeta) = exp0 ---------------------------------------------------------------------- -- conversion and unification of forests |