forked from GitHub/gf-rgl
added second preposition in V2A
This commit is contained in:
@@ -74,8 +74,8 @@ concrete CatBul of Cat = CommonX - [IAdv,CAdv,SC] ** open ResBul, Prelude, Prede
|
|||||||
-- Open lexical classes, e.g. Lexicon
|
-- Open lexical classes, e.g. Lexicon
|
||||||
|
|
||||||
V, VS, VQ, VA = Verb ;
|
V, VS, VQ, VA = Verb ;
|
||||||
V2, V2A = Verb ** {c2 : Preposition} ;
|
V2 = Verb ** {c2 : Preposition} ;
|
||||||
V2V, V2S, V2Q = Verb ** {c2, c3 : Preposition} ; --- AR
|
V2A, V2V, V2S, V2Q = Verb ** {c2, c3 : Preposition} ;
|
||||||
V3 = Verb ** {c2, c3 : Preposition} ;
|
V3 = Verb ** {c2, c3 : Preposition} ;
|
||||||
VV = Verb ** {typ : VVType};
|
VV = Verb ** {typ : VVType};
|
||||||
|
|
||||||
@@ -95,8 +95,8 @@ concrete CatBul of Cat = CommonX - [IAdv,CAdv,SC] ** open ResBul, Prelude, Prede
|
|||||||
VPSlash = \s -> slashV {s = \\_,_ => s; vtype = VNormal} {s=""; c=Acc};
|
VPSlash = \s -> slashV {s = \\_,_ => s; vtype = VNormal} {s=""; c=Acc};
|
||||||
|
|
||||||
V, VS, VQ, VA = \s -> {s = \\_,_ => s; vtype = VNormal};
|
V, VS, VQ, VA = \s -> {s = \\_,_ => s; vtype = VNormal};
|
||||||
V2, V2A = \s -> {s = \\_,_ => s; vtype = VNormal; c2 = {s=""; c=Acc}};
|
V2 = \s -> {s = \\_,_ => s; vtype = VNormal; c2 = {s=""; c=Acc}};
|
||||||
V2V, V2S, V2Q = \s -> {s = \\_,_ => s; vtype = VNormal; c2,c3 = {s=""; c=Acc}};
|
V2A, V2V, V2S, V2Q = \s -> {s = \\_,_ => s; vtype = VNormal; c2,c3 = {s=""; c=Acc}};
|
||||||
V3 = \s -> {s = \\_,_ => s; vtype = VNormal; c2,c3 = {s=""; c=Acc}};
|
V3 = \s -> {s = \\_,_ => s; vtype = VNormal; c2,c3 = {s=""; c=Acc}};
|
||||||
VV = \s -> {s = \\_,_ => s; vtype = VNormal; typ = VVInf};
|
VV = \s -> {s = \\_,_ => s; vtype = VNormal; typ = VVInf};
|
||||||
|
|
||||||
@@ -128,9 +128,9 @@ concrete CatBul of Cat = CommonX - [IAdv,CAdv,SC] ** open ResBul, Prelude, Prede
|
|||||||
} ;
|
} ;
|
||||||
|
|
||||||
V, VS, VQ, VA = \v -> linrefVP (predV v);
|
V, VS, VQ, VA = \v -> linrefVP (predV v);
|
||||||
V2, V2A = \v -> linrefVP (predV v) ++ v.c2.s;
|
V2 = \v -> linrefVP (predV v) ++ v.c2.s;
|
||||||
V2V = \v -> linrefVP (predV v) ++ v.c2.s ++ v.c3.s ++ "да";
|
V2V = \v -> linrefVP (predV v) ++ v.c2.s ++ v.c3.s ++ "да";
|
||||||
V2S, V2Q = \v -> linrefVP (predV v) ++ v.c2.s ++ v.c3.s;
|
V2A, V2S, V2Q = \v -> linrefVP (predV v) ++ v.c2.s ++ v.c3.s;
|
||||||
V3 = \v -> linrefVP (predV v) ++ v.c2.s ++ v.c3.s;
|
V3 = \v -> linrefVP (predV v) ++ v.c2.s ++ v.c3.s;
|
||||||
VV = \v -> linrefVP (predV v);
|
VV = \v -> linrefVP (predV v);
|
||||||
|
|
||||||
|
|||||||
@@ -128,8 +128,13 @@ oper
|
|||||||
mkV2V : V -> Prep -> Prep -> V2V ;
|
mkV2V : V -> Prep -> Prep -> V2V ;
|
||||||
mkV2V v p t = prepV2 v p ** {c3 = t ; lock_V2V = <>} ;
|
mkV2V v p t = prepV2 v p ** {c3 = t ; lock_V2V = <>} ;
|
||||||
|
|
||||||
mkV2A : V -> Prep -> V2A ;
|
mkV2A = overload {
|
||||||
mkV2A v p = prepV2 v p ** {lock_V2A = <>} ;
|
mkV2A : V -> Prep -> V2A
|
||||||
|
= \v, p -> prepV2 v p ** {c3 = noPrep ; lock_V2A = <>} ;
|
||||||
|
|
||||||
|
mkV2A : V -> Prep -> Prep -> V2A
|
||||||
|
= \v, p, t -> prepV2 v p ** {c3 = t ; lock_V2A = <>} ;
|
||||||
|
} ;
|
||||||
|
|
||||||
mkV2Q : V -> Prep -> Prep -> V2Q ;
|
mkV2Q : V -> Prep -> Prep -> V2Q ;
|
||||||
mkV2Q v p t = prepV2 v p ** {c3 = t ; lock_V2Q = <>} ;
|
mkV2Q v p t = prepV2 v p ** {c3 = t ; lock_V2Q = <>} ;
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
|
|||||||
|
|
||||||
|
|
||||||
SlashV2A v ap =
|
SlashV2A v ap =
|
||||||
insertSlashObj2 (\\a => ap.s ! aform a.gn Indef (RObj Acc) ! a.p) Pos (slashV v v.c2) ;
|
insertSlashObj2 (\\a => v.c3.s ++ ap.s ! aform a.gn Indef (RObj Acc) ! a.p) Pos (slashV v v.c2) ;
|
||||||
|
|
||||||
-- test: I saw a boy to whom she said that they are here
|
-- test: I saw a boy to whom she said that they are here
|
||||||
SlashV2S v s = insertSlashObj2 (\\_ => comma ++ "֌" ++ s.s) Pos (slashV v v.c2) ;
|
SlashV2S v s = insertSlashObj2 (\\_ => comma ++ "֌" ++ s.s) Pos (slashV v v.c2) ;
|
||||||
|
|||||||
Reference in New Issue
Block a user