diff options
Diffstat (limited to 'src/GF/Conversion')
| -rw-r--r-- | src/GF/Conversion/FTypes.hs | 1 | ||||
| -rw-r--r-- | src/GF/Conversion/SimpleToFCFG.hs | 13 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/GF/Conversion/FTypes.hs b/src/GF/Conversion/FTypes.hs index 6538b04cd..9409fc4ee 100644 --- a/src/GF/Conversion/FTypes.hs +++ b/src/GF/Conversion/FTypes.hs @@ -1,6 +1,5 @@ module GF.Conversion.FTypes where -import qualified GF.Infra.Ident as Ident (Ident(..), wildIdent, isWildIdent) import qualified GF.Canon.GFCC.AbsGFCC as AbsGFCC (CId(..)) import GF.Formalism.FCFG diff --git a/src/GF/Conversion/SimpleToFCFG.hs b/src/GF/Conversion/SimpleToFCFG.hs index 6b580cb24..f5d771298 100644 --- a/src/GF/Conversion/SimpleToFCFG.hs +++ b/src/GF/Conversion/SimpleToFCFG.hs @@ -13,11 +13,9 @@ module GF.Conversion.SimpleToFCFG - (convertGrammar,convertGrammarCId,FCat(..)) where + (convertGrammar,FCat(..)) where -import GF.System.Tracing import GF.Infra.PrintClass -import GF.Infra.Ident import Control.Monad @@ -42,13 +40,8 @@ import Data.Maybe type FToken = String -convertGrammar :: Grammar -> [(Ident,FCFGrammar FCat FName FToken)] -convertGrammar g = [(IC c, f) | (CId c,f) <- convertGrammarCId (mkGFCC g)] - --- this is more native for GFCC - -convertGrammarCId :: GFCC -> [(CId,FCFGrammar FCat FName FToken)] -convertGrammarCId gfcc = [(cncname,convert abs_defs conc) | +convertGrammar :: GFCC -> [(CId,FCFGrammar FCat FName FToken)] +convertGrammar gfcc = [(cncname,convert abs_defs conc) | cncname <- cncnames gfcc, conc <- Map.lookup cncname (concretes gfcc)] where |