mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-04-23 19:42:50 -06:00
implemented V2? in finnish, german, romance
This commit is contained in:
@@ -26,12 +26,22 @@ concrete VerbFin of Verb = CatFin ** open Prelude, ResFin in {
|
|||||||
|
|
||||||
ComplVS v s = insertExtrapos ("että" ++ s.s) (predV v) ;
|
ComplVS v s = insertExtrapos ("että" ++ s.s) (predV v) ;
|
||||||
ComplVQ v q = insertExtrapos ( q.s) (predV v) ;
|
ComplVQ v q = insertExtrapos ( q.s) (predV v) ;
|
||||||
|
|
||||||
ComplVA v ap =
|
ComplVA v ap =
|
||||||
insertObj
|
insertObj
|
||||||
(\\_,b,agr =>
|
(\\_,b,agr =>
|
||||||
ap.s ! False ! AN (NCase agr.n (npform2case agr.n v.c2.c))) --- v.cs.s ignored
|
ap.s ! False ! AN (NCase agr.n (npform2case agr.n v.c2.c))) --- v.cs.s ignored
|
||||||
(predV v) ;
|
(predV v) ;
|
||||||
|
|
||||||
|
ComplV2S v np s =
|
||||||
|
insertExtrapos ("että" ++ s.s)
|
||||||
|
(insertObj (\\fin,b,_ => appCompl fin b v.c2 np) (predV v)) ;
|
||||||
|
ComplV2Q v np q =
|
||||||
|
insertExtrapos (q.s)
|
||||||
|
(insertObj (\\fin,b,_ => appCompl fin b v.c2 np) (predV v)) ;
|
||||||
|
ComplV2V v np vp =
|
||||||
|
insertObj (\\_,b,a => infVP v.sc b a vp) ---- different infinitives
|
||||||
|
(insertObj (\\fin,b,_ => appCompl fin b v.c2 np) (predV v)) ;
|
||||||
|
|
||||||
ComplV2A v np ap =
|
ComplV2A v np ap =
|
||||||
insertObj
|
insertObj
|
||||||
(\\fin,b,_ => appCompl fin b v.c2 np ++
|
(\\fin,b,_ => appCompl fin b v.c2 np ++
|
||||||
|
|||||||
@@ -22,8 +22,23 @@ concrete VerbGer of Verb = CatGer ** open Prelude, ResGer in {
|
|||||||
insertExtrapos (conjThat ++ s.s ! Sub) (predV v) ;
|
insertExtrapos (conjThat ++ s.s ! Sub) (predV v) ;
|
||||||
ComplVQ v q =
|
ComplVQ v q =
|
||||||
insertExtrapos (q.s ! QIndir) (predV v) ;
|
insertExtrapos (q.s ! QIndir) (predV v) ;
|
||||||
|
|
||||||
ComplVA v ap = insertObj (\\ _ => ap.s ! APred) (predV v) ;
|
ComplVA v ap = insertObj (\\ _ => ap.s ! APred) (predV v) ;
|
||||||
|
|
||||||
|
ComplV2S v np s =
|
||||||
|
insertExtrapos (conjThat ++ s.s ! Sub)
|
||||||
|
(insertObj (\\_ => appPrep v.c2 np.s) (predV v)) ;
|
||||||
|
ComplV2Q v np q =
|
||||||
|
insertExtrapos (q.s ! QIndir)
|
||||||
|
(insertObj (\\_ => appPrep v.c2 np.s) (predV v)) ;
|
||||||
|
ComplV2V v np vp =
|
||||||
|
let
|
||||||
|
vpi = infVP False vp
|
||||||
|
in
|
||||||
|
insertExtrapos vpi.p3 (
|
||||||
|
insertInf vpi.p2 (
|
||||||
|
insertObj vpi.p1 (
|
||||||
|
(insertObj (\\_ => appPrep v.c2 np.s) (predV v))))) ;
|
||||||
|
|
||||||
ComplV2A v np ap =
|
ComplV2A v np ap =
|
||||||
insertObj (\\_ => appPrep v.c2 np.s ++ ap.s ! APred) (predV v) ;
|
insertObj (\\_ => appPrep v.c2 np.s ++ ap.s ! APred) (predV v) ;
|
||||||
|
|
||||||
|
|||||||
@@ -12,12 +12,21 @@ incomplete concrete VerbRomance of Verb =
|
|||||||
|
|
||||||
ComplVV v vp =
|
ComplVV v vp =
|
||||||
insertComplement (\\a => prepCase v.c2.c ++ infVP vp a) (predV v) ;
|
insertComplement (\\a => prepCase v.c2.c ++ infVP vp a) (predV v) ;
|
||||||
|
|
||||||
ComplVS v s = insertExtrapos (\\b => conjThat ++ s.s ! (v.m ! b)) (predV v) ;
|
ComplVS v s = insertExtrapos (\\b => conjThat ++ s.s ! (v.m ! b)) (predV v) ;
|
||||||
ComplVQ v q = insertExtrapos (\\_ => q.s ! QIndir) (predV v) ;
|
ComplVQ v q = insertExtrapos (\\_ => q.s ! QIndir) (predV v) ;
|
||||||
|
|
||||||
ComplVA v ap =
|
ComplVA v ap =
|
||||||
insertComplement (\\a => ap.s ! AF a.g a.n) (predV v) ;
|
insertComplement (\\a => ap.s ! AF a.g a.n) (predV v) ;
|
||||||
|
|
||||||
|
ComplV2V v np vp =
|
||||||
|
insertComplement (\\a => prepCase v.c2.c ++ infVP vp a)
|
||||||
|
(insertObject v.c2 np (predV v)) ;
|
||||||
|
ComplV2S v np s =
|
||||||
|
insertExtrapos (\\b => s.s ! Indic) ---- mood
|
||||||
|
(insertObject v.c2 np (predV v)) ;
|
||||||
|
ComplV2Q v np q =
|
||||||
|
insertExtrapos (\\_ => q.s ! QIndir)
|
||||||
|
(insertObject v.c2 np (predV v)) ;
|
||||||
|
|
||||||
ComplV2A v np ap =
|
ComplV2A v np ap =
|
||||||
let af = case v.c3.isDir of {
|
let af = case v.c3.isDir of {
|
||||||
True => AF np.a.g np.a.n ; -- ... bleues
|
True => AF np.a.g np.a.n ; -- ... bleues
|
||||||
|
|||||||
Reference in New Issue
Block a user