diff options
Diffstat (limited to 'src/runtime/haskell/PGF/Morphology.hs')
| -rw-r--r-- | src/runtime/haskell/PGF/Morphology.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/runtime/haskell/PGF/Morphology.hs b/src/runtime/haskell/PGF/Morphology.hs index c77aa1735..f5c65b3ba 100644 --- a/src/runtime/haskell/PGF/Morphology.hs +++ b/src/runtime/haskell/PGF/Morphology.hs @@ -25,17 +25,17 @@ buildMorpho pgf lang = Morpho $ Nothing -> Map.empty collectWords pinfo = Map.fromListWith (++) - [(t, [(fun,lbls ! l)]) | (s,e,lbls) <- Map.elems (startCats pinfo) + [(t, [(fun,lbls ! l)]) | (CncCat s e lbls) <- Map.elems (cnccats pinfo) , fid <- [s..e] - , FApply funid _ <- maybe [] Set.toList (IntMap.lookup fid (pproductions pinfo)) - , let FFun fun lins = functions pinfo ! funid + , PApply funid _ <- maybe [] Set.toList (IntMap.lookup fid (pproductions pinfo)) + , let CncFun fun lins = cncfuns pinfo ! funid , (l,seqid) <- assocs lins , sym <- elems (sequences pinfo ! seqid) , t <- sym2tokns sym] where - sym2tokns (FSymKS ts) = ts - sym2tokns (FSymKP ts alts) = ts ++ [t | Alt ts ps <- alts, t <- ts] - sym2tokns _ = [] + sym2tokns (SymKS ts) = ts + sym2tokns (SymKP ts alts) = ts ++ [t | Alt ts ps <- alts, t <- ts] + sym2tokns _ = [] lookupMorpho :: Morpho -> String -> [(Lemma,Analysis)] lookupMorpho (Morpho mo) s = maybe [] id $ Map.lookup s mo |