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 | |
| parent | 945a49214bd49fb082e8f613fc68d192a1b38743 (diff) | |
gf works with the new gfcc format
Diffstat (limited to 'src/GF/Parsing')
| -rw-r--r-- | src/GF/Parsing/FCFG.hs | 15 | ||||
| -rw-r--r-- | src/GF/Parsing/GFC.hs | 9 |
2 files changed, 13 insertions, 11 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 diff --git a/src/GF/Parsing/GFC.hs b/src/GF/Parsing/GFC.hs index 8d9257ebc..e84a2ec90 100644 --- a/src/GF/Parsing/GFC.hs +++ b/src/GF/Parsing/GFC.hs @@ -24,8 +24,8 @@ import GF.Data.Operations (Err(..)) import qualified GF.Grammar.Grammar as Grammar import qualified GF.Grammar.Macros as Macros import qualified GF.Canon.AbsGFC as AbsGFC -import qualified GF.Canon.GFCC.AbsGFCC as AbsGFCC -import qualified GF.Canon.GFCC.ErrM as ErrM +import qualified GF.GFCC.AbsGFCC as AbsGFCC +import qualified GF.GFCC.ErrM as ErrM import qualified GF.Infra.Ident as Ident import GF.CF.CFIdent (CFCat, cfCat2Ident, CFTok, wordsCFTok, prCFTok) @@ -169,14 +169,15 @@ tree2term abs (TFloat f) = Macros.float2term f tree2term abs (TMeta) = Macros.mkMeta 0 exp2term :: Ident.Ident -> AbsGFCC.Exp -> Grammar.Term -exp2term abs (AbsGFCC.Tr a es) = Macros.mkApp (atom2term abs a) (map (exp2term abs) es) +exp2term abs (AbsGFCC.DTr _ a es) = ---- TODO: bindings + Macros.mkApp (atom2term abs a) (map (exp2term abs) es) atom2term :: Ident.Ident -> AbsGFCC.Atom -> Grammar.Term atom2term abs (AbsGFCC.AC (AbsGFCC.CId f)) = Macros.qq (abs,Ident.IC f) atom2term abs (AbsGFCC.AS s) = Macros.string2term s atom2term abs (AbsGFCC.AI n) = Macros.int2term n atom2term abs (AbsGFCC.AF f) = Macros.float2term f -atom2term abs AbsGFCC.AM = Macros.mkMeta 0 +atom2term abs (AbsGFCC.AM i) = Macros.mkMeta (fromInteger i) ---------------------------------------------------------------------- -- conversion and unification of forests |