diff --git a/lib/src/finnish/DictEngFin.gf b/lib/src/finnish/DictEngFin.gf index 2bb5c3724..a72ff1c3b 100644 --- a/lib/src/finnish/DictEngFin.gf +++ b/lib/src/finnish/DictEngFin.gf @@ -7,6 +7,10 @@ concrete DictEngFin of DictEngAbs = CatFin ** open ParadigmsFin, flags coding=utf8 ; +oper + tehda_V = mkV (lin VK {s = c71 "tehdä"}) ; --CHECKED + nahda_V = mkV (lin VK {s = c71 "nähdä"}) ; --CHECKED + lin a_fortiori_Adv = mkWAdv "suuremmalla" "syyllä" ; @@ -53038,10 +53042,6 @@ zymotic_A = mkWA "tsymoosiin" "liittyvä" ; worry_VS = mkVS (caseV partitive (mkV "huolettaa")) ; --CHECKED --- minua huolettaa että zip_code_N = mkN "postinumero" ; --CHECKED -oper - tehda_V = mkV (lin VK {s = c71 "tehdä"}) ; --CHECKED - nahda_V = mkV (lin VK {s = c71 "nähdä"}) ; --CHECKED - -- another batch of additions, 29/3/2013 lin diff --git a/lib/src/romance/VerbRomance.gf b/lib/src/romance/VerbRomance.gf index 72918bcad..13f29150e 100644 --- a/lib/src/romance/VerbRomance.gf +++ b/lib/src/romance/VerbRomance.gf @@ -65,11 +65,27 @@ incomplete concrete VerbRomance of Verb = mkVPSlash vp.c2 (insertComplement (\\a => prepCase v.c2.c ++ infVP vp a) (predV v)) ; + SlashV2VNP v np vps = let obj = np.s ! v.c2.c in { + s = v ; + agr = partAgr v.vtyp ; + clit1 = obj.c1 ; + clit2 = obj.c2 ; + clit3 = {s,imp = [] ; hasClit = False} ; ---- shortcut from insertObject, to check AR 20/11/2013 + isNeg = False ; + neg = negation ; + comp = \\a => v.c2.s ++ obj.comp ++ prepCase v.c3.c ++ infVP vps a ; + ext = \\p => [] ; + c2 = vps.c2 + } ; + +{- ---- this takes ages to compile, hence inlined as above AR 20/11/2013 SlashV2VNP v np vp = mkVPSlash vp.c2 (insertComplement (\\a => prepCase v.c3.c ++ infVP vp a) (insertObject v.c2 np (predV v))) ; +-} + UseComp comp = insertComplement comp.s (predV copula) ;