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

bugfix in the new PGF generation

Browse Source
This commit is contained in:
kr.angelov
2011-11-14 16:27:59 +00:00
parent 43fc9f462a
commit 8a7aa15c57
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/GF/Compile/GrammarToPGF.hs
View File

@@ -196,7 +196,7 @@ genCncFuns gr am cm cdefs fid_cnt cnccats =
let !funs_cnt' = let (s_funid, e_funid) = bounds funs0 let !funs_cnt' = let (s_funid, e_funid) = bounds funs0
in funs_cnt+(e_funid-s_funid+1) in funs_cnt+(e_funid-s_funid+1)
lindefs' = foldl' (toLinDef (am,id) funs_cnt) lindefs prods0 lindefs' = foldl' (toLinDef (am,id) funs_cnt) lindefs prods0
!(seqs',funs') = foldl' (toCncFun funs_cnt (m,id)) (seqs,funs) (assocs funs0) !(seqs',funs') = foldl' (toCncFun funs_cnt (m,mkLinDefId id)) (seqs,funs) (assocs funs0)
in mkCncCats cdefs fid_cnt funs_cnt' seqs' funs' lindefs' in mkCncCats cdefs fid_cnt funs_cnt' seqs' funs' lindefs'
mkCncCats (_ :cdefs) fid_cnt funs_cnt seqs funs lindefs = mkCncCats (_ :cdefs) fid_cnt funs_cnt seqs funs lindefs =
mkCncCats cdefs fid_cnt funs_cnt seqs funs lindefs mkCncCats cdefs fid_cnt funs_cnt seqs funs lindefs
@@ -237,6 +237,9 @@ genCncFuns gr am cm cdefs fid_cnt cnccats =
ctxt = mapM (mkCtxt lindefs) hargs_C ctxt = mapM (mkCtxt lindefs) hargs_C
fids = map (mkFId arg_C) fid0s fids = map (mkFId arg_C) fid0s
mkLinDefId id =
identC (BS.append (BS.pack "lindef ") (ident2bs id))
toLinDef res offs lindefs (Production fid0 funid0 _) = toLinDef res offs lindefs (Production fid0 funid0 _) =
IntMap.insertWith (++) fid [offs+funid0] lindefs IntMap.insertWith (++) fid [offs+funid0] lindefs
where where