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

getFCats -> getFIds in GeneratePMCFG

Browse Source
This commit is contained in:
krasimir
2010-06-20 08:45:31 +00:00
parent fe6e90e6ce
commit f3f1320416
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/GF/Compile/GeneratePMCFG.hs
View File

@@ -129,8 +129,8 @@ convertRule gr opts grammarEnv (PFRule fun args res ctypes ctype term) = do
return $! grammarEnv2 return $! grammarEnv2
where where
addRule lins (newCat', newArgs') env0 = addRule lins (newCat', newArgs') env0 =
let [newCat] = getFCats env0 newCat' let [newCat] = getFIds env0 newCat'
(env1, newArgs) = List.mapAccumL (\env -> addFCoercion env . getFCats env) env0 newArgs' (env1, newArgs) = List.mapAccumL (\env -> addFCoercion env . getFIds env) env0 newArgs'
(env2,funid) = addCncFun env1 (PGF.Data.CncFun (i2i fun) (mkArray lins)) (env2,funid) = addCncFun env1 (PGF.Data.CncFun (i2i fun) (mkArray lins))
@@ -500,7 +500,7 @@ expandHOAS opts (m,mo) env = return env {-
env3 = foldl (\env (arg,res) -> addProduction env res (PApply funid (arg : replicate n fcatVar))) env3 = foldl (\env (arg,res) -> addProduction env res (PApply funid (arg : replicate n fcatVar)))
env2 env2
(zip (getFCats env2 arg) (getFCats env2 res)) (zip (getFIds env2 arg) (getFIds env2 res))
in env3 in env3
where where
(arg,res) = case Map.lookup cat lincats of (arg,res) = case Map.lookup cat lincats of
@@ -579,8 +579,8 @@ getConcr flags printnames (GrammarEnv last_id catSet seqSet funSet crcSet prodSe
collect path paths (CPar _) = paths collect path paths (CPar _) = paths
getFCats :: GrammarEnv -> ProtoFCat -> [FId] getFIds :: GrammarEnv -> ProtoFCat -> [FId]
getFCats (GrammarEnv last_id catSet seqSet funSet crcSet prodSet) (PFCat n cat schema) = getFIds (GrammarEnv last_id catSet seqSet funSet crcSet prodSet) (PFCat n cat schema) =
case IntMap.lookup n catSet >>= Map.lookup cat of case IntMap.lookup n catSet >>= Map.lookup cat of
Just (start,end,_) -> reverse (solutions (fmap (start +) $ variants schema) ()) Just (start,end,_) -> reverse (solutions (fmap (start +) $ variants schema) ())
where where