GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-25 02:38:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixedRon

Browse Source
This commit is contained in:
ra.monique
2009-12-14 11:58:15 +00:00
parent 7a449030b0
commit bb0bac0310
8 changed files with 112 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/src/romanian/CatRon.gf
View File

@@ -8,7 +8,7 @@ concrete CatRon of Cat =
lincat lincat
-- Tensed/Untensed -- Tensed/Untensed
@@ -47,7 +47,7 @@ concrete CatRon of Cat =
-- Noun -- Noun
CN = {s : Number => Species => ACase => Str; g : NGender; a : Animacy } ; CN = {s : Number => Species => ACase => Str; g : NGender; a : Animacy ; isComp : Bool} ;
Pron = {s : NCase => Str ; Pron = {s : NCase => Str ;
c1, c2 : Clitics => Str ; c1, c2 : Clitics => Str ;
@@ -162,3 +162,4 @@ conjThan : Str = "dec
conjThat : Str = "cã" ; conjThat : Str = "cã" ;
} }

14
lib/src/romanian/ConjunctionRon.gf
View File

@@ -11,8 +11,8 @@ concrete ConjunctionRon of Conjunction =
ConjNP conj ss = heavyNP (conjunctDistrTable NCase conj ss ** { ConjNP conj ss = heavyNP (conjunctDistrTable NCase conj ss ** {
a = {g = ss.a.g ; n = conjNumber conj.n ss.a.n ; p = ss.a.p} ; a = {g = ss.a.g ; n = conjNumber conj.n ss.a.n ; p = ss.a.p} ;
hasClit = ss.hasClit; hasClit = ss.nForm;
ss = "" ---- fix this !!!! ss = ""
}) ; }) ;
@@ -35,13 +35,17 @@ concrete ConjunctionRon of Conjunction =
s1 = \\c => (x.s ! c).comp ; s1 = \\c => (x.s ! c).comp ;
s2 = \\c => (y.s ! c).comp ; s2 = \\c => (y.s ! c).comp ;
a = conjAgr x.a y.a; a = conjAgr x.a y.a;
hasClit = andB x.hasClit y.hasClit nForm = case x.nForm of
{HasClit => y.nForm ;
_ => HasRef False }
} ; } ;
ConsNP x xs = { ConsNP x xs = {
s1 = \\c => (x.s ! c).comp ++ comma ++ xs.s1 ! c ; ----e (conjunctCase c) ; s1 = \\c => (x.s ! c).comp ++ comma ++ xs.s1 ! c ; ----e (conjunctCase c) ;
s2 = \\c => xs.s2 ! c ; ----e (conjunctCase c) ; s2 = \\c => xs.s2 ! c ; ----e (conjunctCase c) ;
a = conjAgr x.a xs.a ; a = conjAgr x.a xs.a ;
hasClit = andB xs.hasClit x.hasClit nForm = case x.nForm of
{HasClit => xs.nForm ;
_ => HasRef False}
} ; } ;
BaseAP x y = twoTable AForm x y ** {isPre = andB x.isPre y.isPre} ; BaseAP x y = twoTable AForm x y ** {isPre = andB x.isPre y.isPre} ;
@@ -52,7 +56,7 @@ concrete ConjunctionRon of Conjunction =
lincat lincat
[S] = {s1,s2 : Mood => Str} ; [S] = {s1,s2 : Mood => Str} ;
[Adv] = {s1,s2 : Str} ; [Adv] = {s1,s2 : Str} ;
[NP] = {s1,s2 : NCase => Str ; a : Agr; hasClit : Bool} ; [NP] = {s1,s2 : NCase => Str ; a : Agr; nForm : NForm} ;
[AP] = {s1,s2 : AForm => Str ; isPre : Bool} ; [AP] = {s1,s2 : AForm => Str ; isPre : Bool} ;
[RS] = {s1,s2 : Mood => Agr => Str ; c : NCase} ; [RS] = {s1,s2 : Mood => Agr => Str ; c : NCase} ;

58
lib/src/romanian/NounRon.gf
View File

@@ -1,5 +1,5 @@
concrete NounRon of Noun = concrete NounRon of Noun =
CatRon ** open ResRon,Prelude in { CatRon ** open ResRon,Prelude in {
flags optimize=all_subs ; flags optimize=all_subs ;
@@ -9,7 +9,8 @@ concrete NounRon of Noun =
n = det.n; n = det.n;
gg = agrGender cn.g n ; gg = agrGender cn.g n ;
ag = agrP3 gg n ; ag = agrP3 gg n ;
hr = andB (getClit cn.a) det.hasRef ; hr = orB (andB (getClit cn.a) det.hasRef) (andB det.isDef cn.isComp);
nf = if_then_else NForm hr HasClit (HasRef False);
st= if_then_else Species det.isDef Def Indef; st= if_then_else Species det.isDef Def Indef;
rs = if_then_else Species det.hasRef Def Indef rs = if_then_else Species det.hasRef Def Indef
in in
@@ -21,9 +22,8 @@ concrete NounRon of Noun =
clit = \\cs => if_then_Str hr ((genCliticsCase ag c).s ! cs) [] } clit = \\cs => if_then_Str hr ((genCliticsCase ag c).s ! cs) [] }
}; };
a = ag ; a = ag ;
hasClit = hr ; nForm = nf;
hasRef = hr ; isPronoun = False;
isPronoun = False ;
indForm = det.s ! gg ! No ++ det.size ++cn.s ! n ! rs ! ANomAcc ++ det.post ! gg ! No indForm = det.s ! gg ! No ++ det.size ++cn.s ! n ! rs ! ANomAcc ++ det.post ! gg ! No
} ; } ;
@@ -38,16 +38,14 @@ concrete NounRon of Noun =
clit = \\cs => if_then_Str hc ((genCliticsCase ag c).s ! cs) [] } ; clit = \\cs => if_then_Str hc ((genCliticsCase ag c).s ! cs) [] } ;
a = ag; a = ag;
hasClit = hc ; nForm = if_then_else NForm hc HasClit (HasRef False) ;
hasRef = hc ;
isPronoun = False ; isPronoun = False ;
indForm = pn.s ! No indForm = pn.s ! No
} ; } ;
UsePron p = {s = \\c =>{comp = p.s ! c ; UsePron p = {s = \\c =>{comp = p.s ! c ;
clit = (genCliticsCase p.a c).s } ; clit = (genCliticsCase p.a c).s } ;
hasClit = True; nForm = HasClit;
hasRef = True ;
isPronoun = True ; isPronoun = True ;
a = p.a; a = p.a;
indForm = p.s ! Ac indForm = p.s ! Ac
@@ -59,8 +57,7 @@ concrete NounRon of Noun =
{s = \\c => {comp = pred.s ! aagr (np.a.g) (np.a.n) ! (convCase c) ++ (np.s ! pred.c).comp ; {s = \\c => {comp = pred.s ! aagr (np.a.g) (np.a.n) ! (convCase c) ++ (np.s ! pred.c).comp ;
clit = (np.s ! c).clit }; clit = (np.s ! c).clit };
a = np.a ; a = np.a ;
hasClit = np.hasClit ; nForm = np.nForm ;
hasRef = np.hasRef ;
isPronoun = False ; isPronoun = False ;
indForm = pred.s ! aagr (np.a.g) (np.a.n) ! ANomAcc ++ (np.s ! pred.c).comp indForm = pred.s ! aagr (np.a.g) (np.a.n) ! ANomAcc ++ (np.s ! pred.c).comp
} ; } ;
@@ -70,21 +67,21 @@ concrete NounRon of Noun =
heavyNP { heavyNP {
s = \\c => (np.s ! c).comp ++ v2.s ! PPasse np.a.g np.a.n Indef (convCase c); s = \\c => (np.s ! c).comp ++ v2.s ! PPasse np.a.g np.a.n Indef (convCase c);
a = np.a ; a = np.a ;
hasClit = np.hasClit; hasClit = np.nForm;
ss = (np.s ! No).comp ++ v2.s ! PPasse np.a.g np.a.n Indef ANomAcc ss = (np.s ! No).comp ++ v2.s ! PPasse np.a.g np.a.n Indef ANomAcc
} ; } ;
RelNP np rs = heavyNP { RelNP np rs = heavyNP {
s = \\c => (np.s ! c).comp ++ rs.s ! Indic ! np.a ; s = \\c => (np.s ! c).comp ++ rs.s ! Indic ! np.a ;
a = np.a ; a = np.a ;
hasClit = np.hasClit ; hasClit = np.nForm ;
ss = (np.s ! No).comp ++ rs.s ! Indic ! np.a ss = (np.s ! No).comp ++ rs.s ! Indic ! np.a
} ; } ;
AdvNP np adv = heavyNP { AdvNP np adv = heavyNP {
s = \\c => (np.s ! c).comp ++ adv.s ; s = \\c => (np.s ! c).comp ++ adv.s ;
a = np.a ; a = np.a ;
hasClit = np.hasClit; hasClit = np.nForm;
ss = (np.s ! No).comp ++adv.s ; ss = (np.s ! No).comp ++adv.s ;
} ; } ;
@@ -141,7 +138,7 @@ in {
in heavyNP { in heavyNP {
s = \\c => det.sp ! g ! c ; s = \\c => det.sp ! g ! c ;
a = agrP3 g n ; a = agrP3 g n ;
hasClit = True ; hasClit = HasClit ;
ss = det.sp ! g ! No ss = det.sp ! g ! No
} ; } ;
@@ -226,15 +223,14 @@ in {
s = \\c => {comp = cn.s ! n ! Indef ! (convCase c); s = \\c => {comp = cn.s ! n ! Indef ! (convCase c);
clit = \\cs => [] } ; clit = \\cs => [] } ;
a = agrP3 g n ; a = agrP3 g n ;
hasClit = False ; nForm = HasRef False ;
hasRef = False ;
isPronoun = False ; isPronoun = False ;
indForm = cn.s ! n ! Indef ! ANomAcc indForm = cn.s ! n ! Indef ! ANomAcc
} ; } ;
-- This is based on record subtyping. -- This is based on record subtyping.
UseN, UseN2 = \noun -> noun ; UseN, UseN2 = \noun -> noun ** {isComp = False};
Use2N3 f = f ; Use2N3 f = f ;
@@ -243,14 +239,16 @@ in {
ComplN2 f x = { ComplN2 f x = {
s = \\n,sp,c => f.s ! n ! sp ! c ++ appCompl f.c2 x ; s = \\n,sp,c => f.s ! n ! sp ! c ++ appCompl f.c2 x ;
g = f.g ; g = f.g ;
a = f.a a = f.a ;
isComp = getClit f.a
} ; } ;
ComplN3 f x = { ComplN3 f x = {
s = \\n,sp,c => f.s ! n ! sp ! c ++ appCompl f.c2 x ; s = \\n,sp,c => f.s ! n ! sp ! c ++ appCompl f.c2 x ;
g = f.g ; g = f.g ;
c2 = f.c3; c2 = f.c3;
a = f.a a = f.a ;
isComp = getClit f.a
} ; } ;
AdjCN ap cn = AdjCN ap cn =
@@ -264,36 +262,38 @@ in {
Indef => \\c => cn.s ! n ! Indef ! c ++ ap.s ! (AF (agrGender g n) n Indef c) } Indef => \\c => cn.s ! n ! Indef ! c ++ ap.s ! (AF (agrGender g n) n Indef c) }
}; };
g = g ; g = g ;
a = cn.a a = cn.a ;
isComp = getClit cn.a
} ; } ;
RelCN cn rs = { RelCN cn rs = {
s = \\n,sp,c => cn.s ! n ! sp ! c ++ rs.s ! Indic ! agrP3 (agrGender cn.g n) n ; s = \\n,sp,c => cn.s ! n ! sp ! c ++ rs.s ! Indic ! agrP3 (agrGender cn.g n) n ;
g = cn.g ; g = cn.g ;
a = cn.a a = cn.a ;
isComp = False
} ; } ;
SentCN cn sc = let g = cn.g in { SentCN cn sc = let g = cn.g in {
s = \\n,sp,c => cn.s ! n ! sp ! c ++ sc.s ; s = \\n,sp,c => cn.s ! n ! sp ! c ++ sc.s ;
g = g ; g = g ;
a = cn.a a = cn.a ;
isComp = False
} ; } ;
AdvCN cn sc = let g = cn.g in { AdvCN cn sc = let g = cn.g in {
s = \\n,sp,c => cn.s ! n ! sp ! c ++ sc.s ; s = \\n,sp,c => cn.s ! n ! sp ! c ++ sc.s ;
g = g; g = g;
a = cn.a a = cn.a ;
isComp = False
} ; } ;
ApposCN cn np = let g = cn.g in { ApposCN cn np = let g = cn.g in {
s = \\n,sp,c => cn.s ! n ! sp ! c ++ (np.s ! No).comp ; s = \\n,sp,c => cn.s ! n ! sp ! c ++ (np.s ! No).comp ;
g = g; g = g;
a = cn.a a = cn.a ;
isComp = False
} ; } ;
}; };

9
lib/src/romanian/ParadigmsRon.gf
View File

@@ -465,9 +465,8 @@ mkNPspec : Str -> Str -> Str -> Number -> Gender -> NP =
}; };
a = ag ; a = ag ;
indForm = cineva ; indForm = cineva ;
hasClit = True; nForm = HasClit ;
isPronoun = False ; isPronoun = False ;
hasRef = True ;
lock_NP = <> lock_NP = <>
} ; } ;
@@ -482,9 +481,8 @@ mkNPs : Str -> Str -> Number -> Gender -> Bool -> NP =
}; };
a = ag ; a = ag ;
indForm = cineva ; indForm = cineva ;
hasClit = False;
isPronoun = False ; isPronoun = False ;
hasRef = b ; nForm = HasRef b ;
lock_NP = <> lock_NP = <>
}; };
@@ -501,8 +499,7 @@ mkNPa : Str -> Str -> Str -> Number -> Gender -> Bool -> NP =
comp = om} comp = om}
}; };
a = ag; a = ag;
hasClit = False; nForm = HasRef b;
hasRef = b;
isPronoun = False ; isPronoun = False ;
indForm = om ; indForm = om ;
lock_NP = <> lock_NP = <>

7
lib/src/romanian/RelativeRon.gf
View File

@@ -3,7 +3,7 @@ concrete RelativeRon of Relative =
flags optimize=all_subs ; flags optimize=all_subs ;
lin lin
RelCl cl = { RelCl cl = {
s = \\ag,t,a,p,m => "astfel" ++ "cã" ++ s = \\ag,t,a,p,m => "astfel" ++ "cã" ++
@@ -40,7 +40,10 @@ concrete RelativeRon of Relative =
s = \\a,c => ss ++ p.s ++ rp.s ! a ! p.c ; s = \\a,c => ss ++ p.s ++ rp.s ! a ! p.c ;
a = {g = np.a.g ; n = np.a.n} ; a = {g = np.a.g ; n = np.a.n} ;
hasAgr = True; hasAgr = True;
hasRef = np.hasRef hasRef = case np.nForm of
{HasRef False => False ;
_ => True
}
} ; } ;
-- Ac => if_then_Str p.isDir (ss ++ p.s ++ rp.s ! a ! p.c) (ss ++ p.s ++ rp.s ! a ! No) -- Ac => if_then_Str p.isDir (ss ++ p.s ++ rp.s ! a ! p.c) (ss ++ p.s ++ rp.s ! a ! No)

19
lib/src/romanian/ResRon.gf
View File

@@ -74,6 +74,10 @@ param
CardOrd = NCard Gender | NOrd Gender; CardOrd = NCard Gender | NOrd Gender;
-- Parameter indicating the presence of clitic doubling / referential form for noun phrases
NForm = HasClit | HasRef Bool ;
------------------------------------------------- -------------------------------------------------
--------------------2 Verbs --------------------- --------------------2 Verbs ---------------------
------------------------------------------------- -------------------------------------------------
@@ -312,8 +316,7 @@ oper
NounPhrase : Type = {s : NCase => {comp : Str ; clit : Clitics => Str} ; NounPhrase : Type = {s : NCase => {comp : Str ; clit : Clitics => Str} ;
a : Agr ; a : Agr ;
indForm : Str ; --needed for prepositions that demand the indefinite form of a NP indForm : Str ; --needed for prepositions that demand the indefinite form of a NP
hasClit : Bool ; -- needed to indicate if the NP has clitics or not (and is referenced also) nForm : NForm ; -- indicates the presence of clitic doubling and referential form
hasRef : Bool ; -- needed to indicate if the NP is referenced or not - for the use of the preposition for Accusative
isPronoun : Bool -- in the case of pronouns, just the clitics are used, and not the comp form isPronoun : Bool -- in the case of pronouns, just the clitics are used, and not the comp form
} ; } ;
VerbPhrase :Type = { VerbPhrase :Type = {
@@ -532,14 +535,15 @@ oper
-- various : -- various :
heavyNP : {s : NCase => Str ; a : Agr; hasClit : Bool; ss : Str} -> NounPhrase = \np -> { heavyNP : {s : NCase => Str ; a : Agr; hasClit : NForm; ss : Str} -> NounPhrase = \np -> {
s = \\c => {comp = np.s ! c ; s = \\c => {comp = np.s ! c ;
clit = \\cs => if_then_Str np.hasClit ((genCliticsCase np.a c).s ! cs) [] }; clit = \\cs => case np.hasClit of
{HasClit => (genCliticsCase np.a c).s ! cs ;
_ => [] }};
a = np.a ; a = np.a ;
indForm = np.ss ; indForm = np.ss ;
hasClit = np.hasClit ; nForm = np.hasClit;
isPronoun = False; isPronoun = False
hasRef = np.hasClit
} ; } ;
genForms : Str -> Str -> Gender => Str = \bon,bonne -> genForms : Str -> Str -> Gender => Str = \bon,bonne ->
@@ -608,3 +612,4 @@ oper
_ => False}; _ => False};
} }

1
lib/src/romanian/SymbolRon.gf
View File

@@ -1,3 +1,4 @@
--# -path=.:../abstract:../common:../prelude
concrete SymbolRon of Symbol = concrete SymbolRon of Symbol =
CatRon ** open Prelude, ResRon in { CatRon ** open Prelude, ResRon in {

70
lib/src/romanian/VerbRon.gf
View File

@@ -30,10 +30,16 @@ concrete VerbRon of Verb =
Slash2V3 v np = let s1 = v.c2.s ++(np.s ! (v.c2.c)).comp ; Slash2V3 v np = let s1 = v.c2.s ++(np.s ! (v.c2.c)).comp ;
ss = if_then_Str np.hasRef (v.c2.prepDir ++ s1) s1; ss = case np.nForm of
{HasRef False => s1 ;
_ => v.c2.prepDir ++ s1 };
sir = if_then_Str np.isPronoun "" ss ; sir = if_then_Str np.isPronoun "" ss ;
vcDa = if_then_else VClit np.hasClit (nextClit v.nrClit PDat) v.nrClit; vcDa = case np.nForm of
vcAc = if_then_else VClit np.hasClit (nextClit v.nrClit PAcc) v.nrClit {HasClit => nextClit v.nrClit PDat ;
_ => v.nrClit };
vcAc = case np.nForm of
{HasClit => nextClit v.nrClit PAcc ;
_ => v.nrClit }
in in
case v.c2.isDir of case v.c2.isDir of
{Dir PAcc => (insertObje (\\_ => sir) (clitFromNoun np Ac) RNoAg (isAgrFSg np.a) vcAc (useVerb v)) ** {needAgr = False ; needClit = True ; c2 = v.c3} ; {Dir PAcc => (insertObje (\\_ => sir) (clitFromNoun np Ac) RNoAg (isAgrFSg np.a) vcAc (useVerb v)) ** {needAgr = False ; needClit = True ; c2 = v.c3} ;
@@ -42,10 +48,16 @@ concrete VerbRon of Verb =
}; };
Slash3V3 v np = let s1 = v.c3.s ++ (np.s ! (v.c3.c)).comp ; Slash3V3 v np = let s1 = v.c3.s ++ (np.s ! (v.c3.c)).comp ;
ss = if_then_Str np.hasRef (v.c3.prepDir ++ s1) s1 ; ss = case np.nForm of
{HasRef False => s1 ;
_ => v.c3.prepDir ++ s1} ;
sir = if_then_Str np.isPronoun "" ss ; sir = if_then_Str np.isPronoun "" ss ;
vcDa = if_then_else VClit np.hasClit (nextClit v.nrClit PDat) v.nrClit; vcDa = case np.nForm of
vcAc = if_then_else VClit np.hasClit (nextClit v.nrClit PAcc) v.nrClit {HasClit => nextClit v.nrClit PDat ;
_ => v.nrClit };
vcAc = case np.nForm of
{HasClit => nextClit v.nrClit PAcc ;
_ => v.nrClit };
in in
case v.c3.isDir of case v.c3.isDir of
{Dir PAcc => (insertObje (\\_ => sir) (clitFromNoun np Ac) RNoAg (isAgrFSg np.a) vcAc (useVerb v)) ** {needAgr = False ; needClit = True ; c2 = v.c2} ; {Dir PAcc => (insertObje (\\_ => sir) (clitFromNoun np Ac) RNoAg (isAgrFSg np.a) vcAc (useVerb v)) ** {needAgr = False ; needClit = True ; c2 = v.c2} ;
@@ -68,14 +80,24 @@ concrete VerbRon of Verb =
-- more usually the adverbial form is used, hence no agreement -- more usually the adverbial form is used, hence no agreement
SlashV2A v ap = SlashV2A v ap =
(insertSimpObj (\\a => ap.s ! (AF Masc Sg Indef ANomAcc)) (useVerb v)) (insertSimpObj (\\a => v.c2.s ++ ap.s ! (AF Masc Sg Indef (convCase v.c2.c)))
** {needAgr = False ; needClit = True ; c2 = v.c2} ; (useVerb v)) ** {needAgr = False ; needClit = True ; c2 = v.c2} ;
ComplSlash vp np = let s1 = vp.c2.s ++(np.s ! (vp.c2.c)).comp ; ComplSlash vp np = let s1 = vp.c2.s ++(np.s ! (vp.c2.c)).comp ;
ss = if_then_Str np.hasRef (vp.c2.prepDir ++ s1) s1 ; ss = case np.nForm of
{ HasRef False => s1 ;
_ => vp.c2.prepDir ++ s1 };
sir = if_then_Str np.isPronoun "" ss ; sir = if_then_Str np.isPronoun "" ss ;
vcDa = if_then_else VClit np.hasClit (nextClit vp.nrClit PDat) vp.nrClit; vcDa = case np.nForm of
vcAc = if_then_else VClit np.hasClit (nextClit vp.nrClit PAcc) vp.nrClit; {HasClit => nextClit vp.nrClit PDat ;
_ => vp.nrClit
};
--if_then_else VClit np.hasClit (nextClit vp.nrClit PDat) vp.nrClit;
vcAc = case np.nForm of
{HasClit => nextClit vp.nrClit PAcc ;
_ => vp.nrClit
};
--if_then_else VClit np.hasClit (nextClit vp.nrClit PAcc) vp.nrClit;
vpp = case vp.c2.isDir of vpp = case vp.c2.isDir of
{Dir PAcc => insertObje (\\_ => sir) (clitFromNoun np Ac) RNoAg (isAgrFSg np.a) vcAc vp ; {Dir PAcc => insertObje (\\_ => sir) (clitFromNoun np Ac) RNoAg (isAgrFSg np.a) vcAc vp ;
Dir PDat => insertObje (\\_ => sir) RNoAg (clitFromNoun np Da) False vcDa vp; Dir PDat => insertObje (\\_ => sir) RNoAg (clitFromNoun np Da) False vcDa vp;
@@ -121,19 +143,27 @@ concrete VerbRon of Verb =
insertObjc (\\a => "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp a ++ vp.comp ! a ++ vp.ext ! Pos) ((useVerb v) **{c2=vp.c2; needAgr= vp.needAgr ; needClit = False; lock_VPSlash = <>}) ; insertObjc (\\a => "sã" ++ (flattenSimpleClitics vp.nrClit vp.clAcc vp.clDat (vp.isRefl ! a)) ++ conjVP vp a ++ vp.comp ! a ++ vp.ext ! Pos) ((useVerb v) **{c2=vp.c2; needAgr= vp.needAgr ; needClit = False; lock_VPSlash = <>}) ;
SlashV2VNP v np vp = let s1 = v.c2.s ++(np.s ! (v.c2.c)).comp ; SlashV2VNP v np vp = let s1 = v.c2.s ++(np.s ! (v.c2.c)).comp ;
ss = if_then_Str np.hasRef (v.c2.prepDir ++ s1) s1; ss = case np.nForm of
{HasRef False => s1 ;
_ => v.c2.prepDir ++ s1 };
sir = if_then_Str np.isPronoun "" ss ; sir = if_then_Str np.isPronoun "" ss ;
vcDa = if_then_else VClit np.hasClit (nextClit v.nrClit PDat) v.nrClit; vcDa = case np.nForm of
vcAc = if_then_else VClit np.hasClit (nextClit v.nrClit PAcc) v.nrClit ; {HasClit => nextClit v.nrClit PDat;
_ => v.nrClit };
vcAc = case np.nForm of
{HasClit => nextClit v.nrClit PAcc;
_ => v.nrClit };
vvp = vp ** {lock_VP = <>}; vvp = vp ** {lock_VP = <>};
vcomp = (getConjComp vvp np.a).s vcomp = (getConjComp vvp np.a).s
in in
case v.c2.isDir of { case v.c2.isDir of
Dir PAcc => insertObje (\\a => sir ++ vcomp ! a) (clitFromNoun np Ac) RNoAg (isAgrFSg np.a) vcAc (useVerb v) ; {Dir PAcc => (insertObje (\\a => sir ++ vcomp ! a) (clitFromNoun np Ac) RNoAg (isAgrFSg np.a) vcAc (useVerb v)) ** {needAgr = vp.needAgr ; needClit = False ;c2 = vp.c2} ;
Dir PDat => insertObje (\\a => sir ++ vcomp ! a) RNoAg (clitFromNoun np Da) False vcDa (useVerb v) ;
_ => insertSimpObjPre (\\a => ss ++ vcomp ! a) (useVerb v) Dir PDat => (insertObje (\\a => sir ++ vcomp ! a) RNoAg (clitFromNoun np Da) False vcDa (useVerb v)) ** {needAgr = vp.needAgr ; needClit = False ; c2 = vp.c2};
}
** {needAgr = vp.needAgr ; needClit = False ;c2 = vp.c2} ; _ => (insertSimpObjPre (\\a => ss ++ vcomp ! a) (useVerb v)) ** {needAgr = vp.needAgr ; needClit = False ; c2 = vp.c2}
};
UseComp comp = insertSimpObj comp.s copula ; UseComp comp = insertSimpObj comp.s copula ;