msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

addFCoercion -> addCoercion in GeneratePMCFG

Browse Source
This commit is contained in:
krasimir
2010-06-20 08:53:25 +00:00
parent f3f1320416
commit 8433afdac9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,7 +130,7 @@ convertRule gr opts grammarEnv (PFRule fun args res ctypes ctype term) = do
where where
addRule lins (newCat', newArgs') env0 = addRule lins (newCat', newArgs') env0 =
let [newCat] = getFIds env0 newCat' let [newCat] = getFIds env0 newCat'
(env1, newArgs) = List.mapAccumL (\env -> addFCoercion env . getFIds env) env0 newArgs' (env1, newArgs) = List.mapAccumL (\env -> addCoercion 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))
@@ -146,7 +146,7 @@ brk f (GrammarEnv last_id catSet seqSet funSet crcSet prodSet) =
ff :: FunId -> [[FId]] -> GrammarEnv -> GrammarEnv ff :: FunId -> [[FId]] -> GrammarEnv -> GrammarEnv
ff funid xs env ff funid xs env
| product (map Set.size ys) == count = | product (map Set.size ys) == count =
case List.mapAccumL (\env c -> addFCoercion env (Set.toList c)) env ys of case List.mapAccumL (\env c -> addCoercion env (Set.toList c)) env ys of
(env,args) -> addProduction env cat (PApply funid args) (env,args) -> addProduction env cat (PApply funid args)
| otherwise = List.foldl (\env args -> addProduction env cat (PApply funid args)) env xs | otherwise = List.foldl (\env args -> addProduction env cat (PApply funid args)) env xs
where where
@@ -543,8 +543,8 @@ addCncFun env@(GrammarEnv last_id catSet seqSet funSet crcSet prodSet) fun =
Nothing -> let !last_funid = Map.size funSet Nothing -> let !last_funid = Map.size funSet
in (GrammarEnv last_id catSet seqSet (Map.insert fun last_funid funSet) crcSet prodSet,last_funid) in (GrammarEnv last_id catSet seqSet (Map.insert fun last_funid funSet) crcSet prodSet,last_funid)
addFCoercion :: GrammarEnv -> [FId] -> (GrammarEnv,FId) addCoercion :: GrammarEnv -> [FId] -> (GrammarEnv,FId)
addFCoercion env@(GrammarEnv last_id catSet seqSet funSet crcSet prodSet) sub_fcats = addCoercion env@(GrammarEnv last_id catSet seqSet funSet crcSet prodSet) sub_fcats =
case sub_fcats of case sub_fcats of
[fcat] -> (env,fcat) [fcat] -> (env,fcat)
_ -> case Map.lookup sub_fcats crcSet of _ -> case Map.lookup sub_fcats crcSet of