From b447cf1a047a6f6e1c4945e809bffa57c88a08af Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 13 Dec 2007 20:19:47 +0000 Subject: new GFCC concrete syntax in place everywhere --- src/GF/Conversion/SimpleToFCFG.hs | 4 ++-- src/GF/Conversion/Types.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/GF/Conversion') diff --git a/src/GF/Conversion/SimpleToFCFG.hs b/src/GF/Conversion/SimpleToFCFG.hs index e1fa52297..a85c1843e 100644 --- a/src/GF/Conversion/SimpleToFCFG.hs +++ b/src/GF/Conversion/SimpleToFCFG.hs @@ -22,9 +22,9 @@ import Control.Monad import GF.Formalism.Utilities import GF.Formalism.FCFG -import GF.GFCC.Macros hiding (prt) +import GF.GFCC.Macros --hiding (prt) import GF.GFCC.DataGFCC -import GF.GFCC.AbsGFCC +import GF.GFCC.Raw.AbsGFCCRaw (CId (..)) import GF.Data.BacktrackM import GF.Data.SortedList diff --git a/src/GF/Conversion/Types.hs b/src/GF/Conversion/Types.hs index 913ee24bf..befc495a0 100644 --- a/src/GF/Conversion/Types.hs +++ b/src/GF/Conversion/Types.hs @@ -18,7 +18,7 @@ module GF.Conversion.Types where import qualified GF.Infra.Ident as Ident (Ident(..), wildIdent, isWildIdent) import qualified GF.Canon.AbsGFC as AbsGFC (CIdent(..), Label(..)) -import qualified GF.GFCC.AbsGFCC as AbsGFCC (CId(..)) +import qualified GF.GFCC.Raw.AbsGFCCRaw as AbsGFCC (CId(..)) import qualified GF.Grammar.Grammar as Grammar (Term) import GF.Formalism.GCFG -- cgit v1.2.3