diff options
| author | aarne <aarne@cs.chalmers.se> | 2007-12-13 20:19:47 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2007-12-13 20:19:47 +0000 |
| commit | b447cf1a047a6f6e1c4945e809bffa57c88a08af (patch) | |
| tree | 4b6792997f34b764796a8b787b3e8a9638c6ff49 /src/GF/Canon/CanonToGFCC.hs | |
| parent | a311dda5392ac1d019bc4f60bd94b37df01a1411 (diff) | |
new GFCC concrete syntax in place everywhere
Diffstat (limited to 'src/GF/Canon/CanonToGFCC.hs')
| -rw-r--r-- | src/GF/Canon/CanonToGFCC.hs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/GF/Canon/CanonToGFCC.hs b/src/GF/Canon/CanonToGFCC.hs index 290b6ba33..9beb1a2b7 100644 --- a/src/GF/Canon/CanonToGFCC.hs +++ b/src/GF/Canon/CanonToGFCC.hs @@ -21,8 +21,10 @@ import qualified GF.Canon.Look as Look import qualified GF.Canon.Subexpressions as Sub import qualified GF.GFCC.Macros as CM -import qualified GF.GFCC.AbsGFCC as C +import GF.GFCC.Raw.AbsGFCCRaw (CId (..)) +import qualified GF.GFCC.DataGFCC as C import qualified GF.GFCC.DataGFCC as D +import GF.Devel.PrintGFCC import GF.GFCC.OptimizeGFCC import GF.Canon.GFC @@ -46,7 +48,7 @@ import Debug.Trace ---- -- the main function: generate GFCC from GFCM. prCanon2gfcc :: CanonGrammar -> String -prCanon2gfcc = D.printGFCC . mkCanon2gfcc +prCanon2gfcc = printGFCC . mkCanon2gfcc -- this variant makes utf8 conversion; used in back ends mkCanon2gfcc :: CanonGrammar -> D.GFCC @@ -99,8 +101,8 @@ canon2gfcc cgr@(M.MGrammar ((a,M.ModMod abm):cms)) = printnames = Map.fromAscList [] ---- printnames params = Map.fromAscList [] ---- params -i2i :: Ident -> C.CId -i2i (IC c) = C.CId c +i2i :: Ident -> CId +i2i (IC c) = CId c mkType :: A.Type -> C.Type mkType t = case GM.catSkeleton t of |