GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-11 20:22:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update GFCCAPI after the removal of FTypes and the FCFG lexer

Browse Source
This commit is contained in:
kr.angelov
2007-09-24 08:58:46 +00:00
parent b109169441
commit 9222e4d34c
2 changed files with 4 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/GF/Canon/GFCC/FCFGParsing.hs
View File

@@ -1,44 +1,23 @@
module GF.Canon.GFCC.FCFGParsing (parserLang,buildPInfo,FCFPInfo) where module GF.Canon.GFCC.FCFGParsing (parserLang,PF.buildFCFPInfo,PF.FCFPInfo) where
import GF.Canon.GFCC.DataGFCC import GF.Canon.GFCC.DataGFCC
import GF.Canon.GFCC.AbsGFCC import GF.Canon.GFCC.AbsGFCC
import GF.Conversion.SimpleToFCFG (convertGrammar,FCat(..)) import GF.Conversion.SimpleToFCFG (convertGrammar,FCat(..))
--import GF.System.Tracing
--import GF.Infra.Print
--import qualified GF.Grammar.PrGrammar as PrGrammar
--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.Infra.Ident as Ident
--import GF.CF.CFIdent (CFCat, cfCat2Ident, CFTok, wordsCFTok)
import GF.Data.SortedList import GF.Data.SortedList
import GF.Data.Assoc import GF.Data.Assoc
import GF.Formalism.Utilities --(forest2trees) import GF.Formalism.Utilities --(forest2trees)
import qualified GF.Data.Operations as Op import qualified GF.Data.Operations as Op
import GF.Conversion.FTypes
import GF.Formalism.FCFG import GF.Formalism.FCFG
--import qualified GF.Formalism.GCFG as G
--import qualified GF.Formalism.SimpleGFC as S
--import qualified GF.Formalism.MCFG as M
--import qualified GF.Formalism.CFG as C
--import qualified GF.Parsing.MCFG as PM
import qualified GF.Parsing.FCFG as PF import qualified GF.Parsing.FCFG as PF
--import qualified GF.Parsing.CFG as PC
import GF.Canon.GFCC.ErrM import GF.Canon.GFCC.ErrM
import GF.Infra.PrintClass import GF.Infra.PrintClass
parserLang :: GFCC -> CId -> CFCat -> [CFTok] -> Err [Exp] parserLang :: GFCC -> CId -> CFCat -> [CFTok] -> Err [Exp]
parserLang mgr lang = parse info where parserLang mgr lang = parse info where
fcfgs = convertGrammar mgr fcfgs = convertGrammar mgr
info = buildPInfo $ maybe (error "no parser") id $ lookup lang fcfgs info = PF.buildFCFPInfo $ maybe (error "no parser") id $ lookup lang fcfgs
type CFTok = String ---- type CFTok = String ----
type CFCat = CId ---- type CFCat = CId ----
@@ -50,24 +29,12 @@ wordsCFTok :: CFTok -> [String]
wordsCFTok = return ---- wordsCFTok = return ----
type FCFPInfo = PF.FCFPInfo FCat FName String
buildPInfo :: FGrammar -> FCFPInfo
buildPInfo fcfg = PF.buildFCFPInfo grammarLexer fcfg where
grammarLexer s =
case reads s of
[(n,"")] -> (fcatInt, SInt (n::Integer))
_ -> case reads s of
[(f,"")] -> (fcatFloat, SFloat (f::Double))
_ -> (fcatString,SString s)
-- main parsing function -- main parsing function
parse :: parse ::
-- String -> -- ^ parsing algorithm (mcfg or cfg) -- String -> -- ^ parsing algorithm (mcfg or cfg)
-- String -> -- ^ parsing strategy -- String -> -- ^ parsing strategy
FCFPInfo -> -- ^ compiled grammar (fcfg) PF.FCFPInfo -> -- ^ compiled grammar (fcfg)
-- Ident.Ident -> -- ^ abstract module name -- Ident.Ident -> -- ^ abstract module name
CFCat -> -- ^ starting category CFCat -> -- ^ starting category
[CFTok] -> -- ^ input tokens [CFTok] -> -- ^ input tokens

2
src/GF/Canon/GFCC/GFCCAPI.hs
View File

@@ -74,7 +74,7 @@ startCat :: MultiGrammar -> Category
file2grammar f = do file2grammar f = do
gfcc <- file2gfcc f gfcc <- file2gfcc f
let fcfgs = convertGrammar gfcc let fcfgs = convertGrammar gfcc
return (MultiGrammar gfcc [(lang, buildPInfo fcfg) | (CId lang,fcfg) <- fcfgs]) return (MultiGrammar gfcc [(lang, buildFCFPInfo fcfg) | (CId lang,fcfg) <- fcfgs])
file2gfcc f = file2gfcc f =
readFileIf f >>= err (error "no parse") (return . mkGFCC) . pGrammar . myLexer readFileIf f >>= err (error "no parse") (return . mkGFCC) . pGrammar . myLexer